spork 0.5.3 → 0.5.4

data/assets/bootstrap.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'spork'
 
 Spork.prefork do
-  # Loading more in this block will cause your specs to run faster. However, 
+  # Loading more in this block will cause your tests to run faster. However, 
   # if you change any configuration or code from libraries loaded here, you'll
   # need to restart spork for it take effect.
   

data/features/cucumber_rails_integration.feature

@@ -12,6 +12,10 @@ Feature: Cucumber integration with rails
       require 'spork'
 
       Spork.prefork do
+        # Loading more in this block will cause your tests to run faster. However, 
+        # if you change any configuration or code from libraries loaded here, you'll
+        # need to restart spork for it take effect.
+        
         # Sets up the Rails environment for Cucumber
         ENV['RAILS_ENV'] = "cucumber"
         require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
@@ -23,18 +27,14 @@ Feature: Cucumber integration with rails
         end
 
         require 'webrat/core/matchers'
-        require 'cucumber' # I needed to add this... We could move this require to Spork if we think it is better there...
+        require 'cucumber'
         require 'cucumber/formatter/unicode' # Comment out this line if you don't want Cucumber Unicode support
-        require 'spec/rails' # I needed to add this as well to avoid the #records error...
+        require 'spec/rails'
         require 'cucumber/rails/rspec'
-        class ActiveRecord::Base
-          class << self
-            def establish_connection
-              ($loaded_stuff ||= []) << 'establish_connection'
-            end
-          end
-        end
-        ($loaded_stuff ||= []) << 'prefork block'
+        
+        # ---- this is for this test only ----
+        $loaded_stuff << 'prefork block'
+        # ---- end test stuff ----
       end
 
       Spork.each_run do
@@ -43,7 +43,10 @@ Feature: Cucumber integration with rails
         Cucumber::Rails.use_transactional_fixtures
         Cucumber::Rails.bypass_rescue # Comment out this line if you want Rails own error handling
                                       # (e.g. rescue_action_in_public / rescue_responses / rescue_from)
-        ($loaded_stuff ||= []) << 'each_run block'
+        
+        # ---- this is for this test only ----
+        $loaded_stuff << 'each_run block'
+        # ---- end test stuff ----
       end
       """
     And a file named "features/cucumber_rails.feature" with:
@@ -54,14 +57,25 @@ Feature: Cucumber integration with rails
       """
     And a file named "features/support/cucumber_rails_helper.rb" with:
       """
-      ($loaded_stuff ||= []) << 'features/support/cucumber_rails_helper.rb'
+      $loaded_stuff << 'features/support/cucumber_rails_helper.rb'
+      """
+    And a file named "config/environments/cucumber.rb" with:
+      """
+      # your cucumber env here
+      """
+    And a file named "config/database.yml" with:
+      """
+      cucumber:
+        adapter: sqlite3
+        database: db/cucumber.sqlite3
+        timeout: 5000
       """
     And a file named "features/step_definitions/cucumber_rails_steps.rb" with:
       """
       Then "it should work" do
         Spork.state.should == :using_spork
         RAILS_ENV.should == 'cucumber'
-        $loaded_stuff.should include('establish_connection')
+        $loaded_stuff.should include('ActiveRecord::Base.establish_connection')
         $loaded_stuff.should include('User')
         $loaded_stuff.should include('UserObserver')
         $loaded_stuff.should include('ApplicationHelper')
@@ -72,17 +86,6 @@ Feature: Cucumber integration with rails
         puts "It worked!"
       end
       """
-    And a file named "config/environments/cucumber.rb" with:
-      """
-      $cucumber_used = true
-      """
-    And a file named "config/database.yml" with:
-      """
-      cucumber:
-        adapter: sqlite3
-        database: db/cucumber.sqlite3
-        timeout: 5000
-      """
     Scenario: Analyzing files were preloaded
       When I run spork --diagnose
       Then the output should not contain "user_observer.rb"

data/features/rails_delayed_loading_workarounds.feature

