rspec-steps 0.0.3 → 0.0.4

data/lib/rspec-steps.rb

@@ -1,3 +1,2 @@
 require 'rspec-steps/duckpunch/object-extensions'
 require 'rspec-steps/duckpunch/example-group'
-

data/lib/rspec-steps/duckpunch/example-group.rb

@@ -1,12 +1,20 @@
+require 'rspec/core/example_group'
 require 'rspec-steps/stepwise'
 
-module RSpec::Core
-  class ExampleGroup
-    def self.steps(*args, &example_group_block)
-      describe(*args) do
-        extend RSpecStepwise
-        module_eval &example_group_block
-      end
+module RSpec::Steps
+  module ClassMethods
+    def steps(*args, &block)
+      options = if args.last.is_a?(Hash) then args.pop else {} end
+      options[:stepwise] = true
+      options[:caller] ||= caller
+      args.push(options)
+
+      describe(*args, &block)
     end
   end
 end
+
+RSpec::Core::ExampleGroup.extend RSpec::Steps::ClassMethods
+include RSpec::Steps::ClassMethods
+
+RSpec::configuration.include(RSpecStepwise, :stepwise => true)

data/lib/rspec-steps/duckpunch/object-extensions.rb

@@ -1,14 +1,9 @@
+require 'rspec-steps/duckpunch/example-group'
 require 'rspec-steps/stepwise'
+require 'rspec/core/shared_example_group'
 
-module RSpec::Steps
-  module ObjectExtensions
-    def steps(*args, &example_group_block)
-      RSpec::Core::ExampleGroup.steps(*args, &example_group_block).register
-    end
-
-    alias :shared_steps :shared_context
-    alias :steps_shared_as :share_as
-  end
+module RSpec::Core::SharedExampleGroup
+  alias :shared_steps :share_examples_for
+  alias :steps_shared_as :share_as
 end
-
-include RSpec::Steps::ObjectExtensions
+extend RSpec::Steps::ClassMethods

data/lib/rspec-steps/stepwise.rb

@@ -1,112 +1,136 @@
 module RSpecStepwise
-  #TODO: This is hacky and needs a more general solution
-  #Something like cloning the current conf and having RSpec::Stepwise::config ?
-  def suspend_transactional_fixtures
-    if self.respond_to? :use_transactional_fixtures
-      old_val = self.use_transactional_fixtures
-      self.use_transactional_fixtures = false
-
-      yield
-
-      self.use_transactional_fixtures = old_val
-    else
-      yield
+  module ClassMethods
+    #TODO: This is hacky and needs a more general solution
+    #Something like cloning the current conf and having RSpec::Stepwise::config ?
+    def suspend_transactional_fixtures
+      if self.respond_to? :use_transactional_fixtures
+        old_val = self.use_transactional_fixtures
+        self.use_transactional_fixtures = false
+
+        yield
+
+        self.use_transactional_fixtures = old_val
+      else
+        yield
+      end
     end
-  end
 
-  def before(*args, &block)
-    if args.first == :each
-      puts "before blocks declared for steps are always treated as :all scope"
+    def before(*args, &block)
+      if args.first == :each
+        puts "before blocks declared for steps are always treated as :all scope"
+      end
+      super
     end
-    super
-  end
 
-  def after(*args, &block)
-    if args.first == :each
-      puts "after blocks declared for steps are always treated as :all scope"
+    def after(*args, &block)
+      if args.first == :each
+        puts "after blocks declared for steps are always treated as :all scope"
+      end
+      super
     end
-    super
-  end
 
-  def around(*args, &block)
-    if args.first == :each
-      puts "around :each blocks declared for steps are treated as :all scope"
+    def around(*args, &block)
+      if args.first == :each
+        puts "around :each blocks declared for steps are treated as :all scope"
+      end
+      super
     end
-    super
-  end
 
-  def eval_before_alls(example_group_instance)
-    super
-    example_group_instance.example = whole_list_example
-    world.run_hook_filtered(:before, :each, self, example_group_instance, example)
-    ancestors.reverse.each { |ancestor| ancestor.run_hook(:before, :each, example_group_instance) }
-  end
+    def eval_before_alls(example_group_instance)
+      super
+      example_group_instance.example = whole_list_example
+      world.run_hook_filtered(:before, :each, self, example_group_instance, whole_list_example)
+      ancestors.reverse.each { |ancestor| ancestor.run_hook(:before, :each, example_group_instance) }
+    end
 
-  def eval_around_eachs(example)
-  end
+    def eval_around_eachs(example)
+    end
 
-  def eval_before_eachs(example)
-  end
+    def eval_before_eachs(example)
+    end
 
