Templater 0.2 fixes

wycats · Sep 8, 2008 · 745386a · 745386a
1 parent 6d1284d
commit 745386a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/merb-gen/lib/generators/scripts.rb b/merb-gen/lib/generators/scripts.rb
@@ -11,15 +11,15 @@ def self.source_root
     DESC
 
     # Install a script/merb script for local execution (for frozen apps).
-    file :script_merb do
+    file :script_merb do |f|
-      source(bin_merb_location)
+      f.source = bin_merb_location
-      destination('script/merb')
+      f.destination = 'script/merb'
     end
 
     # Install a script/merb-gen script for local execution (for frozen apps).
-    file :script_merb_gen do
+    file :script_merb_gen do |f|
-      source(bin_merb_gen_location)
+      f.source = bin_merb_gen_location
-      destination('script/merb-gen')
+      f.destination = 'script/merb-gen'
     end
 
     protected
@@ -48,4 +48,4 @@ def bin_merb_gen_location
 
   puts ScriptsGenerator
 
-end
+end
diff --git a/merb-haml/lib/generators/controller.rb b/merb-haml/lib/generators/controller.rb
@@ -1,4 +1,4 @@
-Merb::Generators::ControllerGenerator.template :index_haml, :template_engine => :haml do
+Merb::Generators::ControllerGenerator.template :index_haml, :template_engine => :haml do |t|
-  source(File.dirname(__FILE__), 'templates/controller/app/views/%file_name%/index.html.haml')
+  t.source = File.join(File.dirname(__FILE__), 'templates/controller/app/views/%file_name%/index.html.haml')
-  destination("app/views", base_path, "#{file_name}/index.html.haml")
+  t.destination = File.join("app/views", base_path, "#{file_name}/index.html.haml")
 end
diff --git a/merb-haml/lib/generators/layout.rb b/merb-haml/lib/generators/layout.rb
@@ -1,4 +1,4 @@
-Merb::Generators::LayoutGenerator.template :layout_haml, :template_engine => :haml do
+Merb::Generators::LayoutGenerator.template :layout_haml, :template_engine => :haml do |t|
-  source(File.dirname(__FILE__), 'templates/layout/app/views/layout/%file_name%.html.haml')
+  t.source = File.join(File.dirname(__FILE__), 'templates/layout/app/views/layout/%file_name%.html.haml')
-  destination("app/views/layout/#{file_name}.html.haml")
+  t.destination = "app/views/layout/#{file_name}.html.haml"
-end
+end
diff --git a/merb-haml/lib/generators/resource_controller.rb b/merb-haml/lib/generators/resource_controller.rb
@@ -2,11 +2,11 @@
 
   [:show, :index, :edit, :new].each do |view|
 
-    Merb::Generators::ResourceControllerGenerator.template "view_#{view}_haml", :orm => orm, :template_engine => :haml do
+    Merb::Generators::ResourceControllerGenerator.template "view_#{view}_haml", :orm => orm, :template_engine => :haml do |t|
-      source(File.dirname(__FILE__), "templates/resource_controller/#{orm}/app/views/%file_name%/#{view}.html.haml")
+      t.source = File.join(File.dirname(__FILE__), "templates/resource_controller/#{orm}/app/views/%file_name%/#{view}.html.haml")
-      destination("app/views", base_path, "#{file_name}/#{view}.html.haml")
+      t.destination = File.join("app/views", base_path, "#{file_name}/#{view}.html.haml")
     end
 
   end
 
-end
+end
diff --git a/merb-slices/lib/generators/base.rb b/merb-slices/lib/generators/base.rb
@@ -21,14 +21,14 @@ class BaseSliceGenerator < NamedGenerator
 
     def self.common_template(name, template_source)
       common_base_dir = File.expand_path(File.dirname(__FILE__))
-      template name do 
+      template name do |t|
-        source common_base_dir, 'templates', 'common', template_source
+        t.source = File.join(common_base_dir, 'templates', 'common', template_source)
-        destination template_source
+        t.destination = template_source
       end
     end
 
   end
 
   add :slice, SliceGenerator
 
-end
+end