From a8b3efbe5cf07edcafe76f5ed86b27b18c3df5f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 17 Jun 2009 11:46:59 +0200
Subject: [PATCH] Moved prototypes files to where they should be.

---
 railties/lib/generator/generators/app.thor    | 26 +++++++++++++------
 .../javascripts}/application.js               |  0
 .../javascripts}/controls.js                  |  0
 .../javascripts}/dragdrop.js                  |  0
 .../javascripts}/effects.js                   |  0
 .../javascripts}/prototype.js                 |  0
 6 files changed, 18 insertions(+), 8 deletions(-)
 rename railties/lib/generator/templates/app/{javascripts/prototype => public/javascripts}/application.js (100%)
 rename railties/lib/generator/templates/app/{javascripts/prototype => public/javascripts}/controls.js (100%)
 rename railties/lib/generator/templates/app/{javascripts/prototype => public/javascripts}/dragdrop.js (100%)
 rename railties/lib/generator/templates/app/{javascripts/prototype => public/javascripts}/effects.js (100%)
 rename railties/lib/generator/templates/app/{javascripts/prototype => public/javascripts}/prototype.js (100%)

diff --git a/railties/lib/generator/generators/app.thor b/railties/lib/generator/generators/app.thor
index 4aa2022759..a15344051b 100644
--- a/railties/lib/generator/generators/app.thor
+++ b/railties/lib/generator/generators/app.thor
@@ -50,9 +50,7 @@ module Rails::Generators
       inside "config" do
         copy_file "boot.rb"
         copy_file "routes.rb"
-
-        template "databases/#{options[:database]}.yml", "database.yml"
-        template "environment.rb"
+        template  "environment.rb"
 
         directory "environments"
         directory "initializers"
@@ -60,6 +58,10 @@ module Rails::Generators
       end
     end
 
+    def craete_db_config_files
+      template "config/databases/#{options[:database]}.yml", "config/database.yml"
+    end
+
     def create_db_files
       directory "db"
     end
@@ -85,7 +87,19 @@ module Rails::Generators
     end
 
     def create_public_files
-      directory "public"
+      directory "public", "public", false # Non-recursive. Do small steps, so anyone can overwrite it.
+    end
+
+    def create_public_image_files
+      directory "public/images"
+    end
+
+    def create_public_stylesheets_files
+      directory "public/stylesheets"
+    end
+
+    def create_public_javascripts_files
+      directory "public/javascripts"
     end
 
     def create_dispatch_files
@@ -103,10 +117,6 @@ module Rails::Generators
       chmod "public/dispatch.fcgi", 0755, false
     end
 
-    def create_javascript_files
-      directory "javascripts/prototype", "public/javascripts"
-    end
-
     def create_script_files
       directory "script"
       chmod "script", 0755, false
diff --git a/railties/lib/generator/templates/app/javascripts/prototype/application.js b/railties/lib/generator/templates/app/public/javascripts/application.js
similarity index 100%
rename from railties/lib/generator/templates/app/javascripts/prototype/application.js
rename to railties/lib/generator/templates/app/public/javascripts/application.js
diff --git a/railties/lib/generator/templates/app/javascripts/prototype/controls.js b/railties/lib/generator/templates/app/public/javascripts/controls.js
similarity index 100%
rename from railties/lib/generator/templates/app/javascripts/prototype/controls.js
rename to railties/lib/generator/templates/app/public/javascripts/controls.js
diff --git a/railties/lib/generator/templates/app/javascripts/prototype/dragdrop.js b/railties/lib/generator/templates/app/public/javascripts/dragdrop.js
similarity index 100%
rename from railties/lib/generator/templates/app/javascripts/prototype/dragdrop.js
rename to railties/lib/generator/templates/app/public/javascripts/dragdrop.js
diff --git a/railties/lib/generator/templates/app/javascripts/prototype/effects.js b/railties/lib/generator/templates/app/public/javascripts/effects.js
similarity index 100%
rename from railties/lib/generator/templates/app/javascripts/prototype/effects.js
rename to railties/lib/generator/templates/app/public/javascripts/effects.js
diff --git a/railties/lib/generator/templates/app/javascripts/prototype/prototype.js b/railties/lib/generator/templates/app/public/javascripts/prototype.js
similarity index 100%
rename from railties/lib/generator/templates/app/javascripts/prototype/prototype.js
rename to railties/lib/generator/templates/app/public/javascripts/prototype.js