Update generator for new asset paths

Jake Boxer · Jake Boxer · commit 5cff02fcec68 · 2013-11-03T16:29:17.000-08:00
* Generate jquery and bootstrap into vendor/assets
diff --git a/lib/hyperloop/generators/site.rb b/lib/hyperloop/generators/site.rb
@@ -21,6 +21,10 @@ def create_directories
         empty_directory(File.join(name, "app", "assets", "stylesheets"))
         empty_directory(File.join(name, "app", "views"))
         empty_directory(File.join(name, "app", "views", "layouts"))
+        empty_directory(File.join(name, "vendor"))
+        empty_directory(File.join(name, "vendor", "assets"))
+        empty_directory(File.join(name, "vendor", "assets", "javascripts"))
+        empty_directory(File.join(name, "vendor", "assets", "stylesheets"))
       end
 
       def copy_files
@@ -29,14 +33,14 @@ def copy_files
         copy_file("socool.jpg",          File.join(name, "app", "assets", "images", "socool.jpg"))
         template("app.js",               File.join(name, "app", "assets", "javascripts", "app.js"))
         template("current-time.coffee",  File.join(name, "app", "assets", "javascripts", "current-time.coffee"))
-        template("jquery.js",            File.join(name, "app", "assets", "javascripts", "jquery.js"))
         template("app.css",              File.join(name, "app", "assets", "stylesheets", "app.css"))
-        template("bootstrap.css",        File.join(name, "app", "assets", "stylesheets", "bootstrap.css"))
         template("main.scss",            File.join(name, "app", "assets", "stylesheets", "main.scss"))
         template("application.html.erb", File.join(name, "app", "views", "layouts", "application.html.erb"))
         template("index.html.erb",       File.join(name, "app", "views", "index.html.erb"))
         template("about.html.erb",       File.join(name, "app", "views", "about.html.erb"))
         template("_partial.html.erb",    File.join(name, "app", "views", "_partial.html.erb"))
+        template("jquery.js",            File.join(name, "vendor", "assets", "javascripts", "jquery.js"))
+        template("bootstrap.css",        File.join(name, "vendor", "assets", "stylesheets", "bootstrap.css"))
       end
     end
   end
diff --git a/lib/hyperloop/generators/site/app.css b/lib/hyperloop/generators/site/app.css
@@ -1,2 +1,2 @@
-//= require bootstrap
+//= require stylesheets/bootstrap
 //= require_tree
diff --git a/lib/hyperloop/generators/site/app.js b/lib/hyperloop/generators/site/app.js
@@ -1,2 +1,2 @@
-//= require jquery
+//= require javascripts/jquery
 //= require_tree
diff --git a/lib/hyperloop/generators/site/application.html.erb b/lib/hyperloop/generators/site/application.html.erb
@@ -3,7 +3,7 @@
   <head>
     <title><%= name.capitalize %></title>
 
-    <link href="/assets/app.css" media="all" rel="stylesheet" type="text/css">
+    <link href="/assets/stylesheets/app.css" media="all" rel="stylesheet" type="text/css">
   </head>
 
   <body>
@@ -18,6 +18,6 @@
 
     <%%= yield %>
 
-    <script src="/assets/app.js" type="text/javascript"></script>
+    <script src="/assets/javascripts/app.js" type="text/javascript"></script>
   </body>
 </html>
diff --git a/lib/hyperloop/generators/site/index.html.erb b/lib/hyperloop/generators/site/index.html.erb
@@ -1,4 +1,4 @@
-<img src="/assets/socool.jpg" alt="can't leave rap alone the game needs me">
+<img src="/assets/images/socool.jpg" alt="can't leave rap alone the game needs me">
 
 <h2>This is your root view!</h2>
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-//= require bootstrap`
	`1`	`+//= require stylesheets/bootstrap`
`2`	`2`	`//= require_tree`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-//= require jquery`
	`1`	`+//= require javascripts/jquery`
`2`	`2`	`//= require_tree`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<img src="/assets/socool.jpg" alt="can't leave rap alone the game needs me">`
	`1`	`+<img src="/assets/images/socool.jpg" alt="can't leave rap alone the game needs me">`
`2`	`2`
`3`	`3`	`<h2>This is your root view!</h2>`
`4`	`4`