railties 3.0.0.beta → 3.0.0.beta2

data/CHANGELOG

@@ -1,4 +1,18 @@
-*Edge*
+*Rails 3.0.0 [beta 2] (April 1st, 2010)*
+
+* Session store configuration has changed [YK & CL]
+
+    config.session_store :cookie_store, {:key => "..."}
+    config.cookie_secret = "fdsfhisdghfidugnfdlg"
+
+* railtie_name and engine_name are deprecated. You can now add any object to
+  the configuration object: config.your_plugin = {} [JK]
+
+* Added config.generators.templates to provide alternative paths for the generators
+  to look for templates [JV]
+
+
+*Rails 3.0.0 [beta 1] (February 4, 2010)*
 
 * Added "rake about" as a replacement for script/about [DHH]
 

data/README

@@ -29,14 +29,14 @@ link:files/vendor/rails/actionpack/README.html.
 
 1. At the command prompt, start a new Rails application using the <tt>rails</tt> command
    and your application name. Ex: <tt>rails myapp</tt>
-2. Change directory into myapp and start the web server: <tt>script/server</tt> (run with --help for options)
+2. Change directory into myapp and start the web server: <tt>rails server</tt> (run with --help for options)
 3. Go to http://localhost:3000/ and get "Welcome aboard: You're riding the Rails!"
 4. Follow the guidelines to start developing your application
 
 
 == Web Servers
 
-By default, Rails will try to use Mongrel if it's installed when started with script/server, otherwise
+By default, Rails will try to use Mongrel if it's installed when started with <tt>rails server</tt>, otherwise
 Rails will use WEBrick, the webserver that ships with Ruby. But you can also use Rails with a variety of
 other web servers.
 
@@ -45,7 +45,7 @@ suitable for development and deployment of Rails applications. If you have Ruby
 getting up and running with mongrel is as easy as: <tt>gem install mongrel</tt>.
 More info at: http://mongrel.rubyforge.org
 
