lib/generators/devise/views_generator.rb in devise-1.4.9 vs lib/generators/devise/views_generator.rb in devise-1.5.0.rc1

@@ -21,12 +21,12 @@
         view_directory :unlocks
       end
 
       protected
 
-      def view_directory(name)
-        directory name.to_s, "#{target_path}/#{name}"
+      def view_directory(name, _target_path = nil)
+        directory name.to_s, _target_path || "#{target_path}/#{name}"
       end
 
       def target_path
         @target_path ||= "app/views/#{scope || :devise}"
       end
@@ -37,11 +37,10 @@
       source_root File.expand_path("../../../../app/views/devise", __FILE__)
       desc "Copies shared Devise views to your application."
 
       # Override copy_views to just copy mailer and shared.
       def copy_views
-        view_directory :mailer
         view_directory :shared
       end
     end
 
     class FormForGenerator < Rails::Generators::Base #:nodoc:
@@ -54,19 +53,46 @@
       include ViewPathTemplates
       source_root File.expand_path("../../templates/simple_form_for", __FILE__)
       desc "Copies simple form enabled views to your application."
     end
 
+    class ErbGenerator < Rails::Generators::Base #:nodoc:
+      include ViewPathTemplates
+      source_root File.expand_path("../../../../app/views/devise", __FILE__)
+      desc "Copies Devise mail erb views to your application."
+
+      def copy_views
+        view_directory :mailer
+      end
+    end
+
+    class MarkerbGenerator < Rails::Generators::Base #:nodoc:
+      include ViewPathTemplates
+      source_root File.expand_path("../../templates", __FILE__)
+      desc "Copies Devise mail markerb views to your application."
+
+      def copy_views
+        view_directory :markerb, target_path
+      end
+
+      def target_path
+        "app/views/#{scope || :devise}/mailer"
+      end
+    end
+
     class ViewsGenerator < Rails::Generators::Base
       desc "Copies Devise views to your application."
 
       argument :scope, :required => false, :default => nil,
                        :desc => "The scope to copy views to"
 
       invoke SharedViewsGenerator
-
       hook_for :form_builder, :aliases => "-b",
                               :desc => "Form builder to be used",
                               :default => defined?(SimpleForm) ? "simple_form_for" : "form_for"
+
+      hook_for :markerb,  :desc => "Generate markerb instead of erb mail views",
+                          :default => defined?(Markerb) ? :markerb : :erb,
+                          :type => :boolean
     end
   end
 end