rails 2.0.5 → 2.1.0

data/configs/databases/sqlite3.yml

@@ -5,8 +5,8 @@ development:
   database: db/development.sqlite3
   timeout: 5000
 
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   adapter: sqlite3

data/configs/initializers/new_rails_defaults.rb

@@ -0,0 +1,15 @@
+# These settings change the behavior of Rails 2 apps and will be defaults
+# for Rails 3. You can remove this initializer when Rails 3 is released.
+
+# Include Active Record class name as root for JSON serialized output.
+ActiveRecord::Base.include_root_in_json = true
+
+# Store the full class name (including module namespace) in STI type column.
+ActiveRecord::Base.store_full_sti_class = true
+
+# Use ISO 8601 format for JSON serialized times and dates.
+ActiveSupport.use_standard_json_time_format = true
+
+# Don't escape HTML entities in JSON, leave that for the #json_escape helper.
+# if you're including raw json in an HTML page.
+ActiveSupport.escape_html_entities_in_json = false

data/configs/routes.rb

@@ -17,6 +17,12 @@ ActionController::Routing::Routes.draw do |map|
 
   # Sample resource route with sub-resources:
   #   map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller
+  
+  # Sample resource route with more complex sub-resources
+  #   map.resources :products do |products|
+  #     products.resources :comments
+  #     products.resources :sales, :collection => { :recent => :get }
+  #   end
 
   # Sample resource route within a namespace:
   #   map.namespace :admin do |admin|

data/environments/boot.rb

@@ -43,6 +43,7 @@ module Rails
   class VendorBoot < Boot
     def load_initializer
       require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+      Rails::Initializer.run(:install_gem_spec_stubs)
     end
   end
 

data/environments/development.rb

@@ -12,7 +12,6 @@ config.whiny_nils = true
 config.action_controller.consider_all_requests_local = true
 config.action_view.debug_rjs                         = true
 config.action_controller.perform_caching             = false
-config.action_view.cache_template_extensions         = false
 
 # Don't care if the mailer can't send
 config.action_mailer.raise_delivery_errors = false

data/environments/environment.rb

@@ -16,10 +16,16 @@ Rails::Initializer.run do |config|
   # -- all .rb files in that directory are automatically loaded.
   # See Rails::Configuration for more options.
 
-  # Skip frameworks you're not going to use (only works if using vendor/rails).
-  # To use Rails without a database, you must remove the Active Record framework
+  # Skip frameworks you're not going to use. To use Rails without a database
+  # you must remove the Active Record framework.
   # config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
 
+  # Specify gems that this application depends on. 
+  # They can then be installed with "rake gems:install" on new installations.
+  # config.gem "bj"
+  # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
+  # config.gem "aws-s3", :lib => "aws/s3"
+
   # Only load the plugins named here, in the order given. By default, all plugins 
   # in vendor/plugins are loaded in alphabetical order.
   # :all can be used as a placeholder for all plugins not explicitly named
@@ -32,6 +38,11 @@ Rails::Initializer.run do |config|
   # (by default production uses :info, the others :debug)
   # config.log_level = :debug
 
+  # Make Time.zone default to the specified zone, and make Active Record store time values
+  # in the database in UTC, and return them converted to the specified local zone.
+  # Run "rake -D time" for a list of tasks for finding time zone names. Uncomment to use default local time.
+  config.time_zone = 'UTC'
+
   # Your secret key for verifying cookie session data integrity.
   # If you change this key, all old sessions will become invalid!
   # Make sure the secret is at least 30 characters and all random, 
@@ -43,7 +54,7 @@ Rails::Initializer.run do |config|
 
   # Use the database for sessions instead of the cookie-based default,
   # which shouldn't be used to store highly confidential information
-  # (create the session table with 'rake db:sessions:create')
+  # (create the session table with "rake db:sessions:create")
   # config.action_controller.session_store = :active_record_store
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
@@ -53,7 +64,4 @@ Rails::Initializer.run do |config|
 
   # Activate observers that should always be running
   # config.active_record.observers = :cacher, :garbage_collector
-
-  # Make Active Record use UTC-base instead of local time
-  # config.active_record.default_timezone = :utc
-end
+end

data/environments/production.rb

@@ -12,6 +12,9 @@ config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching             = true
 config.action_view.cache_template_loading            = true
 
+# Use a different cache store in production
+# config.cache_store = :mem_cache_store
+
 # Enable serving of images, stylesheets, and javascripts from an asset server
 # config.action_controller.asset_host                  = "http://assets.example.com"
 

