diff options
27 files changed, 2713 insertions, 6406 deletions
diff --git a/railties/doc/guides/html/2_2_release_notes.html b/railties/doc/guides/html/2_2_release_notes.html index b886df7aca..0dec014c3e 100644 --- a/railties/doc/guides/html/2_2_release_notes.html +++ b/railties/doc/guides/html/2_2_release_notes.html @@ -1,296 +1,128 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>Ruby on Rails 2.2 Release Notes</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Ruby on Rails 2.2 Release Notes</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> - - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_infrastructure">Infrastructure</a> - <ul> - - <li><a href="#_internationalization">Internationalization</a></li> - - <li><a href="#_compatibility_with_ruby_1_9_and_jruby">Compatibility with Ruby 1.9 and JRuby</a></li> - - </ul> - </li> - <li> - <a href="#_documentation">Documentation</a> - </li> - <li> - <a href="#_better_integration_with_http_out_of_the_box_etag_support">Better integration with HTTP : Out of the box ETag support</a> - </li> - <li> - <a href="#_thread_safety">Thread Safety</a> - </li> - <li> - <a href="#_active_record">Active Record</a> - <ul> - - <li><a href="#_transactional_migrations">Transactional Migrations</a></li> - - <li><a href="#_connection_pooling">Connection Pooling</a></li> - - <li><a href="#_hashes_for_join_table_conditions">Hashes for Join Table Conditions</a></li> - - <li><a href="#_new_dynamic_finders">New Dynamic Finders</a></li> - - <li><a href="#_associations_respect_private_protected_scope">Associations Respect Private/Protected Scope</a></li> - - <li><a href="#_other_activerecord_changes">Other ActiveRecord Changes</a></li> - - </ul> - </li> - <li> - <a href="#_action_controller">Action Controller</a> - <ul> - - <li><a href="#_shallow_route_nesting">Shallow Route Nesting</a></li> - - <li><a href="#_method_arrays_for_member_or_collection_routes">Method Arrays for Member or Collection Routes</a></li> - - <li><a href="#_resources_with_specific_actions">Resources With Specific Actions</a></li> - - <li><a href="#_other_action_controller_changes">Other Action Controller Changes</a></li> - - </ul> - </li> - <li> - <a href="#_action_view">Action View</a> - </li> - <li> - <a href="#_action_mailer">Action Mailer</a> - </li> - <li> - <a href="#_active_support">Active Support</a> - <ul> - - <li><a href="#_memoization">Memoization</a></li> - - <li><a href="#_tt_each_with_object_tt"><tt>each_with_object</tt></a></li> - - <li><a href="#_delegates_with_prefixes">Delegates With Prefixes</a></li> - - <li><a href="#_other_active_support_changes">Other Active Support Changes</a></li> - - </ul> - </li> - <li> - <a href="#_railties">Railties</a> - <ul> - - <li><a href="#_tt_config_gems_tt"><tt>config.gems</tt></a></li> - - <li><a href="#_other_railties_changes">Other Railties Changes</a></li> - - </ul> - </li> - <li> - <a href="#_deprecated">Deprecated</a> - </li> - <li> - <a href="#_credits">Credits</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>Ruby on Rails 2.2 Release Notes</h1> - <div id="preamble">
+ <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> + + <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_infrastructure">Infrastructure</a> + <ul> + + <li><a href="#_internationalization">Internationalization</a></li> + + <li><a href="#_compatibility_with_ruby_1_9_and_jruby">Compatibility with Ruby 1.9 and JRuby</a></li> + + </ul> + </li> + <li> + <a href="#_documentation">Documentation</a> + </li> + <li> + <a href="#_better_integration_with_http_out_of_the_box_etag_support">Better integration with HTTP : Out of the box ETag support</a> + </li> + <li> + <a href="#_thread_safety">Thread Safety</a> + </li> + <li> + <a href="#_active_record">Active Record</a> + <ul> + + <li><a href="#_transactional_migrations">Transactional Migrations</a></li> + + <li><a href="#_connection_pooling">Connection Pooling</a></li> + + <li><a href="#_hashes_for_join_table_conditions">Hashes for Join Table Conditions</a></li> + + <li><a href="#_new_dynamic_finders">New Dynamic Finders</a></li> + + <li><a href="#_associations_respect_private_protected_scope">Associations Respect Private/Protected Scope</a></li> + + <li><a href="#_other_activerecord_changes">Other ActiveRecord Changes</a></li> + + </ul> + </li> + <li> + <a href="#_action_controller">Action Controller</a> + <ul> + + <li><a href="#_shallow_route_nesting">Shallow Route Nesting</a></li> + + <li><a href="#_method_arrays_for_member_or_collection_routes">Method Arrays for Member or Collection Routes</a></li> + + <li><a href="#_resources_with_specific_actions">Resources With Specific Actions</a></li> + + <li><a href="#_other_action_controller_changes">Other Action Controller Changes</a></li> + + </ul> + </li> + <li> + <a href="#_action_view">Action View</a> + </li> + <li> + <a href="#_action_mailer">Action Mailer</a> + </li> + <li> + <a href="#_active_support">Active Support</a> + <ul> + + <li><a href="#_memoization">Memoization</a></li> + + <li><a href="#_tt_each_with_object_tt"><tt>each_with_object</tt></a></li> + + <li><a href="#_delegates_with_prefixes">Delegates With Prefixes</a></li> + + <li><a href="#_other_active_support_changes">Other Active Support Changes</a></li> + + </ul> + </li> + <li> + <a href="#_railties">Railties</a> + <ul> + + <li><a href="#_tt_config_gems_tt"><tt>config.gems</tt></a></li> + + <li><a href="#_other_railties_changes">Other Railties Changes</a></li> + + </ul> + </li> + <li> + <a href="#_deprecated">Deprecated</a> + </li> + <li> + <a href="#_credits">Credits</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>Ruby on Rails 2.2 Release Notes</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>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 <a href="http://github.com/rails/rails/commits/master">list of commits</a> in the main Rails repository on GitHub.</p></div>
<div class="paragraph"><p>Along with Rails, 2.2 marks the launch of the <a href="http://guides.rubyonrails.org/">Ruby on Rails Guides</a>, the first results of the ongoing <a href="http://hackfest.rubyonrails.org/guide">Rails Guides hackfest</a>. This site will deliver high-quality documentation of the major features of Rails.</p></div>
@@ -1168,7 +1000,7 @@ Durations of fractional months or fractional years are deprecated. Use Ruby̵ <div class="paragraph"><p>Release notes compiled by <a href="http://afreshcup.com">Mike Gunderloy</a></p></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/actioncontroller_basics.html b/railties/doc/guides/html/actioncontroller_basics.html index c859a2893e..f5b25a4d7a 100644 --- a/railties/doc/guides/html/actioncontroller_basics.html +++ b/railties/doc/guides/html/actioncontroller_basics.html @@ -1,295 +1,127 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>Action Controller basics</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Action Controller basics</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_what_does_a_controller_do">What Does a Controller do?</a> - </li> - <li> - <a href="#_methods_and_actions">Methods and Actions</a> - </li> - <li> - <a href="#_parameters">Parameters</a> - <ul> - - <li><a href="#_hash_and_array_parameters">Hash and Array Parameters</a></li> - - <li><a href="#_routing_parameters">Routing Parameters</a></li> - - <li><a href="#_tt_default_url_options_tt"><tt>default_url_options</tt></a></li> - - </ul> - </li> - <li> - <a href="#_session">Session</a> - <ul> - - <li><a href="#_accessing_the_session">Accessing the Session</a></li> - - <li><a href="#_the_flash">The flash</a></li> - - </ul> - </li> - <li> - <a href="#_cookies">Cookies</a> - </li> - <li> - <a href="#_filters">Filters</a> - <ul> - - <li><a href="#_after_filters_and_around_filters">After Filters and Around Filters</a></li> - - <li><a href="#_other_ways_to_use_filters">Other Ways to Use Filters</a></li> - - </ul> - </li> - <li> - <a href="#_verification">Verification</a> - </li> - <li> - <a href="#_request_forgery_protection">Request Forgery Protection</a> - </li> - <li> - <a href="#_the_tt_request_tt_and_tt_response_tt_objects">The <tt>request</tt> and <tt>response</tt> Objects</a> - <ul> - - <li><a href="#_the_tt_request_tt_object">The <tt>request</tt> Object</a></li> - - <li><a href="#_the_tt_response_tt_object">The <tt>response</tt> Object</a></li> - - </ul> - </li> - <li> - <a href="#_http_basic_authentication">HTTP Basic Authentication</a> - </li> - <li> - <a href="#_streaming_and_file_downloads">Streaming and File Downloads</a> - <ul> - - <li><a href="#_sending_files">Sending Files</a></li> - - <li><a href="#_restful_downloads">RESTful Downloads</a></li> - - </ul> - </li> - <li> - <a href="#_parameter_filtering">Parameter Filtering</a> - </li> - <li> - <a href="#_rescue">Rescue</a> - <ul> - - <li><a href="#_the_default_500_and_404_templates">The Default 500 and 404 Templates</a></li> - - <li><a href="#_tt_rescue_from_tt"><tt>rescue_from</tt></a></li> - - </ul> - </li> - <li> - <a href="#_changelog">Changelog</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>Action Controller basics</h1> - <div id="preamble">
+ <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_what_does_a_controller_do">What Does a Controller do?</a> + </li> + <li> + <a href="#_methods_and_actions">Methods and Actions</a> + </li> + <li> + <a href="#_parameters">Parameters</a> + <ul> + + <li><a href="#_hash_and_array_parameters">Hash and Array Parameters</a></li> + + <li><a href="#_routing_parameters">Routing Parameters</a></li> + + <li><a href="#_tt_default_url_options_tt"><tt>default_url_options</tt></a></li> + + </ul> + </li> + <li> + <a href="#_session">Session</a> + <ul> + + <li><a href="#_accessing_the_session">Accessing the Session</a></li> + + <li><a href="#_the_flash">The flash</a></li> + + </ul> + </li> + <li> + <a href="#_cookies">Cookies</a> + </li> + <li> + <a href="#_filters">Filters</a> + <ul> + + <li><a href="#_after_filters_and_around_filters">After Filters and Around Filters</a></li> + + <li><a href="#_other_ways_to_use_filters">Other Ways to Use Filters</a></li> + + </ul> + </li> + <li> + <a href="#_verification">Verification</a> + </li> + <li> + <a href="#_request_forgery_protection">Request Forgery Protection</a> + </li> + <li> + <a href="#_the_tt_request_tt_and_tt_response_tt_objects">The <tt>request</tt> and <tt>response</tt> Objects</a> + <ul> + + <li><a href="#_the_tt_request_tt_object">The <tt>request</tt> Object</a></li> + + <li><a href="#_the_tt_response_tt_object">The <tt>response</tt> Object</a></li> + + </ul> + </li> + <li> + <a href="#_http_basic_authentication">HTTP Basic Authentication</a> + </li> + <li> + <a href="#_streaming_and_file_downloads">Streaming and File Downloads</a> + <ul> + + <li><a href="#_sending_files">Sending Files</a></li> + + <li><a href="#_restful_downloads">RESTful Downloads</a></li> + + </ul> + </li> + <li> + <a href="#_parameter_filtering">Parameter Filtering</a> + </li> + <li> + <a href="#_rescue">Rescue</a> + <ul> + + <li><a href="#_the_default_500_and_404_templates">The Default 500 and 404 Templates</a></li> + + <li><a href="#_tt_rescue_from_tt"><tt>rescue_from</tt></a></li> + + </ul> + </li> + <li> + <a href="#_changelog">Changelog</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>Action Controller basics</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>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:</p></div>
<div class="ulist"><ul>
@@ -1198,7 +1030,7 @@ November 4, 2008: First release version by Tore Darrell </ul></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/active_record_querying.html b/railties/doc/guides/html/active_record_querying.html index 043e5120d1..cc2a6b7e4a 100644 --- a/railties/doc/guides/html/active_record_querying.html +++ b/railties/doc/guides/html/active_record_querying.html @@ -1,305 +1,137 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>Active Record Query Interface</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Active Record Query Interface</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> - - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_ids_first_last_and_all">IDs, First, Last and All</a> - </li> - <li> - <a href="#_conditions">Conditions</a> - <ul> - - <li><a href="#_pure_string_conditions">Pure String Conditions</a></li> - - <li><a href="#_array_conditions">Array Conditions</a></li> - - <li><a href="#_placeholder_conditions">Placeholder Conditions</a></li> - - <li><a href="#_hash_conditions">Hash Conditions</a></li> - - </ul> - </li> - <li> - <a href="#_ordering">Ordering</a> - </li> - <li> - <a href="#_selecting_certain_fields">Selecting Certain Fields</a> - </li> - <li> - <a href="#_limit_amp_offset">Limit & Offset</a> - </li> - <li> - <a href="#_group">Group</a> - </li> - <li> - <a href="#_having">Having</a> - </li> - <li> - <a href="#_read_only">Read Only</a> - </li> - <li> - <a href="#_lock">Lock</a> - </li> - <li> - <a href="#_making_it_all_work_together">Making It All Work Together</a> - </li> - <li> - <a href="#_eager_loading">Eager Loading</a> - </li> - <li> - <a href="#_dynamic_finders">Dynamic finders</a> - </li> - <li> - <a href="#_finding_by_sql">Finding By SQL</a> - </li> - <li> - <a href="#_tt_select_all_tt"><tt>select_all</tt></a> - </li> - <li> - <a href="#_working_with_associations">Working with Associations</a> - </li> - <li> - <a href="#_named_scopes">Named Scopes</a> - <ul> - - <li><a href="#_simple_named_scopes">Simple Named Scopes</a></li> - - <li><a href="#_combining_named_scopes">Combining Named Scopes</a></li> - - <li><a href="#_runtime_evaluation_of_named_scope_conditions">Runtime Evaluation of Named Scope Conditions</a></li> - - <li><a href="#_named_scopes_with_multiple_models">Named Scopes with Multiple Models</a></li> - - <li><a href="#_arguments_to_named_scopes">Arguments to Named Scopes</a></li> - - <li><a href="#_anonymous_scopes">Anonymous Scopes</a></li> - - </ul> - </li> - <li> - <a href="#_existence_of_objects">Existence of Objects</a> - </li> - <li> - <a href="#_calculations">Calculations</a> - <ul> - - <li><a href="#_count">Count</a></li> - - <li><a href="#_average">Average</a></li> - - <li><a href="#_minimum">Minimum</a></li> - - <li><a href="#_maximum">Maximum</a></li> - - <li><a href="#_sum">Sum</a></li> - - </ul> - </li> - <li> - <a href="#_changelog">Changelog</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>Active Record Query Interface</h1> - <div id="preamble">
+ <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> + + <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_ids_first_last_and_all">IDs, First, Last and All</a> + </li> + <li> + <a href="#_conditions">Conditions</a> + <ul> + + <li><a href="#_pure_string_conditions">Pure String Conditions</a></li> + + <li><a href="#_array_conditions">Array Conditions</a></li> + + <li><a href="#_placeholder_conditions">Placeholder Conditions</a></li> + + <li><a href="#_hash_conditions">Hash Conditions</a></li> + + </ul> + </li> + <li> + <a href="#_ordering">Ordering</a> + </li> + <li> + <a href="#_selecting_certain_fields">Selecting Certain Fields</a> + </li> + <li> + <a href="#_limit_amp_offset">Limit & Offset</a> + </li> + <li> + <a href="#_group">Group</a> + </li> + <li> + <a href="#_having">Having</a> + </li> + <li> + <a href="#_read_only">Read Only</a> + </li> + <li> + <a href="#_lock">Lock</a> + </li> + <li> + <a href="#_making_it_all_work_together">Making It All Work Together</a> + </li> + <li> + <a href="#_eager_loading">Eager Loading</a> + </li> + <li> + <a href="#_dynamic_finders">Dynamic finders</a> + </li> + <li> + <a href="#_finding_by_sql">Finding By SQL</a> + </li> + <li> + <a href="#_tt_select_all_tt"><tt>select_all</tt></a> + </li> + <li> + <a href="#_working_with_associations">Working with Associations</a> + </li> + <li> + <a href="#_named_scopes">Named Scopes</a> + <ul> + + <li><a href="#_simple_named_scopes">Simple Named Scopes</a></li> + + <li><a href="#_combining_named_scopes">Combining Named Scopes</a></li> + + <li><a href="#_runtime_evaluation_of_named_scope_conditions">Runtime Evaluation of Named Scope Conditions</a></li> + + <li><a href="#_named_scopes_with_multiple_models">Named Scopes with Multiple Models</a></li> + + <li><a href="#_arguments_to_named_scopes">Arguments to Named Scopes</a></li> + + <li><a href="#_anonymous_scopes">Anonymous Scopes</a></li> + + </ul> + </li> + <li> + <a href="#_existence_of_objects">Existence of Objects</a> + </li> + <li> + <a href="#_calculations">Calculations</a> + <ul> + + <li><a href="#_count">Count</a></li> + + <li><a href="#_average">Average</a></li> + + <li><a href="#_minimum">Minimum</a></li> + + <li><a href="#_maximum">Maximum</a></li> + + <li><a href="#_sum">Sum</a></li> + + </ul> + </li> + <li> + <a href="#_changelog">Changelog</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>Active Record Query Interface</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>This guide covers different ways to retrieve data from the database using Active Record. By referring to this guide, you will be able to:</p></div>
<div class="ulist"><ul>
@@ -1094,7 +926,7 @@ December 29 2008: Initial version by Ryan Bigg </ul></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/activerecord_validations_callbacks.html b/railties/doc/guides/html/activerecord_validations_callbacks.html index 0106c6fc38..be556283c1 100644 --- a/railties/doc/guides/html/activerecord_validations_callbacks.html +++ b/railties/doc/guides/html/activerecord_validations_callbacks.html @@ -1,346 +1,178 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>Active Record Validations and Callbacks</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Active Record Validations and Callbacks</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_overview_of_activerecord_validation">Overview of ActiveRecord Validation</a> - <ul> - - <li><a href="#_why_use_activerecord_validations">Why Use ActiveRecord Validations?</a></li> - - <li><a href="#_when_does_validation_happen">When Does Validation Happen?</a></li> - - <li><a href="#_the_meaning_of_tt_valid_tt">The Meaning of <tt>valid</tt></a></li> - - </ul> - </li> - <li> - <a href="#_the_declarative_validation_helpers">The Declarative Validation Helpers</a> - <ul> - - <li><a href="#_the_tt_validates_acceptance_of_tt_helper">The <tt>validates_acceptance_of</tt> helper</a></li> - - <li><a href="#_the_tt_validates_associated_tt_helper">The <tt>validates_associated</tt> helper</a></li> - - <li><a href="#_the_tt_validates_confirmation_of_tt_helper">The <tt>validates_confirmation_of</tt> helper</a></li> - - <li><a href="#_the_tt_validates_exclusion_of_tt_helper">The <tt>validates_exclusion_of</tt> helper</a></li> - - <li><a href="#_the_tt_validates_format_of_tt_helper">The <tt>validates_format_of</tt> helper</a></li> - - <li><a href="#_the_tt_validates_inclusion_of_tt_helper">The <tt>validates_inclusion_of</tt> helper</a></li> - - <li><a href="#_the_tt_validates_length_of_tt_helper">The <tt>validates_length_of</tt> helper</a></li> - - <li><a href="#_the_tt_validates_numericality_of_tt_helper">The <tt>validates_numericality_of</tt> helper</a></li> - - <li><a href="#_the_tt_validates_presence_of_tt_helper">The <tt>validates_presence_of</tt> helper</a></li> - - <li><a href="#_the_tt_validates_uniqueness_of_tt_helper">The <tt>validates_uniqueness_of</tt> helper</a></li> - - <li><a href="#_the_tt_validates_each_tt_helper">The <tt>validates_each</tt> helper</a></li> - - </ul> - </li> - <li> - <a href="#_common_validation_options">Common Validation Options</a> - <ul> - - <li><a href="#_the_tt_allow_nil_tt_option">The <tt>:allow_nil</tt> option</a></li> - - <li><a href="#_the_tt_allow_blank_tt_option">The <tt>:allow_blank</tt> option</a></li> - - <li><a href="#_the_tt_message_tt_option">The <tt>:message</tt> option</a></li> - - <li><a href="#_the_tt_on_tt_option">The <tt>:on</tt> option</a></li> - - </ul> - </li> - <li> - <a href="#_conditional_validation">Conditional validation</a> - <ul> - - <li><a href="#_using_a_symbol_with_the_tt_if_tt_and_tt_unless_tt_options">Using a symbol with the <tt>:if</tt> and <tt>:unless</tt> options</a></li> - - <li><a href="#_using_a_string_with_the_tt_if_tt_and_tt_unless_tt_options">Using a string with the <tt>:if</tt> and <tt>:unless</tt> options</a></li> - - <li><a href="#_using_a_proc_object_with_the_tt_if_tt_and_tt_unless_tt_options">Using a Proc object with the <tt>:if</tt> and :<tt>unless</tt> options</a></li> - - </ul> - </li> - <li> - <a href="#_writing_your_own_validation_methods">Writing your own validation methods</a> - </li> - <li> - <a href="#_manipulating_the_tt_errors_tt_collection">Manipulating the <tt>errors</tt> collection</a> - </li> - <li> - <a href="#_using_the_tt_errors_tt_collection_in_your_view_templates">Using the <tt>errors</tt> collection in your view templates</a> - <ul> - - <li><a href="#_changing_the_way_form_fields_with_errors_are_displayed">Changing the way form fields with errors are displayed</a></li> - - </ul> - </li> - <li> - <a href="#_callbacks">Callbacks</a> - <ul> - - <li><a href="#_callbacks_registration">Callbacks registration</a></li> - - </ul> - </li> - <li> - <a href="#_conditional_callbacks">Conditional callbacks</a> - <ul> - - <li><a href="#_using_a_symbol_with_the_tt_if_tt_and_tt_unless_tt_options_2">Using a symbol with the <tt>:if</tt> and <tt>:unless</tt> options</a></li> - - <li><a href="#_using_a_string_with_the_tt_if_tt_and_tt_unless_tt_options_2">Using a string with the <tt>:if</tt> and <tt>:unless</tt> options</a></li> - - <li><a href="#_using_a_proc_object_with_the_tt_if_tt_and_tt_unless_tt_options_2">Using a Proc object with the <tt>:if</tt> and :<tt>unless</tt> options</a></li> - - <li><a href="#_multiple_conditions_for_callbacks">Multiple Conditions for Callbacks</a></li> - - </ul> - </li> - <li> - <a href="#_available_callbacks">Available callbacks</a> - <ul> - - <li><a href="#_callbacks_called_both_when_creating_or_updating_a_record">Callbacks called both when creating or updating a record.</a></li> - - <li><a href="#_callbacks_called_only_when_creating_a_new_record">Callbacks called only when creating a new record.</a></li> - - <li><a href="#_callbacks_called_only_when_updating_an_existing_record">Callbacks called only when updating an existing record.</a></li> - - <li><a href="#_callbacks_called_when_removing_a_record_from_the_database">Callbacks called when removing a record from the database.</a></li> - - <li><a href="#_the_tt_after_initialize_tt_and_tt_after_find_tt_callbacks">The <tt>after_initialize</tt> and <tt>after_find</tt> callbacks</a></li> - - </ul> - </li> - <li> - <a href="#_halting_execution">Halting Execution</a> - </li> - <li> - <a href="#_callback_classes">Callback classes</a> - </li> - <li> - <a href="#_observers">Observers</a> - <ul> - - <li><a href="#_registering_observers">Registering observers</a></li> - - <li><a href="#_where_to_put_the_observers_source_files">Where to put the observers' source files</a></li> - - </ul> - </li> - <li> - <a href="#_changelog">Changelog</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>Active Record Validations and Callbacks</h1> - <div id="preamble">
+ <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_overview_of_activerecord_validation">Overview of ActiveRecord Validation</a> + <ul> + + <li><a href="#_why_use_activerecord_validations">Why Use ActiveRecord Validations?</a></li> + + <li><a href="#_when_does_validation_happen">When Does Validation Happen?</a></li> + + <li><a href="#_the_meaning_of_tt_valid_tt">The Meaning of <tt>valid</tt></a></li> + + </ul> + </li> + <li> + <a href="#_the_declarative_validation_helpers">The Declarative Validation Helpers</a> + <ul> + + <li><a href="#_the_tt_validates_acceptance_of_tt_helper">The <tt>validates_acceptance_of</tt> helper</a></li> + + <li><a href="#_the_tt_validates_associated_tt_helper">The <tt>validates_associated</tt> helper</a></li> + + <li><a href="#_the_tt_validates_confirmation_of_tt_helper">The <tt>validates_confirmation_of</tt> helper</a></li> + + <li><a href="#_the_tt_validates_exclusion_of_tt_helper">The <tt>validates_exclusion_of</tt> helper</a></li> + + <li><a href="#_the_tt_validates_format_of_tt_helper">The <tt>validates_format_of</tt> helper</a></li> + + <li><a href="#_the_tt_validates_inclusion_of_tt_helper">The <tt>validates_inclusion_of</tt> helper</a></li> + + <li><a href="#_the_tt_validates_length_of_tt_helper">The <tt>validates_length_of</tt> helper</a></li> + + <li><a href="#_the_tt_validates_numericality_of_tt_helper">The <tt>validates_numericality_of</tt> helper</a></li> + + <li><a href="#_the_tt_validates_presence_of_tt_helper">The <tt>validates_presence_of</tt> helper</a></li> + + <li><a href="#_the_tt_validates_uniqueness_of_tt_helper">The <tt>validates_uniqueness_of</tt> helper</a></li> + + <li><a href="#_the_tt_validates_each_tt_helper">The <tt>validates_each</tt> helper</a></li> + + </ul> + </li> + <li> + <a href="#_common_validation_options">Common Validation Options</a> + <ul> + + <li><a href="#_the_tt_allow_nil_tt_option">The <tt>:allow_nil</tt> option</a></li> + + <li><a href="#_the_tt_allow_blank_tt_option">The <tt>:allow_blank</tt> option</a></li> + + <li><a href="#_the_tt_message_tt_option">The <tt>:message</tt> option</a></li> + + <li><a href="#_the_tt_on_tt_option">The <tt>:on</tt> option</a></li> + + </ul> + </li> + <li> + <a href="#_conditional_validation">Conditional validation</a> + <ul> + + <li><a href="#_using_a_symbol_with_the_tt_if_tt_and_tt_unless_tt_options">Using a symbol with the <tt>:if</tt> and <tt>:unless</tt> options</a></li> + + <li><a href="#_using_a_string_with_the_tt_if_tt_and_tt_unless_tt_options">Using a string with the <tt>:if</tt> and <tt>:unless</tt> options</a></li> + + <li><a href="#_using_a_proc_object_with_the_tt_if_tt_and_tt_unless_tt_options">Using a Proc object with the <tt>:if</tt> and :<tt>unless</tt> options</a></li> + + </ul> + </li> + <li> + <a href="#_writing_your_own_validation_methods">Writing your own validation methods</a> + </li> + <li> + <a href="#_manipulating_the_tt_errors_tt_collection">Manipulating the <tt>errors</tt> collection</a> + </li> + <li> + <a href="#_using_the_tt_errors_tt_collection_in_your_view_templates">Using the <tt>errors</tt> collection in your view templates</a> + <ul> + + <li><a href="#_changing_the_way_form_fields_with_errors_are_displayed">Changing the way form fields with errors are displayed</a></li> + + </ul> + </li> + <li> + <a href="#_callbacks">Callbacks</a> + <ul> + + <li><a href="#_callbacks_registration">Callbacks registration</a></li> + + </ul> + </li> + <li> + <a href="#_conditional_callbacks">Conditional callbacks</a> + <ul> + + <li><a href="#_using_a_symbol_with_the_tt_if_tt_and_tt_unless_tt_options_2">Using a symbol with the <tt>:if</tt> and <tt>:unless</tt> options</a></li> + + <li><a href="#_using_a_string_with_the_tt_if_tt_and_tt_unless_tt_options_2">Using a string with the <tt>:if</tt> and <tt>:unless</tt> options</a></li> + + <li><a href="#_using_a_proc_object_with_the_tt_if_tt_and_tt_unless_tt_options_2">Using a Proc object with the <tt>:if</tt> and :<tt>unless</tt> options</a></li> + + <li><a href="#_multiple_conditions_for_callbacks">Multiple Conditions for Callbacks</a></li> + + </ul> + </li> + <li> + <a href="#_available_callbacks">Available callbacks</a> + <ul> + + <li><a href="#_callbacks_called_both_when_creating_or_updating_a_record">Callbacks called both when creating or updating a record.</a></li> + + <li><a href="#_callbacks_called_only_when_creating_a_new_record">Callbacks called only when creating a new record.</a></li> + + <li><a href="#_callbacks_called_only_when_updating_an_existing_record">Callbacks called only when updating an existing record.</a></li> + + <li><a href="#_callbacks_called_when_removing_a_record_from_the_database">Callbacks called when removing a record from the database.</a></li> + + <li><a href="#_the_tt_after_initialize_tt_and_tt_after_find_tt_callbacks">The <tt>after_initialize</tt> and <tt>after_find</tt> callbacks</a></li> + + </ul> + </li> + <li> + <a href="#_halting_execution">Halting Execution</a> + </li> + <li> + <a href="#_callback_classes">Callback classes</a> + </li> + <li> + <a href="#_observers">Observers</a> + <ul> + + <li><a href="#_registering_observers">Registering observers</a></li> + + <li><a href="#_where_to_put_the_observers_source_files">Where to put the observers' source files</a></li> + + </ul> + </li> + <li> + <a href="#_changelog">Changelog</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>Active Record Validations and Callbacks</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>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.</p></div>
<div class="paragraph"><p>After reading this guide and trying out the presented concepts, we hope that you’ll be able to:</p></div>
@@ -683,7 +515,7 @@ http://www.gnu.org/software/src-highlite --> <td class="icon">
<img src="./images/icons/note.png" alt="Note" />
</td>
-<td class="content">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</td>
+<td class="content">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</td>
</tr></table>
</div>
<div class="paragraph"><p>The default error message for <tt>validates_presence_of</tt> is "<em>can’t be empty</em>".</p></div>
@@ -1393,7 +1225,7 @@ config<span style="color: #990000">.</span>active_record<span style="color: #990 <div class="paragraph"><p>January 9, 2009: Initial version by <a href="http://guides.rails.info/authors.html#cmarques">Cássio Marques</a></p></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/association_basics.html b/railties/doc/guides/html/association_basics.html index 336fa4255b..bfe8f3f341 100644 --- a/railties/doc/guides/html/association_basics.html +++ b/railties/doc/guides/html/association_basics.html @@ -1,273 +1,105 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>A Guide to Active Record Associations</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>A Guide to Active Record Associations</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_why_associations">Why Associations?</a> - </li> - <li> - <a href="#_the_types_of_associations">The Types of Associations</a> - <ul> - - <li><a href="#_the_tt_belongs_to_tt_association">The <tt>belongs_to</tt> Association</a></li> - - <li><a href="#_the_tt_has_one_tt_association">The <tt>has_one</tt> Association</a></li> - - <li><a href="#_the_tt_has_many_tt_association">The <tt>has_many</tt> Association</a></li> - - <li><a href="#_the_tt_has_many_through_tt_association">The <tt>has_many :through</tt> Association</a></li> - - <li><a href="#_the_tt_has_one_through_tt_association">The <tt>has_one :through</tt> Association</a></li> - - <li><a href="#_the_tt_has_and_belongs_to_many_tt_association">The <tt>has_and_belongs_to_many</tt> Association</a></li> - - <li><a href="#_choosing_between_tt_belongs_to_tt_and_tt_has_one_tt">Choosing Between <tt>belongs_to</tt> and <tt>has_one</tt></a></li> - - <li><a href="#_choosing_between_tt_has_many_through_tt_and_tt_has_and_belongs_to_many_tt">Choosing Between <tt>has_many :through</tt> and <tt>has_and_belongs_to_many</tt></a></li> - - <li><a href="#_polymorphic_associations">Polymorphic Associations</a></li> - - <li><a href="#_self_joins">Self Joins</a></li> - - </ul> - </li> - <li> - <a href="#_tips_tricks_and_warnings">Tips, Tricks, and Warnings</a> - <ul> - - <li><a href="#_controlling_caching">Controlling Caching</a></li> - - <li><a href="#_avoiding_name_collisions">Avoiding Name Collisions</a></li> - - <li><a href="#_updating_the_schema">Updating the Schema</a></li> - - <li><a href="#_controlling_association_scope">Controlling Association Scope</a></li> - - </ul> - </li> - <li> - <a href="#_detailed_association_reference">Detailed Association Reference</a> - <ul> - - <li><a href="#_the_tt_belongs_to_tt_association_2">The <tt>belongs_to</tt> Association</a></li> - - <li><a href="#_the_has_one_association">The has_one Association</a></li> - - <li><a href="#_the_has_many_association">The has_many Association</a></li> - - <li><a href="#_the_tt_has_and_belongs_to_many_tt_association_2">The <tt>has_and_belongs_to_many</tt> Association</a></li> - - <li><a href="#_association_callbacks">Association Callbacks</a></li> - - <li><a href="#_association_extensions">Association Extensions</a></li> - - </ul> - </li> - <li> - <a href="#_changelog">Changelog</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>A Guide to Active Record Associations</h1> - <div id="preamble">
+ <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_why_associations">Why Associations?</a> + </li> + <li> + <a href="#_the_types_of_associations">The Types of Associations</a> + <ul> + + <li><a href="#_the_tt_belongs_to_tt_association">The <tt>belongs_to</tt> Association</a></li> + + <li><a href="#_the_tt_has_one_tt_association">The <tt>has_one</tt> Association</a></li> + + <li><a href="#_the_tt_has_many_tt_association">The <tt>has_many</tt> Association</a></li> + + <li><a href="#_the_tt_has_many_through_tt_association">The <tt>has_many :through</tt> Association</a></li> + + <li><a href="#_the_tt_has_one_through_tt_association">The <tt>has_one :through</tt> Association</a></li> + + <li><a href="#_the_tt_has_and_belongs_to_many_tt_association">The <tt>has_and_belongs_to_many</tt> Association</a></li> + + <li><a href="#_choosing_between_tt_belongs_to_tt_and_tt_has_one_tt">Choosing Between <tt>belongs_to</tt> and <tt>has_one</tt></a></li> + + <li><a href="#_choosing_between_tt_has_many_through_tt_and_tt_has_and_belongs_to_many_tt">Choosing Between <tt>has_many :through</tt> and <tt>has_and_belongs_to_many</tt></a></li> + + <li><a href="#_polymorphic_associations">Polymorphic Associations</a></li> + + <li><a href="#_self_joins">Self Joins</a></li> + + </ul> + </li> + <li> + <a href="#_tips_tricks_and_warnings">Tips, Tricks, and Warnings</a> + <ul> + + <li><a href="#_controlling_caching">Controlling Caching</a></li> + + <li><a href="#_avoiding_name_collisions">Avoiding Name Collisions</a></li> + + <li><a href="#_updating_the_schema">Updating the Schema</a></li> + + <li><a href="#_controlling_association_scope">Controlling Association Scope</a></li> + + </ul> + </li> + <li> + <a href="#_detailed_association_reference">Detailed Association Reference</a> + <ul> + + <li><a href="#_the_tt_belongs_to_tt_association_2">The <tt>belongs_to</tt> Association</a></li> + + <li><a href="#_the_has_one_association">The has_one Association</a></li> + + <li><a href="#_the_has_many_association">The has_many Association</a></li> + + <li><a href="#_the_tt_has_and_belongs_to_many_tt_association_2">The <tt>has_and_belongs_to_many</tt> Association</a></li> + + <li><a href="#_association_callbacks">Association Callbacks</a></li> + + <li><a href="#_association_extensions">Association Extensions</a></li> + + </ul> + </li> + <li> + <a href="#_changelog">Changelog</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>A Guide to Active Record Associations</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>This guide covers the association features of Active Record. By referring to this guide, you will be able to:</p></div>
<div class="ulist"><ul>
@@ -2477,7 +2309,7 @@ September 14, 2008: initial version by <a href="../authors.html#mgunderloy">Mike </ul></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/authors.html b/railties/doc/guides/html/authors.html index fc4ef07549..ab205c96a9 100644 --- a/railties/doc/guides/html/authors.html +++ b/railties/doc/guides/html/authors.html @@ -1,203 +1,35 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>About the Authors</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>About the Authors</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" class="notoc"> - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> - - <div id="container" class="notoc"> - - <div id="content"> - <h1>About the Authors</h1> - <div id="preamble">
+ <div id="header" class="notoc"> + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> + + <div id="container" class="notoc"> + + <div id="content"> + <h1>About the Authors</h1> + <div id="preamble">
<div class="sectionbody">
<div class="sidebarblock" id="fcheung">
<div class="sidebar-content">
@@ -249,7 +81,7 @@ and unobtrusive JavaScript. His home on the internet is his blog <a href="http:/ </div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/caching_with_rails.html b/railties/doc/guides/html/caching_with_rails.html index f05ebe913c..02cc981b0e 100644 --- a/railties/doc/guides/html/caching_with_rails.html +++ b/railties/doc/guides/html/caching_with_rails.html @@ -1,233 +1,65 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>Caching with Rails: An overview</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Caching with Rails: An overview</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> - - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_basic_caching">Basic Caching</a> - <ul> - - <li><a href="#_page_caching">Page Caching</a></li> - - <li><a href="#_action_caching">Action Caching</a></li> - - <li><a href="#_fragment_caching">Fragment Caching</a></li> - - <li><a href="#_sweepers">Sweepers</a></li> - - <li><a href="#_sql_caching">SQL Caching</a></li> - - <li><a href="#_cache_stores">Cache stores</a></li> - - </ul> - </li> - <li> - <a href="#_conditional_get_support">Conditional GET support</a> - </li> - <li> - <a href="#_advanced_caching">Advanced Caching</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>Caching with Rails: An overview</h1> - <div id="preamble">
+ <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> + + <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_basic_caching">Basic Caching</a> + <ul> + + <li><a href="#_page_caching">Page Caching</a></li> + + <li><a href="#_action_caching">Action Caching</a></li> + + <li><a href="#_fragment_caching">Fragment Caching</a></li> + + <li><a href="#_sweepers">Sweepers</a></li> + + <li><a href="#_sql_caching">SQL Caching</a></li> + + <li><a href="#_cache_stores">Cache stores</a></li> + + </ul> + </li> + <li> + <a href="#_conditional_get_support">Conditional GET support</a> + </li> + <li> + <a href="#_advanced_caching">Advanced Caching</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>Caching with Rails: An overview</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>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
@@ -642,7 +474,7 @@ of these plugins play nice with memcached and are a must-see for anyone seriously considering optimizing their caching needs.</p></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/command_line.html b/railties/doc/guides/html/command_line.html index 0890c3bbe7..226a68e105 100644 --- a/railties/doc/guides/html/command_line.html +++ b/railties/doc/guides/html/command_line.html @@ -1,233 +1,65 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>A Guide to The Rails Command Line</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>A Guide to The Rails Command Line</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> - - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_command_line_basics">Command Line Basics</a> - <ul> - - <li><a href="#_rails">rails</a></li> - - <li><a href="#_server">server</a></li> - - <li><a href="#_generate">generate</a></li> - - <li><a href="#_console">console</a></li> - - <li><a href="#_dbconsole">dbconsole</a></li> - - <li><a href="#_plugin">plugin</a></li> - - <li><a href="#_runner">runner</a></li> - - <li><a href="#_destroy">destroy</a></li> - - <li><a href="#_about">about</a></li> - - </ul> - </li> - </ol> - </div> - - <div id="content"> - <h1>A Guide to The Rails Command Line</h1> - <div id="preamble">
+ <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> + + <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_command_line_basics">Command Line Basics</a> + <ul> + + <li><a href="#_rails">rails</a></li> + + <li><a href="#_server">server</a></li> + + <li><a href="#_generate">generate</a></li> + + <li><a href="#_console">console</a></li> + + <li><a href="#_dbconsole">dbconsole</a></li> + + <li><a href="#_plugin">plugin</a></li> + + <li><a href="#_runner">runner</a></li> + + <li><a href="#_destroy">destroy</a></li> + + <li><a href="#_about">about</a></li> + + </ul> + </li> + </ol> + </div> + + <div id="content"> + <h1>A Guide to The Rails Command Line</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>Rails comes with every command line tool you’ll need to</p></div>
<div class="ulist"><ul>
@@ -638,7 +470,7 @@ About your application<span style="color: #FF0000">'s environment</span> <span style="color: #FF0000">Database schema version 20081217073400</span></tt></pre></div></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/configuring.html b/railties/doc/guides/html/configuring.html index 7b7202b2f4..3cd41f100e 100644 --- a/railties/doc/guides/html/configuring.html +++ b/railties/doc/guides/html/configuring.html @@ -1,247 +1,79 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>Configuring Rails Applications</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Configuring Rails Applications</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> - - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_locations_for_initialization_code">Locations for Initialization Code</a> - </li> - <li> - <a href="#_using_a_preinitializer">Using a Preinitializer</a> - </li> - <li> - <a href="#_configuring_rails_components">Configuring Rails Components</a> - <ul> - - <li><a href="#_configuring_active_record">Configuring Active Record</a></li> - - <li><a href="#_configuring_action_controller">Configuring Action Controller</a></li> - - <li><a href="#_configuring_action_view">Configuring Action View</a></li> - - <li><a href="#_configuring_action_mailer">Configuring Action Mailer</a></li> - - <li><a href="#_configuring_active_resource">Configuring Active Resource</a></li> - - <li><a href="#_configuring_active_support">Configuring Active Support</a></li> - - <li><a href="#_configuring_active_model">Configuring Active Model</a></li> - - </ul> - </li> - <li> - <a href="#_using_initializers">Using Initializers</a> - </li> - <li> - <a href="#_using_an_after_initializer">Using an After-Initializer</a> - </li> - <li> - <a href="#_rails_environment_settings">Rails Environment Settings</a> - </li> - <li> - <a href="#_changelog">Changelog</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>Configuring Rails Applications</h1> - <div id="preamble">
+ <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> + + <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_locations_for_initialization_code">Locations for Initialization Code</a> + </li> + <li> + <a href="#_using_a_preinitializer">Using a Preinitializer</a> + </li> + <li> + <a href="#_configuring_rails_components">Configuring Rails Components</a> + <ul> + + <li><a href="#_configuring_active_record">Configuring Active Record</a></li> + + <li><a href="#_configuring_action_controller">Configuring Action Controller</a></li> + + <li><a href="#_configuring_action_view">Configuring Action View</a></li> + + <li><a href="#_configuring_action_mailer">Configuring Action Mailer</a></li> + + <li><a href="#_configuring_active_resource">Configuring Active Resource</a></li> + + <li><a href="#_configuring_active_support">Configuring Active Support</a></li> + + <li><a href="#_configuring_active_model">Configuring Active Model</a></li> + + </ul> + </li> + <li> + <a href="#_using_initializers">Using Initializers</a> + </li> + <li> + <a href="#_using_an_after_initializer">Using an After-Initializer</a> + </li> + <li> + <a href="#_rails_environment_settings">Rails Environment Settings</a> + </li> + <li> + <a href="#_changelog">Changelog</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>Configuring Rails Applications</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>This guide covers the configuration and initialization features available to Rails applications. By referring to this guide, you will be able to:</p></div>
<div class="ulist"><ul>
@@ -514,7 +346,7 @@ November 5, 2008: Rough outline by <a href="../authors.html#mgunderloy">Mike Gun </ul></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/creating_plugins.html b/railties/doc/guides/html/creating_plugins.html index 2eca3b74b8..3347f77228 100644 --- a/railties/doc/guides/html/creating_plugins.html +++ b/railties/doc/guides/html/creating_plugins.html @@ -1,307 +1,139 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>The Basics of Creating Rails Plugins</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>The Basics of Creating Rails Plugins</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_setup">Setup</a> - <ul> - - <li><a href="#_create_the_basic_app">Create the basic app</a></li> - - <li><a href="#_generate_the_plugin_skeleton">Generate the plugin skeleton</a></li> - - <li><a href="#_organize_your_files">Organize your files</a></li> - - </ul> - </li> - <li> - <a href="#_tests">Tests</a> - <ul> - - <li><a href="#_test_setup">Test Setup</a></li> - - <li><a href="#_run_the_plugin_tests">Run the plugin tests</a></li> - - </ul> - </li> - <li> - <a href="#_extending_core_classes">Extending core classes</a> - <ul> - - <li><a href="#_working_with_init_rb">Working with init.rb</a></li> - - </ul> - </li> - <li> - <a href="#_add_an_em_acts_as_em_method_to_active_record">Add an <em>acts_as</em> method to Active Record</a> - <ul> - - <li><a href="#_add_a_class_method">Add a class method</a></li> - - <li><a href="#_add_an_instance_method">Add an instance method</a></li> - - </ul> - </li> - <li> - <a href="#_models">Models</a> - </li> - <li> - <a href="#_controllers">Controllers</a> - </li> - <li> - <a href="#_helpers">Helpers</a> - </li> - <li> - <a href="#_routes">Routes</a> - </li> - <li> - <a href="#_generators">Generators</a> - <ul> - - <li><a href="#_testing_generators">Testing generators</a></li> - - <li><a href="#_the_usage_file">The USAGE file</a></li> - - </ul> - </li> - <li> - <a href="#_generator_commands">Generator Commands</a> - </li> - <li> - <a href="#_migrations">Migrations</a> - <ul> - - <li><a href="#_create_a_custom_rake_task">Create a custom rake task</a></li> - - <li><a href="#_call_migrations_directly">Call migrations directly</a></li> - - <li><a href="#_generate_migrations">Generate migrations</a></li> - - </ul> - </li> - <li> - <a href="#_rake_tasks">Rake tasks</a> - </li> - <li> - <a href="#_plugingems">PluginGems</a> - </li> - <li> - <a href="#_rdoc_documentation">RDoc Documentation</a> - </li> - <li> - <a href="#_appendix">Appendix</a> - <ul> - - <li><a href="#_references">References</a></li> - - <li><a href="#_contents_of_em_lib_yaffle_rb_em">Contents of <em>lib/yaffle.rb</em></a></li> - - <li><a href="#_final_plugin_directory_structure">Final plugin directory structure</a></li> - - </ul> - </li> - </ol> - </div> - - <div id="content"> - <h1>The Basics of Creating Rails Plugins</h1> - <div id="preamble">
+ <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_setup">Setup</a> + <ul> + + <li><a href="#_create_the_basic_app">Create the basic app</a></li> + + <li><a href="#_generate_the_plugin_skeleton">Generate the plugin skeleton</a></li> + + <li><a href="#_organize_your_files">Organize your files</a></li> + + </ul> + </li> + <li> + <a href="#_tests">Tests</a> + <ul> + + <li><a href="#_test_setup">Test Setup</a></li> + + <li><a href="#_run_the_plugin_tests">Run the plugin tests</a></li> + + </ul> + </li> + <li> + <a href="#_extending_core_classes">Extending core classes</a> + <ul> + + <li><a href="#_working_with_init_rb">Working with init.rb</a></li> + + </ul> + </li> + <li> + <a href="#_add_an_em_acts_as_em_method_to_active_record">Add an <em>acts_as</em> method to Active Record</a> + <ul> + + <li><a href="#_add_a_class_method">Add a class method</a></li> + + <li><a href="#_add_an_instance_method">Add an instance method</a></li> + + </ul> + </li> + <li> + <a href="#_models">Models</a> + </li> + <li> + <a href="#_controllers">Controllers</a> + </li> + <li> + <a href="#_helpers">Helpers</a> + </li> + <li> + <a href="#_routes">Routes</a> + </li> + <li> + <a href="#_generators">Generators</a> + <ul> + + <li><a href="#_testing_generators">Testing generators</a></li> + + <li><a href="#_the_usage_file">The USAGE file</a></li> + + </ul> + </li> + <li> + <a href="#_generator_commands">Generator Commands</a> + </li> + <li> + <a href="#_migrations">Migrations</a> + <ul> + + <li><a href="#_create_a_custom_rake_task">Create a custom rake task</a></li> + + <li><a href="#_call_migrations_directly">Call migrations directly</a></li> + + <li><a href="#_generate_migrations">Generate migrations</a></li> + + </ul> + </li> + <li> + <a href="#_rake_tasks">Rake tasks</a> + </li> + <li> + <a href="#_plugingems">PluginGems</a> + </li> + <li> + <a href="#_rdoc_documentation">RDoc Documentation</a> + </li> + <li> + <a href="#_appendix">Appendix</a> + <ul> + + <li><a href="#_references">References</a></li> + + <li><a href="#_contents_of_em_lib_yaffle_rb_em">Contents of <em>lib/yaffle.rb</em></a></li> + + <li><a href="#_final_plugin_directory_structure">Final plugin directory structure</a></li> + + </ul> + </li> + </ol> + </div> + + <div id="content"> + <h1>The Basics of Creating Rails Plugins</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>A Rails plugin is either an extension or a modification of the core framework. Plugins provide:</p></div>
<div class="ulist"><ul>
@@ -1858,7 +1690,7 @@ http://www.gnu.org/software/src-highlite --> </div></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/debugging_rails_applications.html b/railties/doc/guides/html/debugging_rails_applications.html index 7807da98b7..07557b9e99 100644 --- a/railties/doc/guides/html/debugging_rails_applications.html +++ b/railties/doc/guides/html/debugging_rails_applications.html @@ -1,284 +1,116 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>Debugging Rails Applications</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Debugging Rails Applications</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> - - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_view_helpers_for_debugging">View Helpers for Debugging</a> - <ul> - - <li><a href="#_debug">debug</a></li> - - <li><a href="#_to_yaml">to_yaml</a></li> - - <li><a href="#_inspect">inspect</a></li> - - <li><a href="#_debugging_javascript">Debugging Javascript</a></li> - - </ul> - </li> - <li> - <a href="#_the_logger">The Logger</a> - <ul> - - <li><a href="#_what_is_the_logger">What is The Logger?</a></li> - - <li><a href="#_log_levels">Log Levels</a></li> - - <li><a href="#_sending_messages">Sending Messages</a></li> - - </ul> - </li> - <li> - <a href="#_debugging_with_ruby_debug">Debugging with ruby-debug</a> - <ul> - - <li><a href="#_setup">Setup</a></li> - - <li><a href="#_the_shell">The Shell</a></li> - - <li><a href="#_the_context">The Context</a></li> - - <li><a href="#_threads">Threads</a></li> - - <li><a href="#_inspecting_variables">Inspecting Variables</a></li> - - <li><a href="#_step_by_step">Step by Step</a></li> - - <li><a href="#_breakpoints">Breakpoints</a></li> - - <li><a href="#_catching_exceptions">Catching Exceptions</a></li> - - <li><a href="#_resuming_execution">Resuming Execution</a></li> - - <li><a href="#_editing">Editing</a></li> - - <li><a href="#_quitting">Quitting</a></li> - - <li><a href="#_settings">Settings</a></li> - - </ul> - </li> - <li> - <a href="#_debugging_memory_leaks">Debugging Memory Leaks</a> - <ul> - - <li><a href="#_bleakhouse">BleakHouse</a></li> - - <li><a href="#_valgrind">Valgrind</a></li> - - </ul> - </li> - <li> - <a href="#_plugins_for_debugging">Plugins for Debugging</a> - </li> - <li> - <a href="#_references">References</a> - </li> - <li> - <a href="#_changelog">Changelog</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>Debugging Rails Applications</h1> - <div id="preamble">
+ <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> + + <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_view_helpers_for_debugging">View Helpers for Debugging</a> + <ul> + + <li><a href="#_debug">debug</a></li> + + <li><a href="#_to_yaml">to_yaml</a></li> + + <li><a href="#_inspect">inspect</a></li> + + <li><a href="#_debugging_javascript">Debugging Javascript</a></li> + + </ul> + </li> + <li> + <a href="#_the_logger">The Logger</a> + <ul> + + <li><a href="#_what_is_the_logger">What is The Logger?</a></li> + + <li><a href="#_log_levels">Log Levels</a></li> + + <li><a href="#_sending_messages">Sending Messages</a></li> + + </ul> + </li> + <li> + <a href="#_debugging_with_ruby_debug">Debugging with ruby-debug</a> + <ul> + + <li><a href="#_setup">Setup</a></li> + + <li><a href="#_the_shell">The Shell</a></li> + + <li><a href="#_the_context">The Context</a></li> + + <li><a href="#_threads">Threads</a></li> + + <li><a href="#_inspecting_variables">Inspecting Variables</a></li> + + <li><a href="#_step_by_step">Step by Step</a></li> + + <li><a href="#_breakpoints">Breakpoints</a></li> + + <li><a href="#_catching_exceptions">Catching Exceptions</a></li> + + <li><a href="#_resuming_execution">Resuming Execution</a></li> + + <li><a href="#_editing">Editing</a></li> + + <li><a href="#_quitting">Quitting</a></li> + + <li><a href="#_settings">Settings</a></li> + + </ul> + </li> + <li> + <a href="#_debugging_memory_leaks">Debugging Memory Leaks</a> + <ul> + + <li><a href="#_bleakhouse">BleakHouse</a></li> + + <li><a href="#_valgrind">Valgrind</a></li> + + </ul> + </li> + <li> + <a href="#_plugins_for_debugging">Plugins for Debugging</a> + </li> + <li> + <a href="#_references">References</a> + </li> + <li> + <a href="#_changelog">Changelog</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>Debugging Rails Applications</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>This guide introduces techniques for debugging Ruby on Rails applications. By referring to this guide, you will be able to:</p></div>
<div class="ulist"><ul>
@@ -1154,7 +986,7 @@ September 16, 2008: initial version by <a href="../authors.html#miloops">Emilio </ul></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/form_helpers.html b/railties/doc/guides/html/form_helpers.html index 4af2dec344..1054aa8ff5 100644 --- a/railties/doc/guides/html/form_helpers.html +++ b/railties/doc/guides/html/form_helpers.html @@ -1,303 +1,135 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>Rails form helpers</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Rails form helpers</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> - - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_basic_forms">Basic forms</a> - <ul> - - <li><a href="#_generic_search_form">Generic search form</a></li> - - <li><a href="#_multiple_hashes_in_form_helper_attributes">Multiple hashes in form helper attributes</a></li> - - <li><a href="#_checkboxes_radio_buttons_and_other_controls">Checkboxes, radio buttons and other controls</a></li> - - <li><a href="#_how_do_forms_with_put_or_delete_methods_work">How do forms with PUT or DELETE methods work?</a></li> - - </ul> - </li> - <li> - <a href="#_different_families_of_helpers">Different Families of helpers</a> - <ul> - - <li><a href="#_barebones_helpers">Barebones helpers</a></li> - - <li><a href="#_model_object_helpers">Model object helpers</a></li> - - </ul> - </li> - <li> - <a href="#_forms_that_deal_with_model_attributes">Forms that deal with model attributes</a> - <ul> - - <li><a href="#_relying_on_record_identification">Relying on record identification</a></li> - - </ul> - </li> - <li> - <a href="#_making_select_boxes_with_ease">Making select boxes with ease</a> - <ul> - - <li><a href="#_the_select_tag_and_options">The select tag and options</a></li> - - <li><a href="#_select_boxes_for_dealing_with_models">Select boxes for dealing with models</a></li> - - <li><a href="#_option_tags_from_a_collection_of_arbitrary_objects">Option tags from a collection of arbitrary objects</a></li> - - <li><a href="#_time_zone_and_country_select">Time zone and country select</a></li> - - </ul> - </li> - <li> - <a href="#_date_and_time_select_boxes">Date and time select boxes</a> - <ul> - - <li><a href="#_barebones_helpers_2">Barebones helpers</a></li> - - <li><a href="#_model_object_helpers_2">Model object helpers</a></li> - - <li><a href="#_common_options">Common options</a></li> - - </ul> - </li> - <li> - <a href="#_form_builders">Form builders</a> - <ul> - - <li><a href="#_scoping_out_form_controls_with_tt_fields_for_tt">Scoping out form controls with <tt>fields_for</tt></a></li> - - </ul> - </li> - <li> - <a href="#_file_uploads">File Uploads</a> - <ul> - - <li><a href="#_what_gets_uploaded">What gets uploaded</a></li> - - <li><a href="#_dealing_with_ajax">Dealing with Ajax</a></li> - - </ul> - </li> - <li> - <a href="#_parameter_names">Parameter Names</a> - <ul> - - <li><a href="#_basic_structures">Basic structures</a></li> - - <li><a href="#_combining_them">Combining them</a></li> - - <li><a href="#_using_form_helpers">Using form helpers</a></li> - - </ul> - </li> - <li> - <a href="#_complex_forms">Complex forms</a> - </li> - <li> - <a href="#_changelog">Changelog</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>Rails form helpers</h1> - <div id="preamble">
+ <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> + + <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_basic_forms">Basic forms</a> + <ul> + + <li><a href="#_generic_search_form">Generic search form</a></li> + + <li><a href="#_multiple_hashes_in_form_helper_attributes">Multiple hashes in form helper attributes</a></li> + + <li><a href="#_checkboxes_radio_buttons_and_other_controls">Checkboxes, radio buttons and other controls</a></li> + + <li><a href="#_how_do_forms_with_put_or_delete_methods_work">How do forms with PUT or DELETE methods work?</a></li> + + </ul> + </li> + <li> + <a href="#_different_families_of_helpers">Different Families of helpers</a> + <ul> + + <li><a href="#_barebones_helpers">Barebones helpers</a></li> + + <li><a href="#_model_object_helpers">Model object helpers</a></li> + + </ul> + </li> + <li> + <a href="#_forms_that_deal_with_model_attributes">Forms that deal with model attributes</a> + <ul> + + <li><a href="#_relying_on_record_identification">Relying on record identification</a></li> + + </ul> + </li> + <li> + <a href="#_making_select_boxes_with_ease">Making select boxes with ease</a> + <ul> + + <li><a href="#_the_select_tag_and_options">The select tag and options</a></li> + + <li><a href="#_select_boxes_for_dealing_with_models">Select boxes for dealing with models</a></li> + + <li><a href="#_option_tags_from_a_collection_of_arbitrary_objects">Option tags from a collection of arbitrary objects</a></li> + + <li><a href="#_time_zone_and_country_select">Time zone and country select</a></li> + + </ul> + </li> + <li> + <a href="#_date_and_time_select_boxes">Date and time select boxes</a> + <ul> + + <li><a href="#_barebones_helpers_2">Barebones helpers</a></li> + + <li><a href="#_model_object_helpers_2">Model object helpers</a></li> + + <li><a href="#_common_options">Common options</a></li> + + </ul> + </li> + <li> + <a href="#_form_builders">Form builders</a> + <ul> + + <li><a href="#_scoping_out_form_controls_with_tt_fields_for_tt">Scoping out form controls with <tt>fields_for</tt></a></li> + + </ul> + </li> + <li> + <a href="#_file_uploads">File Uploads</a> + <ul> + + <li><a href="#_what_gets_uploaded">What gets uploaded</a></li> + + <li><a href="#_dealing_with_ajax">Dealing with Ajax</a></li> + + </ul> + </li> + <li> + <a href="#_parameter_names">Parameter Names</a> + <ul> + + <li><a href="#_basic_structures">Basic structures</a></li> + + <li><a href="#_combining_them">Combining them</a></li> + + <li><a href="#_using_form_helpers">Using form helpers</a></li> + + </ul> + </li> + <li> + <a href="#_complex_forms">Complex forms</a> + </li> + <li> + <a href="#_changelog">Changelog</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>Rails form helpers</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>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.</p></div>
<div class="paragraph"><p>In this guide you will:</p></div>
@@ -1132,7 +964,7 @@ Mislav Marohnić <<a href="mailto:mislav.marohnic@gmail.com">mislav.marohnic@ </ul></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/getting_started_with_rails.html b/railties/doc/guides/html/getting_started_with_rails.html index dcf112ef6d..a79d9903aa 100644 --- a/railties/doc/guides/html/getting_started_with_rails.html +++ b/railties/doc/guides/html/getting_started_with_rails.html @@ -1,313 +1,145 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>Getting Started With Rails</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Getting Started With Rails</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_this_guide_assumes">This Guide Assumes</a> - </li> - <li> - <a href="#_what_is_rails">What is Rails?</a> - <ul> - - <li><a href="#_the_mvc_architecture">The MVC Architecture</a></li> - - <li><a href="#_the_components_of_rails">The Components of Rails</a></li> - - <li><a href="#_rest">REST</a></li> - - </ul> - </li> - <li> - <a href="#_creating_a_new_rails_project">Creating a New Rails Project</a> - <ul> - - <li><a href="#_installing_rails">Installing Rails</a></li> - - <li><a href="#_creating_the_blog_application">Creating the Blog Application</a></li> - - <li><a href="#_configuring_a_database">Configuring a Database</a></li> - - </ul> - </li> - <li> - <a href="#_hello_rails">Hello, Rails!</a> - <ul> - - <li><a href="#_starting_up_the_web_server">Starting up the Web Server</a></li> - - <li><a href="#_setting_the_application_home_page">Setting the Application Home Page</a></li> - - </ul> - </li> - <li> - <a href="#_getting_up_and_running_quickly_with_scaffolding">Getting Up and Running Quickly With Scaffolding</a> - </li> - <li> - <a href="#_creating_a_resource">Creating a Resource</a> - <ul> - - <li><a href="#_running_a_migration">Running a Migration</a></li> - - <li><a href="#_adding_a_link">Adding a Link</a></li> - - <li><a href="#_working_with_posts_in_the_browser">Working with Posts in the Browser</a></li> - - <li><a href="#_the_model">The Model</a></li> - - <li><a href="#_adding_some_validation">Adding Some Validation</a></li> - - <li><a href="#_using_the_console">Using the Console</a></li> - - <li><a href="#_listing_all_posts">Listing All Posts</a></li> - - <li><a href="#_customizing_the_layout">Customizing the Layout</a></li> - - <li><a href="#_creating_new_posts">Creating New Posts</a></li> - - <li><a href="#_showing_an_individual_post">Showing an Individual Post</a></li> - - <li><a href="#_editing_posts">Editing Posts</a></li> - - <li><a href="#_destroying_a_post">Destroying a Post</a></li> - - </ul> - </li> - <li> - <a href="#_drying_up_the_code">DRYing up the Code</a> - <ul> - - <li><a href="#_using_partials_to_eliminate_view_duplication">Using Partials to Eliminate View Duplication</a></li> - - <li><a href="#_using_filters_to_eliminate_controller_duplication">Using Filters to Eliminate Controller Duplication</a></li> - - </ul> - </li> - <li> - <a href="#_adding_a_second_model">Adding a Second Model</a> - <ul> - - <li><a href="#_generating_a_model">Generating a Model</a></li> - - <li><a href="#_associating_models">Associating Models</a></li> - - <li><a href="#_adding_a_route">Adding a Route</a></li> - - <li><a href="#_generating_a_controller">Generating a Controller</a></li> - - <li><a href="#_building_views">Building Views</a></li> - - <li><a href="#_hooking_comments_to_posts">Hooking Comments to Posts</a></li> - - </ul> - </li> - <li> - <a href="#_what_8217_s_next">What’s Next?</a> - </li> - <li> - <a href="#_changelog">Changelog</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>Getting Started With Rails</h1> - <div id="preamble">
+ <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_this_guide_assumes">This Guide Assumes</a> + </li> + <li> + <a href="#_what_is_rails">What is Rails?</a> + <ul> + + <li><a href="#_the_mvc_architecture">The MVC Architecture</a></li> + + <li><a href="#_the_components_of_rails">The Components of Rails</a></li> + + <li><a href="#_rest">REST</a></li> + + </ul> + </li> + <li> + <a href="#_creating_a_new_rails_project">Creating a New Rails Project</a> + <ul> + + <li><a href="#_installing_rails">Installing Rails</a></li> + + <li><a href="#_creating_the_blog_application">Creating the Blog Application</a></li> + + <li><a href="#_configuring_a_database">Configuring a Database</a></li> + + </ul> + </li> + <li> + <a href="#_hello_rails">Hello, Rails!</a> + <ul> + + <li><a href="#_starting_up_the_web_server">Starting up the Web Server</a></li> + + <li><a href="#_setting_the_application_home_page">Setting the Application Home Page</a></li> + + </ul> + </li> + <li> + <a href="#_getting_up_and_running_quickly_with_scaffolding">Getting Up and Running Quickly With Scaffolding</a> + </li> + <li> + <a href="#_creating_a_resource">Creating a Resource</a> + <ul> + + <li><a href="#_running_a_migration">Running a Migration</a></li> + + <li><a href="#_adding_a_link">Adding a Link</a></li> + + <li><a href="#_working_with_posts_in_the_browser">Working with Posts in the Browser</a></li> + + <li><a href="#_the_model">The Model</a></li> + + <li><a href="#_adding_some_validation">Adding Some Validation</a></li> + + <li><a href="#_using_the_console">Using the Console</a></li> + + <li><a href="#_listing_all_posts">Listing All Posts</a></li> + + <li><a href="#_customizing_the_layout">Customizing the Layout</a></li> + + <li><a href="#_creating_new_posts">Creating New Posts</a></li> + + <li><a href="#_showing_an_individual_post">Showing an Individual Post</a></li> + + <li><a href="#_editing_posts">Editing Posts</a></li> + + <li><a href="#_destroying_a_post">Destroying a Post</a></li> + + </ul> + </li> + <li> + <a href="#_drying_up_the_code">DRYing up the Code</a> + <ul> + + <li><a href="#_using_partials_to_eliminate_view_duplication">Using Partials to Eliminate View Duplication</a></li> + + <li><a href="#_using_filters_to_eliminate_controller_duplication">Using Filters to Eliminate Controller Duplication</a></li> + + </ul> + </li> + <li> + <a href="#_adding_a_second_model">Adding a Second Model</a> + <ul> + + <li><a href="#_generating_a_model">Generating a Model</a></li> + + <li><a href="#_associating_models">Associating Models</a></li> + + <li><a href="#_adding_a_route">Adding a Route</a></li> + + <li><a href="#_generating_a_controller">Generating a Controller</a></li> + + <li><a href="#_building_views">Building Views</a></li> + + <li><a href="#_hooking_comments_to_posts">Hooking Comments to Posts</a></li> + + </ul> + </li> + <li> + <a href="#_what_8217_s_next">What’s Next?</a> + </li> + <li> + <a href="#_changelog">Changelog</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>Getting Started With Rails</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>This guide covers getting up and running with Ruby on Rails. After reading it, you should be familiar with:</p></div>
<div class="ulist"><ul>
@@ -1906,7 +1738,7 @@ September 8, 2008: initial version by James Miller (not yet approved for publica </ul></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/i18n.html b/railties/doc/guides/html/i18n.html index 4d2e4bb7a3..7326244ce0 100644 --- a/railties/doc/guides/html/i18n.html +++ b/railties/doc/guides/html/i18n.html @@ -1,287 +1,119 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>The Rails Internationalization API</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>The Rails Internationalization API</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> - - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_how_i18n_in_ruby_on_rails_works">How I18n in Ruby on Rails works</a> - <ul> - - <li><a href="#_the_overall_architecture_of_the_library">The overall architecture of the library</a></li> - - <li><a href="#_the_public_i18n_api">The public I18n API</a></li> - - </ul> - </li> - <li> - <a href="#_walkthrough_setup_a_simple_i18n_8217_ed_rails_application">Walkthrough: setup a simple I18n’ed Rails application</a> - <ul> - - <li><a href="#_configure_the_i18n_module">Configure the I18n module</a></li> - - <li><a href="#_optional_custom_i18n_configuration_setup">Optional: custom I18n configuration setup</a></li> - - <li><a href="#_set_the_locale_in_each_request">Set the locale in each request</a></li> - - </ul> - </li> - <li> - <a href="#_internationalize_your_application">Internationalize your application</a> - <ul> - - <li><a href="#_adding_translations">Adding Translations</a></li> - - <li><a href="#_adding_date_time_formats">Adding Date/Time formats</a></li> - - </ul> - </li> - <li> - <a href="#_overview_of_the_i18n_api_features">Overview of the I18n API features</a> - <ul> - - <li><a href="#_looking_up_translations">Looking up translations</a></li> - - <li><a href="#_interpolation">Interpolation</a></li> - - <li><a href="#_pluralization">Pluralization</a></li> - - <li><a href="#_setting_and_passing_a_locale">Setting and passing a locale</a></li> - - </ul> - </li> - <li> - <a href="#_how_to_store_your_custom_translations">How to store your custom translations</a> - <ul> - - <li><a href="#_translations_for_activerecord_models">Translations for ActiveRecord models</a></li> - - <li><a href="#_other_translations_and_localizations">Other translations and localizations</a></li> - - </ul> - </li> - <li> - <a href="#_customize_your_i18n_setup">Customize your I18n setup</a> - <ul> - - <li><a href="#_using_different_backends">Using different backends</a></li> - - <li><a href="#_using_different_exception_handlers">Using different exception handlers</a></li> - - </ul> - </li> - <li> - <a href="#_resources">Resources</a> - </li> - <li> - <a href="#_footnotes">Footnotes</a> - </li> - <li> - <a href="#_credits">Credits</a> - </li> - <li> - <a href="#_notes">NOTES</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>The Rails Internationalization API</h1> - <div id="preamble">
+ <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> + + <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_how_i18n_in_ruby_on_rails_works">How I18n in Ruby on Rails works</a> + <ul> + + <li><a href="#_the_overall_architecture_of_the_library">The overall architecture of the library</a></li> + + <li><a href="#_the_public_i18n_api">The public I18n API</a></li> + + </ul> + </li> + <li> + <a href="#_walkthrough_setup_a_simple_i18n_8217_ed_rails_application">Walkthrough: setup a simple I18n’ed Rails application</a> + <ul> + + <li><a href="#_configure_the_i18n_module">Configure the I18n module</a></li> + + <li><a href="#_optional_custom_i18n_configuration_setup">Optional: custom I18n configuration setup</a></li> + + <li><a href="#_set_the_locale_in_each_request">Set the locale in each request</a></li> + + </ul> + </li> + <li> + <a href="#_internationalize_your_application">Internationalize your application</a> + <ul> + + <li><a href="#_adding_translations">Adding Translations</a></li> + + <li><a href="#_adding_date_time_formats">Adding Date/Time formats</a></li> + + </ul> + </li> + <li> + <a href="#_overview_of_the_i18n_api_features">Overview of the I18n API features</a> + <ul> + + <li><a href="#_looking_up_translations">Looking up translations</a></li> + + <li><a href="#_interpolation">Interpolation</a></li> + + <li><a href="#_pluralization">Pluralization</a></li> + + <li><a href="#_setting_and_passing_a_locale">Setting and passing a locale</a></li> + + </ul> + </li> + <li> + <a href="#_how_to_store_your_custom_translations">How to store your custom translations</a> + <ul> + + <li><a href="#_translations_for_activerecord_models">Translations for ActiveRecord models</a></li> + + <li><a href="#_other_translations_and_localizations">Other translations and localizations</a></li> + + </ul> + </li> + <li> + <a href="#_customize_your_i18n_setup">Customize your I18n setup</a> + <ul> + + <li><a href="#_using_different_backends">Using different backends</a></li> + + <li><a href="#_using_different_exception_handlers">Using different exception handlers</a></li> + + </ul> + </li> + <li> + <a href="#_resources">Resources</a> + </li> + <li> + <a href="#_footnotes">Footnotes</a> + </li> + <li> + <a href="#_credits">Credits</a> + </li> + <li> + <a href="#_notes">NOTES</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>The Rails Internationalization API</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>The Ruby I18n 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 providing multi-language support in your application.</p></div>
</div>
@@ -991,7 +823,7 @@ http://www.gnu.org/software/src-highlite --> <div class="paragraph"><p>How to contribute?</p></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/index.html b/railties/doc/guides/html/index.html index b946fd5d28..8552848ae6 100644 --- a/railties/doc/guides/html/index.html +++ b/railties/doc/guides/html/index.html @@ -1,203 +1,35 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>Ruby on Rails Guides</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Ruby on Rails Guides</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" class="notoc"> - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> - - <div id="container" class="notoc"> - - <div id="content"> - <h1>Ruby on Rails Guides</h1> - <div id="preamble">
+ <div id="header" class="notoc"> + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> + + <div id="container" class="notoc"> + + <div id="content"> + <h1>Ruby on Rails Guides</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>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:</p></div>
<div class="ulist"><ul>
@@ -379,7 +211,7 @@ of your code.</p></div> </div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/layouts_and_rendering.html b/railties/doc/guides/html/layouts_and_rendering.html index 91c3f3350d..037714db78 100644 --- a/railties/doc/guides/html/layouts_and_rendering.html +++ b/railties/doc/guides/html/layouts_and_rendering.html @@ -1,245 +1,77 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>Layouts and Rendering in Rails</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Layouts and Rendering in Rails</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_overview_how_the_pieces_fit_together">Overview: How the Pieces Fit Together</a> - </li> - <li> - <a href="#_creating_responses">Creating Responses</a> - <ul> - - <li><a href="#_rendering_by_default_convention_over_configuration_in_action">Rendering by Default: Convention Over Configuration in Action</a></li> - - <li><a href="#_using_tt_render_tt">Using <tt>render</tt></a></li> - - <li><a href="#_using_tt_redirect_to_tt">Using <tt>redirect_to</tt></a></li> - - <li><a href="#_using_tt_head_tt_to_build_header_only_responses">Using <tt>head</tt> To Build Header-Only Responses</a></li> - - </ul> - </li> - <li> - <a href="#_structuring_layouts">Structuring Layouts</a> - <ul> - - <li><a href="#_asset_tags">Asset Tags</a></li> - - <li><a href="#_understanding_tt_yield_tt">Understanding <tt>yield</tt></a></li> - - <li><a href="#_using_tt_content_for_tt">Using <tt>content_for</tt></a></li> - - <li><a href="#_using_partials">Using Partials</a></li> - - <li><a href="#_using_nested_layouts">Using Nested Layouts</a></li> - - </ul> - </li> - <li> - <a href="#_changelog">Changelog</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>Layouts and Rendering in Rails</h1> - <div id="preamble">
+ <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_overview_how_the_pieces_fit_together">Overview: How the Pieces Fit Together</a> + </li> + <li> + <a href="#_creating_responses">Creating Responses</a> + <ul> + + <li><a href="#_rendering_by_default_convention_over_configuration_in_action">Rendering by Default: Convention Over Configuration in Action</a></li> + + <li><a href="#_using_tt_render_tt">Using <tt>render</tt></a></li> + + <li><a href="#_using_tt_redirect_to_tt">Using <tt>redirect_to</tt></a></li> + + <li><a href="#_using_tt_head_tt_to_build_header_only_responses">Using <tt>head</tt> To Build Header-Only Responses</a></li> + + </ul> + </li> + <li> + <a href="#_structuring_layouts">Structuring Layouts</a> + <ul> + + <li><a href="#_asset_tags">Asset Tags</a></li> + + <li><a href="#_understanding_tt_yield_tt">Understanding <tt>yield</tt></a></li> + + <li><a href="#_using_tt_content_for_tt">Using <tt>content_for</tt></a></li> + + <li><a href="#_using_partials">Using Partials</a></li> + + <li><a href="#_using_nested_layouts">Using Nested Layouts</a></li> + + </ul> + </li> + <li> + <a href="#_changelog">Changelog</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>Layouts and Rendering in Rails</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>This guide covers the basic layout features of Action Controller and Action View. By referring to this guide, you will be able to:</p></div>
<div class="ulist"><ul>
@@ -1440,7 +1272,7 @@ September 28, 2008: First draft by <a href="../authors.html#mgunderloy">Mike Gun </ul></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/migrations.html b/railties/doc/guides/html/migrations.html index c4c2591234..0a8b85c77c 100644 --- a/railties/doc/guides/html/migrations.html +++ b/railties/doc/guides/html/migrations.html @@ -1,283 +1,115 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>Migrations</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Migrations</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> - - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_anatomy_of_a_migration">Anatomy Of A Migration</a> - <ul> - - <li><a href="#_migrations_are_classes">Migrations are classes</a></li> - - <li><a href="#_what_8217_s_in_a_name">What’s in a name</a></li> - - <li><a href="#_changing_migrations">Changing migrations</a></li> - - </ul> - </li> - <li> - <a href="#_creating_a_migration">Creating A Migration</a> - <ul> - - <li><a href="#_creating_a_model">Creating a model</a></li> - - <li><a href="#_creating_a_standalone_migration">Creating a standalone migration</a></li> - - </ul> - </li> - <li> - <a href="#_writing_a_migration">Writing a Migration</a> - <ul> - - <li><a href="#_creating_a_table">Creating a table</a></li> - - <li><a href="#_changing_tables">Changing tables</a></li> - - <li><a href="#_special_helpers">Special helpers</a></li> - - <li><a href="#_writing_your_down_method">Writing your down method</a></li> - - </ul> - </li> - <li> - <a href="#_running_migrations">Running Migrations</a> - <ul> - - <li><a href="#_rolling_back">Rolling back</a></li> - - <li><a href="#_being_specific">Being Specific</a></li> - - <li><a href="#_being_talkative">Being talkative</a></li> - - </ul> - </li> - <li> - <a href="#models">Using Models In Your Migrations</a> - <ul> - - <li><a href="#_dealing_with_changing_models">Dealing with changing models</a></li> - - </ul> - </li> - <li> - <a href="#_schema_dumping_and_you">Schema dumping and you</a> - <ul> - - <li><a href="#schema">What are schema files for?</a></li> - - <li><a href="#_types_of_schema_dumps">Types of schema dumps</a></li> - - <li><a href="#_schema_dumps_and_source_control">Schema dumps and source control</a></li> - - </ul> - </li> - <li> - <a href="#foreign_key">Active Record and Referential Integrity</a> - </li> - <li> - <a href="#_changelog">Changelog</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>Migrations</h1> - <div id="preamble">
+ <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> + + <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_anatomy_of_a_migration">Anatomy Of A Migration</a> + <ul> + + <li><a href="#_migrations_are_classes">Migrations are classes</a></li> + + <li><a href="#_what_8217_s_in_a_name">What’s in a name</a></li> + + <li><a href="#_changing_migrations">Changing migrations</a></li> + + </ul> + </li> + <li> + <a href="#_creating_a_migration">Creating A Migration</a> + <ul> + + <li><a href="#_creating_a_model">Creating a model</a></li> + + <li><a href="#_creating_a_standalone_migration">Creating a standalone migration</a></li> + + </ul> + </li> + <li> + <a href="#_writing_a_migration">Writing a Migration</a> + <ul> + + <li><a href="#_creating_a_table">Creating a table</a></li> + + <li><a href="#_changing_tables">Changing tables</a></li> + + <li><a href="#_special_helpers">Special helpers</a></li> + + <li><a href="#_writing_your_down_method">Writing your down method</a></li> + + </ul> + </li> + <li> + <a href="#_running_migrations">Running Migrations</a> + <ul> + + <li><a href="#_rolling_back">Rolling back</a></li> + + <li><a href="#_being_specific">Being Specific</a></li> + + <li><a href="#_being_talkative">Being talkative</a></li> + + </ul> + </li> + <li> + <a href="#models">Using Models In Your Migrations</a> + <ul> + + <li><a href="#_dealing_with_changing_models">Dealing with changing models</a></li> + + </ul> + </li> + <li> + <a href="#_schema_dumping_and_you">Schema dumping and you</a> + <ul> + + <li><a href="#schema">What are schema files for?</a></li> + + <li><a href="#_types_of_schema_dumps">Types of schema dumps</a></li> + + <li><a href="#_schema_dumps_and_source_control">Schema dumps and source control</a></li> + + </ul> + </li> + <li> + <a href="#foreign_key">Active Record and Referential Integrity</a> + </li> + <li> + <a href="#_changelog">Changelog</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>Migrations</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>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 <tt>rake db:migrate</tt>. 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.</p></div>
<div class="paragraph"><p>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.</p></div>
@@ -893,7 +725,7 @@ September 14, 2008: initial version by <a href="../authors.html#fcheung">Frederi </ul></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/performance_testing.html b/railties/doc/guides/html/performance_testing.html index 55b181dccd..858076008d 100644 --- a/railties/doc/guides/html/performance_testing.html +++ b/railties/doc/guides/html/performance_testing.html @@ -1,274 +1,106 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>Performance Testing Rails Applications</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Performance Testing Rails Applications</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> - - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_performance_test_cases">Performance Test Cases</a> - <ul> - - <li><a href="#_generating_performance_tests">Generating performance tests</a></li> - - <li><a href="#_examples">Examples</a></li> - - <li><a href="#_modes">Modes</a></li> - - <li><a href="#_metrics">Metrics</a></li> - - <li><a href="#_understanding_the_output">Understanding the output</a></li> - - <li><a href="#_tuning_test_runs">Tuning Test Runs</a></li> - - <li><a href="#_performance_test_environment">Performance Test Environment</a></li> - - <li><a href="#gc">Installing GC-Patched Ruby</a></li> - - </ul> - </li> - <li> - <a href="#_command_line_tools">Command Line Tools</a> - <ul> - - <li><a href="#_benchmarker">benchmarker</a></li> - - <li><a href="#_profiler">profiler</a></li> - - </ul> - </li> - <li> - <a href="#_helper_methods">Helper methods</a> - <ul> - - <li><a href="#_model">Model</a></li> - - <li><a href="#_controller">Controller</a></li> - - <li><a href="#_view">View</a></li> - - </ul> - </li> - <li> - <a href="#_request_logging">Request Logging</a> - </li> - <li> - <a href="#_useful_links">Useful Links</a> - <ul> - - <li><a href="#_rails_plugins_and_gems">Rails Plugins and Gems</a></li> - - <li><a href="#_generic_tools">Generic Tools</a></li> - - <li><a href="#_tutorials_and_documentation">Tutorials and Documentation</a></li> - - </ul> - </li> - <li> - <a href="#_commercial_products">Commercial Products</a> - </li> - <li> - <a href="#_changelog">Changelog</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>Performance Testing Rails Applications</h1> - <div id="preamble">
+ <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> + + <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_performance_test_cases">Performance Test Cases</a> + <ul> + + <li><a href="#_generating_performance_tests">Generating performance tests</a></li> + + <li><a href="#_examples">Examples</a></li> + + <li><a href="#_modes">Modes</a></li> + + <li><a href="#_metrics">Metrics</a></li> + + <li><a href="#_understanding_the_output">Understanding the output</a></li> + + <li><a href="#_tuning_test_runs">Tuning Test Runs</a></li> + + <li><a href="#_performance_test_environment">Performance Test Environment</a></li> + + <li><a href="#gc">Installing GC-Patched Ruby</a></li> + + </ul> + </li> + <li> + <a href="#_command_line_tools">Command Line Tools</a> + <ul> + + <li><a href="#_benchmarker">benchmarker</a></li> + + <li><a href="#_profiler">profiler</a></li> + + </ul> + </li> + <li> + <a href="#_helper_methods">Helper methods</a> + <ul> + + <li><a href="#_model">Model</a></li> + + <li><a href="#_controller">Controller</a></li> + + <li><a href="#_view">View</a></li> + + </ul> + </li> + <li> + <a href="#_request_logging">Request Logging</a> + </li> + <li> + <a href="#_useful_links">Useful Links</a> + <ul> + + <li><a href="#_rails_plugins_and_gems">Rails Plugins and Gems</a></li> + + <li><a href="#_generic_tools">Generic Tools</a></li> + + <li><a href="#_tutorials_and_documentation">Tutorials and Documentation</a></li> + + </ul> + </li> + <li> + <a href="#_commercial_products">Commercial Products</a> + </li> + <li> + <a href="#_changelog">Changelog</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>Performance Testing Rails Applications</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>This guide covers the various ways of performance testing a Ruby on Rails application. By referring to this guide, you will be able to:</p></div>
<div class="ulist"><ul>
@@ -890,7 +722,7 @@ September 6, 2008: Initial version by Matthew Bergman </ul></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/rails_on_rack.html b/railties/doc/guides/html/rails_on_rack.html index e32a7357f5..eb1ff6ef1b 100644 --- a/railties/doc/guides/html/rails_on_rack.html +++ b/railties/doc/guides/html/rails_on_rack.html @@ -1,254 +1,86 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>Rails on Rack</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Rails on Rack</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> - - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_introduction_to_rack">Introduction to Rack</a> - </li> - <li> - <a href="#_rails_on_rack">Rails on Rack</a> - <ul> - - <li><a href="#_actioncontroller_dispatcher_new">ActionController::Dispatcher.new</a></li> - - <li><a href="#_script_server">script/server</a></li> - - <li><a href="#_rackup">rackup</a></li> - - </ul> - </li> - <li> - <a href="#_action_controller_middleware_stack">Action Controller Middleware Stack</a> - <ul> - - <li><a href="#_inspecting_middleware_stack">Inspecting Middleware Stack</a></li> - - <li><a href="#_adding_middlewares">Adding Middlewares</a></li> - - <li><a href="#_internal_middleware_stack">Internal Middleware Stack</a></li> - - <li><a href="#_customizing_internal_middleware_stack">Customizing Internal Middleware Stack</a></li> - - </ul> - </li> - <li> - <a href="#_rails_metal_applications">Rails Metal Applications</a> - <ul> - - <li><a href="#_generating_a_metal_application">Generating a Metal Application</a></li> - - <li><a href="#_execution_order">Execution Order</a></li> - - </ul> - </li> - <li> - <a href="#_middlewares_and_rails">Middlewares and Rails</a> - </li> - <li> - <a href="#_changelog">Changelog</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>Rails on Rack</h1> - <div id="preamble">
+ <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> + + <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_introduction_to_rack">Introduction to Rack</a> + </li> + <li> + <a href="#_rails_on_rack">Rails on Rack</a> + <ul> + + <li><a href="#_actioncontroller_dispatcher_new">ActionController::Dispatcher.new</a></li> + + <li><a href="#_script_server">script/server</a></li> + + <li><a href="#_rackup">rackup</a></li> + + </ul> + </li> + <li> + <a href="#_action_controller_middleware_stack">Action Controller Middleware Stack</a> + <ul> + + <li><a href="#_inspecting_middleware_stack">Inspecting Middleware Stack</a></li> + + <li><a href="#_adding_middlewares">Adding Middlewares</a></li> + + <li><a href="#_internal_middleware_stack">Internal Middleware Stack</a></li> + + <li><a href="#_customizing_internal_middleware_stack">Customizing Internal Middleware Stack</a></li> + + </ul> + </li> + <li> + <a href="#_rails_metal_applications">Rails Metal Applications</a> + <ul> + + <li><a href="#_generating_a_metal_application">Generating a Metal Application</a></li> + + <li><a href="#_execution_order">Execution Order</a></li> + + </ul> + </li> + <li> + <a href="#_middlewares_and_rails">Middlewares and Rails</a> + </li> + <li> + <a href="#_changelog">Changelog</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>Rails on Rack</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>This guide covers Rails integration with Rack and interfacing with other Rack components. By referring to this guide, you will be able to:</p></div>
<div class="ulist"><ul>
@@ -612,7 +444,7 @@ January 11, 2009: First version by <a href="../authors.html#lifo">Pratik</a> </ul></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/routing_outside_in.html b/railties/doc/guides/html/routing_outside_in.html index 0b5ccc1219..22477e18e7 100644 --- a/railties/doc/guides/html/routing_outside_in.html +++ b/railties/doc/guides/html/routing_outside_in.html @@ -1,327 +1,159 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>Rails Routing from the Outside In</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Rails Routing from the Outside In</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_the_dual_purpose_of_routing">The Dual Purpose of Routing</a> - <ul> - - <li><a href="#_connecting_urls_to_code">Connecting URLs to Code</a></li> - - <li><a href="#_generating_urls_from_code">Generating URLs from Code</a></li> - - </ul> - </li> - <li> - <a href="#_quick_tour_of_routes_rb">Quick Tour of Routes.rb</a> - <ul> - - <li><a href="#_processing_the_file">Processing the File</a></li> - - <li><a href="#_restful_routes">RESTful Routes</a></li> - - <li><a href="#_named_routes">Named Routes</a></li> - - <li><a href="#_nested_routes">Nested Routes</a></li> - - <li><a href="#_regular_routes">Regular Routes</a></li> - - <li><a href="#_default_routes">Default Routes</a></li> - - </ul> - </li> - <li> - <a href="#_restful_routing_the_rails_default">RESTful Routing: the Rails Default</a> - <ul> - - <li><a href="#_what_is_rest">What is REST?</a></li> - - <li><a href="#_crud_verbs_and_actions">CRUD, Verbs, and Actions</a></li> - - <li><a href="#_urls_and_paths">URLs and Paths</a></li> - - <li><a href="#_defining_multiple_resources_at_the_same_time">Defining Multiple Resources at the Same Time</a></li> - - <li><a href="#_singular_resources">Singular Resources</a></li> - - <li><a href="#_customizing_resources">Customizing Resources</a></li> - - <li><a href="#_controller_namespaces_and_routing">Controller Namespaces and Routing</a></li> - - <li><a href="#_nested_resources">Nested Resources</a></li> - - <li><a href="#_route_generation_from_arrays">Route Generation from Arrays</a></li> - - <li><a href="#_namespaced_resources">Namespaced Resources</a></li> - - <li><a href="#_adding_more_restful_actions">Adding More RESTful Actions</a></li> - - </ul> - </li> - <li> - <a href="#_regular_routes_2">Regular Routes</a> - <ul> - - <li><a href="#_bound_parameters">Bound Parameters</a></li> - - <li><a href="#_wildcard_components">Wildcard Components</a></li> - - <li><a href="#_static_text">Static Text</a></li> - - <li><a href="#_querystring_parameters">Querystring Parameters</a></li> - - <li><a href="#_defining_defaults">Defining Defaults</a></li> - - <li><a href="#_named_routes_2">Named Routes</a></li> - - <li><a href="#_route_requirements">Route Requirements</a></li> - - <li><a href="#_route_conditions">Route Conditions</a></li> - - <li><a href="#_route_globbing">Route Globbing</a></li> - - <li><a href="#_route_options">Route Options</a></li> - - </ul> - </li> - <li> - <a href="#_formats_and_respond_to">Formats and respond_to</a> - <ul> - - <li><a href="#_specifying_the_format_with_an_http_header">Specifying the Format with an HTTP Header</a></li> - - <li><a href="#_recognized_mime_types">Recognized MIME types</a></li> - - </ul> - </li> - <li> - <a href="#_the_default_routes">The Default Routes</a> - </li> - <li> - <a href="#_the_empty_route">The Empty Route</a> - <ul> - - <li><a href="#_using_map_root">Using map.root</a></li> - - <li><a href="#_connecting_the_empty_string">Connecting the Empty String</a></li> - - </ul> - </li> - <li> - <a href="#_inspecting_and_testing_routes">Inspecting and Testing Routes</a> - <ul> - - <li><a href="#_seeing_existing_routes_with_rake">Seeing Existing Routes with rake</a></li> - - <li><a href="#_testing_routes">Testing Routes</a></li> - - </ul> - </li> - <li> - <a href="#_changelog">Changelog</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>Rails Routing from the Outside In</h1> - <div id="preamble">
+ <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_the_dual_purpose_of_routing">The Dual Purpose of Routing</a> + <ul> + + <li><a href="#_connecting_urls_to_code">Connecting URLs to Code</a></li> + + <li><a href="#_generating_urls_from_code">Generating URLs from Code</a></li> + + </ul> + </li> + <li> + <a href="#_quick_tour_of_routes_rb">Quick Tour of Routes.rb</a> + <ul> + + <li><a href="#_processing_the_file">Processing the File</a></li> + + <li><a href="#_restful_routes">RESTful Routes</a></li> + + <li><a href="#_named_routes">Named Routes</a></li> + + <li><a href="#_nested_routes">Nested Routes</a></li> + + <li><a href="#_regular_routes">Regular Routes</a></li> + + <li><a href="#_default_routes">Default Routes</a></li> + + </ul> + </li> + <li> + <a href="#_restful_routing_the_rails_default">RESTful Routing: the Rails Default</a> + <ul> + + <li><a href="#_what_is_rest">What is REST?</a></li> + + <li><a href="#_crud_verbs_and_actions">CRUD, Verbs, and Actions</a></li> + + <li><a href="#_urls_and_paths">URLs and Paths</a></li> + + <li><a href="#_defining_multiple_resources_at_the_same_time">Defining Multiple Resources at the Same Time</a></li> + + <li><a href="#_singular_resources">Singular Resources</a></li> + + <li><a href="#_customizing_resources">Customizing Resources</a></li> + + <li><a href="#_controller_namespaces_and_routing">Controller Namespaces and Routing</a></li> + + <li><a href="#_nested_resources">Nested Resources</a></li> + + <li><a href="#_route_generation_from_arrays">Route Generation from Arrays</a></li> + + <li><a href="#_namespaced_resources">Namespaced Resources</a></li> + + <li><a href="#_adding_more_restful_actions">Adding More RESTful Actions</a></li> + + </ul> + </li> + <li> + <a href="#_regular_routes_2">Regular Routes</a> + <ul> + + <li><a href="#_bound_parameters">Bound Parameters</a></li> + + <li><a href="#_wildcard_components">Wildcard Components</a></li> + + <li><a href="#_static_text">Static Text</a></li> + + <li><a href="#_querystring_parameters">Querystring Parameters</a></li> + + <li><a href="#_defining_defaults">Defining Defaults</a></li> + + <li><a href="#_named_routes_2">Named Routes</a></li> + + <li><a href="#_route_requirements">Route Requirements</a></li> + + <li><a href="#_route_conditions">Route Conditions</a></li> + + <li><a href="#_route_globbing">Route Globbing</a></li> + + <li><a href="#_route_options">Route Options</a></li> + + </ul> + </li> + <li> + <a href="#_formats_and_respond_to">Formats and respond_to</a> + <ul> + + <li><a href="#_specifying_the_format_with_an_http_header">Specifying the Format with an HTTP Header</a></li> + + <li><a href="#_recognized_mime_types">Recognized MIME types</a></li> + + </ul> + </li> + <li> + <a href="#_the_default_routes">The Default Routes</a> + </li> + <li> + <a href="#_the_empty_route">The Empty Route</a> + <ul> + + <li><a href="#_using_map_root">Using map.root</a></li> + + <li><a href="#_connecting_the_empty_string">Connecting the Empty String</a></li> + + </ul> + </li> + <li> + <a href="#_inspecting_and_testing_routes">Inspecting and Testing Routes</a> + <ul> + + <li><a href="#_seeing_existing_routes_with_rake">Seeing Existing Routes with rake</a></li> + + <li><a href="#_testing_routes">Testing Routes</a></li> + + </ul> + </li> + <li> + <a href="#_changelog">Changelog</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>Rails Routing from the Outside In</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>This guide covers the user-facing features of Rails routing. By referring to this guide, you will be able to:</p></div>
<div class="ulist"><ul>
@@ -1518,7 +1350,7 @@ http://www.gnu.org/software/src-highlite --> <span style="color: #990000">:</span>conditions <span style="color: #990000">=></span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>method <span style="color: #990000">=></span> <span style="color: #990000">:</span>get <span style="color: #FF0000">}</span></tt></pre></div></div>
<div class="paragraph"><p>As with conditions in RESTful routes, you can specify <tt>:get</tt>, <tt>:post</tt>, <tt>:put</tt>, <tt>:delete</tt>, or <tt>:any</tt> for the acceptable method.</p></div>
<h3 id="_route_globbing">4.9. Route Globbing</h3>
-<div class="paragraph"><p>Route globbing is a way to specify that a particular parameter (which must be the last parameter in the route) should be matched to all the remaining parts of a route. For example</p></div>
+<div class="paragraph"><p>Route globbing is a way to specify that a particular parameter should be matched to all the remaining parts of a route. For example</p></div>
<div class="listingblock">
<div class="content"><!-- Generator: GNU source-highlight 2.9
by Lorenzo Bettini
@@ -1753,7 +1585,7 @@ September 10, 2008: initial version by <a href="../authors.html#mgunderloy">Mike </ul></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/security.html b/railties/doc/guides/html/security.html index 4cbc8214b9..4751e9f92b 100644 --- a/railties/doc/guides/html/security.html +++ b/railties/doc/guides/html/security.html @@ -1,324 +1,156 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>Ruby On Rails Security Guide</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Ruby On Rails Security Guide</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_introduction">Introduction</a> - </li> - <li> - <a href="#_sessions">Sessions</a> - <ul> - - <li><a href="#_what_are_sessions">What are sessions?</a></li> - - <li><a href="#_session_id">Session id</a></li> - - <li><a href="#_session_hijacking">Session hijacking</a></li> - - <li><a href="#_session_guidelines">Session guidelines</a></li> - - <li><a href="#_session_storage">Session storage</a></li> - - <li><a href="#_replay_attacks_for_cookiestore_sessions">Replay attacks for CookieStore sessions</a></li> - - <li><a href="#_session_fixation">Session fixation</a></li> - - <li><a href="#_session_fixation_countermeasures">Session fixation – Countermeasures</a></li> - - <li><a href="#_session_expiry">Session expiry</a></li> - - </ul> - </li> - <li> - <a href="#_cross_site_reference_forgery_csrf">Cross-Site Reference Forgery (CSRF)</a> - <ul> - - <li><a href="#_csrf_countermeasures">CSRF Countermeasures</a></li> - - </ul> - </li> - <li> - <a href="#_redirection_and_files">Redirection and Files</a> - <ul> - - <li><a href="#_redirection">Redirection</a></li> - - <li><a href="#_file_uploads">File uploads</a></li> - - <li><a href="#_executable_code_in_file_uploads">Executable code in file uploads</a></li> - - <li><a href="#_file_downloads">File downloads</a></li> - - </ul> - </li> - <li> - <a href="#_intranet_and_admin_security">Intranet and Admin security</a> - <ul> - - <li><a href="#_additional_precautions">Additional precautions</a></li> - - </ul> - </li> - <li> - <a href="#_mass_assignment">Mass assignment</a> - <ul> - - <li><a href="#_countermeasures">Countermeasures</a></li> - - </ul> - </li> - <li> - <a href="#_user_management">User management</a> - <ul> - - <li><a href="#_brute_forcing_accounts">Brute-forcing accounts</a></li> - - <li><a href="#_account_hijacking">Account hijacking</a></li> - - <li><a href="#_captchas">CAPTCHAs</a></li> - - <li><a href="#_logging">Logging</a></li> - - <li><a href="#_good_passwords">Good passwords</a></li> - - <li><a href="#_regular_expressions">Regular expressions</a></li> - - <li><a href="#_privilege_escalation">Privilege escalation</a></li> - - </ul> - </li> - <li> - <a href="#_injection">Injection</a> - <ul> - - <li><a href="#_whitelists_versus_blacklists">Whitelists versus Blacklists</a></li> - - <li><a href="#_sql_injection">SQL Injection</a></li> - - <li><a href="#_cross_site_scripting_xss">Cross-Site Scripting (XSS)</a></li> - - <li><a href="#_css_injection">CSS Injection</a></li> - - <li><a href="#_textile_injection">Textile Injection</a></li> - - <li><a href="#_ajax_injection">Ajax Injection</a></li> - - <li><a href="#_rjs_injection">RJS Injection</a></li> - - <li><a href="#_command_line_injection">Command Line Injection</a></li> - - <li><a href="#_header_injection">Header Injection</a></li> - - </ul> - </li> - <li> - <a href="#_additional_resources">Additional resources</a> - </li> - <li> - <a href="#_changelog">Changelog</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>Ruby On Rails Security Guide</h1> - <div id="preamble">
+ <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_introduction">Introduction</a> + </li> + <li> + <a href="#_sessions">Sessions</a> + <ul> + + <li><a href="#_what_are_sessions">What are sessions?</a></li> + + <li><a href="#_session_id">Session id</a></li> + + <li><a href="#_session_hijacking">Session hijacking</a></li> + + <li><a href="#_session_guidelines">Session guidelines</a></li> + + <li><a href="#_session_storage">Session storage</a></li> + + <li><a href="#_replay_attacks_for_cookiestore_sessions">Replay attacks for CookieStore sessions</a></li> + + <li><a href="#_session_fixation">Session fixation</a></li> + + <li><a href="#_session_fixation_countermeasures">Session fixation – Countermeasures</a></li> + + <li><a href="#_session_expiry">Session expiry</a></li> + + </ul> + </li> + <li> + <a href="#_cross_site_reference_forgery_csrf">Cross-Site Reference Forgery (CSRF)</a> + <ul> + + <li><a href="#_csrf_countermeasures">CSRF Countermeasures</a></li> + + </ul> + </li> + <li> + <a href="#_redirection_and_files">Redirection and Files</a> + <ul> + + <li><a href="#_redirection">Redirection</a></li> + + <li><a href="#_file_uploads">File uploads</a></li> + + <li><a href="#_executable_code_in_file_uploads">Executable code in file uploads</a></li> + + <li><a href="#_file_downloads">File downloads</a></li> + + </ul> + </li> + <li> + <a href="#_intranet_and_admin_security">Intranet and Admin security</a> + <ul> + + <li><a href="#_additional_precautions">Additional precautions</a></li> + + </ul> + </li> + <li> + <a href="#_mass_assignment">Mass assignment</a> + <ul> + + <li><a href="#_countermeasures">Countermeasures</a></li> + + </ul> + </li> + <li> + <a href="#_user_management">User management</a> + <ul> + + <li><a href="#_brute_forcing_accounts">Brute-forcing accounts</a></li> + + <li><a href="#_account_hijacking">Account hijacking</a></li> + + <li><a href="#_captchas">CAPTCHAs</a></li> + + <li><a href="#_logging">Logging</a></li> + + <li><a href="#_good_passwords">Good passwords</a></li> + + <li><a href="#_regular_expressions">Regular expressions</a></li> + + <li><a href="#_privilege_escalation">Privilege escalation</a></li> + + </ul> + </li> + <li> + <a href="#_injection">Injection</a> + <ul> + + <li><a href="#_whitelists_versus_blacklists">Whitelists versus Blacklists</a></li> + + <li><a href="#_sql_injection">SQL Injection</a></li> + + <li><a href="#_cross_site_scripting_xss">Cross-Site Scripting (XSS)</a></li> + + <li><a href="#_css_injection">CSS Injection</a></li> + + <li><a href="#_textile_injection">Textile Injection</a></li> + + <li><a href="#_ajax_injection">Ajax Injection</a></li> + + <li><a href="#_rjs_injection">RJS Injection</a></li> + + <li><a href="#_command_line_injection">Command Line Injection</a></li> + + <li><a href="#_header_injection">Header Injection</a></li> + + </ul> + </li> + <li> + <a href="#_additional_resources">Additional resources</a> + </li> + <li> + <a href="#_changelog">Changelog</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>Ruby On Rails Security Guide</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>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 {<em>et</em>} rorsecurity.info. After reading it, you should be familiar with:</p></div>
@@ -449,7 +281,7 @@ The client can see everything you store in a session, because it is stored in cl <div class="literalblock">
<div class="content">
<pre><tt>config.action_controller.session = {
- :session_key => ‘_app_session’,
+ :key => ‘_app_session’,
:secret => ‘0x0dkfj3927dkc7djdh36rkckdfzsg...’
}</tt></pre>
</div></div>
@@ -1315,7 +1147,7 @@ November 1, 2008: First approved version by Heiko Webers </ul></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/html/testing_rails_applications.html b/railties/doc/guides/html/testing_rails_applications.html index 457f93f622..16822904fc 100644 --- a/railties/doc/guides/html/testing_rails_applications.html +++ b/railties/doc/guides/html/testing_rails_applications.html @@ -1,298 +1,130 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>A Guide to Testing Rails Applications</title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - 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; -} - - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>A Guide to Testing Rails Applications</title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" > - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + <div id="header" > + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> + + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> - <div id="container"> - - <div id="sidebar"> - <h2>Chapters</h2> - <ol> - <li> - <a href="#_why_write_tests_for_your_rails_applications">Why Write Tests for your Rails Applications?</a> - </li> - <li> - <a href="#_introduction_to_testing">Introduction to Testing</a> - <ul> - - <li><a href="#_the_3_environments">The 3 Environments</a></li> - - <li><a href="#_rails_sets_up_for_testing_from_the_word_go">Rails Sets up for Testing from the Word Go</a></li> - - <li><a href="#_the_low_down_on_fixtures">The Low-Down on Fixtures</a></li> - - </ul> - </li> - <li> - <a href="#_unit_testing_your_models">Unit Testing your Models</a> - <ul> - - <li><a href="#_preparing_you_application_for_testing">Preparing you Application for Testing</a></li> - - <li><a href="#_running_tests">Running Tests</a></li> - - <li><a href="#_what_to_include_in_your_unit_tests">What to Include in Your Unit Tests</a></li> - - <li><a href="#_assertions_available">Assertions Available</a></li> - - <li><a href="#_rails_specific_assertions">Rails Specific Assertions</a></li> - - </ul> - </li> - <li> - <a href="#_functional_tests_for_your_controllers">Functional Tests for Your Controllers</a> - <ul> - - <li><a href="#_what_to_include_in_your_functional_tests">What to include in your Functional Tests</a></li> - - <li><a href="#_available_request_types_for_functional_tests">Available Request Types for Functional Tests</a></li> - - <li><a href="#_the_4_hashes_of_the_apocalypse">The 4 Hashes of the Apocalypse</a></li> - - <li><a href="#_instance_variables_available">Instance Variables Available</a></li> - - <li><a href="#_a_fuller_functional_test_example">A Fuller Functional Test Example</a></li> - - <li><a href="#_testing_views">Testing Views</a></li> - - </ul> - </li> - <li> - <a href="#_integration_testing">Integration Testing</a> - <ul> - - <li><a href="#_helpers_available_for_integration_tests">Helpers Available for Integration tests</a></li> - - <li><a href="#_integration_testing_examples">Integration Testing Examples</a></li> - - </ul> - </li> - <li> - <a href="#_rake_tasks_for_running_your_tests">Rake Tasks for Running your Tests</a> - </li> - <li> - <a href="#_brief_note_about_test_unit">Brief Note About Test::Unit</a> - </li> - <li> - <a href="#_setup_and_teardown">Setup and Teardown</a> - </li> - <li> - <a href="#_testing_routes">Testing Routes</a> - </li> - <li> - <a href="#_testing_your_mailers">Testing Your Mailers</a> - <ul> - - <li><a href="#_keeping_the_postman_in_check">Keeping the Postman in Check</a></li> - - <li><a href="#_unit_testing">Unit Testing</a></li> - - <li><a href="#_functional_testing">Functional Testing</a></li> - - </ul> - </li> - <li> - <a href="#_other_testing_approaches">Other Testing Approaches</a> - </li> - <li> - <a href="#_changelog">Changelog</a> - </li> - </ol> - </div> - - <div id="content"> - <h1>A Guide to Testing Rails Applications</h1> - <div id="preamble">
+ <div id="container"> + + <div id="sidebar"> + <h2>Chapters</h2> + <ol> + <li> + <a href="#_why_write_tests_for_your_rails_applications">Why Write Tests for your Rails Applications?</a> + </li> + <li> + <a href="#_introduction_to_testing">Introduction to Testing</a> + <ul> + + <li><a href="#_the_3_environments">The 3 Environments</a></li> + + <li><a href="#_rails_sets_up_for_testing_from_the_word_go">Rails Sets up for Testing from the Word Go</a></li> + + <li><a href="#_the_low_down_on_fixtures">The Low-Down on Fixtures</a></li> + + </ul> + </li> + <li> + <a href="#_unit_testing_your_models">Unit Testing your Models</a> + <ul> + + <li><a href="#_preparing_you_application_for_testing">Preparing you Application for Testing</a></li> + + <li><a href="#_running_tests">Running Tests</a></li> + + <li><a href="#_what_to_include_in_your_unit_tests">What to Include in Your Unit Tests</a></li> + + <li><a href="#_assertions_available">Assertions Available</a></li> + + <li><a href="#_rails_specific_assertions">Rails Specific Assertions</a></li> + + </ul> + </li> + <li> + <a href="#_functional_tests_for_your_controllers">Functional Tests for Your Controllers</a> + <ul> + + <li><a href="#_what_to_include_in_your_functional_tests">What to include in your Functional Tests</a></li> + + <li><a href="#_available_request_types_for_functional_tests">Available Request Types for Functional Tests</a></li> + + <li><a href="#_the_4_hashes_of_the_apocalypse">The 4 Hashes of the Apocalypse</a></li> + + <li><a href="#_instance_variables_available">Instance Variables Available</a></li> + + <li><a href="#_a_fuller_functional_test_example">A Fuller Functional Test Example</a></li> + + <li><a href="#_testing_views">Testing Views</a></li> + + </ul> + </li> + <li> + <a href="#_integration_testing">Integration Testing</a> + <ul> + + <li><a href="#_helpers_available_for_integration_tests">Helpers Available for Integration tests</a></li> + + <li><a href="#_integration_testing_examples">Integration Testing Examples</a></li> + + </ul> + </li> + <li> + <a href="#_rake_tasks_for_running_your_tests">Rake Tasks for Running your Tests</a> + </li> + <li> + <a href="#_brief_note_about_test_unit">Brief Note About Test::Unit</a> + </li> + <li> + <a href="#_setup_and_teardown">Setup and Teardown</a> + </li> + <li> + <a href="#_testing_routes">Testing Routes</a> + </li> + <li> + <a href="#_testing_your_mailers">Testing Your Mailers</a> + <ul> + + <li><a href="#_keeping_the_postman_in_check">Keeping the Postman in Check</a></li> + + <li><a href="#_unit_testing">Unit Testing</a></li> + + <li><a href="#_functional_testing">Functional Testing</a></li> + + </ul> + </li> + <li> + <a href="#_other_testing_approaches">Other Testing Approaches</a> + </li> + <li> + <a href="#_changelog">Changelog</a> + </li> + </ol> + </div> + + <div id="content"> + <h1>A Guide to Testing Rails Applications</h1> + <div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>This guide covers built-in mechanisms offered by Rails to test your application. By referring to this guide, you will be able to:</p></div>
<div class="ulist"><ul>
@@ -1713,7 +1545,7 @@ October 12, 2008: First draft by <a href="../authors.html#asurve">Akshay Surve</ </ul></div>
</div>
- </div> - </div> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/source/stylesheets/base.css b/railties/doc/guides/source/stylesheets/base.css index 1cf0a3de98..2bf0b93c40 100644 --- a/railties/doc/guides/source/stylesheets/base.css +++ b/railties/doc/guides/source/stylesheets/base.css @@ -6,95 +6,95 @@ 1. General HTML elements 2. General classes 3. General structure - 1. header - 2. Content - 3. Sidebar - 4. Sitewide elements - 1. Introduction boxes - 2. Navigation + 1. header + 2. Content + 3. Sidebar + 4. Sitewide elements + 1. Introduction boxes + 2. Navigation 5. Elements for specific areas - 1. Weblog - + 1. Weblog + ---------------------------------------------------------------------------- */ * { - margin: 0; - padding: 0; + margin: 0; + padding: 0; } -body { - color: #333333; +body { + color: #333333; + + background-color: #FFFFFF; + background-image: url(../images/header_backdrop.png); + background-repeat: repeat-x; + background-position: 0 -25px; - 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; - font-size: 80%; - font-family: verdana, helvetica, arial, sans-serif; - line-height: 1.7em; - - /* Center in IE5.5 */ - text-align: center; + /* Center in IE5.5 */ + text-align: center; } h1 { - font-size: 2em; - font-weight: normal; - letter-spacing: -0.04em; + font-size: 2em; + font-weight: normal; + letter-spacing: -0.04em; } h2 { - font-size: 1.5em; - font-weight: normal; - letter-spacing: -0.04em; + font-size: 1.5em; + font-weight: normal; + letter-spacing: -0.04em; } h1,h2,h3,h4,h5,h6 { - margin-top: 1em; - margin-bottom: 0.5em; + margin-top: 1em; + margin-bottom: 0.5em; } .pageheader a:link, .pageheader a:visited{ - color: #333; + color: #333; text-decoration: none; } img { - border: none; + border: none; } p { - margin-bottom: 1em; + margin-bottom: 1em; } a:link { - color: #BB2233; + color: #BB2233; } a:visited { - color: #991122; + color: #991122; } a:hover { - color: #CC2233; - background-color: #EEEEEE; + color: #CC2233; + background-color: #EEEEEE; } a:active { } ul { - margin-top: 1em; - list-style-type: none; + 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; + 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 { @@ -102,98 +102,98 @@ ul li p { } /* ---------------------------------------------------------------------------- - Structure + Structure ---------------------------------------------------------------------------- */ div#container { - width: 90%; - max-width: 790px; + width: 90%; + max-width: 790px; - margin-top: 10px; - margin-left: auto; - margin-right: auto; + margin-top: 10px; + margin-left: auto; + margin-right: auto; - font-size: 1em; + font-size: 1em; - /* Don't center text, only div#container */ - text-align: left; + /* 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; + /* 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; + 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; + 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; + float: left; + width: 110px; + height: 140px; + margin-right: 31px; } */ div#content { - margin-left: 170px; + margin-left: 170px; } /* Fix the IE only 3pixel jog - documented at http://www.positioniseverything.net/articles/hollyhack.html#haslayout \*/ * html #content { - height: 1px; + height: 1px; } /* End hide from IE5-mac */ div#sidebar { - float: left; - width: 170px; - margin-top: -4px; - font-size: 0.8em; + float: left; + width: 170px; + margin-top: -4px; + font-size: 0.8em; } div#sidebar h2 { - margin: 0; - font-size: 1.1em; - font-weight: bold; + margin: 0; + font-size: 1.1em; + font-weight: bold; } div#sidebar ul { - margin-top: 0; - margin-bottom: 1em; - padding: 0; + 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; + 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; + display: block; + width: 150px; + padding: 0.2em 0; } div#sidebar ul li { @@ -203,160 +203,160 @@ div#sidebar ul li { div#sidebar ol>ol { padding-left: 5px; padding-right: 5px; - list-style-type: none; - + list-style-type: none; + } div#sidebar ol>ol li a { - display: block; - width: 140px; - padding: 0.2em 0; - margin-left: 10px; - + display: block; + width: 140px; + padding: 0.2em 0; + margin-left: 10px; + } div#sidebar ol li a:hover { } /* ---------------------------------------------------------------------------- - Specific site-wide elements + Specific site-wide elements ---------------------------------------------------------------------------- */ /* Introduction boxes */ .introduction { - margin-bottom: 1em; - padding: 1em; - background-color: #D6DFE8; + margin-bottom: 1em; + padding: 1em; + background-color: #D6DFE8; } .introduction p { - margin-bottom: 0; + margin-bottom: 0; } /* Navigation */ ul#navMain { - height: 22px; - margin: 0; - margin-left: 140px; - padding: 16px 0; + height: 22px; + margin: 0; + margin-left: 140px; + padding: 16px 0; - list-style-type: none; + list-style-type: none; } ul#navMain li { - display: inline; - background-image: none; - margin: 0; - padding: 0; + display: inline; + background-image: none; + margin: 0; + padding: 0; } ul#navMain li { - border-left: 1px solid #FFFFFF; + 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; + /* 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 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; + /* 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; +ul#navMain li a:hover { + text-decoration: underline; + background-color: transparent; } /* Mark the current page */ ul#navMain li.current a { - font-weight: bold; + font-weight: bold; } /* ---------------------------------------------------------------------------- - Elements for specific areas + Elements for specific areas ---------------------------------------------------------------------------- */ /* Weblog */ .blogEntry { - margin-bottom: 2em; + margin-bottom: 2em; } .blogEntry h2 { - margin-top: 0; - margin-bottom: 0; + margin-top: 0; + margin-bottom: 0; } p.metaData { - color: #999999; - font-size: 0.9em; + color: #999999; + font-size: 0.9em; } /* Reference documentation */ #reference #sidebar { - display: none; - width: 0; + display: none; + width: 0; } #reference #content { - margin-left: 0; + margin-left: 0; } #reference #content #api { - width: 100%; - height: 800px; + width: 100%; + height: 800px; } #reference #logo { - width: 80px; - height: 86px; + width: 80px; + height: 86px; - margin-right: 0; + margin-right: 0; } #reference #logo img { - height: 84px; + 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; + /* 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; + height: 90px; } #reference #header h1 { - height: 24px; + height: 24px; + + margin-top: 2px; + margin-left: 0; + + background-image: none; - margin-top: 2px; - margin-left: 0; - - background-image: none; + text-indent: 0; + font-size: 1.5em; + font-weight: bold; - text-indent: 0; - font-size: 1.5em; - font-weight: bold; - } #reference #container { - max-width: 100%; + max-width: 100%; }
\ No newline at end of file diff --git a/railties/doc/guides/source/stylesheets/forms.css b/railties/doc/guides/source/stylesheets/forms.css index a3fce205b7..1da34dc999 100644 --- a/railties/doc/guides/source/stylesheets/forms.css +++ b/railties/doc/guides/source/stylesheets/forms.css @@ -1,7 +1,7 @@ label, input { - display: block; - float: left; - margin-bottom: 10px; + display: block; + float: left; + margin-bottom: 10px; } label { @@ -25,7 +25,7 @@ form>h1{ } td { - vertical-align: top; + vertical-align: top; } #livepreview { diff --git a/railties/doc/guides/source/stylesheets/more.css b/railties/doc/guides/source/stylesheets/more.css index 9446b439d4..756ae06d0e 100644 --- a/railties/doc/guides/source/stylesheets/more.css +++ b/railties/doc/guides/source/stylesheets/more.css @@ -12,8 +12,8 @@ border: 1px solid #ccc; } -pre { - overflow: auto; +pre { + overflow: auto; } #content pre, #content ul { @@ -25,13 +25,13 @@ pre { } div#header h1 a{ - color: #333333; - text-decoration: none; + color: #333333; + text-decoration: none; } div#header p a{ text-decoration: none; - color: #999; + color: #999; } .left-floaty { @@ -80,3 +80,174 @@ div#header p a{ 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/railties/doc/guides/source/templates/guides.html.erb b/railties/doc/guides/source/templates/guides.html.erb index d69cf5e08a..ae1145c1ae 100644 --- a/railties/doc/guides/source/templates/guides.html.erb +++ b/railties/doc/guides/source/templates/guides.html.erb @@ -1,97 +1,94 @@ <%- - manuals_index_url = ENV['MANUALSONRAILS_INDEX_URL'] || "index.html" - show_toc = ENV['MANUALSONRAILS_TOC'] != 'no' + manuals_index_url = ENV['MANUALSONRAILS_INDEX_URL'] || "index.html" + show_toc = ENV['MANUALSONRAILS_TOC'] != 'no' -%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title><%- if multi_page? && !is_preamble? -%><%=h current_chapter.plain_title %> :: <% end %><%=h title %></title> - <!--[if lt IE 8]> - <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> - <![endif]--> - <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> - <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> - <style type="text/css"> - <%= include_file('inline.css') %> - </style> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title><%- if multi_page? && !is_preamble? -%><%=h current_chapter.plain_title %> :: <% end %><%=h title %></title> + <!--[if lt IE 8]> + <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script> + <![endif]--> + <link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" /> + <link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" /> </head> <body> - <div id="header" <% if !show_toc %> class="notoc"<% end %>> - <div id="logo"> - <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> - </div> - - <h1 id="site_title"><span>Ruby on Rails</span></h1> - <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> + <div id="header" <% if !show_toc %> class="notoc"<% end %>> + <div id="logo"> + <a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a> + </div> - <ul id="navMain"> - <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> - <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> - </ul> - </div> + <h1 id="site_title"><span>Ruby on Rails</span></h1> + <h2 id="site_title_tagline">Sustainable productivity for web-application development</h2> - <div id="container"<% if !show_toc %> class="notoc"<% end %>> - <% if show_toc %> - <div id="sidebar"> - <h2>Chapters</h2> - <%- if multi_page? -%> - <a href="<%=h chapters.first.basename %>">Preamble</a> - <%- end -%> - <ol> - <%- if multi_page? -%> - <%- for heading in table_of_contents -%> - <li> - <a href="<%=h heading.basename %>"><%= heading.title_without_numbers %></a> - <%- if !heading.children.empty? -%> - <ul> - <% for h in heading.children %> - <li><a href="<%=h h.basename %><%=h h.anchor %>"><%= h.title_without_numbers %></a></li> - <% end %> - </ul> - <%- end -%> - </li> - <%- end -%> - <%- else -%> - <%- for heading in table_of_contents -%> - <li> - <a href="<%=h heading.anchor %>"><%= heading.title_without_numbers %></a> - <%- if !heading.children.empty? -%> - <ul> - <% for h in heading.children %> - <li><a href="<%=h h.anchor %>"><%= h.title_without_numbers %></a></li> - <% end %> - </ul> - <%- end -%> - </li> - <%- end -%> - <%- end -%> - </ol> - </div> - <% end %> - <div id="content"> - <%- if multi_page? && !is_preamble? -%> - <h2 id="<%=h current_chapter.anchor_id %>"><%= current_chapter.title %></h2> - <%- else -%> - <h1><%=h title %></h1> - <%- end -%> - <%= contents %> - <%- if multi_page? -%> - <div id="chapter_navigation"> - <%- if prev_chapter -%> - <div class="left-floaty"> - <a href="<%=h prev_chapter.basename %>">« <%= prev_chapter.title %></a> - </div> - <%- end -%> - <%- if next_chapter -%> - <div class="right-floaty"> - <a href="<%=h next_chapter.basename %>"><%= next_chapter.title %> »</a> - </div> - <%- end -%> - </div> - <%- end -%> - </div> - </div> + <ul id="navMain"> + <li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li> + <li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li> + </ul> + </div> + + <div id="container"<% if !show_toc %> class="notoc"<% end %>> + <% if show_toc %> + <div id="sidebar"> + <h2>Chapters</h2> + <%- if multi_page? -%> + <a href="<%=h chapters.first.basename %>">Preamble</a> + <%- end -%> + <ol> + <%- if multi_page? -%> + <%- for heading in table_of_contents -%> + <li> + <a href="<%=h heading.basename %>"><%= heading.title_without_numbers %></a> + <%- if !heading.children.empty? -%> + <ul> + <% for h in heading.children %> + <li><a href="<%=h h.basename %><%=h h.anchor %>"><%= h.title_without_numbers %></a></li> + <% end %> + </ul> + <%- end -%> + </li> + <%- end -%> + <%- else -%> + <%- for heading in table_of_contents -%> + <li> + <a href="<%=h heading.anchor %>"><%= heading.title_without_numbers %></a> + <%- if !heading.children.empty? -%> + <ul> + <% for h in heading.children %> + <li><a href="<%=h h.anchor %>"><%= h.title_without_numbers %></a></li> + <% end %> + </ul> + <%- end -%> + </li> + <%- end -%> + <%- end -%> + </ol> + </div> + <% end %> + <div id="content"> + <%- if multi_page? && !is_preamble? -%> + <h2 id="<%=h current_chapter.anchor_id %>"><%= current_chapter.title %></h2> + <%- else -%> + <h1><%=h title %></h1> + <%- end -%> + <%= contents %> + <%- if multi_page? -%> + <div id="chapter_navigation"> + <%- if prev_chapter -%> + <div class="left-floaty"> + <a href="<%=h prev_chapter.basename %>">« <%= prev_chapter.title %></a> + </div> + <%- end -%> + <%- if next_chapter -%> + <div class="right-floaty"> + <a href="<%=h next_chapter.basename %>"><%= next_chapter.title %> »</a> + </div> + <%- end -%> + </div> + <%- end -%> + </div> + </div> </body> </html> diff --git a/railties/doc/guides/source/templates/inline.css b/railties/doc/guides/source/templates/inline.css deleted file mode 100644 index 1b406733de..0000000000 --- a/railties/doc/guides/source/templates/inline.css +++ /dev/null @@ -1,165 +0,0 @@ -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; -} |