-Other ruby web servers exist which can run your rails application, however script/server does
+Other ruby web servers exist which can run your rails application, however <tt>rails server</tt> does
 not search for them or start them.  These include {Thin}[http://code.macournoyer.com/thin/], {Ebb}[http://ebb.rubyforge.org/], and Apache with {mod_rails}[http://www.modrails.com/].
 
 For production use, often a web/proxy server such as {Apache}[http://apache.org], {Nginx}[http://nginx.net/], {LiteSpeed}[http://litespeedtech.com/], {Lighttpd}[http://www.lighttpd.net/] or {IIS}[http://www.iis.net/] is
@@ -168,22 +168,22 @@ model. Here you'll have all parts of the application configured, just like it is
 application is running. You can inspect domain models, change values, and save to the
 database. Starting the script without arguments will launch it in the development environment.
 
-To start the console, just run <tt>script/console</tt> from the application directory.
+To start the console, just run <tt>rails console</tt> from the application directory.
 
 Options:
 
 * Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications made to the database.
 * Passing an environment name as an argument will load the corresponding environment.
-  Example: <tt>script/console production</tt>.
+  Example: <tt>rails console production</tt>.
 
 More information about irb can be found at link:http://www.rubycentral.com/pickaxe/irb.html
 
 == dbconsole
 
-You can go to the command line of your database directly through <tt>script/dbconsole</tt>.
+You can go to the command line of your database directly through <tt>rails dbconsole</tt>.
 You would be connected to the database with the credentials defined in database.yml.
 Starting the script without arguments will connect you to the development database. Passing an
-argument will connect you to a different database, like <tt>script/dbconsole production</tt>.
+argument will connect you to a different database, like <tt>rails dbconsole production</tt>.
 Currently works for mysql, postgresql and sqlite.
 
 == Description of Contents
@@ -250,7 +250,7 @@ app/views/layouts
 
 app/helpers
   Holds view helpers that should be named like weblogs_helper.rb. These are generated
-  for you automatically when using script/generate for controllers. Helpers can be used to
+  for you automatically when using <tt>rails generate</tt> for controllers. Helpers can be used to
   wrap functionality for your views into methods.
 
 config
@@ -277,7 +277,7 @@ script
   Helper scripts for automation and generation.
 
 test
-  Unit and functional tests along with fixtures. When using the script/generate scripts, template
+  Unit and functional tests along with fixtures. When using the <tt>rails generate</tt> scripts, template
   test files will be generated for you and placed in this directory.
 
 vendor

data/bin/rails

@@ -1,11 +1,30 @@
-if File.exists?(Dir.getwd + '/script/rails')
-  exec(Dir.getwd + '/script/rails', *ARGV)
-else
-  railties_path = File.expand_path('../../lib', __FILE__)
-  $:.unshift(railties_path) if File.directory?(railties_path) && !$:.include?(railties_path)
+require 'rbconfig'
 
-  require 'rails/ruby_version_check'
-  Signal.trap("INT") { puts; exit }
+module Rails
+  module ScriptRailsLoader
+    RUBY = File.join(*RbConfig::CONFIG.values_at("bindir", "ruby_install_name")) + RbConfig::CONFIG["EXEEXT"]
+    SCRIPT_RAILS = File.join('script', 'rails')
 
-  require 'rails/commands/application'
-end
+    def self.exec_script_rails!
+      cwd = Dir.pwd
+      exec RUBY, SCRIPT_RAILS, *ARGV if File.exists?(SCRIPT_RAILS)
+      Dir.chdir("..") do
+        # Recurse in a chdir block: if the search fails we want to be sure
+        # the application is generated in the original working directory.
+        exec_script_rails! unless cwd == Dir.pwd
+      end
+    rescue SystemCallError
+      # could not chdir, no problem just return
+    end
+  end
+end
+
+Rails::ScriptRailsLoader.exec_script_rails!
+
+railties_path = File.expand_path('../../lib', __FILE__)
+$:.unshift(railties_path) if File.directory?(railties_path) && !$:.include?(railties_path)
+
+require 'rails/ruby_version_check'
+Signal.trap("INT") { puts; exit }
+
+require 'rails/commands/application'

data/guides/rails_guides.rb

@@ -5,40 +5,27 @@ $:.unshift pwd
 require 'rubygems'
 
 begin
+  # Guides generation in the Rails repo.
   as_lib = File.join(pwd, "../../activesupport/lib")
   ap_lib = File.join(pwd, "../../actionpack/lib")
 
-  $: << as_lib if File.directory?(as_lib)
-  $: << ap_lib if File.directory?(ap_lib)
-  
-  require "action_controller"
-  require "action_view"
+  $:.unshift as_lib if File.directory?(as_lib)
+  $:.unshift ap_lib if File.directory?(ap_lib)
 rescue LoadError
-  gem "actionpack", '>= 2.3'
-
-  require "action_controller"
-  require "action_view"
+  # Guides generation from gems.
+  gem "actionpack", '>= 3.0'
 end
 
 begin
   gem 'RedCloth', '>= 4.1.1'
+  require 'redcloth'
 rescue Gem::LoadError
   $stderr.puts %(Generating Guides requires RedCloth 4.1.1+)
   exit 1
 end
 
-require 'redcloth'
-
-module RailsGuides
-  autoload :Generator,         "rails_guides/generator"
-  autoload :Indexer,           "rails_guides/indexer"
-  autoload :Helpers,           "rails_guides/helpers"
-  autoload :TextileExtensions, "rails_guides/textile_extensions"
-  autoload :Levenshtein,       "rails_guides/levenshtein"
-end
-
+require "rails_guides/textile_extensions"
 RedCloth.send(:include, RailsGuides::TextileExtensions)
 
-if $0 == __FILE__
-  RailsGuides::Generator.new.generate
-end
+require "rails_guides/generator"
+RailsGuides::Generator.new.generate

data/guides/rails_guides/generator.rb

@@ -1,70 +1,95 @@
 require 'set'
+require 'fileutils'
 
-class String
-  def html_safe!
-    self
-  end unless "post 9415935902f120a9bac0bfce7129725a0db38ed3".respond_to?(:html_safe!)
-end
+require 'active_support/core_ext/string/output_safety'
+require 'action_controller'
+require 'action_view'
+
+require 'rails_guides/indexer'
+require 'rails_guides/helpers'
+require 'rails_guides/levenshtein'
 
 module RailsGuides
   class Generator
-    attr_reader :output, :view_path, :view, :guides_dir
-
-    def initialize(output = nil)
-      @guides_dir = File.join(File.dirname(__FILE__), '..')
-
-      @output = output || File.join(@guides_dir, "output")
+    attr_reader :guides_dir, :source_dir, :output_dir 
 
-      unless ENV["ONLY"]
-        FileUtils.rm_r(@output) if File.directory?(@output)
-        FileUtils.mkdir(@output)
-      end
-
-      @view_path = File.join(@guides_dir, "source")
+    def initialize(output=nil)
+      initialize_dirs(output)
+      create_output_dir_if_needed
     end
 
     def generate
-      guides = Dir.entries(view_path).find_all {|g| g =~ /\.textile(?:\.erb)?$/ }
+      generate_guides
+      copy_assets
+    end
 
-      if ENV["ONLY"]
-        only = ENV["ONLY"].split(",").map{|x| x.strip }.map {|o| "#{o}.textile" }
-        guides = guides.find_all {|g| only.include?(g) }
-        puts "GENERATING ONLY #{guides.inspect}"
-      end
+    private
+    def initialize_dirs(output)
+      @guides_dir = File.join(File.dirname(__FILE__), '..')
+      @source_dir = File.join(@guides_dir, "source")
+      @output_dir = output || File.join(@guides_dir, "output")      
+    end
 
-      guides.each do |guide|
-        generate_guide(guide)
+    def create_output_dir_if_needed
+      FileUtils.mkdir_p(output_dir)
+    end  
+
+    def generate_guides
+      guides_to_generate.each do |guide|
+        output_file = output_file_for(guide)
+        generate_guide(guide, output_file) if generate?(guide, output_file)
       end
+    end
 
-      # Copy images and css files to html directory
-      FileUtils.cp_r File.join(guides_dir, 'images'), File.join(output, 'images')
-      FileUtils.cp_r File.join(guides_dir, 'files'), File.join(output, 'files')
+    def guides_to_generate
+      guides = Dir.entries(source_dir).grep(/\.textile(?:\.erb)?$/)
+      ENV.key?("ONLY") ? select_only(guides) : guides
     end
 
-    def generate_guide(guide)
-      guide =~ /(.*?)\.textile(?:\.erb)?$/
-      name = $1
+    def select_only(guides)
+      prefixes = ENV["ONLY"].split(",").map(&:strip)
+      guides.select do |guide|
+        prefixes.any? {|p| guide.start_with?(p)}
+      end
+    end
 
-      puts "Generating #{name}"
+    def copy_assets
+      FileUtils.cp_r(File.join(guides_dir, 'images'), File.join(output_dir, 'images'))
+      FileUtils.cp_r(File.join(guides_dir, 'files'), File.join(output_dir, 'files'))      
+    end
 
-      file = File.join(output, "#{name}.html")
-      File.open(file, 'w') do |f|
-        @view = ActionView::Base.new(view_path)
-        @view.extend(Helpers)
+    def output_file_for(guide)
+      guide.sub(/\.textile(?:\.erb)?$/, '.html')
+    end
+    
+    def generate?(source_file, output_file)
+      fin  = File.join(source_dir, source_file)
+      fout = File.join(output_dir, output_file)
+      ENV['ALL'] == '1' || !File.exists?(fout) || File.mtime(fout) < File.mtime(fin)
+    end
 
+    def generate_guide(guide, output_file)
+      puts "Generating #{output_file}"
+      File.open(File.join(output_dir, output_file), 'w') do |f|
+        view = ActionView::Base.new(source_dir)
+        view.extend(Helpers)
+        
         if guide =~ /\.textile\.erb$/
           # Generate the erb pages with textile formatting - e.g. index/authors
           result = view.render(:layout => 'layout', :file => guide)
-          f.write textile(result)
+          result = textile(result)
         else
-          body = File.read(File.join(view_path, guide))
-          body = set_header_section(body, @view)
-          body = set_index(body, @view)
+          body = File.read(File.join(source_dir, guide))
+          body = set_header_section(body, view)
+          body = set_index(body, view)
+
+          result = view.render(:layout => 'layout', :text => textile(body))
 
-          result = view.render(:layout => 'layout', :text => textile(body).html_safe!)
-          f.write result
           warn_about_broken_links(result) if ENV.key?("WARN_BROKEN_LINKS")
         end
+        
+        result = insert_edge_badge(result) if ENV.key?('INSERT_EDGE_BADGE')
+        f.write result
       end
     end
 
@@ -77,8 +102,8 @@ module RailsGuides
 
       header = textile(header)
 
-      view.content_for(:page_title) { page_title.html_safe! }
-      view.content_for(:header_section) { header.html_safe! }
+      view.content_for(:page_title) { page_title.html_safe }
+      view.content_for(:header_section) { header.html_safe }
       new_body
     end
 
@@ -94,22 +119,22 @@ module RailsGuides
 
       # Set index for 2 levels
       i.level_hash.each do |key, value|
-        link = view.content_tag(:a, :href => key[:id]) { textile(key[:title]) }
+        link = view.content_tag(:a, :href => key[:id]) { textile(key[:title]).html_safe }
 
         children = value.keys.map do |k|
-          l = view.content_tag(:a, :href => k[:id]) { textile(k[:title]) }
-          view.content_tag(:li, l)
+          l = view.content_tag(:a, :href => k[:id]) { textile(k[:title]).html_safe }
+          view.content_tag(:li, l.html_safe)
         end
 
-        children_ul = view.content_tag(:ul, children.join(" "))
+        children_ul = view.content_tag(:ul, children.join(" ").html_safe)
 
-        index << view.content_tag(:li, link + children_ul)
+        index << view.content_tag(:li, link.html_safe + children_ul.html_safe)
       end
 
       index << '</ol>'
       index << '</div>'
 
-      view.content_for(:index_section) { index.html_safe! }
+      view.content_for(:index_section) { index.html_safe }
 
       i.result
     end
@@ -174,5 +199,9 @@ module RailsGuides
         end
       end
     end
+    
+    def insert_edge_badge(html)
+      html.sub(/<body[^>]*>/, '\&<img src="images/edge_badge.png" style="position:fixed; right:0px; top:0px; border:none; z-index:100"/>')
+    end
   end
 end

data/guides/rails_guides/textile_extensions.rb

@@ -1,7 +1,7 @@
 module RailsGuides
   module TextileExtensions
     def notestuff(body)
-      body.gsub!(/^(IMPORTANT|CAUTION|WARNING|NOTE|INFO)(?:\.|\:)(.*)$/) do |m|
+      body.gsub!(/^(IMPORTANT|CAUTION|WARNING|NOTE|INFO)[.:](.*)$/) do |m|
         css_class = $1.downcase
         css_class = 'warning' if ['caution', 'important'].include?(css_class)
 
@@ -13,9 +13,9 @@ module RailsGuides
     end
 
     def tip(body)
-      body.gsub!(/^(TIP)\:(.*)$/) do |m|
+      body.gsub!(/^TIP[.:](.*)$/) do |m|
         result = "<div class='info'><p>"
-        result << $2.strip
+        result << $1.strip
         result << '</p></div>'
         result
       end

data/guides/source/2_2_release_notes.textile

@@ -53,7 +53,7 @@ rake doc:guides
 
 This will put the guides inside +Rails.root/doc/guides+ and you may start surfing straight away by opening +Rails.root/doc/guides/index.html+ in your favourite browser.
 
-* Lead Contributors: "Rails Documentation Team":http://guides.rails.info/credits.html
+* Lead Contributors: "Rails Documentation Team":credits.html
 * Major contributions from "Xavier Noria":http://advogato.org/person/fxn/diary.html and "Hongli Lai":http://izumi.plan99.net/blog/.
 * More information:
 ** "Rails Guides hackfest":http://hackfest.rubyonrails.org/guide

data/guides/source/2_3_release_notes.textile

@@ -47,7 +47,7 @@ After some versions without an upgrade, Rails 2.3 offers some new features for R
 
 h3. Documentation
 
-The "Ruby on Rails guides":http://guides.rubyonrails.org/ project has published several additional guides for Rails 2.3. In addition, a "separate site":http://guides.rails.info/ maintains updated copies of the Guides for Edge Rails. Other documentation efforts include a relaunch of the "Rails wiki":http://newwiki.rubyonrails.org/ and early planning for a Rails Book.
+The "Ruby on Rails guides":http://guides.rubyonrails.org/ project has published several additional guides for Rails 2.3. In addition, a "separate site":http://edgeguides.rubyonrails.org/ maintains updated copies of the Guides for Edge Rails. Other documentation efforts include a relaunch of the "Rails wiki":http://newwiki.rubyonrails.org/ and early planning for a Rails Book.
 
 * More Information: "Rails Documentation Projects":http://weblog.rubyonrails.org/2009/1/15/rails-documentation-projects.
 

data/guides/source/3_0_release_notes.textile

@@ -1,14 +1,14 @@
-h2. Rails 3.0: Release Notes
+h2. Ruby on Rails 3.0 Release Notes
 
-Rails 3.0 is ponies and rainbows! It's going to cook you dinner and fold your laundry. You're going to wonder how life was ever possible before you it arrived. It's the Best Version of Rails We've Ever Done! 
+Rails 3.0 is ponies and rainbows! It's going to cook you dinner and fold your laundry. You're going to wonder how life was ever possible before it arrived. It's the Best Version of Rails We've Ever Done! 
 
 But seriously now, it's really good stuff. There are all the good ideas brought over from when the Merb team joined the party and brought a focus on framework agnosticism, slimmer and faster internals, and a handful of tasty APIs. If you're coming to Rails 3.0 from Merb 1.x, you should recognize lots. If you're coming from Rails 2.x, you're going to love it too.
 
 Even if you don't give a hoot about any of our internal cleanups, Rails 3.0 is going to delight. We have a bunch of new features and improved APIs. It's never been a better time to be a Rails developer. Some of the highlights are:
 
 * Brand new router with an emphasis on RESTful declarations
-* New Action Mailer API modelled after Action Controller (now without the agonizing pain of sending multipart messages!)
-* New Active Record chainable query language built on top of "Arel":http://github.com/brynary/arel, a relational algebra engine
+* New Action Mailer API modeled after Action Controller (now without the agonizing pain of sending multipart messages!)
+* New Active Record chainable query language built on top of relational algebra
 * Unobtrusive JavaScript helpers with drivers for Prototype, jQuery, and more coming (end of inline JS)
 * Explicit dependency management with Bundler
 
@@ -20,6 +20,18 @@ endprologue.
 
 WARNING: Rails 3.0 is currently in beta. This means that there are probably bugs and that you should "report them":http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/overview if you see them. You also may not want to run the NORAD nuclear launch application off a beta version. But if you're starting development on a new application and you don't mind getting wind in your hair, please do jump on board!
 
+TIP: To install the Rails 3 prerelease beta using rubygems you have to install all the Rails dependencies first as these will not be installed for you by rubygems:
+
+<shell>
+# Use sudo if your setup requires it
+gem install tzinfo builder i18n memcache-client rack \
+  rake rack-test erubis mail text-format \
+  thor bundler
+gem install rack-mount -v=0.4
+gem install rails --pre
+</shell>
+
+
 h3. Upgrading to Rails 3
 
 If you're upgrading an existing application, it's a great idea to have good test coverage before going in. You should also first upgrade to Rails 2.3.5 and make sure your application still runs as expected before attempting to update to Rails 3. Then take heed of the following changes:
@@ -39,11 +51,11 @@ h4. script/* replaced by script/rails
 The new <tt>script/rails</tt> replaces all the scripts that used to be in the <tt>script</tt> directory. You do not run <tt>script/rails</tt> directly though, the +rails+ command detects it is being invoked in the root of a Rails application and runs the script for you. Intended usage is:
 
 <shell>
-rails console                      # => ./script/console
-rails g scaffold post title:string # => ./script/generate scaffold post title:string
+rails console                      # instead of script/console
+rails g scaffold post title:string # instead of script/generate scaffold post title:string
 </shell>
 
-Run rails --help for a list of all the options.
+Run <tt>rails --help</tt> for a list of all the options.
 
 h4. Dependencies and config.gem
 
@@ -65,7 +77,6 @@ Aside from Rails Upgrade tool, if you need more help, there are people on IRC an
 
 More information - "The Path to Rails 3: Approaching the upgrade":http://omgbloglol.com/post/353978923/the-path-to-rails-3-approaching-the-upgrade
 
-
 h3. Creating a Rails 3.0 application
 
 The new installing rails sequence (for the beta) is:
@@ -80,34 +91,32 @@ h4. Vendoring Gems
 
 Rails now uses a +Gemfile+ in the application root to determine the gems you require for your application to start. This +Gemfile+ is processed by the "Bundler":http://github.com/carlhuda/bundler, which then installs all your dependencies. It can even install all the dependencies locally to your application so that it doesn't depend on the system gems.
 
-More information: - "Using bundler":http://yehudakatz.com/2009/11/03/using-the-new-gem-bundler-today/
-
+More information: - "bundler README on Github":http://github.com/carlhuda/bundler
 
 h4. Living on the Edge
 
 +Bundler+ and +Gemfile+ makes freezing your Rails application easy as pie with the new dedicated <tt>bundle</tt> command, so <tt>rake freeze</tt> is no longer relevant and has been dropped.
 
-If you want to bundle straight from the Git repository, you can pass the edge flag:
+If you want to bundle straight from the Git repository, you can pass the +--edge+ flag:
 
 <shell>
 $ rails myapp --edge
 </shell>
 
-More information:
-* "Spinning up a new Rails app":http://yehudakatz.com/2009/12/31/spinning-up-a-new-rails-app/
-* "Rails 3 and Passenger":http://cakebaker.42dh.com/2010/01/17/rails-3-and-passenger/
+If you have a local checkout of the Rails repository and want to generate an application using that, you can pass the +--dev+ flag:
 
+<shell>
+$ ruby /path/to/rails/railties/bin/rails myapp --dev
+</shell>
 
 h3. Rails Architectural Changes
 
 There are six major changes in the architecture of Rails.
 
-
 h4. Railties Restrung
 
 Railties was updated to provide a consistent plugin API for the entire Rails framework as well as a total rewrite of generators and the Rails bindings, the result is that developers can now hook into any significant stage of the generators and application framework in a consistent, defined manner.
 
-
 h4. All Rails core components are decoupled
 
 With the merge of Merb and Rails, one of the big jobs was to remove the tight coupling between Rails core components.  This has now been achieved, and all Rails core components are now using the same API that you can use for developing plugins.  This means any plugin you make, or any core component replacement (like DataMapper or Sequel) can access all the functionality that the Rails core components have access to and extend and enhance at will.
@@ -145,7 +154,7 @@ More information: - "New Action Mailer API in Rails 3":http://lindsaar.net/2010/
 
 h3. Documentation
 
-The documentation in the Rails tree is being updated with all the API changes, additionally, the "Rails Edge guides":http://guides.rails.info/ are being updated one by one to reflect the changes in Rails 3.0.  The guides at "guides.rubyonrails.org":http://guides.rubyonrails.org/ however will continue to contain only the stable version of Rails (at this point, version 2.3.5, until 3.0 is released).
+The documentation in the Rails tree is being updated with all the API changes, additionally, the "Rails Edge Guides":http://edgeguides.rubyonrails.org/ are being updated one by one to reflect the changes in Rails 3.0.  The guides at "guides.rubyonrails.org":http://guides.rubyonrails.org/ however will continue to contain only the stable version of Rails (at this point, version 2.3.5, until 3.0 is released).
 
 More Information: - "Rails Documentation Projects":http://weblog.rubyonrails.org/2009/1/15/rails-documentation-projects.
 
@@ -166,7 +175,7 @@ h3. Railties
 
 With the decoupling of the main Rails frameworks, Railties got a huge overhaul so as to make linking up frameworks, engines or plugins as painless and extensible as possible:
 
-* Each application now has it's own name space, application is started with <tt>YourAppName.boot</tt> for example, makes interacting with other applications a lot easier.
+* Each application now has its own name space, application is started with <tt>YourAppName.boot</tt> for example, makes interacting with other applications a lot easier.
 * Anything under <tt>Rails.root/app</tt> is now added to the load path, so you can make <tt>app/observers/user_observer.rb</tt> and Rails will load it without any modifications.
 * Rails 3.0 now provides a <tt>Rails.config</tt> object, which provides a central repository of all sorts of Rails wide configuration options.
 
@@ -203,7 +212,7 @@ Railties now deprecates:
 More information:
 * "Discovering Rails 3 generators":http://blog.plataformatec.com.br/2010/01/discovering-rails-3-generators
 * "Making Generators for Rails 3 with Thor":http://caffeinedd.com/guides/331-making-generators-for-rails-3-with-thor
-
+* "The Rails Module (in Rails 3)":http://litanyagainstfear.com/blog/2010/02/03/the-rails-module/
 
 h3. Action Pack
 
@@ -224,8 +233,8 @@ More Information: - "Rails Edge Architecture":http://yehudakatz.com/2009/06/11/r
 h4. Action Controller
 
 * <tt>application_controller.rb</tt> now has <tt>protect_from_forgery</tt> on by default.
-* The <tt>cookie_verifier_secret</tt> has been moved to <tt>initializers/cookie_verification_secret.rb</tt>.
-* The <tt>session_store</tt> configuration has moved to <tt>initializers/session_store.rb</tt>.
+* The <tt>cookie_verifier_secret</tt> has been deprecated and now instead it is assigned through <tt>Rails.application.config.cookie_secret</tt> and moved into its own file: <tt>config/initializers/cookie_verification_secret.rb</tt>.
+* The <tt>session_store</tt> was configured in <tt>ActionController::Base.session</tt>, and that is now moved to <tt>Rails.application.config.session_store</tt>. Defaults are set up in <tt>config/initializers/session_store.rb</tt>.
 * <tt>cookies.secure</tt> allowing you to set encrypted values in cookies with <tt>cookie.secure[:key] => value</tt>.
 * <tt>cookies.permanent</tt> allowing you to set permanent values in the cookie hash <tt>cookie.permanent[:key] => value</tt> that raise exceptions on signed values if verification failures.
 * You can now pass <tt>:notice => 'This is a flash message'</tt> or <tt>:alert => 'Something went wrong'</tt> to the <tt>format</tt> call inside a +respond_to+ block.  The <tt>flash[]</tt> hash still works as previously.
@@ -251,7 +260,7 @@ Action Dispatch is new in Rails 3.0 and provides a new, cleaner implementation f
 <ruby>
 # Instead of:
 
-ActionController::Routing::Routes.draw do
+ActionController::Routing::Routes.draw do |map|
   map.resources :posts
 end
 
@@ -313,7 +322,6 @@ Produces:
 * I18n select label on should now be :en.helpers.select instead of :en.support.select.
 * You no longer need to place a minus sign at the end of a ruby interpolation inside an ERb template to remove the trailing carriage return in the HTML output.
 * Added +grouped_collection_select+ helper to Action View.
-* Action View now will raise exceptions if CSS stylesheets and javascript files listed in the +javascript_include_tag+ and +stylesheet_include_tag+ helpers are missing.
 * +content_for?+ has been added allowing you to check for the existence of content in a view before rendering.
 
 
@@ -386,7 +394,7 @@ Active Record received a lot of attention in Rails 3.0, including abstraction in
 
 h4. Query Interface
 
-Active Record, through the use of Arel, now returns relations on it's core methods.  The existing API in Rails 2.3.x is still supported and will not be deprecated until Rails 3.1 and not removed until Rails 3.2, however, the new API provides the following new methods that all return relations allowing them to be chained together:
+Active Record, through the use of Arel, now returns relations on its core methods.  The existing API in Rails 2.3.x is still supported and will not be deprecated until Rails 3.1 and not removed until Rails 3.2, however, the new API provides the following new methods that all return relations allowing them to be chained together:
 
 * <tt>where</tt> - provides conditions on the relation, what gets returned.
 * <tt>select</tt> - choose what attributes of the models you wish to have returned from the database.
@@ -421,7 +429,7 @@ Additionally, many fixes in the Active Record branch:
 
 * SQLite 2 support has been dropped in favour of SQLite 3.
 * MySQL support for column order.
-* PostgreSQL adapter has had it's +TIME ZONE+ support fixed so it no longer inserts incorrect values.
+* PostgreSQL adapter has had its +TIME ZONE+ support fixed so it no longer inserts incorrect values.
 * Support multiple schemas in table names for PostgreSQL.
 * PostgreSQL support for the XML data type column.
 * +table_name+ is now cached.
@@ -435,7 +443,7 @@ As well as the following deprecations:
 * I18n error messages for ActiveRecord should be changed from :en.activerecord.errors.template to <tt>:en.errors.template</tt>.
 * <tt>model.errors.on</tt> is deprecated in favour of <tt>model.errors[]</tt>
 * validates_presence_of => validates... :presence => true
-* <tt>ActiveRecord::Base.colorize_logging</tt> and <tt>config.active_record.colorize_logging</tt> are deprecated in favour of <tt>Rails::Subscriber.colorize_logging</tt> or <tt>config.colorize_logging</tt>
+* <tt>ActiveRecord::Base.colorize_logging</tt> and <tt>config.active_record.colorize_logging</tt> are deprecated in favour of <tt>Rails::LogSubscriber.colorize_logging</tt> or <tt>config.colorize_logging</tt>
 
 NOTE: While an implementation of State Machine has been in Active Record edge for some months now, it has been removed from the Rails 3.0 release.
 
@@ -461,7 +469,7 @@ Active Resource was also extracted out to Active Model allowing you to use Activ
 * Fix <tt>ActiveResource::ConnectionError#to_s</tt> when +@response+ does not respond to #code or #message, handles Ruby 1.9 compat.
 * Add support for errors in JSON format.
 * Ensure <tt>load</tt> works with numeric arrays.
-* Recognises a 410 response from remote resource as the resource has been deleted.
+* Recognizes a 410 response from remote resource as the resource has been deleted.
 * Add ability to set SSL options on Active Resource connections.
 * Setting connection timeout also affects +Net::HTTP+ <tt>open_timeout</tt>.
 
@@ -478,7 +486,7 @@ A large effort was made in Active Support to make it cherry pickable, that is, y
 These are the main changes in Active Support:
 
 * Large clean up of the library removing unused methods throughout.
-* Active Support no longer provides vendored versions of "TZInfo":http://tzinfo.rubyforge.org/, "Memcache Client":http://deveiate.org/projects/RMemCache/ and "Builder":http://builder.rubyforge.org/, these are all included as dependencies and installed via the <tt>gem bundle</tt> command.
+* Active Support no longer provides vendored versions of "TZInfo":http://tzinfo.rubyforge.org/, "Memcache Client":http://deveiate.org/projects/RMemCache/ and "Builder":http://builder.rubyforge.org/, these are all included as dependencies and installed via the <tt>bundle install</tt> command.
 * Safe buffers are implemented in <tt>ActiveSupport::SafeBuffer</tt>.
 * Added <tt>Array.uniq_by</tt> and <tt>Array.uniq_by!</tt>.
 * Fixed bug on +TimeZone.seconds_to_utc_offset+ returning wrong value.
@@ -501,7 +509,7 @@ These are the main changes in Active Support:
 * <tt>String#to_time</tt> and <tt>String#to_datetime</tt> handle fractional seconds.
 * Added support to new callbacks for around filter object that respond to <tt>:before</tt> and <tt>:after</tt> used in before and after callbacks.
 * The <tt>ActiveSupport::OrderedHash#to_a</tt> method returns an ordered set of arrays. Matches Ruby 1.9's <tt>Hash#to_a</tt>.
-* <tt>MissingSourceFile</tt> exists as a constant but it is now just equals to <tt>LoadError</tt>
+* <tt>MissingSourceFile</tt> exists as a constant but it is now just equals to <tt>LoadError</tt>.
 * Added <tt>Class#class_attribute</tt>, to be able to declare a class-level attribute whose value is inheritable and overwritable by subclasses.
 * Finally removed +DeprecatedCallbacks+ in <tt>ActiveRecord::Associations</tt>.
 
@@ -520,10 +528,10 @@ The security patch for REXML remains in Active Support because early patchlevels
 
 The following methods have been removed because they are no longer used in the framework:
 
-* <tt>Object#remove_subclasses_of</tt>, <tt>Object#subclasses_of</tt>, <tt>Object#extend_with_included_modules_from</tt>, <tt>Object#extended_by</tt>
-* <tt>Class#subclasses</tt>, <tt>Class#reachable?</tt>, <tt>Class#remove_class</tt>
-* <tt>Regexp#number_of_captures</tt>
-* <tt>Regexp.unoptionalize</tt>, <tt>Regexp.optionalize</tt>, <tt>Regexp#number_of_captures</tt>
+* +Kernel#daemonize+
+* <tt>Object#remove_subclasses_of</tt> <tt>Object#extend_with_included_modules_from</tt>, <tt>Object#extended_by</tt>
+* <tt>Class#remove_class</tt>
+* <tt>Regexp#number_of_captures</tt>, <tt>Regexp.unoptionalize</tt>, <tt>Regexp.optionalize</tt>, <tt>Regexp#number_of_captures</tt>
 
 
 h3. Action Mailer
@@ -532,11 +540,11 @@ Action Mailer has been given a new API with TMail being replaced out with the ne
 
 * All mailers are now in <tt>app/mailers</tt> by default.
 * Can now send email using new API with three methods: +attachments+, +headers+ and +mail+.
-* ActionMailer emailing methods now return Mail::Message objects, which can then be sent the +deliver+ message to send itself.
+* Action Mailer emailing methods now return <tt>Mail::Message</tt> objects, which can then be sent the +deliver+ message to send itself.
 * All delivery methods are now abstracted out to the Mail gem.
 * The mail delivery method can accept a hash of all valid mail header fields with their value pair.
-* The mail delivery method acts in a similar way to Action Controller's respond_to block, and you can explicitly or implicitly render templates. Action Mailer will turn the email into a multipart email as needed.
-* You can pass a proc to the <tt>format.mime_type</tt> calls within the mail block and explicitly render specific types of text, or add layouts or different templates. The +render+ call inside the proc is from Abstract Controller, so all the same options are available as they are in Action Controller.
+* The +mail+ delivery method acts in a similar way to Action Controller's +respond_to+, and you can explicitly or implicitly render templates. Action Mailer will turn the email into a multipart email as needed.
+* You can pass a proc to the <tt>format.mime_type</tt> calls within the mail block and explicitly render specific types of text, or add layouts or different templates. The +render+ call inside the proc is from Abstract Controller and supports the same options.
 * What were mailer unit tests have been moved to functional tests.
 
 Deprecations:
@@ -545,7 +553,7 @@ Deprecations:
 * Mailer dynamic <tt>create_method_name</tt> and <tt>deliver_method_name</tt> are deprecated, just call <tt>method_name</tt> which now returns a <tt>Mail::Message</tt> object.
 * <tt>ActionMailer.deliver(message)</tt> is deprecated, just call <tt>message.deliver</tt>.
 * <tt>template_root</tt> is deprecated, pass options to a render call inside a proc from the <tt>format.mime_type</tt> method inside the <tt>mail</tt> generation block
-* The body method to define instance variables is deprecated (<tt>body {:ivar => value}</tt>), just declare instance variables in the method directly and they will be available in the view.
+* The +body+ method to define instance variables is deprecated (<tt>body {:ivar => value}</tt>), just declare instance variables in the method directly and they will be available in the view.
 * Mailers being in <tt>app/models</tt> is deprecated, use <tt>app/mailers</tt> instead.
 
 More Information:
@@ -557,4 +565,4 @@ h3. Credits
 
 See the "full list of contributors to Rails":http://contributors.rubyonrails.org/ for the many people who spent many hours making Rails 3.  Kudos to all of them.
 
-Rails 3.0 Release Notes were compiled by "Mikel Lindsaar":http://lindsaar.net.
+Rails 3.0 Release Notes were compiled by "Mikel Lindsaar":http://lindsaar.net.