data/environments/test.rb

@@ -16,7 +16,7 @@ config.action_controller.perform_caching             = false
 # Disable request forgery protection in test environment
 config.action_controller.allow_forgery_protection    = false
 
-# Tell ActionMailer not to deliver emails to the real world.
+# Tell Action Mailer not to deliver emails to the real world.
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test

data/helpers/application.rb

@@ -7,4 +7,9 @@ class ApplicationController < ActionController::Base
   # See ActionController::RequestForgeryProtection for details
   # Uncomment the :secret if you're not using the cookie session store
   protect_from_forgery # :secret => '<%= app_secret %>'
+  
+  # See ActionController::Base for details 
+  # Uncomment this to filter the contents of submitted sensitive data parameters
+  # from your application log (in this case, all fields with names like "password"). 
+  # filter_parameter_logging :password
 end

data/html/index.html

@@ -219,10 +219,7 @@
             <ul class="links">
               <li><a href="http://www.rubyonrails.org/">Ruby on Rails</a></li>
               <li><a href="http://weblog.rubyonrails.org/">Official weblog</a></li>
-              <li><a href="http://lists.rubyonrails.org/">Mailing lists</a></li>
-              <li><a href="http://wiki.rubyonrails.org/rails/pages/IRC">IRC channel</a></li>
               <li><a href="http://wiki.rubyonrails.org/">Wiki</a></li>
-              <li><a href="http://dev.rubyonrails.org/">Bug tracker</a></li>
             </ul>
           </li>
           
@@ -252,12 +249,7 @@
           <h1>Getting started</h1>
           <h2>Here&rsquo;s how to get rolling:</h2>
           
-          <ol>
-            <li>
-              <h2>Create your databases and edit <tt>config/database.yml</tt></h2>
-              <p>Rails needs to know your login and password.</p>
-            </li>
-          
+          <ol>          
             <li>
               <h2>Use <tt>script/generate</tt> to create your models and controllers</h2>
               <p>To see all available options, run it without parameters.</p>
@@ -267,6 +259,11 @@
               <h2>Set up a default route and remove or rename this file</h2>
               <p>Routes are set up in config/routes.rb.</p>
             </li>
+
+            <li>
+              <h2>Create your database</h2>
+              <p>Run <tt>rake db:migrate</tt> to create your database. If you're not using SQLite (the default), edit <tt>config/database.yml</tt> with your username and password.</p>
+            </li>
           </ol>
         </div>
       </div>

data/html/javascripts/controls.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 //           (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
 //           (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
 // Contributors:

data/html/javascripts/dragdrop.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 //           (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
 // 
 // script.aculo.us is freely distributable under the terms of an MIT-style license.

data/html/javascripts/effects.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 // Contributors:
 //  Justin Palmer (http://encytemedia.com/)
 //  Mark Pilgrim (http://diveintomark.org/)

data/lib/commands/console.rb

@@ -24,9 +24,9 @@ ENV['RAILS_ENV'] = case ARGV.first
 end
 
 if options[:sandbox]
-  puts "Loading #{ENV['RAILS_ENV']} environment in sandbox (Rails #{Rails::VERSION::STRING})"
+  puts "Loading #{ENV['RAILS_ENV']} environment in sandbox (Rails #{Rails.version})"
   puts "Any modifications you make will be rolled back on exit"
 else
-  puts "Loading #{ENV['RAILS_ENV']} environment (Rails #{Rails::VERSION::STRING})"
+  puts "Loading #{ENV['RAILS_ENV']} environment (Rails #{Rails.version})"
 end
 exec "#{options[:irb]} #{libs} --simple-prompt"

data/lib/commands/dbconsole.rb

@@ -0,0 +1,65 @@
+require 'erb'
+require 'yaml'
+require 'optparse'
+
+include_password = false
+
+OptionParser.new do |opt|
+  opt.banner = "Usage: dbconsole [options] [environment]"
+  opt.on("-p", "--include-password", "Automatically provide the database from database.yml") do |v|
+    include_password = true
+  end
+  opt.parse!(ARGV)
+  abort opt.to_s unless (0..1).include?(ARGV.size)
+end
+
+env = ARGV.first || ENV['RAILS_ENV'] || 'development'
+unless config = YAML::load(ERB.new(IO.read(RAILS_ROOT + "/config/database.yml")).result)[env]
+  abort "No database is configured for the environment '#{env}'"
+end
+
+
+def find_cmd(*commands)
+  dirs_on_path = ENV['PATH'].to_s.split(File::PATH_SEPARATOR)
+  commands += commands.map{|cmd| "#{cmd}.exe"} if RUBY_PLATFORM =~ /win32/
+  commands.detect do |cmd|
+    dirs_on_path.detect do |path|
+      File.executable? File.join(path, cmd)
+    end
+  end || abort("Couldn't find database client: #{commands.join(', ')}. Check your $PATH and try again.")
+end
+
+case config["adapter"]
+when "mysql"
+  args = {
+    'host'      => '--host',
+    'port'      => '--port',
+    'socket'    => '--socket',
+    'username'  => '--user',
+    'encoding'  => '--default-character-set'
+  }.map { |opt, arg| "#{arg}=#{config[opt]}" if config[opt] }.compact
+
+  if config['password'] && include_password
+    args << "--password=#{config['password']}"
+  end
+
+  args << config['database']
+
+  exec(find_cmd('mysql5', 'mysql'), *args)
+
+when "postgresql"
+  ENV['PGUSER']     = config["username"] if config["username"]
+  ENV['PGHOST']     = config["host"] if config["host"]
+  ENV['PGPORT']     = config["port"].to_s if config["port"]
+  ENV['PGPASSWORD'] = config["password"].to_s if config["password"] && include_password
+  exec(find_cmd('psql'), config["database"])
+
+when "sqlite"
+  exec(find_cmd('sqlite'), config["database"])
+
+when "sqlite3"
+  exec(find_cmd('sqlite3'), config["database"])
+
+else
+  abort "Unknown command-line client for #{config['database']}. Submit a Rails patch to add support!"
+end

data/lib/commands/performance/profiler.rb

@@ -19,7 +19,7 @@ begin
   begin
     require "ruby-prof"
     $stderr.puts 'Using the ruby-prof extension.'
-    RubyProf.clock_mode = RubyProf::WALL_TIME
+    RubyProf.measure_mode = RubyProf::WALL_TIME
     RubyProf.start
     profile_me
     results = RubyProf.stop

data/lib/commands/plugin.rb

@@ -162,6 +162,10 @@ class Plugin
     @uri =~ /svn(?:\+ssh)?:\/\/*/
   end
   
+  def git_url?
+    @uri =~ /^git:\/\// || @uri =~ /\.git$/
+  end
+  
   def installed?
     File.directory?("#{rails_env.root}/vendor/plugins/#{name}") \
       or rails_env.externals.detect{ |name, repo| self.uri == repo }
@@ -169,7 +173,10 @@ class Plugin
   
   def install(method=nil, options = {})
     method ||= rails_env.best_install_method?
-    method   = :export if method == :http and svn_url?
+    if :http == method
+      method = :export if svn_url?
+      method = :clone  if git_url?
+    end
 
     uninstall if installed? and options[:force]
 
@@ -247,6 +254,10 @@ class Plugin
         fetcher.fetch
       end
     end
+    
+    def install_using_clone(options = {})
+      git_command :clone, options
+    end
 
     def svn_command(cmd, options = {})
       root = rails_env.root
@@ -257,12 +268,23 @@ class Plugin
       puts base_cmd if $verbose
       system(base_cmd)
     end
+    
+    def git_command(cmd, options = {})
+      root = rails_env.root
+      mkdir_p "#{root}/vendor/plugins"
+      base_cmd = "git #{cmd} --depth 1 #{uri} \"#{root}/vendor/plugins/#{name}\""
+      puts base_cmd if $verbose
+      puts "removing: #{root}/vendor/plugins/#{name}/.git"
+      system(base_cmd)
+      rm_rf "#{root}/vendor/plugins/#{name}/.git"
+    end
 
     def guess_name(url)
       @name = File.basename(url)
       if @name == 'trunk' || @name.empty?
         @name = File.basename(File.dirname(url))
       end
+      @name.gsub!(/\.git$/, '') if @name =~ /\.git$/
     end
     
     def rails_env
@@ -447,6 +469,8 @@ module Commands
         o.separator "    #{@script_name} install continuous_builder\n"
         o.separator "  Install a plugin from a subversion URL:"
         o.separator "    #{@script_name} install http://dev.rubyonrails.com/svn/rails/plugins/continuous_builder\n"
+        o.separator "  Install a plugin from a git URL:"
+        o.separator "    #{@script_name} install git://github.com/SomeGuy/my_awesome_plugin.git\n"
         o.separator "  Install a plugin and add a svn:externals entry to vendor/plugins"
         o.separator "    #{@script_name} install -x continuous_builder\n"
         o.separator "  List all available plugins:"
@@ -725,6 +749,9 @@ module Commands
         o.on(         "-o", "--checkout",
                       "Use svn checkout to grab the plugin.",
                       "Enables updating but does not add a svn:externals entry.") { |v| @method = :checkout }
+        o.on(         "-e", "--export",
+                      "Use svn export to grab the plugin.",
+                      "Exports the plugin, allowing you to check it into your local repository. Does not enable updates, or add an svn:externals entry.") { |v| @method = :export }
         o.on(         "-q", "--quiet",
                       "Suppresses the output from installation.",
                       "Ignored if -v is passed (./script/plugin -v install ...)") { |v| @options[:quiet] = true }

data/lib/commands/server.rb

@@ -14,7 +14,7 @@ rescue Exception
 end
 
 server = case ARGV.first
-  when "lighttpd", "mongrel", "webrick"
+  when "lighttpd", "mongrel", "new_mongrel", "webrick"
     ARGV.shift
   else
     if defined?(Mongrel)
@@ -31,7 +31,7 @@ case server
     puts "=> Booting WEBrick..."
   when "lighttpd"
     puts "=> Booting lighttpd (use 'script/server webrick' to force WEBrick)"
-  when "mongrel"
+  when "mongrel", "new_mongrel"
     puts "=> Booting Mongrel (use 'script/server webrick' to force WEBrick)"
 end
 

data/lib/commands/servers/lighttpd.rb

@@ -62,7 +62,7 @@ config = IO.read(config_file)
 default_port, default_ip = 3000, '0.0.0.0'
 port = config.scan(/^\s*server.port\s*=\s*(\d+)/).first rescue default_port
 ip   = config.scan(/^\s*server.bind\s*=\s*"([^"]+)"/).first rescue default_ip
-puts "=> Rails application starting on http://#{ip || default_ip}:#{port || default_port}"
+puts "=> Rails #{Rails.version} application starting on http://#{ip || default_ip}:#{port || default_port}"
 
 tail_thread = nil
 

data/lib/commands/servers/mongrel.rb

@@ -32,12 +32,12 @@ ARGV.clone.options do |opts|
   opts.parse!
 end
 
-puts "=> Rails application starting on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}"
+puts "=> Rails #{Rails.version} application starting on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}"
 
-parameters = [ 
-  "start", 
-  "-p", OPTIONS[:port].to_s, 
-  "-a", OPTIONS[:ip].to_s, 
+parameters = [
+  "start",
+  "-p", OPTIONS[:port].to_s,
+  "-a", OPTIONS[:ip].to_s,
   "-e", OPTIONS[:environment],
   "-P", "#{RAILS_ROOT}/tmp/pids/mongrel.pid"
 ]
@@ -50,12 +50,12 @@ else
 
   start_debugger if OPTIONS[:debugger]
 
-  require 'initializer'
-  Rails::Initializer.run(:initialize_logger)
-
   puts "=> Call with -d to detach"
   puts "=> Ctrl-C to shutdown server"
-  tail_thread = tail(Pathname.new("#{File.expand_path(RAILS_ROOT)}/log/#{RAILS_ENV}.log").cleanpath)
+
+  log = Pathname.new("#{File.expand_path(RAILS_ROOT)}/log/#{RAILS_ENV}.log").cleanpath
+  open(log, (File::WRONLY | File::APPEND | File::CREAT)) unless File.exist? log
+  tail_thread = tail(log)
 
   trap(:INT) { exit }
 

data/lib/commands/servers/new_mongrel.rb

@@ -0,0 +1,16 @@
+unless defined?(Mongrel)
+  abort "PROBLEM: Mongrel is not available on your system (or not in your path)"
+end
+
+require 'rails/mongrel_server/commands'
+
+GemPlugin::Manager.instance.load "rails::mongrel" => GemPlugin::INCLUDE, "rails" => GemPlugin::EXCLUDE
+
+case ARGV[0] ||= 'start'
+when 'start', 'stop', 'restart'
+  ARGV[0] = "rails::mongrelserver::#{ARGV[0]}"
+end
+
+if not Mongrel::Command::Registry.instance.run ARGV
+  exit 1
+end