spinach 0.5.1 → 0.5.2

data/lib/spinach/hookable.rb

@@ -28,6 +28,22 @@ module Spinach
           run_hook(hook, *args, &block)
         end
       end
+
+      # Adds a new around_hook to this class. Every hook defines two methods 
+      # used to add new callbacks and to run them around a given block of code
+      # passing a bunch of parameters and invoking them in the order they were
+      # defined.
+      #
+      # @example
+      #   class
+      def around_hook(hook)
+        define_method hook do |&block|
+          add_hook(hook, &block)
+        end
+        define_method "run_#{hook}" do |*args, &block|
+          run_around_hook(hook, *args, &block)
+        end
+      end
     end
 
     module InstanceMethods
@@ -45,6 +61,32 @@ module Spinach
         self.hooks = {}
       end
 
+      # Runs around hooks in a way that ensure the scenario block is executed
+      # only once
+      #
+      # @param [String] name
+      #   the around hook's name
+      #
+      # @param [] args
+      #   the list of arguments to pass to other around filters
+      #
+      # @param [Proc] block
+      #   the block containing the scenario action to be executed
+      def run_around_hook(name, *args, &block)
+        raise ArgumentError.new("block is mandatory") unless block
+        if callbacks = hooks[name.to_sym]
+          callbacks.reverse.inject(block) do |blk, callback|
+            proc do
+              callback.call *args do
+                blk.call
+              end
+            end
+          end.call
+        else
+          yield
+        end
+      end
+
       # Runs a particular hook given a set of arguments
       #
       # @param [String] name

data/lib/spinach/hooks.rb

@@ -62,7 +62,7 @@ module Spinach
     #     # feature_data is a hash of the parsed scenario data
     #     block.call
     #   end
-    hook :around_scenario
+    around_hook :around_scenario
 
     # Runs after every scenario
     #

data/lib/spinach/runner/feature_runner.rb

@@ -74,7 +74,7 @@ module Spinach
 
       def run_scenario?(scenario, current_scenario_index)
         match_line(current_scenario_index) && 
-          TagsMatcher.match(feature_tags | scenario.tags)
+          TagsMatcher.match((feature_tags << scenario.tags).flatten.compact)
       end
 
       def match_line(current_scenario_index)

data/lib/spinach/tags_matcher.rb

@@ -27,15 +27,17 @@ module Spinach
       end
 
       def match_tag_group(tag_group, tags)
-        tag_group.any? do |tag|
-          tag_matched = tags.include?(tag.delete(NEGATION_SIGN))
-
-          if tag_negated?(tag)
-            !tag_matched
-          else
-            tag_matched
-          end
-        end
+        matched_tags = tag_group.select { |tag| !tag_negated?(tag) }
+        
+        matched = matched_tags.any? { |tag| tags.include?(tag) }
+
+        return true if matched
+
+        negated_tags = tag_group.select { |tag| tag_negated? tag }
+        negated = negated_tags.any? {|tag| !tags.include?(tag.delete(NEGATION_SIGN))}
+
+        return true if negated && tag_group.count == 1
+        false
       end
 
       def tag_negated?(tag)

data/lib/spinach/version.rb

@@ -1,4 +1,4 @@
 module Spinach
   # Spinach version.
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/test/spinach/hookable_test.rb

@@ -12,6 +12,11 @@ describe Spinach::Hookable do
       subject.class.hook :before_save
       subject.must_respond_to :before_save
     end
+
+    it "defines a new around hook" do
+      subject.class.around_hook :around_save
+      subject.must_respond_to :around_save
+    end
   end
 
   describe "hooking mechanism" do
@@ -30,6 +35,17 @@ describe Spinach::Hookable do
         subject.run_hook(:before_save)
         arbitrary_variable.must_equal true
       end
+
+      it "allows to run around hook" do
+        arbitrary_variable = false
+        subject.add_hook(:around_save) do |&block|
+          arbitrary_variable = true
+          block.call
+        end
+        subject.run_around_hook(:around_save) do
+        end
+        arbitrary_variable.must_equal true
+      end
     end
 
     describe "with params" do
@@ -49,6 +65,18 @@ describe Spinach::Hookable do
         array.must_equal [1, 2]
       end
 
+      it "allows to run an around hook" do
+        array = []
+        subject.add_hook(:around_save) do |var1, var2, &block|
+          array << var1
+          array << var2
+          block.call
+        end
+        subject.run_around_hook(:around_save, 1, 2) do
+        end
+        array.must_equal [1, 2]
+      end
+
       it "yields to hook block even if nothing is hooked" do
         called = false
         subject.run_hook(:before_save) do
@@ -56,11 +84,77 @@ describe Spinach::Hookable do
         end
         called.must_equal true
       end
+
+      it "yields to around hook block even if nothing is hooked" do
+        called = false
+        subject.run_hook(:around_save) do
+          called = true
+        end
+        called.must_equal true
+      end
+    end
+
+    describe "order" do
+      it "runs hooks in registration order" do
+        save = sequence("save")
+        object = mock("object")
+        object.expects(:before_first).in_sequence(save)
+        object.expects(:before_second).in_sequence(save)
+
+        subject.add_hook(:before_save) do
+          object.before_first
+        end
+        subject.add_hook(:before_save) do
+          object.before_second
+        end
+        subject.run_hook(:before_save)
+      end
+
+      it "runs around hooks in registration order" do
+        save = sequence("save")
+        object = mock("object")
+        object.expects(:before_first).in_sequence(save)
+        object.expects(:before_second).in_sequence(save)
+        object.expects(:after_second).in_sequence(save)
+        object.expects(:after_first).in_sequence(save)
+
+        subject.add_hook(:around_save) do |&block|
+          object.before_first
+          block.call
+          object.after_first
+        end
+        subject.add_hook(:around_save) do |&block|
+          object.before_second
+          block.call
+          object.after_second
+        end
+
+        subject.run_around_hook(:around_save) {}
+      end
+    end
+
+    it "requires a block when running around hook" do
+      subject.add_hook(:around_save) do
+      end
+      lambda {
+        subject.run_around_hook(:around_save)
+      }.must_raise ArgumentError
+    end
+
+    it "runs around hook block only once" do
+      object = mock("object")
+      object.expects(:save).once
+      subject.add_hook(:around_save){|&block| block.call}
+      subject.add_hook(:around_save){|&block| block.call}
+      subject.run_around_hook(:around_save){ object.save }
     end
 
     describe "#reset_hooks" do
       it "resets the hooks to a pristine state" do
         subject.add_hook(:before_save)
+        (subject.hooks.empty?).must_equal false
+        subject.reset
+        (subject.hooks.empty?).must_equal true
       end
     end
   end

data/test/spinach/hooks_test.rb

@@ -6,9 +6,23 @@ describe Spinach::Hooks do
   end
 
   describe "hooks" do
-    %w{before_run after_run before_feature after_feature on_undefined_feature
-    before_scenario around_scenario after_scenario before_step after_step on_successful_step
-    on_failed_step on_error_step on_undefined_step on_skipped_step}.each do |callback|
+    %w{
+      before_run
+      after_run
+      before_feature
+      after_feature
+      on_undefined_feature
+      before_scenario
+      after_scenario
+      before_step
+      after_step
+      on_successful_step
+      on_failed_step
+      on_error_step
+      on_undefined_step
+      on_skipped_step
+      on_pending_step
+    }.each do |callback|
       describe "#{callback}" do
         it "responds to #{callback}" do
           subject.must_respond_to callback
@@ -27,6 +41,24 @@ describe Spinach::Hooks do
       end
     end
 
+    describe "around_scenario" do
+      it "responds to around_scenario" do
+        subject.must_respond_to :around_scenario
+      end
+
+      it "executes the hook with params" do
+        array = []
+        block = Proc.new do |arg1, arg2|
+          array << arg1
+          array << arg2
+        end
+        subject.send(:around_scenario, &block)
+        subject.send("run_around_scenario", 1, 2) do
+        end
+        array.must_equal [1, 2]
+      end
+    end
+
     describe "#on_tag" do
       let(:scenario) do
         stub(tags: ['javascript', 'capture'])

data/test/spinach/runner/feature_runner_test.rb

@@ -113,27 +113,46 @@ describe Spinach::Runner::FeatureRunner do
 
     describe "when running for specific tags configured" do
 
-      before do
-        @feature = stub('feature', name: 'Feature', tags: ["feature_tag"])
-        Spinach.stubs(:find_step_definitions).returns(true)
-        @scenario = stub(line: 4, tags: ["scenario_tag"])
-        @feature.stubs(:scenarios).returns [@scenario]
-      end
+      describe "with feature" do
+        before do
+          @feature = stub('feature', name: 'Feature', tags: ["feature_tag"])
+          Spinach.stubs(:find_step_definitions).returns(true)
+          @scenario = stub(line: 4, tags: [])
+          @feature.stubs(:scenarios).returns [@scenario]
+        end
 
-      it "runs matching scenario" do
-        Spinach::TagsMatcher.expects(:match).with(["feature_tag", "scenario_tag"]).returns true
-        Spinach::Runner::ScenarioRunner.expects(:new).with(@scenario).returns stub(run: true)
+        it "runs matching feature" do
+          Spinach::TagsMatcher.expects(:match).with(["feature_tag"]).returns true
+          Spinach::Runner::ScenarioRunner.expects(:new).with(@scenario).returns stub(run: true)
 
-        @runner = Spinach::Runner::FeatureRunner.new(@feature)
-        @runner.run
+          @runner = Spinach::Runner::FeatureRunner.new(@feature)
+          @runner.run
+        end
       end
 
-      it "skips scenarios that do not match" do
-        Spinach::TagsMatcher.expects(:match).with(["feature_tag", "scenario_tag"]).returns false
-        Spinach::Runner::ScenarioRunner.expects(:new).never
+      describe "with scenario" do
+        before do
+          @feature = stub('feature', name: 'Feature', tags: ["feature_tag"])
+          Spinach.stubs(:find_step_definitions).returns(true)
+          @scenario = stub(line: 4, tags: ["scenario_tag"])
+          @feature.stubs(:scenarios).returns [@scenario]
+        end
 
-        @runner = Spinach::Runner::FeatureRunner.new(@feature)
-        @runner.run
+        it "runs matching scenario" do
+          Spinach::TagsMatcher.expects(:match).with(["feature_tag", "scenario_tag"]).returns true
+          Spinach::Runner::ScenarioRunner.expects(:new).with(@scenario).returns stub(run: true)
+
+          @runner = Spinach::Runner::FeatureRunner.new(@feature)
+          @runner.run
+        end
+
+        it "skips scenarios that do not match" do
+          Spinach::TagsMatcher.expects(:match).with(["feature_tag", "scenario_tag"]).returns false
+          Spinach::Runner::ScenarioRunner.expects(:new).never
+
+          @runner = Spinach::Runner::FeatureRunner.new(@feature)
+          @runner.run
+        end
       end
     end
   end

data/test/spinach/tags_matcher_test.rb

@@ -45,6 +45,27 @@ describe Spinach::TagsMatcher do
       end
     end
 
+    describe 'when matching against a single negated tag and an added tag' do
+
+      before { @config.tags = [['~wip', 'added']] }
+
+      it "returns false for the same tag" do
+        subject.match(['wip']).must_equal false
+      end
+
+      it "returns true for the added tag" do
+        subject.match(['added']).must_equal true
+      end
+      
+      it "returns false for a different tag" do
+        subject.match(['important']).must_equal false
+      end
+
+      it "returns false when no tags are present" do
+        subject.match([]).must_equal false
+      end
+    end
+
     describe "when matching against ANDed tags" do
 
       before { @config.tags = [['wip'], ['important']] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinach
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-02 00:00:00.000000000 Z
+date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin-ruby
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2153592980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,15 +24,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+  version_requirements: *2153592980
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2153592500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -40,15 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2153592500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2153591980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,15 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2153591980
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2153591360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -72,15 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2153591360
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2153590420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,15 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2153590420
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2153589600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -104,15 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2153589600
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2153589180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,15 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2153589180
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2153721260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -136,15 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2153721260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2153720800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -152,15 +112,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2153720800
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2153720380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -168,15 +123,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2153720380
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2153719960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -184,12 +134,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2153719960
 description: Spinach is a BDD framework on top of gherkin
 email:
 - info@codegram.com
@@ -306,15 +251,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 264819993730994742
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 264819993730994742
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Spinach is a BDD framework on top of gherkin