rails 0.8.5 → 0.9.0

data/bin/breakpointer

@@ -0,0 +1,3 @@
+#!/usr/local/bin/ruby
+$LOAD_PATH << File.dirname(__FILE__) + '/../vendor/railties/lib'
+require 'breakpoint_client'

data/bin/breakpointer_for_gem

@@ -0,0 +1,4 @@
+#!/usr/local/bin/ruby
+require 'rubygems'
+require_gem 'rails'
+require 'breakpoint_client'

data/bin/console

@@ -0,0 +1,30 @@
+#!/usr/local/bin/ruby
+
+if ARGV[0]
+  ENV['RAILS_ENV'] = ARGV[0]
+  puts "Loading environment..."
+  exec "irb -r config/environment.rb -r irb/completion --noinspect"
+else
+  puts <<-HELP
+
+NAME
+     console - interact with the domain model through a environment console (on IRB)
+
+SYNOPSIS
+     console [environment]
+
+DESCRIPTION
+     Starts an environment console using IRB that lets you manipulate and interrogate
+     the domain model or even trigger controller actions. The database connection and
+     configuration available to the web application is already setup.
+     
+     Tab completion is available to see classes and methods on individual objects.
+     
+EXAMPLE
+     console production
+     
+     This will initialize the production environment (as setup in config/database.yml
+     and config/environments/production.rb). You would now be ready to start requiring
+     models using require_dependency.
+HELP
+end

data/bin/generate

@@ -0,0 +1,41 @@
+#!/usr/local/bin/ruby
+require File.dirname(__FILE__) + '/../config/environment'
+require 'rails_generator'
+
+unless ARGV.empty?
+  begin
+    name = ARGV.shift
+    Rails::Generator.instance(name, ARGV).generate
+  rescue Rails::Generator::UsageError => e
+    puts e.message
+  end
+else
+  builtin_generators = Rails::Generator.builtin_generators.join(', ')
+  contrib_generators = Rails::Generator.contrib_generators.join(', ')
+
+  $stderr.puts <<end_usage
+  #{$0} generator [args]
+
+  Rails comes with #{builtin_generators} generators.
+    #{$0} controller Login login logout
+    #{$0} model Account
+    #{$0} mailer AccountMailer
+    #{$0} scaffold Account action another_action
+
+end_usage
+
+  unless contrib_generators.empty?
+    $stderr.puts "  Installed generators (in #{RAILS_ROOT}/generators):"
+    $stderr.puts "    #{contrib_generators}"
+    $stderr.puts
+  end
+
+  $stderr.puts <<end_usage
+  More generators are available at http://rubyonrails.org
+    1. Download, for example, auth_controller.zip
+    2. Unzip to directory #{RAILS_ROOT}/generators/auth_controller
+    3. Generate without args for usage information
+         #{$0} auth_controller
+end_usage
+  exit 0
+end

data/bin/rails

@@ -18,7 +18,7 @@ SYNOPSIS
 DESCRIPTION
      This generator will create a suggested directory structure, lots of minor helper
      files, and a default configuration for creating a new Rails application. Once the
-     generator is done, you're adviced to look at the README in the root of the folder.
+     generator is done, you're advised to look at the README in the root of the folder.
      
 EXAMPLE
      rails ~/Code/Ruby/weblog

data/{dispatches/dispatch.servlet → bin/server}

@@ -1,15 +1,14 @@
 #!/usr/local/bin/ruby
 
-require File.dirname(__FILE__) + "/../config/environments/production"
-require 'webrick_server'
+require 'webrick'
 require 'optparse'
 
 OPTIONS = {
-  :port          => 3000,
-  :ip            => "127.0.0.1",
-  :cache_classes => false,
-  :server_root   => File.expand_path(File.dirname(__FILE__)),
-  :server_type   => SimpleServer
+  :port        => 3000,
+  :ip          => "127.0.0.1",
+  :environment => "development",
+  :server_root => File.expand_path(File.dirname(__FILE__) + "/../public/"),
+  :server_type => WEBrick::SimpleServer
 }
 
 ARGV.options do |opts|
