rails 2.0.5 → 2.1.0

data/lib/rails_generator/generators/components/controller/templates/controller.rb

@@ -1,10 +1,7 @@
 class <%= class_name %>Controller < ApplicationController
-<% if options[:scaffold] -%>
-  scaffold :<%= singular_name %>
-<% end -%>
 <% for action in actions -%>
-
   def <%= action %>
   end
+
 <% end -%>
 end

data/lib/rails_generator/generators/components/controller/templates/functional_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
+require 'test_helper'
 
 class <%= class_name %>ControllerTest < ActionController::TestCase
   # Replace this with your real tests.

data/lib/rails_generator/generators/components/integration_test/templates/integration_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}<%= '/..' * class_nesting_depth %>/../test_helper"
+require 'test_helper'
 
 class <%= class_name %>Test < ActionController::IntegrationTest
   # fixtures :your, :models

data/lib/rails_generator/generators/components/mailer/mailer_generator.rb

@@ -11,12 +11,8 @@ class MailerGenerator < Rails::Generator::NamedBase
       m.directory File.join('test/fixtures', file_path)
 
       # Mailer class and unit test.
-      m.template "mailer.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 "mailer.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")
 
       # View template and fixture for each action.
       actions.each do |action|

data/lib/rails_generator/generators/components/mailer/templates/mailer.rb

@@ -1,13 +1,15 @@
 class <%= class_name %> < ActionMailer::Base
+  
 <% for action in actions -%>
 
   def <%= action %>(sent_at = Time.now)
-    @subject    = '<%= class_name %>#<%= action %>'
-    @body       = {}
-    @recipients = ''
-    @from       = ''
-    @sent_on    = sent_at
-    @headers    = {}
+    subject    '<%= class_name %>#<%= action %>'
+    recipients ''
+    from       ''
+    sent_on    sent_at
+    
+    body       :greeting => 'Hi,'
   end
 <% end -%>
+
 end

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

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

data/lib/rails_generator/generators/components/migration/USAGE

@@ -2,7 +2,7 @@ Description:
     Stubs out a new database migration. Pass the migration name, either
     CamelCased or under_scored, and an optional list of attribute pairs as arguments.
 
-    A migration class is generated in db/migrate prefixed by the latest migration number.
+    A migration class is generated in db/migrate prefixed by a timestamp of the current date and time.
 
     You can name your migration in either of these formats to generate add/remove
     column lines from supplied attributes: AddColumnsToTable or RemoveColumnsFromTable
@@ -10,12 +10,12 @@ Description:
 Example:
     `./script/generate migration AddSslFlag`
 
-    With 4 existing migrations, this creates the AddSslFlag migration in
-    db/migrate/005_add_ssl_flag.rb
+    If the current date is May 14, 2008 and the current time 09:09:12, this creates the AddSslFlag migration
+    db/migrate/20080514090912_add_ssl_flag.rb
 
     `./script/generate migration AddTitleBodyToPost title:string body:text published:boolean`
     
-    This will create the AddTitleBodyToPost in db/migrate/005_add_title_body_to_post.rb with
+    This will create the AddTitleBodyToPost in db/migrate/20080514090912_add_title_body_to_post.rb with
     this in the Up migration:
 
       add_column :posts, :title, :string  

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
+require 'test_helper'
 
 class <%= class_name %>Test < ActiveSupport::TestCase
   # Replace this with your real tests.

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
+require 'test_helper'
 
 class <%= class_name %>ObserverTest < Test::Unit::TestCase
   # Replace this with your real tests.

data/lib/rails_generator/generators/components/resource/templates/functional_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
+require 'test_helper'
 
 class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   # Replace this with your real tests.

data/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb

@@ -34,7 +34,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
       m.class_collisions(controller_class_path, "#{controller_class_name}Controller", "#{controller_class_name}Helper")
       m.class_collisions(class_path, "#{class_name}")
 
-      # Controller, helper, views, and test directories.
+      # Controller, helper, views, test and stylesheets directories.
       m.directory(File.join('app/models', class_path))
       m.directory(File.join('app/controllers', controller_class_path))
       m.directory(File.join('app/helpers', controller_class_path))
