From 2728ad9a6090c32ade3e73ebe23e4a9a8954e135 Mon Sep 17 00:00:00 2001
From: Paco Guzman <fjguzman@aspgems.com>
Date: Sat, 6 Feb 2010 17:42:09 +0100
Subject: [PATCH]  Use google ajax apis in index.html when run rails app generator with skip-prototype option

---
 railties/lib/generators/rails/app/app_generator.rb |    5 +++++
 .../rails/app/templates/public/index.html          |    8 ++++++++
 railties/test/generators/app_generator_test.rb     |    6 ++++++
 3 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/railties/lib/generators/rails/app/app_generator.rb b/railties/lib/generators/rails/app/app_generator.rb
index c439ed8..bf1f4e2 100644
--- a/railties/lib/generators/rails/app/app_generator.rb
+++ b/railties/lib/generators/rails/app/app_generator.rb
@@ -123,6 +123,11 @@ module Rails::Generators
 
     def create_public_files
       directory "public", "public", :recursive => false # Do small steps, so anyone can overwrite it.
+
+      inside "public" do
+        remove_file "index.html"
+        template "index.html"
+      end
     end
 
     def create_public_image_files
diff --git a/railties/lib/generators/rails/app/templates/public/index.html b/railties/lib/generators/rails/app/templates/public/index.html
index ef916f9..2848fe3 100644
--- a/railties/lib/generators/rails/app/templates/public/index.html
+++ b/railties/lib/generators/rails/app/templates/public/index.html
@@ -181,8 +181,16 @@
       }
 
     </style>
+    <% unless options[:skip_prototype] -%>
     <script type="text/javascript" src="javascripts/prototype.js"></script>
     <script type="text/javascript" src="javascripts/effects.js"></script>
+    <% else -%>
+    <script src="http://www.google.com/jsapi"></script>
+    <script type="text/javascript">
+       google.load("prototype", "1.6.1.0");
+       google.load("scriptaculous", "1.8.3");
+    </script>
+    <% end -%>
     <script type="text/javascript">
       function about() {
         if (Element.empty('about-content')) {
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 54b970c..a6dab65 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -104,6 +104,12 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_no_file "public/javascripts/prototype.js"
     assert_no_file "test"
   end
+  
+  def test_prototype_js_and_effects_js_in_index_html_are_skipped_if_required
+    run_generator [destination_root, "--skip-prototype"]
+    assert_file "public/index.html", /(?!javascripts\/prototype\.js)/
+    assert_file "public/index.html", /(?!javascripts\/effects\.js)/
+  end
 
   def test_shebang_is_added_to_rails_file
     run_generator [destination_root, "--ruby", "foo/bar/baz"]
-- 
1.6.3.3