lib/spork/app_framework/rails.rb in timcharper-spork-0.5.0 vs lib/spork/app_framework/rails.rb in timcharper-spork-0.5.5

@@ -1,85 +1,100 @@
 class Spork::AppFramework::Rails < Spork::AppFramework
   
   # TODO - subclass this out to handle different versions of rails
-  class NinjaPatcher
-    def self.run
-      install_hook
-    end
-    
-    def self.install_hook
-      ::Rails::Initializer.class_eval do
-        alias :require_frameworks_without_spork :require_frameworks unless method_defined?(:require_frameworks_without_spork)
-        def require_frameworks
-          result = require_frameworks_without_spork
-          Spork::AppFramework[:Rails].ninja_patcher.install_specific_hooks
-          result
+  module NinjaPatcher
+    def self.included(klass)
+      klass.class_eval do
+        unless method_defined?(:load_environment_without_spork)
+          alias :load_environment_without_spork :load_environment
+          alias :load_environment :load_environment_with_spork
         end
       end
     end
     
-    def self.install_specific_hooks
+    def load_environment_with_spork
+      reset_rails_env
+      result = load_environment_without_spork
+      install_hooks
+      result
+    end
+    
+    def install_hooks
       auto_reestablish_db_connection
       delay_observer_loading
       delay_app_preload
       delay_application_controller_loading
+      delay_route_loading
     end
     
-    def self.delay_observer_loading
-      if Object.const_defined?(:ActiveRecord)
-        Spork.trap_method(::ActiveRecord::Observing::ClassMethods, :instantiate_observers)
+    def reset_rails_env
+      return unless ENV['RAILS_ENV']
+      Object.send(:remove_const, :RAILS_ENV)
+      Object.const_set(:RAILS_ENV, ENV['RAILS_ENV'].dup)
+    end
+    
+    def delay_observer_loading
+      if ::Rails::Initializer.instance_methods.include?('load_observers')
+        Spork.trap_method(::Rails::Initializer, :load_observers)
       end
       if Object.const_defined?(:ActionController)
         require "action_controller/dispatcher.rb"
-        Spork.trap_class_method(::ActionController::Dispatcher, :define_dispatcher_callbacks)
+        Spork.trap_class_method(::ActionController::Dispatcher, :define_dispatcher_callbacks) if ActionController::Dispatcher.respond_to?(:define_dispatcher_callbacks)
       end
     end
     
-    def self.delay_app_preload
+    def delay_app_preload
       if ::Rails::Initializer.instance_methods.include?('load_application_classes')
         Spork.trap_method(::Rails::Initializer, :load_application_classes)
       end
     end
     
-    def self.delay_application_controller_loading
+    def delay_application_controller_loading
       if application_controller_source = ["#{Dir.pwd}/app/controllers/application.rb", "#{Dir.pwd}/app/controllers/application_controller.rb"].find { |f| File.exist?(f) }
         application_helper_source = "#{Dir.pwd}/app/helpers/application_helper.rb"
-        load_paths = (Object.const_defined?(:Dependencies) ? ::Dependencies : ::ActiveSupport::Dependencies).load_paths
+        load_paths = (::ActiveSupport.const_defined?(:Dependencies) ? ::ActiveSupport::Dependencies : ::Dependencies).load_paths
         load_paths.unshift(File.expand_path('rails_stub_files', File.dirname(__FILE__)))
         Spork.each_run do
           require application_controller_source
           require application_helper_source if File.exist?(application_helper_source)
+          # update the rails magic to refresh the module
+          ApplicationController.send(:helper, ApplicationHelper)
         end
       end
     end
     
-    def self.auto_reestablish_db_connection
+    def auto_reestablish_db_connection
       if Object.const_defined?(:ActiveRecord)
         Spork.each_run do
+          # rails lib/test_help.rb is very aggressive about overriding RAILS_ENV and will switch it back to test after the cucumber env was loaded
+          reset_rails_env
           ActiveRecord::Base.establish_connection
         end
       end
     end
+    
+    def delay_route_loading
+      if ::Rails::Initializer.instance_methods.include?('initialize_routing')
+        Spork.trap_method(::Rails::Initializer, :initialize_routing)
+      end
+    end
   end
   
-  def bootstrap_required?
-    false
-  end
-  
   def preload(&block)
     STDERR.puts "Preloading Rails environment"
     STDERR.flush
     ENV["RAILS_ENV"] ||= 'test'
     preload_rails
-    require environment_file
     yield
   end
   
-  def environment_file
-    @environment_file ||= File.expand_path("config/environment.rb", Dir.pwd)
+  def entry_point
+    @entry_point ||= File.expand_path("config/environment.rb", Dir.pwd)
   end
   
+  alias :environment_file :entry_point
+  
   def boot_file
     @boot_file ||= File.join(File.dirname(environment_file), 'boot')
   end
   
   def environment_contents
@@ -98,16 +113,12 @@
         nil
       end
     )
   end
   
-  def ninja_patcher
-    ::Spork::AppFramework::Rails::NinjaPatcher
-  end
-  
   def preload_rails
     Object.const_set(:RAILS_GEM_VERSION, version) if version
     require boot_file
-    ninja_patcher.run
+    ::Rails::Initializer.send(:include, Spork::AppFramework::Rails::NinjaPatcher)
   end
   
 end
\ No newline at end of file