Merge pull request #95 from mfung/master

Added code to remove tmp dir after test suite is completed, fixes bug #79

Author: indirect

lib/generators/haml/mailer/mailer_generator.rb

@@ -6,31 +6,38 @@ class MailerGenerator < ControllerGenerator
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_view_files
-        view_base_path = File.join("app/views", class_path, file_name)
-        empty_directory view_base_path
+        if ::Rails.version.to_s >= "4.2.0"
+          view_base_path = File.join("app/views", class_path, file_name)
+          empty_directory view_base_path
 
-        if self.behavior == :invoke
-          formats.each do |format|
-            layout_path = File.join("app/views/layouts", filename_with_extensions("mailer", format))
-            template filename_with_extensions(:layout, format), layout_path
+          if self.behavior == :invoke
+            formats.each do |format|
+              layout_path = File.join("app/views/layouts", filename_with_extensions("mailer", format))
+              template filename_with_extensions(:layout, format), layout_path
+            end
           end
-        end
 
-        actions.each do |action|
-          @action = action
+          actions.each do |action|
+            @action = action
 
-          formats.each do |format|
-            @path = File.join(view_base_path, filename_with_extensions(action, format))
-            template filename_with_extensions(:view, format), @path
+            formats.each do |format|
+              @path = File.join(view_base_path, filename_with_extensions(action, format))
+              template filename_with_extensions(:view, format), @path
+            end
           end
+        else
+          super
         end
       end
 
     protected
+      def format
+        :text
+      end
+
       def formats
         [:text, :html]
       end
-
     end
   end
 end

lib/haml-rails.rb

@@ -54,7 +54,7 @@ class Railtie < ::Rails::Railtie
 
       rake_tasks do
         load 'tasks/erb2haml.rake'
-      end  
+      end
     end
   end
 end

test/lib/generators/haml/mailer_generator_test.rb

@@ -12,32 +12,35 @@ class Haml::Generators::MailerGeneratorTest < Rails::Generators::TestCase
   test "should invoke template engine" do
     run_generator
 
-    assert_file "app/views/layouts/mailer.text.haml" do |view|
-      assert_match /\= yield/, view
-    end
+    if ::Rails.version.to_s >= '4.2'
+
+      assert_file "app/views/layouts/mailer.text.haml" do |view|
+        assert_match /\= yield/, view
+      end
+
+      assert_file "app/views/layouts/mailer.html.haml" do |view|
+        assert_match /\= yield/, view
+      end
 
-    assert_file "app/views/layouts/mailer.html.haml" do |view|
-      assert_match /\= yield/, view
+      assert_file "app/views/notifier/foo.html.haml" do |view|
+        assert_match %r(app/views/notifier/foo\.html\.haml), view
+        assert_match /\= @greeting/, view
+      end
+
+      assert_file "app/views/notifier/bar.html.haml" do |view|
+        assert_match %r(app/views/notifier/bar\.html\.haml), view
+        assert_match /\= @greeting/, view
+      end
     end
 
     assert_file "app/views/notifier/foo.text.haml" do |view|
       assert_match %r(app/views/notifier/foo\.text\.haml), view
       assert_match /\= @greeting/, view
     end
 
-    assert_file "app/views/notifier/foo.html.haml" do |view|
-      assert_match %r(app/views/notifier/foo\.html\.haml), view
-      assert_match /\= @greeting/, view
-    end
-
     assert_file "app/views/notifier/bar.text.haml" do |view|
       assert_match %r(app/views/notifier/bar\.text\.haml), view
       assert_match /\= @greeting/, view
     end
-
-    assert_file "app/views/notifier/bar.html.haml" do |view|
-      assert_match %r(app/views/notifier/bar\.html\.haml), view
-      assert_match /\= @greeting/, view
-    end
   end
 end

test/test_helper.rb

@@ -70,4 +70,10 @@ def require_generators(generator_list)
 end
 alias :require_generator :require_generators
 
-require_generators generator_list
+require_generators generator_list
+
+# Remove tmp directory when test suite is completed
+MiniTest::Unit.after_tests do
+  tmp_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp'))
+  FileUtils.rm_r(tmp_dir)
+end