Merge pull request notahat#83 from sobrinho/master

Object caching was removed, cleanup the generators.

lib/generators/machinist/install/install_generator.rb

@@ -15,24 +15,15 @@ def blueprints_file
       end
 
       def test_helper
-        if rspec?
-          inject_into_file("spec/spec_helper.rb", :after => "RSpec.configure do |config|\n") do
-            "  # Reset the Machinist cache before each spec.\n" +
-            "  config.before(:each) { Machinist.reset_before_test }\n\n"
-          end
-        else
+        if test_unit?
           inject_into_file("test/test_helper.rb", :after => "require 'rails/test_help'\n") do
             "require File.expand_path(File.dirname(__FILE__) + '/blueprints')\n"
           end
-          inject_into_class("test/test_helper.rb", ActiveSupport::TestCase) do
-            "  # Reset the Machinist cache before each test.\n" +
-            "  setup { Machinist.reset_before_test }\n\n"
-          end
         end
       end
-      
+
       def cucumber_support
-        if options[:cucumber]
+        if cucumber?
           template "machinist.rb.erb", "features/support/machinist.rb"
         end
       end
@@ -43,6 +34,13 @@ def rspec?
         options[:test_framework].to_sym == :rspec
       end
 
+      def test_unit?
+        options[:test_framework].to_sym == :test_unit
+      end
+
+      def cucumber?
+        options[:cucumber]
+      end
     end
   end
 end

lib/generators/machinist/install/templates/machinist.rb.erb

@@ -5,6 +5,3 @@ require "#{Rails.root}/spec/support/blueprints"
 # Load the blueprints from over in test.
 require "#{Rails.root}/test/blueprints"
 <%- end -%>
-
-# Reset the Machinist cache before each scenario.
-Before { Machinist.reset_before_test }