lib/generators/haml/scaffold/scaffold_generator.rb in haml-rails-0.2 vs lib/generators/haml/scaffold/scaffold_generator.rb in haml-rails-0.3

@@ -1,43 +1,36 @@
-require 'generators/haml'
 require 'rails/generators/erb/scaffold/scaffold_generator'
 
 module Haml
   module Generators
     class ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
-      extend TemplatePath
+      source_root File.expand_path("../templates", __FILE__)
 
       def copy_view_files
-        views = available_views
-        views.delete("index") if options[:singleton]
-
-        views.each do |view|
+        available_views.each do |view|
           filename = filename_with_extensions(view)
-          template template_filename_with_extensions(view), File.join("app/views", controller_file_path, filename)
+          template "#{view}.html.haml", File.join("app/views", controller_file_path, filename)
         end
       end
 
       hook_for :form_builder, :as => :scaffold
 
       def copy_form_file
         if options[:form_builder].nil?
           filename = filename_with_extensions("_form")
-          template template_filename_with_extensions("_form"), File.join("app/views", controller_file_path, filename)
+          template "_form.html.haml", File.join("app/views", controller_file_path, filename)
         end
       end
 
-      protected
+    protected
 
-        def available_views
-          %w(index edit show new)
-        end
+      def available_views
+        %w(index edit show new)
+      end
 
-        def handler
-          :haml
-        end
+      def handler
+        :haml
+      end
 
-        def template_filename_with_extensions(name)
-          [name, format, handler, :erb].compact.join(".")
-        end
     end
   end
 end