-  def eval_after_eachs(example)
-  end
+    def eval_after_eachs(example)
+    end
 
-  def eval_after_alls(example_group_instance)
-    example_group_instance.example = whole_list_example
-    ancestors.each { |ancestor| ancestor.run_hook(:after, :each, example_group_instance) }
-    world.run_hook_filtered(:after, :each, self, example_group_instance, example)
-    super
-  end
+    def eval_after_alls(example_group_instance)
+      example_group_instance.example = whole_list_example
+      ancestors.each { |ancestor| ancestor.run_hook(:after, :each, example_group_instance) }
+      world.run_hook_filtered(:after, :each, self, example_group_instance, whole_list_example)
+      super
+    end
 
-  def whole_list_example
-    RSpec::Core::Example.new(self, "step list", {})
-  end
+    def whole_list_example
+      @whole_list_example ||= begin
+                                RSpec::Core::Example.new(self, "step list", {})
+                              end
+    end
 
-  def with_around_hooks(instance, &block)
-    hooks = around_hooks_for(self)
-    if hooks.empty?
-      yield
-    else
-      hooks.reverse.inject(Example.procsy(metadata)) do |procsy, around_hook|
-        Example.procsy(procsy.metadata) do
-          instance.instance_eval_with_args(procsy, &around_hook)
-        end
-      end.call
+    def with_around_hooks(instance, &block)
+      hooks = around_hooks_for(self)
+      if hooks.empty?
+        yield
+      else
+        hooks.reverse.inject(Example.procsy(metadata)) do |procsy, around_hook|
+          Example.procsy(procsy.metadata) do
+            instance.instance_eval_with_args(procsy, &around_hook)
+          end
+        end.call
+      end
     end
-  end
 
-  def perform_steps(name, *args, &customization_block)
-    shared_block = world.shared_example_groups[name]
-    raise "Could not find shared example group named \#{name.inspect}" unless shared_block
+    def perform_steps(name, *args, &customization_block)
+      shared_block = world.shared_example_groups[name]
+      raise "Could not find shared example group named \#{name.inspect}" unless shared_block
 
-    module_eval_with_args(*args, &shared_block)
-    module_eval(&customization_block) if customization_block
-  end
+      module_eval_with_args(*args, &shared_block)
+      module_eval(&customization_block) if customization_block
+    end
 
-  def run_examples(reporter)
-    instance = new
-    set_ivars(instance, before_all_ivars)
-
-    instance.example = whole_list_example
-
-    suspend_transactional_fixtures do
-      with_around_hooks(instance) do
-        filtered_examples.inject(true) do |success, example|
-          break if RSpec.wants_to_quit
-          unless success
-            reporter.example_started(example)
-            example.metadata[:pending] = true
-            example.metadata[:execution_result][:pending_message] = "Previous step failed"
-            example.metadata[:execution_result][:started_at] = Time.now
-            example.instance_eval{ record_finished :pending, :pending_message => "Previous step failed" }
-            reporter.example_pending(example)
-            next
+    def run_examples(reporter)
+      instance = new
+
+      set_ivars(instance, before_all_ivars)
+
+      instance.example = whole_list_example
+
+      suspend_transactional_fixtures do
+        with_around_hooks(instance) do
+          filtered_examples.inject(true) do |success, example|
+            break if RSpec.wants_to_quit
+            unless success
+              reporter.example_started(example)
+              example.metadata[:pending] = true
+              example.metadata[:execution_result][:pending_message] = "Previous step failed"
+              example.metadata[:execution_result][:started_at] = Time.now
+              example.instance_eval{ record_finished :pending, :pending_message => "Previous step failed" }
+              reporter.example_pending(example)
+              next
+            end
+            succeeded = instance.with_indelible_ivars do
+              example.run(instance, reporter)
+            end
+            RSpec.wants_to_quit = true if fail_fast? && !succeeded
+            success && succeeded
           end
-          succeeded = example.run(instance, reporter)
-          RSpec.wants_to_quit = true if fail_fast? && !succeeded
-          success && succeeded
         end
       end
     end
   end
+
+  def with_indelible_ivars
+    old_value, @ivars_indelible = @ivars_indelible, true
+    result = yield
+    @ivars_indelible = old_value
+    result
+  end
+
+  def instance_variable_set(name, value)
+    if !@ivars_indelible
+      super
+    end
+  end
+
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
 end

data/spec/example_group.rb

@@ -9,7 +9,7 @@ describe RSpec::Core::ExampleGroup, "defined as stepwise" do
         group = steps "Test Steps" do
         end
       end
