rails 2.1.2 → 2.2.2

data/lib/rails/version.rb

@@ -1,7 +1,7 @@
 module Rails
   module VERSION #:nodoc:
     MAJOR = 2
-    MINOR = 1
+    MINOR = 2
     TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/rails_generator/commands.rb

@@ -169,35 +169,29 @@ HELP
         # Ruby or Rails.  In the future, expand to check other namespaces
         # such as the rest of the user's app.
         def class_collisions(*class_names)
-
-          # Initialize some check varibles
-          last_class = Object
-          current_class = nil
-          name = nil
-
+          path = class_names.shift
           class_names.flatten.each do |class_name|
             # Convert to string to allow symbol arguments.
             class_name = class_name.to_s
 
             # Skip empty strings.
-            class_name.strip.empty? ? next : current_class = class_name
+            next if class_name.strip.empty?
 
             # Split the class from its module nesting.
             nesting = class_name.split('::')
             name = nesting.pop
 
             # Extract the last Module in the nesting.
-            last = nesting.inject(last_class) { |last, nest|
-              break unless last_class.const_defined?(nest)
-              last_class = last_class.const_get(nest)
+            last = nesting.inject(Object) { |last, nest|
+              break unless last.const_defined?(nest)
+              last.const_get(nest)
             }
 
-          end
-          # If the last Module exists, check whether the given
-          # class exists and raise a collision if so.
-
-          if last_class and last_class.const_defined?(name.camelize)
-            raise_class_collision(current_class)
+            # If the last Module exists, check whether the given
+            # class exists and raise a collision if so.
+            if last and last.const_defined?(name.camelize)
+              raise_class_collision(class_name)
+            end
           end
         end
 

data/lib/rails_generator/generated_attribute.rb

@@ -37,6 +37,10 @@ module Rails
             ""
         end      
       end
+
+      def reference?
+        [ :references, :belongs_to ].include?(self.type)
+      end
     end
   end
 end

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

@@ -1,12 +1,12 @@
 require 'rbconfig'
 require 'digest/md5' 
-require 'rails_generator/secret_key_generator'
+require 'active_support/secure_random'
 
 class AppGenerator < Rails::Generator::Base
   DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
                               Config::CONFIG['ruby_install_name'])
 
-  DATABASES = %w(mysql oracle postgresql sqlite2 sqlite3 frontbase)
+  DATABASES = %w(mysql oracle postgresql sqlite2 sqlite3 frontbase ibm_db)
   DEFAULT_DATABASE = 'sqlite3'
 
   default_options   :db => (ENV["RAILS_DEFAULT_DATABASE"] || DEFAULT_DATABASE),
@@ -36,7 +36,7 @@ class AppGenerator < Rails::Generator::Base
     md5 << @app_name
 
     # Do our best to generate a secure secret key for CookieStore
-    secret = Rails::SecretKeyGenerator.new(@app_name).generate_secret
+    secret = ActiveSupport::SecureRandom.hex(64)
 
     record do |m|
       # Root directory and all subdirectories.
@@ -51,6 +51,7 @@ class AppGenerator < Rails::Generator::Base
       m.template "helpers/application.rb",        "app/controllers/application.rb", :assigns => { :app_name => @app_name, :app_secret => md5.hexdigest }
       m.template "helpers/application_helper.rb", "app/helpers/application_helper.rb"
       m.template "helpers/test_helper.rb",        "test/test_helper.rb"
+      m.template "helpers/performance_test.rb",   "test/performance/browsing_test.rb"
 
       # database.yml and routes.rb
       m.template "configs/databases/#{options[:db]}.yml", "config/database.yml", :assigns => {
@@ -64,6 +65,9 @@ class AppGenerator < Rails::Generator::Base
       m.template "configs/initializers/mime_types.rb", "config/initializers/mime_types.rb"
       m.template "configs/initializers/new_rails_defaults.rb", "config/initializers/new_rails_defaults.rb"
 
+      # Locale
+      m.template "configs/locales/en.yml", "config/locales/en.yml"
+
       # Environments
       m.file "environments/boot.rb",    "config/boot.rb"
       m.template "environments/environment.rb", "config/environment.rb", :assigns => { :freeze => options[:freeze], :app_name => @app_name, :app_secret => secret }
@@ -142,6 +146,7 @@ class AppGenerator < Rails::Generator::Base
     app/views/layouts
     config/environments
     config/initializers
+    config/locales
     db
     doc
     lib
@@ -155,6 +160,7 @@ class AppGenerator < Rails::Generator::Base
     test/fixtures
     test/functional
     test/integration
+    test/performance
     test/unit
     vendor
     vendor/plugins

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

@@ -2,7 +2,7 @@ class ControllerGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
       # Check for class naming collisions.
-      m.class_collisions class_path, "#{class_name}Controller", "#{class_name}ControllerTest", "#{class_name}Helper"
+      m.class_collisions "#{class_name}Controller", "#{class_name}ControllerTest", "#{class_name}Helper"
 
       # Controller, helper, views, and test directories.
       m.directory File.join('app/controllers', class_path)

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

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class <%= class_name %>ControllerTest < ActionController::TestCase
   # Replace this with your real tests.
-  def test_truth
+  test "the truth" do
     assert true
   end
 end

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

@@ -4,7 +4,7 @@ class IntegrationTestGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
       # Check for class naming collisions.
-      m.class_collisions class_path, class_name, "#{class_name}Test"
+      m.class_collisions class_name, "#{class_name}Test"
 
       # integration test directory
       m.directory File.join('test/integration', class_path)

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

@@ -1,10 +1,10 @@
 require 'test_helper'
 
 class <%= class_name %>Test < ActionController::IntegrationTest
-  # fixtures :your, :models
+  fixtures :all
 
   # Replace this with your real tests.
-  def test_truth
+  test "the truth" do
     assert true
   end
 end

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

@@ -2,7 +2,7 @@ class MailerGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
       # Check for class naming collisions.
-      m.class_collisions class_path, class_name, "#{class_name}Test"
+      m.class_collisions class_name, "#{class_name}Test"
 
       # Mailer, view, test, and fixture directories.
       m.directory File.join('app/models', class_path)

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

@@ -1,9 +1,8 @@
 require 'test_helper'
 
 class <%= class_name %>Test < ActionMailer::TestCase
-  tests <%= class_name %>
 <% for action in actions -%>
-  def test_<%= action %>
+  test "<%= action %>" do
     @expected.subject = '<%= class_name %>#<%= action %>'
     @expected.body    = read_fixture('<%= action %>')
     @expected.date    = Time.now
@@ -14,7 +13,7 @@ class <%= class_name %>Test < ActionMailer::TestCase
 <% end -%>
 <% if actions.blank? -%>
   # replace this with your real tests
-  def test_truth
+  test "the truth" do
     assert true
   end
 <% end -%>

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

@@ -4,7 +4,7 @@ class ModelGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
       # Check for class naming collisions.
-      m.class_collisions class_path, class_name, "#{class_name}Test"
+      m.class_collisions class_name, "#{class_name}Test"
 
       # Model, test, and fixture directories.
       m.directory File.join('app/models', class_path)

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

@@ -1,2 +1,5 @@
 class <%= class_name %> < ActiveRecord::Base
+<% attributes.select(&:reference?).each do |attribute| -%>
+  belongs_to :<%= attribute.name %>
+<% end -%>
 end

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

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class <%= class_name %>Test < ActiveSupport::TestCase
   # Replace this with your real tests.
-  def test_truth
+  test "the truth" do
     assert true
   end
 end

data/lib/rails_generator/generators/components/observer/observer_generator.rb

@@ -2,7 +2,7 @@ class ObserverGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
       # Check for class naming collisions.
-      m.class_collisions class_path, "#{class_name}Observer", "#{class_name}ObserverTest"
+      m.class_collisions "#{class_name}Observer", "#{class_name}ObserverTest"
 
       # Observer, and test directories.
       m.directory File.join('app/models', class_path)

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

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class <%= class_name %>ObserverTest < ActiveSupport::TestCase
   # Replace this with your real tests.
-  def test_truth
+  test "the truth" do
     assert true
   end
 end

data/lib/rails_generator/generators/components/performance_test/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Stubs out a new performance test. Pass the name of the test, either
+    CamelCased or under_scored, as an argument. The new test class is
+    generated in test/performance/testname_test.rb
+
+Example:
+    `./script/generate performance_test GeneralStories` creates a GeneralStories
+    performance test in test/performance/general_stories_test.rb

data/lib/rails_generator/generators/components/performance_test/performance_test_generator.rb

@@ -0,0 +1,16 @@
+class PerformanceTestGenerator < Rails::Generator::NamedBase
+  default_options :skip_migration => false
+
+  def manifest
+    record do |m|
+      # Check for class naming collisions.
+      m.class_collisions class_name, "#{class_name}Test"
+
+      # performance test directory
+      m.directory File.join('test/performance', class_path)
+
+      # performance test stub
+      m.template 'performance_test.rb', File.join('test/performance', class_path, "#{file_name}_test.rb")
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+require 'test_helper'
+require 'performance_test_help'
+
+class <%= class_name %>Test < ActionController::PerformanceTest
+  # Replace this with your real tests.
+  def test_homepage
+    get '/'
+  end
+end

data/lib/rails_generator/generators/components/plugin/plugin_generator.rb

@@ -10,22 +10,22 @@ class PluginGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
       # Check for class naming collisions.
-      m.class_collisions class_path, class_name
+      m.class_collisions class_name
 
       m.directory "#{plugin_path}/lib"
       m.directory "#{plugin_path}/tasks"
       m.directory "#{plugin_path}/test"
 
-      m.template 'README',        "#{plugin_path}/README"
-      m.template 'MIT-LICENSE',   "#{plugin_path}/MIT-LICENSE"
-      m.template 'Rakefile',      "#{plugin_path}/Rakefile"
-      m.template 'init.rb',       "#{plugin_path}/init.rb"
-      m.template 'install.rb',    "#{plugin_path}/install.rb"
-      m.template 'uninstall.rb',  "#{plugin_path}/uninstall.rb"
-      m.template 'plugin.rb',     "#{plugin_path}/lib/#{file_name}.rb"
-      m.template 'tasks.rake',    "#{plugin_path}/tasks/#{file_name}_tasks.rake"
-      m.template 'unit_test.rb',  "#{plugin_path}/test/#{file_name}_test.rb"
-      
+      m.template 'README',         "#{plugin_path}/README"
+      m.template 'MIT-LICENSE',    "#{plugin_path}/MIT-LICENSE"
+      m.template 'Rakefile',       "#{plugin_path}/Rakefile"
+      m.template 'init.rb',        "#{plugin_path}/init.rb"
+      m.template 'install.rb',     "#{plugin_path}/install.rb"
+      m.template 'uninstall.rb',   "#{plugin_path}/uninstall.rb"
+      m.template 'plugin.rb',      "#{plugin_path}/lib/#{file_name}.rb"
+      m.template 'tasks.rake',     "#{plugin_path}/tasks/#{file_name}_tasks.rake"
+      m.template 'unit_test.rb',   "#{plugin_path}/test/#{file_name}_test.rb"
+      m.template 'test_helper.rb', "#{plugin_path}/test/test_helper.rb"
       if @with_generator
         m.directory "#{plugin_path}/generators"
         m.directory "#{plugin_path}/generators/#{file_name}"

data/lib/rails_generator/generators/components/plugin/templates/Rakefile

@@ -8,6 +8,7 @@ task :default => :test
 desc 'Test the <%= file_name %> plugin.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
+  t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end

data/lib/rails_generator/generators/components/plugin/templates/test_helper.rb

@@ -0,0 +1,3 @@
+require 'rubygems'
+require 'active_support'
+require 'active_support/test_case'

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

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'test_helper'
 
-class <%= class_name %>Test < Test::Unit::TestCase
+class <%= class_name %>Test < ActiveSupport::TestCase
   # Replace this with your real tests.
-  def test_this_plugin
-    flunk
+  test "the truth" do
+    assert true
   end
 end

data/lib/rails_generator/generators/components/resource/resource_generator.rb

@@ -30,8 +30,8 @@ class ResourceGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
       # Check for class naming collisions.
-      m.class_collisions(controller_class_path, "#{controller_class_name}Controller", "#{controller_class_name}Helper")
-      m.class_collisions(class_path, "#{class_name}")
+      m.class_collisions("#{controller_class_name}Controller", "#{controller_class_name}Helper")
+      m.class_collisions(class_name)
 
       # Controller, helper, views, and test directories.
       m.directory(File.join('app/models', class_path))

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

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   # Replace this with your real tests.
-  def test_truth
+  test "the truth" do
     assert true
   end
 end

data/lib/rails_generator/generators/components/scaffold/USAGE

@@ -1,10 +1,11 @@
 Description:
     Scaffolds an entire resource, from model and migration to controller and
     views, along with a full test suite. The resource is ready to use as a
-    starting point for your restful, resource-oriented application.
+    starting point for your RESTful, resource-oriented application.
 
-    Pass the name of the model, either CamelCased or under_scored, as the first
-    argument, and an optional list of attribute pairs.
+    Pass the name of the model (in singular form), either CamelCased or
+    under_scored, as the first argument, and an optional list of attribute
+    pairs.
 
     Attribute pairs are column_name:sql_type arguments specifying the
     model's attributes. Timestamps are added by default, so you don't have to
@@ -13,13 +14,16 @@ Description:
     You don't have to think up every attribute up front, but it helps to
     sketch out a few so you can start working with the resource immediately.
 
-    For example, `scaffold post title:string body:text published:boolean`
+    For example, 'scaffold post title:string body:text published:boolean'
     gives you a model with those three attributes, a controller that handles
     the create/show/update/destroy, forms to create and edit your posts, and
     an index that lists them all, as well as a map.resources :posts
     declaration in config/routes.rb.
 
+    If you want to remove all the generated files, run
+    'script/destroy scaffold ModelName'.
+
 Examples:
-    `./script/generate scaffold post` # no attributes, view will be anemic
+    `./script/generate scaffold post`
     `./script/generate scaffold post title:string body:text published:boolean`
     `./script/generate scaffold purchase order_id:integer amount:decimal`

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

@@ -1,5 +1,5 @@
 class ScaffoldGenerator < Rails::Generator::NamedBase
-  default_options :skip_timestamps => false, :skip_migration => false
+  default_options :skip_timestamps => false, :skip_migration => false, :force_plural => false
 
   attr_reader   :controller_name,
                 :controller_class_path,
@@ -16,6 +16,11 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
   def initialize(runtime_args, runtime_options = {})
     super
 
+    if @name == @name.pluralize && !options[:force_plural]
+      logger.warning "Plural version of the model detected, using singularized version.  Override with --force-plural."
+      @name = @name.singularize
+    end
+
     @controller_name = @name.pluralize
 
     base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(@controller_name)
@@ -31,8 +36,8 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
       # Check for class naming collisions.
-      m.class_collisions(controller_class_path, "#{controller_class_name}Controller", "#{controller_class_name}Helper")
-      m.class_collisions(class_path, "#{class_name}")
+      m.class_collisions("#{controller_class_name}Controller", "#{controller_class_name}Helper")
+      m.class_collisions(class_name)
 
       # Controller, helper, views, test and stylesheets directories.
       m.directory(File.join('app/models', class_path))
@@ -81,6 +86,8 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
              "Don't add timestamps to the migration file for this model") { |v| options[:skip_timestamps] = v }
       opt.on("--skip-migration",
              "Don't generate a migration file for this model") { |v| options[:skip_migration] = v }
+      opt.on("--force-plural",
+             "Forces the generation of a plural ModelName") { |v| options[:force_plural] = v }
     end
 
     def scaffold_views

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

@@ -1,18 +1,18 @@
 require 'test_helper'
 
 class <%= controller_class_name %>ControllerTest < ActionController::TestCase
-  def test_should_get_index
+  test "should get index" do
     get :index
     assert_response :success
     assert_not_nil assigns(:<%= table_name %>)
   end
 
-  def test_should_get_new
+  test "should get new" do
     get :new
     assert_response :success
   end
 
-  def test_should_create_<%= file_name %>
+  test "should create <%= file_name %>" do
     assert_difference('<%= class_name %>.count') do
       post :create, :<%= file_name %> => { }
     end
@@ -20,22 +20,22 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
     assert_redirected_to <%= file_name %>_path(assigns(:<%= file_name %>))
   end
 
-  def test_should_show_<%= file_name %>
+  test "should show <%= file_name %>" do
     get :show, :id => <%= table_name %>(:one).id
     assert_response :success
   end
 
-  def test_should_get_edit
+  test "should get edit" do
     get :edit, :id => <%= table_name %>(:one).id
     assert_response :success
   end
 
-  def test_should_update_<%= file_name %>
+  test "should update <%= file_name %>" do
     put :update, :id => <%= table_name %>(:one).id, :<%= file_name %> => { }
     assert_redirected_to <%= file_name %>_path(assigns(:<%= file_name %>))
   end
 
-  def test_should_destroy_<%= file_name %>
+  test "should destroy <%= file_name %>" do
     assert_difference('<%= class_name %>.count', -1) do
       delete :destroy, :id => <%= table_name %>(:one).id
     end