@@ -0,0 +1,71 @@
+Feature: Rails Delayed Work arounds
+  To allow a rails developer to update as many parts of his application as possible without needing to restart Spork
+  Spork automatically tells rails to delay loading certain parts of the application until after the fork occurs
+  Providing work arounds
+
+  Background: Rails App with RSpec and Spork
+
+    Given I am in a fresh rails project named "test_rails_project"
+    And a file named "spec/spec_helper.rb" with:
+      """
+      require 'rubygems'
+      require 'spork'
+
+      Spork.prefork do
+        require File.dirname(__FILE__) + '/../config/environment.rb'
+        require 'spec'
+        require 'spec/rails'
+      end
+
+      Spork.each_run do
+      end
+      """
+    And the application has a model, observer, route, and application helper
+  Scenario: within a view, calling helper methods from an included module in ApplicationHelper
+    Given a file named "app/helpers/application_helper.rb" with:
+      """
+      module ApplicationHelper
+        include Reverseatron
+      end
+      """
+    Given a file named "lib/reverseatron.rb" with:
+      """
+      module Reverseatron
+        def reverse_text(txt)
+          txt.reverse
+        end
+      end
+      """
+    Given a file named "app/controllers/users_controller.rb" with:
+      """
+      class UsersController < ApplicationController
+        $loaded_stuff << 'UsersController'
+        def index
+          @users = []
+        end
+      end
+      """
+    Given a file named "app/controllers/users_helper.rb" with:
+      """
+      module UsersHelper
+      end
+      """
+    Given a file named "app/views/users/index.html.erb" with:
+      """
+      <%= reverse_text('listing users'.reverse) %>
+      """
+    Given a file named "spec/controllers/users_controller_spec.rb" with:
+      """
+      describe UsersController do
+        integrate_views
+        it "renders a page, using a method inherited from ApplicationController" do
+          get :index
+          response.body.should include('listing users')
+          puts "Controller stack is functioning"
+        end
+      end
+      """
+    When I fire up a spork instance with "spork rspec"
+    And I run spec --drb spec/controllers/users_controller_spec.rb
+    Then the output should contain "Controller stack is functioning"
+  

data/features/rspec_rails_integration.feature

@@ -0,0 +1,64 @@
+Feature: Rails Integration
+  To get a developer up and running quickly
+  Spork automatically integrates with rails
+  Providing default hooks and behaviors
+
+  Background: Rails App with RSpec and Spork
+
+    Given I am in a fresh rails project named "test_rails_project"
+    And a file named "spec/spec_helper.rb" with:
+      """
+      require 'rubygems'
+      require 'spork'
+
+      Spork.prefork do
+        # Loading more in this block will cause your specs to run faster. However, 
+        # if you change any configuration or code from libraries loaded here, you'll
+        # need to restart spork for it take effect.
+        require File.dirname(__FILE__) + '/../config/environment.rb'
+        require 'spec'
+        require 'spec/rails'
+        
+        # ---- this is for this test only ----
+        $loaded_stuff << 'prefork block'
+        # ---- end test stuff ----
+      end
+
+      Spork.each_run do
+        # This code will be run each time you run your specs.
+        
+        # ---- this is for this test only ----
+        $loaded_stuff << 'each_run block'
+        # ---- end test stuff ----
+      end
+      """
+    And the application has a model, observer, route, and application helper
+  Scenario: Analyzing files were preloaded
+    When I run spork --diagnose
+    Then the output should not contain "user_observer.rb"
+    Then the output should not contain "user.rb"
+    Then the output should not contain "app/controllers/application.rb"
+    Then the output should not contain "app/controllers/application_controller.rb"
+    Then the output should not contain "app/controllers/application_helper.rb"
+    Then the output should not contain "config/routes.rb"
+  
+  Scenario: Running spork with a rails app and observers
+    Given a file named "spec/did_it_work_spec.rb" with:
+    """
+    describe "Did it work?" do
+      it "checks to see if all worked" do
+        Spork.state.should == :using_spork
+        $loaded_stuff.should include('ActiveRecord::Base.establish_connection')
+        $loaded_stuff.should include('User')
+        $loaded_stuff.should include('UserObserver')
+        $loaded_stuff.should include('ApplicationHelper')
+        $loaded_stuff.should include('config/routes.rb')
+        $loaded_stuff.should include('each_run block')
+        $loaded_stuff.should include('prefork block')
+        puts "Specs successfully run within spork, and all initialization files were loaded"
+      end
+    end
+    """
+    When I fire up a spork instance with "spork rspec"
+    And I run spec --drb spec/did_it_work_spec.rb 
+    Then the output should contain "Specs successfully run within spork, and all initialization files were loaded"

data/features/steps/rails_steps.rb

@@ -11,20 +11,19 @@ Given "the application has a model, observer, route, and application helper" do
   Given 'a file named "app/models/user.rb" with:',
     """
     class User < ActiveRecord::Base
-      ($loaded_stuff ||= []) << 'User'
+      $loaded_stuff << 'User'
     end
     """
-
-  Given 'a file named "app/helpers/application_helper.rb" with:',
+  Given 'a file named "app/models/user_observer.rb" with:',
     """
-    module ApplicationHelper
-      ($loaded_stuff ||= []) << 'ApplicationHelper'
+    class UserObserver < ActiveRecord::Observer
+      $loaded_stuff << 'UserObserver'
     end
     """