-      (class << group; self; end).included_modules.should include(RSpecStepwise)
+      (class << group; self; end).included_modules.should include(RSpecStepwise::ClassMethods)
     end
   end
 
@@ -18,8 +18,8 @@ describe RSpec::Core::ExampleGroup, "defined as stepwise" do
       group = nil
       sandboxed do
         group = steps "Test Steps" do
-          it { @a = 1 }
-          it { @a.should == 1}
+          it("sets @a"){ @a = 1 }
+          it("reads @a"){ @a.should == 1}
         end
         group.run
       end
@@ -42,7 +42,7 @@ describe RSpec::Core::ExampleGroup, "defined as stepwise" do
       group.examples[1].metadata[:pending].should be_true
     end
 
-    it "should allow nested steps" do
+    it "should allow nested steps", :pending => "Not really" do
       group = nil
       sandboxed do
         group = steps "Test Steps" do
@@ -59,7 +59,7 @@ describe RSpec::Core::ExampleGroup, "defined as stepwise" do
       end
       group.children[0].should have(2).examples
     end
-    
+
     it "should not allow nested normal contexts" do
       pending "A correct approach - in the meantime, this behavior is undefined"
       expect {

data/spec_help/rspec-sandbox.rb

@@ -1,3 +1,5 @@
+require 'rspec/core'
+
 class NullObject
   private
   def method_missing(method, *args, &block)
@@ -6,39 +8,39 @@ class NullObject
 end
 
 def sandboxed(&block)
-  begin
-    @orig_config = RSpec.configuration
-    @orig_world  = RSpec.world
-    new_config = RSpec::Core::Configuration.new
-    new_world  = RSpec::Core::World.new(new_config)
-    RSpec.instance_variable_set(:@configuration, new_config)
-    RSpec.instance_variable_set(:@world, new_world)
-    object = Object.new
-    object.extend(RSpec::Core::ObjectExtensions)
-    object.extend(RSpec::Core::SharedExampleGroup)
+  @orig_config = RSpec.configuration
+  @orig_world  = RSpec.world
+  new_config = RSpec::Core::Configuration.new
+  new_world  = RSpec::Core::World.new(new_config)
+  RSpec.instance_variable_set(:@configuration, new_config)
+  RSpec.instance_variable_set(:@world, new_world)
 
-    (class << RSpec::Core::ExampleGroup; self; end).class_eval do
-      alias_method :orig_run, :run
-      def run(reporter=nil)
-        @orig_mock_space = RSpec::Mocks::space
-        RSpec::Mocks::space = RSpec::Mocks::Space.new
-        orig_run(reporter || NullObject.new)
-      ensure
-        RSpec::Mocks::space = @orig_mock_space
-      end
-    end
+  load 'rspec-steps/duckpunch/example-group.rb'
 
-    object.instance_eval(&block)
-  ensure
-    (class << RSpec::Core::ExampleGroup; self; end).class_eval do
-      remove_method :run
-      alias_method :run, :orig_run
-      remove_method :orig_run
+  object = Object.new
+  object.extend(RSpec::Core::SharedExampleGroup)
+
+  (class << RSpec::Core::ExampleGroup; self; end).class_eval do
+    alias_method :orig_run, :run
+    def run(reporter=nil)
+      @orig_mock_space = RSpec::Mocks::space
+      RSpec::Mocks::space = RSpec::Mocks::Space.new
+      orig_run(reporter || NullObject.new)
+    ensure
+      RSpec::Mocks::space = @orig_mock_space
     end
+  end
 
-    RSpec.instance_variable_set(:@configuration, @orig_config)
-    RSpec.instance_variable_set(:@world, @orig_world)
+  object.instance_eval(&block)
+ensure
+  (class << RSpec::Core::ExampleGroup; self; end).class_eval do
+    remove_method :run
+    alias_method :run, :orig_run
+    remove_method :orig_run
   end
+
+  RSpec.instance_variable_set(:@configuration, @orig_config)
+  RSpec.instance_variable_set(:@world, @orig_world)
 end
 
 #Original from rspec-core

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-steps
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Judson Lester
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-25 00:00:00 -07:00
+date: 2011-08-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,11 +119,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
         - 2
-        - 0
-        version: "2.0"
+        - 6
+        version: "2.6"
   type: :runtime
   version_requirements: *id007
 description: "  I don't like Cucumber.  I don't need plain text stories.  My clients either\n  read code or don't read any test documents, so Cucumber is mostly useless.\n  But often, especially in full integration tests, it would be nice to have\n  steps in a test.\n"
@@ -391,7 +391,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- rspec-steps-0.0.3 RDoc
+- rspec-steps-0.0.4 RDoc
 require_paths: 
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement