rails 0.14.3 → 0.14.4

data/lib/commands/console.rb

@@ -3,6 +3,7 @@ irb = RUBY_PLATFORM =~ /mswin32/ ? 'irb.bat' : 'irb'
 require 'optparse'
 options = { :sandbox => false, :irb => irb }
 OptionParser.new do |opt|
+  opt.banner = "Usage: console [environment] [options]"
   opt.on('-s', '--sandbox', 'Rollback database modifications on exit.') { |options[:sandbox]| }
   opt.on("--irb=[#{irb}]", 'Invoke a different irb.') { |options[:irb]| }
   opt.parse!(ARGV)

data/lib/commands/performance/benchmarker.rb

@@ -1,5 +1,3 @@
-#!/usr/local/bin/ruby
-
 if ARGV.empty?
   puts "Usage: ./script/perform benchmarker [times] 'Person.expensive_way' 'Person.another_expensive_way' ..."
   exit 1

data/lib/commands/performance/profiler.rb

@@ -1,4 +1,3 @@
-#!/usr/local/bin/ruby
 if ARGV.empty?
   $stderr.puts "Usage: ./script/perform profiler 'Person.expensive_method(10)' [times]"
   exit(1)

data/lib/commands/plugin.rb

@@ -119,7 +119,7 @@ class RailsEnvironment
 
   def externals
     return [] unless use_externals?
-    ext = silence_stderr { `svn propget svn:externals #{root}/vendor/plugins` }
+    ext = `svn propget svn:externals #{root}/vendor/plugins`
     ext.reject{ |line| line.strip == '' }.map do |line| 
       line.strip.split(/\s+/, 2) 
     end

data/lib/commands/servers/lighttpd.rb

@@ -8,16 +8,8 @@ unless defined?(FCGI)
   exit 1
 end
 
-def tail_f(input)
-  loop do
-    line = input.gets
-    yield line if line
-    if input.eof?
-      sleep 1
-      input.seek(input.tell)
-    end
-  end
-end
+require 'initializer'
+configuration = Rails::Initializer.run(:initialize_logger).configuration
 
 config_file = "#{RAILS_ROOT}/config/lighttpd.conf"
 
@@ -29,8 +21,13 @@ unless File.exist?(config_file)
   FileUtils.cp source, config_file
 end
 
-port = IO.read(config_file).scan(/^server.port\s*=\s*(\d+)/).first rescue 3000
-puts "=> Rails application started on http://0.0.0.0:#{port}"
+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 started on http://#{ip || default_ip}:#{port || default_port}"
+
+tail_thread = nil
 
 if ARGV.first == "-d"
   puts "=> Configure in config/lighttpd.conf"
@@ -40,17 +37,24 @@ else
   puts "=> Ctrl-C to shutdown server (see config/lighttpd.conf for options)"
   detach = false
 
-  Process.detach(fork do
-    begin
-      File.open("#{RAILS_ROOT}/log/#{RAILS_ENV}.log", 'r') do |log|
-        log.seek(0, IO::SEEK_END)
-        tail_f(log) {|line| puts line}
+  cursor = File.size(configuration.log_path)
+  last_checked = Time.now
+  tail_thread = Thread.new do
+    File.open(configuration.log_path, 'r') do |f|
+      loop do
+        f.seek cursor
+        if f.mtime > last_checked
+          last_checked = f.mtime
+          contents = f.read
+          cursor += contents.length
+          print contents
+        end
+        sleep 1
       end
-    rescue Exception
     end
-    exit
-  end)
+  end
 end
 
-trap(:INT) {exit}
+trap(:INT) { exit }
 `lighttpd #{!detach ? "-D " : ""}-f #{config_file}`
+tail_thread.kill if tail_thread

data/lib/dispatcher.rb

@@ -73,6 +73,7 @@ class Dispatcher
     
       def reset_after_dispatch
         reset_application! if Dependencies.load?
+        ActiveRecord::Base.clear_connection_cache!
         Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT)
       end
 

data/lib/initializer.rb

@@ -1,5 +1,6 @@
 require 'logger'
 require 'set'
+require File.join(File.dirname(__FILE__), 'railties_path')
 
 RAILS_ENV = (ENV['RAILS_ENV'] || 'development').dup unless defined?(RAILS_ENV)
 
@@ -37,7 +38,9 @@ module Rails
     # incuring the overhead of completely loading the entire environment. 
     def self.run(command = :process, configuration = Configuration.new)
       yield configuration if block_given?
-      new(configuration).send(command)
+      initializer = new configuration
+      initializer.send(command)
+      initializer
     end
     
     # Create a new Initializer instance that references the given Configuration
@@ -81,7 +84,6 @@ module Rails
       initialize_logger
       initialize_framework_logging
       initialize_framework_views
-      initialize_routing
       initialize_dependency_mechanism
       initialize_breakpoints
       initialize_whiny_nils
@@ -96,6 +98,9 @@ module Rails
       load_framework_info
 
       load_plugins
+
+      # Routing must be initialized after plugins to allow the former to extend the routes
+      initialize_routing
     end
     
     # Set the <tt>$LOAD_PATH</tt> based on the value of
@@ -120,7 +125,7 @@ module Rails
       configuration.frameworks.each { |framework| require(framework.to_s) }
     end
     
-    # Loads Rails::Version and Rails::Info.
+    # Loads Rails::VERSION and Rails::Info.
     # TODO: Make this work via dependencies.rb/const_missing instead.
     def load_framework_info
       require 'rails_info'
@@ -303,7 +308,7 @@ module Rails
         config = configuration 
 
         # Evaluate init.rb.
-        silence_warnings { eval(IO.read(init_path), binding) } if has_init
+        silence_warnings { eval(IO.read(init_path), binding, init_path) } if has_init
 
         # Add to set of loaded plugins.
         loaded_plugins << name
@@ -488,7 +493,7 @@ module Rails
       end
       
       def default_controller_paths
-        [ File.join(root_path, 'app', 'controllers'), File.join(root_path, 'components') ]
+        [ File.join(root_path, 'app', 'controllers'), File.join(root_path, 'components'), File.join(RAILTIES_PATH, 'builtin', 'controllers') ]
       end
       
       def default_dependency_mechanism

data/lib/rails_generator/commands.rb

@@ -55,6 +55,34 @@ module Rails
         def readme(*args)
         end
 
+        protected
+          def migration_directory(relative_path)
+            directory(@migration_directory = relative_path)
+          end
+
+          def existing_migrations(file_name)
+            Dir.glob("#{@migration_directory}/[0-9]*_#{file_name}.rb")
+          end
+
+          def migration_exists?(file_name)
+            not existing_migrations(file_name).empty?
+          end
+
+          def current_migration_number
+            Dir.glob("#{@migration_directory}/[0-9]*.rb").inject(0) do |max, file_path|
+              n = File.basename(file_path).split('_', 2).first.to_i
+              if n > max then n else max end
+            end
+          end
+
+          def next_migration_number
+            current_migration_number + 1
+          end
+
+          def next_migration_string(padding = 3)
+            "%.#{padding}d" % next_migration_number
+          end
+
         private
           # Ask the user interactively whether to force collision.
           def force_file_collision?(destination)
@@ -84,10 +112,10 @@ module Rails
             begin_mark = template_part_mark(template_options[:begin_mark], template_options[:mark_id])
             end_mark = template_part_mark(template_options[:end_mark], template_options[:mark_id])
             begin_mark + rendered_part + end_mark
-         end
+          end
 
-         def template_part_mark(name, id)
-           "<!--[#{name}:#{id}]-->\n"
+          def template_part_mark(name, id)
+            "<!--[#{name}:#{id}]-->\n"
           end
       end
 
@@ -192,7 +220,7 @@ module Rails
               if block_given?
                 df.write(yield(sf))
               else
-                line = sf.gets
+                line = sf.gets || ''
                 if file_options[:shebang]
                   df.puts("#!#{file_options[:shebang]}")
                   df.puts(line) if line !~ /^#!/
@@ -279,6 +307,13 @@ module Rails
           end
         end
 
+        # When creating a migration, it knows to find the first available file in db/migrate and use the migration.rb template.
+        def migration_template(relative_source, relative_destination, template_options = {})
+          migration_directory relative_destination
+          raise "Another migration is already named #{file_name}: #{existing_migrations(file_name).first}" if migration_exists?(file_name)
+          template(relative_source, "#{relative_destination}/#{next_migration_string}_#{file_name}.rb", template_options)
+        end
+
         private
           # Raise a usage error with an informative WordNet suggestion.
           # Thanks to Florian Gross (flgr).
@@ -385,6 +420,15 @@ end_message
         def complex_template(*args)
           # nothing should be done here
         end
+
+        # When deleting a migration, it knows to delete every file named "[0-9]*_#{file_name}".
+        def migration_template(relative_source, relative_destination, template_options = {})
+          migration_directory relative_destination
+          raise "There is no migration named #{file_name}" unless migration_exists?(file_name)
+          existing_migrations(file_name).each do |file_path|
+            file(relative_source, file_path, template_options)
+          end
+        end
       end
 
 
@@ -417,6 +461,11 @@ end_message
         def readme(*args)
           logger.readme args.join(', ')
         end
+        
+        def migration_template(relative_source, relative_destination, options = {})
+          migration_directory relative_destination
+          logger.migration_template file_name
+        end
       end
 
       # Update generator's action manifest.

data/lib/rails_generator/generators/applications/app/app_generator.rb

@@ -16,7 +16,8 @@ class AppGenerator < Rails::Generator::Base
   end
 
   def manifest
-    script_options = { :chmod => 0755, :shebang => options[:shebang] }
+    script_options     = { :chmod => 0755 }
+    dispatcher_options = { :chmod => 0755, :shebang => options[:shebang] }
 
     record do |m|
       # Root directory and all subdirectories.
@@ -53,9 +54,9 @@ class AppGenerator < Rails::Generator::Base
       end
 
       # Dispatches
-      m.file "dispatches/dispatch.rb",   "public/dispatch.rb", script_options
-      m.file "dispatches/dispatch.rb",   "public/dispatch.cgi", script_options
-      m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", script_options
+      m.file "dispatches/dispatch.rb",   "public/dispatch.rb", dispatcher_options
+      m.file "dispatches/dispatch.rb",   "public/dispatch.cgi", dispatcher_options
+      m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", dispatcher_options
 
       # HTML files
       %w(404 500 index).each do |file|
@@ -64,6 +65,7 @@ class AppGenerator < Rails::Generator::Base
       
       m.template "html/favicon.ico", "public/favicon.ico"
       m.template "html/robots.txt", "public/robots.txt"
+      m.file "html/images/rails.png", "public/images/rails.png"
 
       # Javascripts
       m.file "html/javascripts/prototype.js",     "public/javascripts/prototype.js"

data/lib/rails_generator/generators/components/migration/migration_generator.rb

@@ -1,58 +1,7 @@
 class MigrationGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
-      m.directory 'db/migrate'
       m.migration_template 'migration.rb', 'db/migrate'
     end
   end
-
-  protected
-    def existing_migrations(file_name)
-      Dir.glob("db/migrate/[0-9]*_#{file_name}.rb")
-    end
-
-    def migration_exists?(file_name)
-      not existing_migrations(file_name).empty?
-    end
-
-    def current_migration_number
-      Dir.glob('db/migrate/[0-9]*.rb').inject(0) do |max, file_path|
-        n = File.basename(file_path).split('_', 2).first.to_i
-        if n > max then n else max end
-      end
-    end
-
-    def next_migration_number
-      current_migration_number + 1
-    end
-
-    def next_migration_string(padding = 3)
-      "%.#{padding}d" % next_migration_number
-    end
-end
-
-module Rails::Generator::Commands
-  # When creating, it knows to find the first available file in db/migrate and use the migration.rb template.
-  class Create
-    def migration_template(relative_source, relative_destination, template_options = {})
-      raise "Another migration is already named #{file_name}: #{existing_migrations(file_name).first}" if migration_exists?(file_name)
-      template(relative_source, "#{relative_destination}/#{next_migration_string}_#{file_name}.rb", template_options)
-    end
-  end
-
-  # When deleting, it knows to delete every file named "[0-9]*_#{file_name}".
-  class Destroy
-    def migration_template(relative_source, relative_destination, template_options = {})
-      raise "There is no migration named #{file_name}" unless migration_exists?(file_name)
-      existing_migrations(file_name).each do |file_path|
-        file(relative_source, file_path, template_options)
-      end
-    end
-  end
-
-  class List
-    def migration_template(relative_source, relative_destination, options = {})
-      logger.migration_template file_name
-    end
-  end
 end

data/lib/rails_generator/generators/components/model/model_generator.rb

@@ -12,7 +12,7 @@ class ModelGenerator < Rails::Generator::NamedBase
       # Model class, unit test, and fixtures.
       m.template 'model.rb',      File.join('app/models', class_path, "#{file_name}.rb")
       m.template 'unit_test.rb',  File.join('test/unit', class_path, "#{file_name}_test.rb")
-      m.template 'fixtures.yml',  File.join('test/fixtures', class_path, "#{ActiveRecord::Base.pluralize_table_names ? plural_name : singular_name}.yml")
+      m.template 'fixtures.yml',  File.join('test/fixtures', class_path, "#{table_name}.yml")
     end
   end
 end

data/lib/rails_generator/generators/components/model/templates/unit_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
 
 class <%= class_name %>Test < Test::Unit::TestCase
   fixtures :<%= table_name %>

data/lib/rails_generator/generators/components/session_migration/USAGE

@@ -0,0 +1,15 @@
+Description:
+    The session table migration generator creates a migration for adding a session table 
+    used by CGI::Session::ActiveRecordStore.
+
+    The generator takes a migration name as its argument.  The migration name may be
+    given in CamelCase or under_score.
+
+    The generator creates a migration class in db/migrate prefixed by its number
+    in the queue.
+
+Example:
+    ./script/generate session_migration AddSessionTable
+
+    With 4 existing migrations, this will create an AddSessionTable migration in the
+    file db/migrate/5_add_session_table.rb

data/lib/rails_generator/generators/components/session_migration/session_migration_generator.rb

@@ -0,0 +1,12 @@
+class SessionMigrationGenerator < Rails::Generator::NamedBase
+  def initialize(runtime_args, runtime_options = {})
+    runtime_args << 'add_session_table' if runtime_args.empty?
+    super
+  end
+
+  def manifest
+    record do |m|
+      m.migration_template 'migration.rb', 'db/migrate'
+    end
+  end
+end

data/lib/rails_generator/generators/components/session_migration/templates/migration.rb

@@ -0,0 +1,15 @@
+class <%= class_name %> < ActiveRecord::Migration
+  def self.up
+    create_table :sessions do |t|
+      t.column :session_id, :string
+      t.column :data, :text
+      t.column :updated_at, :datetime
+    end
+    
+    add_index :sessions, :session_id
+  end
+
+  def self.down
+    drop_table :sessions
+  end
+end

data/lib/rails_generator/options.rb

@@ -127,7 +127,12 @@ module Rails
           opt.on('-q', '--quiet', 'Suppress normal output.') { |options[:quiet]| }
           opt.on('-t', '--backtrace', 'Debugging: show backtrace on errors.') { |options[:backtrace]| }
           opt.on('-h', '--help', 'Show this help message.') { |options[:help]| }
-          opt.on('-c', '--svn', 'Modify files with subversion. (Note: svn must be in path)') { options[:svn] = Hash[*`svn status`.collect { |e| e.chop.split.reverse unless e.chop.split.size != 2 }.flatten] }
+          opt.on('-c', '--svn', 'Modify files with subversion. (Note: svn must be in path)') do
+            options[:svn] = `svn status`.inject({}) do |opt, e|
+              opt[e.chomp[7..-1]] = true
+              opt
+            end
+          end
         end
 
     end

data/lib/rails_info.rb

@@ -26,7 +26,7 @@ module Rails
       
       def component_version(component)
         require "#{component}/version"
-        "#{component.classify}::Version::STRING".constantize
+        "#{component.classify}::VERSION::STRING".constantize
       end
     
       def edge_rails_revision(info = svn_info)
@@ -42,6 +42,16 @@ module Rails
 
       alias inspect to_s
       
+      def to_html
+        returning table = '<table>' do
+          properties.each do |(name, value)|
+            table << %(<tr><td class="name">#{CGI.escapeHTML(name)}</td>)
+            table << %(<td class="value">#{CGI.escapeHTML(value)}</td></tr>)
+          end
+          table << '</table>'
+        end
+      end
+      
     protected
       def svn_info
         Dir.chdir("#{RAILS_ROOT}/vendor/rails") do
@@ -60,7 +70,7 @@ module Rails
   
     # The Rails version.
     property 'Rails version' do
-      Rails::Version::STRING
+      Rails::VERSION::STRING
     end
   
     # Versions of each Rails component (Active Record, Action Pack,