-  Given 'a file named "app/models/user_observer.rb" with:',
+  Given 'a file named "app/helpers/application_helper.rb" with:',
     """
-    class UserObserver < ActiveRecord::Observer
-      ($loaded_stuff ||= []) << 'UserObserver'
+    module ApplicationHelper
+      $loaded_stuff << 'ApplicationHelper'
     end
     """
   Given 'the following code appears in "config/environment.rb" after /Rails::Initializer.run/:',
@@ -33,6 +32,22 @@ Given "the application has a model, observer, route, and application helper" do
     """
   Given 'the following code appears in "config/routes.rb" after /^end/:',
     """
-      ($loaded_stuff ||= []) << 'config/routes.rb'
+      $loaded_stuff << 'config/routes.rb'
+    """
+  Given 'a file named "config/initializers/initialize_loaded_stuff.rb" with:',
+    """
+    $loaded_stuff ||= []
+    """
+  Given 'a file named "config/initializers/log_establish_connection_calls.rb" with:',
+    """
+    class ActiveRecord::Base
+      class << self
+        def establish_connection_with_load_logging(*args)
+          establish_connection_without_load_logging(*args)
+          $loaded_stuff << 'ActiveRecord::Base.establish_connection'
+        end
+        alias_method_chain :establish_connection, :load_logging
+      end
+    end
     """
 end

data/lib/spork/app_framework/rails.rb

@@ -56,6 +56,8 @@ class Spork::AppFramework::Rails < Spork::AppFramework
         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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spork
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - Tim Harper
@@ -29,7 +29,8 @@ files:
 - assets/bootstrap.rb
 - features/cucumber_rails_integration.feature
 - features/diagnostic_mode.feature
-- features/rails_integration.feature
+- features/rails_delayed_loading_workarounds.feature
+- features/rspec_rails_integration.feature
 - features/steps/rails_steps.rb
 - features/steps/sandbox_steps.rb
 - features/support/env.rb

data/features/rails_integration.feature

@@ -1,78 +0,0 @@
-Feature: Rails Integration
-  To get a developer up and running quickly
-  Spork automatically integrates with rails
-  Providing default hooks and behaviors
-
-  Background: Rails App with RSpec and Spork
-
-    Given I am in a fresh rails project named "test_rails_project"
-    And a file named "spec/spec_helper.rb" with:
-      """
-      require 'rubygems'
-      require 'spork'
-      require 'spec'
-
-      Spork.prefork do
-        ENV["RAILS_ENV"] = "testeroni"
-        $run_phase = :prefork
-        ($loaded_stuff ||= []) << 'prefork block'
-        require File.dirname(__FILE__) + '/../config/environment.rb'
-      end
-
-      Spork.each_run do
-        $run_phase = :each_run
-        ($loaded_stuff ||= []) << 'each_run block'
-        puts "I'm loading the stuff just for this run..."
-      end
-      
-      class ActiveRecord::Base
-        class << self
-          def establish_connection
-            ($loaded_stuff ||= []) << 'establish_connection'
-          end
-        end
-      end
-      """
-    And the application has a model, observer, route, and application helper
-    And a file named "config/environments/testeroni.rb" with:
-      """
-      $testeroni_used = true
-      """
-    And a file named "config/database.yml" with:
-      """
-      testeroni:
-        adapter: sqlite3
-        database: db/testeroni.sqlite3
-        timeout: 5000
-      """
-    And a file named "spec/did_it_work_spec.rb" with:
-      """
-      describe "Did it work?" do
-        it "checks to see if all worked" do
-          Spork.state.should == :using_spork
-          RAILS_ENV.should == 'testeroni'
-          $loaded_stuff.should include('establish_connection')
-          $loaded_stuff.should include('User')
-          $loaded_stuff.should include('UserObserver')
-          $loaded_stuff.should include('ApplicationHelper')
-          $loaded_stuff.should include('config/routes.rb')
-          $loaded_stuff.should include('each_run block')
-          $loaded_stuff.should include('prefork block')
-          puts "Specs successfully run within spork, and all initialization files were loaded"
-        end
-      end
-      """
-  Scenario: Analyzing files were preloaded
-    When I run spork --diagnose
-    Then the output should not contain "user_observer.rb"
-    Then the output should not contain "user.rb"
-    Then the output should not contain "app/controllers/application.rb"
-    Then the output should not contain "app/controllers/application_controller.rb"
-    Then the output should not contain "app/controllers/application_helper.rb"
-    Then the output should not contain "config/routes.rb"
-  
-  Scenario: Running spork with a rails app and observers
-  
-    When I fire up a spork instance with "spork rspec"
-    And I run spec --drb spec/did_it_work_spec.rb 
-    Then the output should contain "Specs successfully run within spork, and all initialization files were loaded"