railties 3.0.0.beta → 3.0.0.beta2

data/lib/{generators → rails/generators}/rails/app/templates/public/javascripts/rails.js

@@ -15,8 +15,7 @@ document.observe("dom:loaded", function() {
       params = element.serialize(true);
     } else {
       method = element.readAttribute('data-method') || 'get';
-      // TODO: data-url support is going away, just use href
-      url    = element.readAttribute('data-url') || element.readAttribute('href');
+      url    = element.readAttribute('href');
       params = {};
     }
 

data/lib/{generators → rails/generators}/rails/app/templates/script/rails

@@ -3,7 +3,6 @@
 ENV_PATH  = File.expand_path('../../config/environment',  __FILE__)
 BOOT_PATH = File.expand_path('../../config/boot',  __FILE__)
 APP_PATH  = File.expand_path('../../config/application',  __FILE__)
-ROOT_PATH = File.expand_path('../..',  __FILE__)
 
 require BOOT_PATH
 require 'rails/commands'

data/lib/{generators → rails/generators}/rails/app/templates/test/performance/browsing_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 require 'rails/performance_test_help'
 
 # Profiling results for each test method are written to tmp/performance.
-class BrowsingTest < ActionController::PerformanceTest
+class BrowsingTest < ActionDispatch::PerformanceTest
   def test_homepage
     get '/'
   end

data/lib/{generators → rails/generators}/rails/app/templates/test/test_helper.rb

@@ -1,5 +1,5 @@
 ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 
 class ActiveSupport::TestCase

data/lib/{generators → rails/generators}/rails/controller/USAGE

@@ -9,7 +9,7 @@ Description:
     template engine and test framework generators.
 
 Example:
-    `./script/generate controller CreditCard open debit credit close`
+    `rails generate controller CreditCard open debit credit close`
 
     Credit card controller with URLs like /credit_card/debit.
         Controller:      app/controllers/credit_card_controller.rb

data/lib/{generators → rails/generators}/rails/controller/controller_generator.rb

@@ -8,6 +8,12 @@ module Rails
         template 'controller.rb', File.join('app/controllers', class_path, "#{file_name}_controller.rb")
       end
 
+      def add_routes
+        actions.reverse.each do |action|
+          route %{get "#{file_name}/#{action}"}
+        end
+      end
+
       hook_for :template_engine, :test_framework, :helper
     end
   end

data/lib/{generators → rails/generators}/rails/generator/USAGE

@@ -3,7 +3,7 @@ Description:
     CamelCased or under_scored, as an argument. 
 
 Example:
-    `./script/generate generator Awesome`
+    `rails generate generator Awesome`
 
     creates a standard awesome generator:
         lib/generators/awesome/

data/lib/{generators → rails/generators}/rails/generator/templates/USAGE.tt

@@ -2,7 +2,7 @@ Description:
     Explain the generator
 
 Example:
-    ./script/generate <%= file_name %> Thing
+    rails generate <%= file_name %> Thing
 
     This will create:
         what/will/it/create

data/lib/{generators → rails/generators}/rails/helper/USAGE

@@ -9,7 +9,7 @@ Description:
     test framework.
 
 Example:
-    `./script/generate helper CreditCard`
+    `rails generate helper CreditCard`
 
     Credit card helper.
         Helper:     app/helpers/credit_card_helper.rb

data/lib/{generators → rails/generators}/rails/integration_test/USAGE

@@ -6,5 +6,5 @@ Description:
     TestUnit.
 
 Example:
-    `./script/generate integration_test GeneralStories` creates a GeneralStories
+    `rails generate integration_test GeneralStories` creates a GeneralStories
     integration test in test/integration/general_stories_test.rb

data/lib/{generators → rails/generators}/rails/mailer/USAGE

@@ -6,7 +6,7 @@ Description:
     engine and test framework generators.
 
 Example:
-    `./script/generate mailer Notifications signup forgot_password invoice`
+    `rails generate mailer Notifications signup forgot_password invoice`
 
     creates a Notifications mailer class, views, test, and fixtures:
         Mailer:     app/mailers/notifications.rb

data/lib/{generators → rails/generators}/rails/metal/USAGE

@@ -2,7 +2,7 @@ Description:
     Cast some metal!
 
 Examples:
-    `./script/generate metal poller`
+    `rails generate metal poller`
 
         This will create:
             Metal: app/metal/poller.rb

data/lib/{generators → rails/generators}/rails/migration/USAGE

@@ -8,12 +8,12 @@ Description:
     column lines from supplied attributes: AddColumnsToTable or RemoveColumnsFromTable
 
 Example:
-    `./script/generate migration AddSslFlag`
+    `rails generate migration AddSslFlag`
 
     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`
+    `rails generate migration AddTitleBodyToPost title:string body:text published:boolean`
 
     This will create the AddTitleBodyToPost in db/migrate/20080514090912_add_title_body_to_post.rb with
     this in the Up migration:

data/lib/{generators → rails/generators}/rails/model/USAGE

@@ -16,7 +16,7 @@ Description:
     created model. This allows you create Single Table Inheritance models.
 
 Examples:
-    `./script/generate model account`
+    `rails generate model account`
 
         For ActiveRecord and TestUnit it creates:
 
@@ -25,6 +25,6 @@ Examples:
             Fixtures:   test/fixtures/accounts.yml
             Migration:  db/migrate/XXX_add_accounts.rb
 
-    `./script/generate model post title:string body:text published:boolean`
+    `rails generate model post title:string body:text published:boolean`
 
         Creates a Post model with a string title, text body, and published flag.

data/lib/{generators → rails/generators}/rails/observer/USAGE

@@ -5,7 +5,7 @@ Description:
     This generator only invokes your ORM and test framework generators.
 
 Example:
-    `./script/generate observer Account`
+    `rails generate observer Account`
 
     For ActiveRecord and TestUnit it creates:
         Observer:   app/models/account_observer.rb

data/lib/{generators → rails/generators}/rails/performance_test/USAGE

@@ -6,5 +6,5 @@ Description:
     TestUnit.
 
 Example:
-    `./script/generate performance_test GeneralStories` creates a GeneralStories
+    `rails generate performance_test GeneralStories` creates a GeneralStories
     performance test in test/performance/general_stories_test.rb

data/lib/{generators → rails/generators}/rails/plugin/USAGE

@@ -3,7 +3,7 @@ Description:
     CamelCased or under_scored, as an argument. 
 
 Example:
-    `./script/generate plugin BrowserFilters`
+    `rails generate plugin BrowserFilters`
 
     creates a standard browser_filters plugin:
         vendor/plugins/browser_filters/README

data/lib/{generators → rails/generators}/rails/plugin/plugin_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/rails/generator/generator_generator'
+require 'rails/generators/rails/generator/generator_generator'
 
 module Rails
   module Generators

data/lib/rails/generators/rails/plugin/templates/Rakefile.tt

@@ -0,0 +1,23 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+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
+
+desc 'Generate documentation for the <%= file_name %> plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = '<%= class_name %>'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/lib/{generators → rails/generators}/rails/resource/USAGE

@@ -18,6 +18,6 @@ Description:
     views or add any methods to the generated controller.
 
 Examples:
-    `./script/generate resource post` # no attributes
-    `./script/generate resource post title:string body:text published:boolean`
-    `./script/generate resource purchase order_id:integer amount:decimal`
+    `rails generate resource post` # no attributes
+    `rails generate resource post title:string body:text published:boolean`
+    `rails generate resource purchase order_id:integer amount:decimal`

data/lib/{generators → rails/generators}/rails/resource/resource_generator.rb

@@ -1,5 +1,6 @@
 require 'rails/generators/resource_helpers'
-require 'generators/rails/model/model_generator'
+require 'rails/generators/rails/model/model_generator'
+require 'active_support/core_ext/object/blank'
 
 module Rails
   module Generators
@@ -16,6 +17,7 @@ module Rails
       class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
 
       def add_resource_route
+        return if options[:actions].present?
         route "resource#{:s unless options[:singleton]} :#{pluralize?(file_name)}"
       end
 

data/lib/{generators → rails/generators}/rails/scaffold/USAGE

@@ -21,9 +21,9 @@ Description:
     declaration in config/routes.rb.
 
     If you want to remove all the generated files, run
-    'script/destroy scaffold ModelName'.
+    'rails destroy scaffold ModelName'.
 
 Examples:
-    `./script/generate scaffold post`
-    `./script/generate scaffold post title:string body:text published:boolean`
-    `./script/generate scaffold purchase order_id:integer amount:decimal`
+    `rails generate scaffold post`
+    `rails generate scaffold post title:string body:text published:boolean`
+    `rails generate scaffold purchase order_id:integer amount:decimal`

data/lib/{generators → rails/generators}/rails/scaffold/scaffold_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/rails/resource/resource_generator'
+require 'rails/generators/rails/resource/resource_generator'
 
 module Rails
   module Generators

data/lib/{generators → rails/generators}/rails/scaffold_controller/USAGE

@@ -11,7 +11,7 @@ Description:
     template engine and test framework generators.
 
 Example:
-    `./script/generate scaffold_controller CreditCard`
+    `rails generate scaffold_controller CreditCard`
 
     Credit card controller with URLs like /credit_card/debit.
         Controller:      app/controllers/credit_cards_controller.rb

data/lib/{generators → rails/generators}/rails/scaffold_controller/templates/controller.rb

@@ -46,7 +46,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       if @<%= orm_instance.save %>
-        format.html { redirect_to(@<%= file_name %>, :notice => '<%= class_name %> was successfully created.') }
+        format.html { redirect_to(@<%= file_name %>, :notice => '<%= human_name %> was successfully created.') }
         format.xml  { render :xml => @<%= file_name %>, :status => :created, :location => @<%= file_name %> }
       else
         format.html { render :action => "new" }
@@ -62,7 +62,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       if @<%= orm_instance.update_attributes("params[:#{file_name}]") %>
-        format.html { redirect_to(@<%= file_name %>, :notice => '<%= class_name %> was successfully updated.') }
+        format.html { redirect_to(@<%= file_name %>, :notice => '<%= human_name %> was successfully updated.') }
         format.xml  { head :ok }
       else
         format.html { render :action => "edit" }

data/lib/{generators → rails/generators}/rails/session_migration/USAGE

@@ -5,4 +5,4 @@ Description:
     Before invoking this generator, be sure that your ORM supports session stores.
 
 Example:
-    `./script/generate session_migration CreateSessionTable`
+    `rails generate session_migration CreateSessionTable`

data/lib/{generators → rails/generators}/rails/stylesheets/USAGE

@@ -2,4 +2,4 @@ Description:
     Copies scaffold stylesheets to public/stylesheets/.
 
 Examples:
-    `./script/generate stylesheets`
+    `rails generate stylesheets`

data/lib/{generators → rails/generators}/rails/stylesheets/templates/scaffold.css

@@ -24,6 +24,10 @@ div.field, div.actions {
   color: green;
 }
 
+.alert {
+  color: red;
+}
+
 .fieldWithErrors {
   padding: 2px;
   background-color: red;

data/lib/{generators → rails/generators}/test_unit/controller/controller_generator.rb

@@ -1,8 +1,9 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators
     class ControllerGenerator < Base
+      argument :actions, :type => :array, :default => [], :banner => "action action"
       check_class_collision :suffix => "ControllerTest"
 
       def create_test_files

data/lib/rails/generators/test_unit/controller/templates/functional_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class <%= class_name %>ControllerTest < ActionController::TestCase
+<% if actions.empty? -%>
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+<% else -%>
+<% for action in actions -%>
+  test "should get <%= action %>" do
+    get :<%= action %>
+    assert_response :success
+  end
+
+<% end -%>
+<% end -%>
+end

data/lib/{generators → rails/generators}/test_unit/helper/helper_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

data/lib/{generators → rails/generators}/test_unit/integration/integration_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

data/lib/{generators → rails/generators}/test_unit/mailer/mailer_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators
@@ -9,13 +9,6 @@ module TestUnit
       def create_test_files
         template "functional_test.rb", File.join('test/functional', class_path, "#{file_name}_test.rb")
       end
-
-      def create_fixtures_files
-        actions.each do |action|
-          @action, @path = action, File.join(file_path, action)
-          template "fixture", File.join("test/fixtures", @path)
-        end
-      end
     end
   end
 end