-j parameter added to rails new command.

 Now you can start your apps with jquery with rails new myapp -j jquery, the default is still prototype

[#5613 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>

railties/Rakefile

@@ -45,8 +45,9 @@ task :generate_guides do
   ruby "guides/rails_guides.rb"
 end
 
-task :update_prototype_ujs do
-  system "curl http://github.com/rails/prototype-ujs/raw/master/src/rails.js > lib/rails/generators/rails/app/templates/public/javascripts/rails.js"
+task :update_ujs do
+  system "curl http://github.com/rails/prototype-ujs/raw/master/src/rails.js > lib/rails/generators/rails/app/templates/public/javascripts/prototype_ujs.js"
+  system "curl http://github.com/rails/jquery-ujs/raw/master/src/rails.js > lib/rails/generators/rails/app/templates/public/javascripts/jquery_ujs.js"
 end
 
 # Validate guides -------------------------------------------------------------------------

railties/lib/rails/generators/rails/app/app_generator.rb

@@ -108,12 +108,20 @@ def stylesheets
     end
 
     def javascripts
-      unless options[:skip_prototype]
-        directory "public/javascripts"
-      else
-        empty_directory_with_gitkeep "public/javascripts"
-        create_file "public/javascripts/application.js"
+      empty_directory "public/javascripts"
+
+      unless options[:skip_javascript]
+        copy_file "public/javascripts/#{@options[:javascript]}.js"
+        copy_file "public/javascripts/#{@options[:javascript]}_ujs.js", "public/javascripts/rails.js"
+
+        if options[:prototype]
+          copy_file "public/javascripts/controls.js"
+          copy_file "public/javascripts/dragdrop.js"
+          copy_file "public/javascripts/effects.js"
+        end
       end
+
+      copy_file "public/javascripts/application.js"
     end
 
     def script
@@ -152,6 +160,7 @@ module Generators
 
     class AppGenerator < Base
       DATABASES = %w( mysql oracle postgresql sqlite3 frontbase ibm_db )
+      JAVASCRIPTS = %w( prototype jquery )
 
       attr_accessor :rails_template
       add_shebang_option!
@@ -161,6 +170,9 @@ class AppGenerator < Base
       class_option :database,           :type => :string, :aliases => "-d", :default => "sqlite3",
                                         :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
 
+      class_option :javascript,         :type => :string, :aliases => "-j", :default => "prototype",
+                                        :desc => "Preconfigure for selected javascript library (options: #{JAVASCRIPTS.join('/')})"
+
       class_option :builder,            :type => :string, :aliases => "-b",
                                         :desc => "Path to an application builder (can be a filesystem path or URL)"
 
@@ -182,8 +194,8 @@ class AppGenerator < Base
       class_option :skip_test_unit,     :type => :boolean, :aliases => "-T", :default => false,
                                         :desc => "Skip Test::Unit files"
 
-      class_option :skip_prototype,     :type => :boolean, :aliases => "-J", :default => false,
-                                        :desc => "Skip Prototype files"
+      class_option :skip_javascript,    :type => :boolean, :aliases => "-J", :default => false,
+                                        :desc => "Skip javascript files"
 
       class_option :skip_git,           :type => :boolean, :aliases => "-G", :default => false,
                                         :desc => "Skip Git ignores and keeps"
@@ -205,6 +217,10 @@ def initialize(*args)
         if !options[:skip_active_record] && !DATABASES.include?(options[:database])
           raise Error, "Invalid value for --database option. Supported for preconfiguration are: #{DATABASES.join(", ")}."
         end
+
+        if !options[:skip_javascript] && !JAVASCRIPTS.include?(options[:javascript])
+          raise Error, "Invalid value for --javascript option. Supported for preconfiguration are: #{JAVASCRIPTS.join(", ")}."
+        end
       end
 
       def create_root
@@ -269,7 +285,7 @@ def create_public_stylesheets_files
         build(:stylesheets)
       end
 
-      def create_prototype_files
+      def create_javascript_files
         build(:javascripts)
       end
 

railties/lib/rails/generators/rails/app/templates/config/application.rb

@@ -40,8 +40,10 @@ class Application < Rails::Application
     # config.i18n.default_locale = :de
 
     # JavaScript files you want as :defaults (application.js is always included).
-<% if options[:skip_prototype] -%>
+<% if options[:skip_javascript] -%>
     config.action_view.javascript_expansions[:defaults] = %w()
+<% elsif options[:javascript] == 'jquery' -%>
+    config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
 <% else -%>
     # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
 <% end -%>