@@ -27,12 +26,12 @@ ARGV.options do |opts|
   opts.on("-i", "--index=controller", String,
           "Specifies an index controller that requests for root will go to (instead of congratulations screen)."
           ) { |OPTIONS[:index_controller]| }
+  opts.on("-e", "--environment=name", String,
+          "Specifies the environment to run this server under (test/development/production).",
+          "Default: development") { |OPTIONS[:environment]| }
   opts.on("-d", "--daemon",
           "Make Rails run as a Daemon (only works if fork is available -- meaning on *nix)."
-          ) { OPTIONS[:server_type] = Daemon }
-  opts.on("-c", "--cache-classes",
-          "Caches class compilation which will speed up the serving of requests, but require a server restart on source changes."
-          ) { |OPTIONS[:cache_classes]| }
+          ) { OPTIONS[:server_type] = WEBrick::Daemon }
 
   opts.separator ""
 
@@ -42,4 +41,9 @@ ARGV.options do |opts|
   opts.parse!
 end
 
+ENV["RAILS_ENV"] = OPTIONS[:environment]
+require File.dirname(__FILE__) + "/../config/environment"
+require 'webrick_server'
+
+puts "=> Rails application started on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}"
 DispatchServlet.dispatch(OPTIONS)

data/configs/apache.conf

@@ -3,41 +3,26 @@ AddHandler fastcgi-script .fcgi
 AddHandler cgi-script .cgi
 Options +FollowSymLinks +ExecCGI
 
-
-# Remember to set RubySafeLevel 0 in httpd.conf
-<IfModule mod_ruby.c>
-  RubyRequire apache/ruby-run
-  <Files dispatch.rb>
-    SetHandler ruby-object
-    RubyHandler Apache::RubyRun.instance
-  </Files>
-</IfModule>
-
-
 # Make sure that mod_ruby.c has been added and loaded as a module with Apache
 RewriteEngine On
 
-RewriteRule ^dispatch.servlet$ / [R]
+# Change extension from .cgi to .fcgi to switch to FCGI and to .rb to switch to mod_ruby
+RewriteBase /dispatch.cgi
 
 # Enable this rewrite rule to point to the controller/action that should serve root.
-# RewriteRule ^$ /controller/action [R]
-
-# Force fcgi
-RewriteRule ^fcgi/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)$ /dispatch.fcgi?controller=$1&action=$2&id=$3 [QSA] [L]
-RewriteRule ^fcgi/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)$ /dispatch.fcgi?controller=$1&action=$2 [QSA] [L]
-RewriteRule ^fcgi/([-_a-zA-Z0-9]+)/?$ /dispatch.fcgi?controller=$1&action=index [QSA] [L]
+# RewriteRule ^$ /controller/action 
 
-# Force mod_ruby
-RewriteRule ^mruby/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)$ /dispatch.rb?controller=$1&action=$2&id=$3 [QSA] [L]
-RewriteRule ^mruby/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)$ /dispatch.rb?controller=$1&action=$2 [QSA] [L]
-RewriteRule ^mruby/([-_a-zA-Z0-9]+)/?$ /dispatch.rb?controller=$1&action=index [QSA] [L]
+# Add missing slash
+RewriteRule ^([-_a-zA-Z0-9]+)$                                            /$1/ [R]
 