@@ -42,6 +42,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
       m.directory(File.join('app/views/layouts', controller_class_path))
       m.directory(File.join('test/functional', controller_class_path))
       m.directory(File.join('test/unit', class_path))
+      m.directory(File.join('public/stylesheets', class_path))
 
       for action in scaffold_views
         m.template(

data/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
+require 'test_helper'
 
 class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   def test_should_get_index

data/lib/rails_generator/generators/components/scaffold/templates/style.css

@@ -52,23 +52,3 @@ a:hover { color: #fff; background-color:#000; }
   list-style: square;
 }
 
-div.uploadStatus {
-  margin: 5px;
-}
-
-div.progressBar {
-  margin: 5px;
-}
-
-div.progressBar div.border {
-  background-color: #fff;
-  border: 1px solid gray;
-  width: 100%;
-}
-
-div.progressBar div.background {
-  background-color: #333;
-  height: 18px;
-  width: 0%;
-}
-

data/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb

@@ -1,14 +1,13 @@
 <h1>Editing <%= singular_name %></h1>
 
-<%%= error_messages_for :<%= singular_name %> %>
-
 <%% form_for(@<%= singular_name %>) do |f| %>
+  <%%= f.error_messages %>
+
 <% for attribute in attributes -%>
   <p>
-    <b><%= attribute.column.human_name %></b><br />
+    <%%= f.label :<%= attribute.name %> %><br />
     <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
   </p>
-
 <% end -%>
   <p>
     <%%= f.submit "Update" %>

data/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb

@@ -1,14 +1,13 @@
 <h1>New <%= singular_name %></h1>
 
-<%%= error_messages_for :<%= singular_name %> %>
-
 <%% form_for(@<%= singular_name %>) do |f| %>
+  <%%= f.error_messages %>
+
 <% for attribute in attributes -%>
   <p>
-    <b><%= attribute.column.human_name %></b><br />
+    <%%= f.label :<%= attribute.name %> %><br />
     <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
   </p>
-
 <% end -%>
   <p>
     <%%= f.submit "Create" %>

data/lib/rails_generator/lookup.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 require File.dirname(__FILE__) + '/spec'
 
 class Object
@@ -104,8 +106,10 @@ module Rails
           if defined? ::RAILS_ROOT
             sources << PathSource.new(:lib, "#{::RAILS_ROOT}/lib/generators")
             sources << PathSource.new(:vendor, "#{::RAILS_ROOT}/vendor/generators")
-            sources << PathSource.new(:plugins, "#{::RAILS_ROOT}/vendor/plugins/*/**/generators")
-            sources << PathSource.new(:plugins, "#{::RAILS_ROOT}/vendor/plugins/*/**/rails_generators")
+            Rails.configuration.plugin_paths.each do |path|
+              relative_path = Pathname.new(File.expand_path(path)).relative_path_from(Pathname.new(::RAILS_ROOT))
+              sources << PathSource.new(:"plugins (#{relative_path})", "#{path}/**/{,rails_}generators")
+            end
           end
           sources << PathSource.new(:user, "#{Dir.user_home}/.rails/generators")
           if Object.const_defined?(:Gem)

data/lib/rails_generator/options.rb

@@ -136,6 +136,13 @@ module Rails
               opt
             end
           end
+          opt.on('-g', '--git', 'Modify files with git. (Note: git must be in path)') do
+            options[:git] = `git status`.inject({:new => {}, :modified => {}}) do |opt, e|
+              opt[:new][e.chomp[14..-1]] = true if e =~ /new file:/
+              opt[:modified][e.chomp[14..-1]] = true if e =~ /modified:/
+              opt
+            end
+          end
         end
 
     end

data/lib/rails_generator/scripts.rb

@@ -43,18 +43,21 @@ module Rails
 
           def usage_message
             usage = "\nInstalled Generators\n"
-            Rails::Generator::Base.sources.inject({}) do |mem, source|
+            Rails::Generator::Base.sources.inject([]) do |mem, source|
+              # Using an association list instead of a hash to preserve order,
+              # for esthetic reasons more than anything else.
               label = source.label.to_s.capitalize
-              mem[label] ||= []
-              mem[label] |= source.names
+              pair = mem.assoc(label)
+              mem << (pair = [label, []]) if pair.nil?
+              pair[1] |= source.names
               mem
-            end.each_pair do |label, names|
+            end.each do |label, names|
               usage << "  #{label}: #{names.join(', ')}\n" unless names.empty?
             end
 
             usage << <<end_blurb
 
-More are available at http://rubyonrails.org/show/Generators
+More are available at http://wiki.rubyonrails.org/rails/pages/AvailableGenerators
   1. Download, for example, login_generator.zip
   2. Unzip to directory #{Dir.user_home}/.rails/generators/login
      to use the generator with all your Rails apps

data/lib/rails_generator/secret_key_generator.rb

@@ -1,11 +1,10 @@
-# A class for creating random secret keys. This class will do its best to create a
-# random secret key that's as secure as possible, using whatever methods are
-# available on the current platform. For example:
-#
-#   generator = Rails::SecretKeyGenerator("some unique identifier, such as the application name")
-#   generator.generate_secret     # => "f3f1be90053fa851... (some long string)"
-
 module Rails
+  # A class for creating random secret keys. This class will do its best to create a
+  # random secret key that's as secure as possible, using whatever methods are
+  # available on the current platform. For example:
+  #
+  #   generator = Rails::SecretKeyGenerator("some unique identifier, such as the application name")
+  #   generator.generate_secret     # => "f3f1be90053fa851... (some long string)"
   class SecretKeyGenerator
     GENERATORS = [ :secure_random, :win32_api, :urandom, :openssl, :prng ].freeze
 
@@ -77,7 +76,12 @@ module Rails
         OpenSSL::Random.seed(rand(0).to_s + Time.now.usec.to_s)
       end
       data = OpenSSL::BN.rand(2048, -1, false).to_s
-      return OpenSSL::Digest::SHA512.new(data).hexdigest
+
+      if OpenSSL::OPENSSL_VERSION_NUMBER > 0x00908000
+        OpenSSL::Digest::SHA512.new(data).hexdigest
+      else
+        generate_secret_with_prng
+      end
     end
 
     # Generate a random secret key with /dev/urandom.

data/lib/source_annotation_extractor.rb

@@ -1,5 +1,26 @@
+# Implements the logic behind the rake tasks for annotations like
+#
+#   rake notes
+#   rake notes:optimize
+#
+# and friends. See <tt>rake -T notes</tt> and <tt>railties/lib/tasks/annotations.rake</tt>.
+#
+# Annotation objects are triplets <tt>:line</tt>, <tt>:tag</tt>, <tt>:text</tt> that
+# represent the line where the annotation lives, its tag, and its text. Note
+# the filename is not stored.
+#
+# Annotations are looked for in comments and modulus whitespace they have to
+# start with the tag optionally followed by a colon. Everything up to the end
+# of the line (or closing ERb comment tag) is considered to be their text.
 class SourceAnnotationExtractor
   class Annotation < Struct.new(:line, :tag, :text)
+
+    # Returns a representation of the annotation that looks like this:
+    #
+    #   [126] [TODO] This algorithm is simple and clearly correct, make it faster.
+    #
+    # If +options+ has a flag <tt>:tag</tt> the tag is shown as in the example above.
+    # Otherwise the string contains just line and text.
     def to_s(options={})
       s = "[%3d] " % line
       s << "[#{tag}] " if options[:tag]
@@ -7,6 +28,12 @@ class SourceAnnotationExtractor
     end
   end
 
+  # Prints all annotations with tag +tag+ under the root directories +app+, +lib+,
+  # and +test+ (recursively). Only filenames with extension +.builder+, +.rb+,
+  # +.rxml+, +.rjs+, +.rhtml+, or +.erb+ are taken into account. The +options+
+  # hash is passed to each annotation's +to_s+.
+  #
+  # This class method is the single entry point for the rake tasks.
   def self.enumerate(tag, options={})
     extractor = new(tag)
     extractor.display(extractor.find, options)
@@ -18,10 +45,18 @@ class SourceAnnotationExtractor
     @tag = tag
   end
 
+  # Returns a hash that maps filenames under +dirs+ (recursively) to arrays
+  # with their annotations. Only files with annotations are included, and only
+  # those with extension +.builder+, +.rb+, +.rxml+, +.rjs+, +.rhtml+, and +.erb+
+  # are taken into account.
   def find(dirs=%w(app lib test))
     dirs.inject({}) { |h, dir| h.update(find_in(dir)) }
   end
 
+  # Returns a hash that maps filenames under +dir+ (recursively) to arrays
+  # with their annotations. Only files with annotations are included, and only
+  # those with extension +.builder+, +.rb+, +.rxml+, +.rjs+, +.rhtml+, and +.erb+
+  # are taken into account.
   def find_in(dir)
     results = {}
 
@@ -40,6 +75,9 @@ class SourceAnnotationExtractor
     results
   end
 
+  # If +file+ is the filename of a file that contains annotations this method returns
+  # a hash with a single entry that maps +file+ to an array of its annotations.
+  # Otherwise it returns an empty hash.
   def extract_annotations_from(file, pattern)
     lineno = 0
     result = File.readlines(file).inject([]) do |list, line|
@@ -50,6 +88,8 @@ class SourceAnnotationExtractor
     result.empty? ? {} : { file => result }
   end
 
+  # Prints the mapping from filenames to annotations in +results+ ordered by filename.
+  # The +options+ hash is passed to each annotation's +to_s+.
   def display(results, options={})
     results.keys.sort.each do |file|
       puts "#{file}:"

data/lib/tasks/databases.rake

@@ -5,13 +5,13 @@ namespace :db do
       ActiveRecord::Base.configurations.each_value do |config|
         # Skip entries that don't have a database key, such as the first entry here:
         #
-        #  defaults: &defaults 
-        #    adapter: mysql 
+        #  defaults: &defaults
+        #    adapter: mysql
         #    username: root
-        #    password: 
+        #    password:
         #    host: localhost
-        #  
-        #  development: 
+        #
+        #  development:
         #    database: blog_development
         #    <<: *defaults
         next unless config['database']
@@ -36,21 +36,29 @@ namespace :db do
         @charset   = ENV['CHARSET']   || 'utf8'
         @collation = ENV['COLLATION'] || 'utf8_general_ci'
         begin
-          ActiveRecord::Base.establish_connection(config.merge({'database' => nil}))
-          ActiveRecord::Base.connection.create_database(config['database'], {:charset => @charset, :collation => @collation})
+          ActiveRecord::Base.establish_connection(config.merge('database' => nil))
+          ActiveRecord::Base.connection.create_database(config['database'], :charset => (config['charset'] || @charset), :collation => (config['collation'] || @collation))
           ActiveRecord::Base.establish_connection(config)
         rescue
-          $stderr.puts "Couldn't create database for #{config.inspect}"
+          $stderr.puts "Couldn't create database for #{config.inspect}, charset: #{config['charset'] || @charset}, collation: #{config['collation'] || @collation} (if you set the charset manually, make sure you have a matching collation)"
         end
       when 'postgresql'
-        `createdb "#{config['database']}" -E utf8`
+        @encoding = config[:encoding] || ENV['CHARSET'] || 'utf8'
+        begin
+          ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
+          ActiveRecord::Base.connection.create_database(config['database'], config.merge('encoding' => @encoding))
+          ActiveRecord::Base.establish_connection(config)
+        rescue
+          $stderr.puts $!, *($!.backtrace)
+          $stderr.puts "Couldn't create database for #{config.inspect}"
+        end
       when 'sqlite'
         `sqlite "#{config['database']}"`
       when 'sqlite3'
         `sqlite3 "#{config['database']}"`
       end
     else
-      p "#{config['database']} already exists"
+      $stderr.puts "#{config['database']} already exists"
     end
   end
 
@@ -68,7 +76,12 @@ namespace :db do
 
   desc 'Drops the database for the current RAILS_ENV'
   task :drop => :environment do
-    drop_database(ActiveRecord::Base.configurations[RAILS_ENV || 'development'])
+    config = ActiveRecord::Base.configurations[RAILS_ENV || 'development']
+    begin
+      drop_database(config)
+    rescue Exception => e
+      puts "Couldn't drop #{config['database']} : #{e.inspect}"
+    end
   end
 
   def local_database?(config, &block)
@@ -93,13 +106,29 @@ namespace :db do
 
     desc 'Resets your database using your migrations for the current environment'
     task :reset => ["db:drop", "db:create", "db:migrate"]
+
+    desc 'Runs the "up" for a given migration VERSION.'
+    task :up => :environment do
+      version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
+      raise "VERSION is required" unless version
+      ActiveRecord::Migrator.run(:up, "db/migrate/", version)
+      Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+    end
+
+    desc 'Runs the "down" for a given migration VERSION.'
+    task :down => :environment do
+      version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
+      raise "VERSION is required" unless version
+      ActiveRecord::Migrator.run(:down, "db/migrate/", version)
+      Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+    end
   end
 
   desc 'Rolls the schema back to the previous version. Specify the number of steps with STEP=n'
   task :rollback => :environment do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-    version = ActiveRecord::Migrator.current_version - step
-    ActiveRecord::Migrator.migrate('db/migrate/', version)
+    ActiveRecord::Migrator.rollback('db/migrate/', step)
+    Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
   end
 
   desc 'Drops and recreates the database from db/schema.rb for the current environment.'
@@ -144,7 +173,7 @@ namespace :db do
         pending_migrations.each do |pending_migration|
           puts '  %4d %s' % [pending_migration.version, pending_migration.name]
         end
-        abort "Run `rake db:migrate` to update your database then try again."
+        abort %{Run "rake db:migrate" to update your database then try again.}
       end
     end
   end
@@ -158,21 +187,21 @@ namespace :db do
         Fixtures.create_fixtures('test/fixtures', File.basename(fixture_file, '.*'))
       end
     end
-    
+
     desc "Search for a fixture given a LABEL or ID."
     task :identify => :environment do
       require "active_record/fixtures"
 
       label, id = ENV["LABEL"], ENV["ID"]
       raise "LABEL or ID required" if label.blank? && id.blank?
-      
+
       puts %Q(The fixture ID for "#{label}" is #{Fixtures.identify(label)}.) if label
-      
+
       Dir["#{RAILS_ROOT}/test/fixtures/**/*.yml"].each do |file|
         if data = YAML::load(ERB.new(IO.read(file)).result)
           data.keys.each do |key|
             key_id = Fixtures.identify(key)
-            
+
             if key == label || key_id == id.to_i
               puts "#{file}: #{key} (#{key_id})"
             end
@@ -285,14 +314,9 @@ namespace :db do
         ActiveRecord::Base.establish_connection(:test)
         ActiveRecord::Base.connection.recreate_database(abcs["test"]["database"])
       when "postgresql"
-        ENV['PGHOST']     = abcs["test"]["host"] if abcs["test"]["host"]
-        ENV['PGPORT']     = abcs["test"]["port"].to_s if abcs["test"]["port"]
-        ENV['PGPASSWORD'] = abcs["test"]["password"].to_s if abcs["test"]["password"]
-        enc_option = "-E #{abcs["test"]["encoding"]}" if abcs["test"]["encoding"]
-
         ActiveRecord::Base.clear_active_connections!
-        `dropdb -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}`
-        `createdb #{enc_option} -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}`
+        drop_database(abcs['test'])
+        create_database(abcs['test'])
       when "sqlite","sqlite3"
         dbfile = abcs["test"]["database"] || abcs["test"]["dbfile"]
         File.delete(dbfile) if File.exist?(dbfile)
@@ -344,7 +368,8 @@ def drop_database(config)
   when /^sqlite/
     FileUtils.rm(File.join(RAILS_ROOT, config['database']))
   when 'postgresql'
-    `dropdb "#{config['database']}"`
+    ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
+    ActiveRecord::Base.connection.drop_database config['database']
   end
 end
 
@@ -359,4 +384,4 @@ end
 
 def firebird_db_string(config)
   FireRuby::Database.db_string_for(config.symbolize_keys)
-end
+end