-# Default rewriting rules. Change extension from .cgi to .fcgi to switch to FCGI and to .rb to switch to mod_ruby
-RewriteRule ^([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)$ /dispatch.cgi?controller=$1&action=$2&id=$3 [QSA] [L]
-RewriteRule ^([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)$ /dispatch.cgi?controller=$1&action=$2 [QSA] [L]
-RewriteRule ^([-_a-zA-Z0-9]+)/$ /dispatch.cgi?controller=$1&action=index [QSA] [L]
-RewriteRule ^([-_a-zA-Z0-9]+)$ /$1/ [R]
+# Default rewriting rules. 
+RewriteRule ^([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/([0-9]+)$                  ?controller=$1&action=$2&id=$3 [QSA,L]
+RewriteRule ^([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)$                           ?controller=$1&action=$2 [QSA,L]
+RewriteRule ^([-_a-zA-Z0-9]+)/$                                           ?controller=$1&action=index [QSA,L]
 
+RewriteRule ^([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/([0-9]+)$ ?module=$1&controller=$2&action=$3&id=$4 [QSA,L]
+RewriteRule ^([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)$          ?module=$1&controller=$2&action=$3 [QSA,L]
+RewriteRule ^([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/$                          ?module=$1&controller=$2&action=index [QSA,L]
 
 # You can also point these error messages to a controller/action
 ErrorDocument 500 /500.html

data/configs/database.yml

@@ -1,6 +1,6 @@
-production:
+development:
   adapter: mysql
-  database: rails_production
+  database: rails_development
   host: localhost
   username: root
   password: 
@@ -11,3 +11,10 @@ test:
   host: localhost
   username: root
   password:
+
+production:
+  adapter: mysql
+  database: rails_production
+  host: localhost
+  username: root
+  password: 

data/dispatches/dispatch.fcgi

@@ -1,7 +1,7 @@
 #!/usr/local/bin/ruby
 
-require File.dirname(__FILE__) + "/../config/environments/production"
+require File.dirname(__FILE__) + "/../config/environment"
 require 'dispatcher'
 require 'fcgi'
 
-FCGI.each_cgi { |cgi| Dispatcher.dispatch(cgi, Dispatcher::DEFAULT_SESSION_OPTIONS, File.dirname(__FILE__) + "/500.html") }
+FCGI.each_cgi { |cgi| Dispatcher.dispatch(cgi) }

data/dispatches/dispatch.rb

@@ -1,10 +1,10 @@
 #!/usr/local/bin/ruby
 
-require File.dirname(__FILE__) + "/../config/environments/production"
+require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
 
 # If you're using RubyGems and mod_ruby, this require should be changed to an absolute path one, like:
 # "/usr/local/lib/ruby/gems/1.8/gems/rails-0.8.0/lib/dispatcher" -- otherwise performance is severely impaired
 require "dispatcher"
 
-ADDITIONAL_LOAD_PATHS.each { |dir| $:.unshift "#{File.dirname(__FILE__)}/../#{dir}" }
+ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) }
 Dispatcher.dispatch

data/doc/index.html

@@ -27,13 +27,9 @@
 </head>
 <body>
 
-<h1>Congratulations, you're on Rails!</h1>
+<h1>Congratulations, you've put Ruby on Rails!</h1>
 
-<p>
-  <i>You've succesfully configured your web server to point at this Rails application.</i>
-</p>
-
-<p>Before you move on, verify that the following conditions have been met:</p>
+<p><b>Before you move on</b>, verify that the following conditions have been met:</p>
 
 <ol>
   <li>The log directory and the empty log files must be writable to the web server (<code>chmod -R 777 log</code>).
@@ -53,42 +49,22 @@
 <p>Take the following steps to get started:</p>
 
 <ol>
-  <li>Create empty production and test databases for your application.<br/>
-      <small>Warning: Don't point your test database at your production database, it'll destroy the latter on test runs!</small>
+  <li>Create empty development and test databases for your application.<br/>
+    <small>Recommendation: Use *_development and *_test names, such as basecamp_development and basecamp_test</small><br/>
+    <small>Warning: Don't point your test database at your development database, it'll destroy the latter on test runs!</small>
   <li>Edit config/database.yml with your database settings.
-  <li>Create a new controller using the <code>script/new_controller</code> generator <br/>
-      <small>Help: Run with no arguments for documentation</small>
-  <li>Create a new model using the <code>script/new_model</code> generator <br/>
-      <small>Help: Run with no arguments for documentation</small>
-  <li>See all the tests run and fail by running <code>rake</code>.
+  <li>Create controllers and models using the generator in <code>script/generate</code> <br/>
+    <small>Help: Run the generator with no arguments for documentation</small>
+  <li>See all the tests run by running <code>rake</code>.
   <li>Develop your Rails application!
-  <li>Setup FastCGI or mod_ruby to get production-level performance
+  <li>Setup Apache with <a href="http://www.fastcgi.com">FastCGI</a> (and <a href="http://raa.ruby-lang.org/list.rhtml?name=fcgi">Ruby bindings</a>), if you need better performance
 </ol>
 
 <p>
-  Having problems getting up and running? First try debugging it yourself by looking at the log files. <br/> Then try the friendly Rails 
-  community on IRC  (<a href="http://www.rubyonrails.org/show/IRC">howto IRC</a>). It's on FreeNET in channel #rubyonrails. 
+  Having problems getting up and running? First try debugging it yourself by looking at the log files. <br/>
+  Then try the friendly Rails community <a href="http://www.rubyonrails.org">on the web</a> or <a href="http://www.rubyonrails.org/show/IRC">on IRC</a>
+  (<a href="irc://irc.freenode.net/#rubyonrails">FreeNode#rubyonrails</a>).
 </p>
 
-<div style="float: left; margin-right: 20px">
-  <h2>Rails Online</h2>
-
-  <ul>
-    <li><a href="http://www.rubyonrails.org">Ruby on Rails</a></li>
-    <li><a href="http://activerecord.rubyonrails.org">Active Record</a></li>
-    <li><a href="http://actionpack.rubyonrails.org">Action Pack</a></li>
-  </ul>
-</div>
-
-<div style="float: left">
-  <h2>Beyond CGI</h2>
-
-  <ul>
-    <li><a href="http://www.fastcgi.com">FastCGI</a></li>
-    <li><a href="http://raa.ruby-lang.org/list.rhtml?name=fcgi">FastCGI bindings for Ruby</a></li>
-    <li><a href="http://modruby.net/en/">mod_ruby</a></li>
-  </ul>
-</div>
-
 </body>
 </html>

data/environments/development.rb

@@ -0,0 +1,5 @@
+ActionController::Base.consider_all_requests_local = true
+ActionController::Base.reload_dependencies         = true
+ActiveRecord::Base.reload_associations             = true
+
+BREAKPOINT_SERVER_PORT = 42531

data/environments/production.rb

@@ -1,6 +1,3 @@
-require File.dirname(__FILE__) + "/shared"
-
-ActiveRecord::Base.logger = ActionController::Base.logger = ActionMailer::Base.logger =
-  Logger.new(File.dirname(__FILE__) + "/../../log/production.log")
-
-ActiveRecord::Base.establish_connection(database_configurations["production"])
+ActionController::Base.consider_all_requests_local = false
+ActionController::Base.reload_dependencies         = false 
+ActiveRecord::Base.reload_associations             = false

data/environments/shared.rb

@@ -1,27 +1,53 @@
-ADDITIONAL_LOAD_PATHS = [ 
-  "app/models", 
-  "app/controllers", 
-  "app/helpers", 
-  "config", 
-  "lib", 
-  "vendor",
-  "vendor/railties", 
-  "vendor/railties/lib", 
-  "vendor/activerecord/lib", 
-  "vendor/actionpack/lib",
-  "vendor/actionmailer/lib"
-]
-
-ADDITIONAL_LOAD_PATHS.each { |dir| $:.unshift "#{File.dirname(__FILE__)}/../../#{dir}" }
+RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + "/../")
+RAILS_ENV  = ENV['RAILS_ENV'] || 'development'
 
+
+# Mocks first.
+ADDITIONAL_LOAD_PATHS = ["#{RAILS_ROOT}/test/mocks/#{RAILS_ENV}"]
+
+# Then model subdirectories.
+ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/app/models/[_a-z]*"])
+
+# Followed by the standard includes.
+ADDITIONAL_LOAD_PATHS.concat %w(
+  app
+  app/models
+  app/controllers
+  app/helpers
+  config
+  lib
+  vendor
+  vendor/railties
+  vendor/railties/lib
+  vendor/activerecord/lib
+  vendor/actionpack/lib
+  vendor/actionmailer/lib
+).map { |dir| "#{RAILS_ROOT}/#{dir}" }
+
+# Prepend to $LOAD_PATH
+ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) }
+
+
+# Require Rails libraries.
 require 'active_record'
 require 'action_controller'
 require 'action_mailer'
 
-require 'yaml'
 
-ActionController::Base.template_root = ActionMailer::Base.template_root = File.dirname(__FILE__) + '/../../app/views/'
+# Environment-specific configuration.
+require_dependency "environments/#{RAILS_ENV}"
+ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml"))
+ActiveRecord::Base.establish_connection
+
+
+# Configure defaults if the included environment did not.
+RAILS_DEFAULT_LOGGER = Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log")
+[ActiveRecord::Base, ActionController::Base, ActionMailer::Base].each do |klass|
+  klass.logger ||= RAILS_DEFAULT_LOGGER
+end
+[ActionController::Base, ActionMailer::Base].each do |klass|
+  klass.template_root ||= "#{RAILS_ROOT}/app/views/"
+end
+
 
-def database_configurations
-  YAML::load(File.open(File.dirname(__FILE__) + "/../../config/database.yml"))
-end
+# Include your app's configuration here:

data/environments/shared_for_gem.rb

@@ -1,17 +1,50 @@
-ADDITIONAL_LOAD_PATHS = [ "app/models", "app/controllers", "app/helpers", "config", "lib", "vendor" ]
-ADDITIONAL_LOAD_PATHS.each { |dir| $:.unshift "#{File.dirname(__FILE__)}/../../#{dir}" }
+RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + "/../")
+RAILS_ENV  = ENV['RAILS_ENV'] || 'development'
 
-require 'rubygems'
 
+# Mocks first.
+ADDITIONAL_LOAD_PATHS = ["#{RAILS_ROOT}/test/mocks/#{RAILS_ENV}"]
+
+# Then model subdirectories.
+ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/app/models/[_a-z]*"])
+
+# Followed by the standard includes.
+ADDITIONAL_LOAD_PATHS.concat %w(
+  app
+  app/models
+  app/controllers
+  app/helpers
+  config
+  lib
+  vendor
+).map { |dir| "#{RAILS_ROOT}/#{dir}" }
+
+# Prepend to $LOAD_PATH
+ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) }
+
+
+# Require Rails gems.
+require 'rubygems'
 require_gem 'activerecord'
 require_gem 'actionpack'
 require_gem 'actionmailer'
 require_gem 'rails'
 
-require 'yaml'
 
-ActionController::Base.template_root = ActionMailer::Base.template_root = File.dirname(__FILE__) + '/../../app/views/'
+# Environment-specific configuration.
+require_dependency "environments/#{RAILS_ENV}"
+ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml"))
+ActiveRecord::Base.establish_connection
+
+
+# Configure defaults if the included environment did not.
+RAILS_DEFAULT_LOGGER = Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log")
+[ActiveRecord::Base, ActionController::Base, ActionMailer::Base].each do |klass|
+  klass.logger ||= RAILS_DEFAULT_LOGGER
+end
+[ActionController::Base, ActionMailer::Base].each do |klass|
+  klass.template_root ||= "#{RAILS_ROOT}/app/views/"
+end
+
 
-def database_configurations
-  YAML::load(File.open(File.dirname(__FILE__) + "/../../config/database.yml"))
-end
+# Include your app's configuration here: