cucumber 0.7.2 → 0.7.3

data/History.txt

@@ -1,3 +1,9 @@
+== 0.7.3
+
+=== New Features
+* Table cells can now contain escaped bars - \| and escaped backslashes - \\. (Gregory Hnatiuk, Aslak Hellesøy)
+* Added support for Around hooks. (#605 John Firebaugh)
+
 == 0.7.2 (2010-05-03)
 
 === Bugfixes

data/Rakefile

@@ -16,7 +16,7 @@ begin
     gem.homepage = "http://cukes.info"
     gem.authors = ["Aslak Hellesøy"]
 
-    gem.add_dependency 'gherkin', '>= 1.0.24'
+    gem.add_dependency 'gherkin', '>= 1.0.27'
     gem.add_dependency 'term-ansicolor', '>= 1.0.4'
     gem.add_dependency 'builder', '>= 2.1.2'
     gem.add_dependency 'diff-lcs', '>= 1.1.2'

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 2
+:patch: 3
 :build:
 :major: 0
 :minor: 7

data/cucumber.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber}
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aslak Helles\303\270y"]
-  s.date = %q{2010-05-04}
+  s.date = %q{2010-05-18}
   s.default_executable = %q{cucumber}
   s.description = %q{Behaviour Driven Development with elegance and joy}
   s.email = %q{cukes@googlegroups.com}
@@ -342,6 +342,7 @@ Gem::Specification.new do |s|
      "examples/webrat/features/step_definitions/kvasir_steps.rb",
      "examples/webrat/features/support/env.rb",
      "features/announce.feature",
+     "features/around_hooks.feature",
      "features/background.feature",
      "features/bug_371.feature",
      "features/bug_464.feature",
@@ -541,7 +542,7 @@ Gem::Specification.new do |s|
 
                      (::)   U P G R A D I N G    (::)
 
-Thank you for installing cucumber-0.7.2.
+Thank you for installing cucumber-0.7.3.
 Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading
 for important information about this release. Happy cuking!
 
@@ -681,6 +682,7 @@ for important information about this release. Happy cuking!
      "examples/ruby2python/features/support/env.rb",
      "examples/self_test/features/step_definitions/sample_steps.rb",
      "examples/self_test/features/support/env.rb",
+     "examples/self_test/tmp/features/step_definitions/steps.rb",
      "examples/sinatra/app.rb",
      "examples/sinatra/features/step_definitions/add_steps.rb",
      "examples/sinatra/features/support/env.rb",
@@ -713,7 +715,7 @@ for important information about this release. Happy cuking!
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<gherkin>, [">= 1.0.24"])
+      s.add_runtime_dependency(%q<gherkin>, [">= 1.0.27"])
       s.add_runtime_dependency(%q<term-ansicolor>, [">= 1.0.4"])
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
       s.add_runtime_dependency(%q<diff-lcs>, [">= 1.1.2"])
@@ -726,7 +728,7 @@ for important information about this release. Happy cuking!
       s.add_development_dependency(%q<syntax>, [">= 1.0.0"])
       s.add_development_dependency(%q<spork>, [">= 0.8.3"])
     else
-      s.add_dependency(%q<gherkin>, [">= 1.0.24"])
+      s.add_dependency(%q<gherkin>, [">= 1.0.27"])
       s.add_dependency(%q<term-ansicolor>, [">= 1.0.4"])
       s.add_dependency(%q<builder>, [">= 2.1.2"])
       s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])
@@ -740,7 +742,7 @@ for important information about this release. Happy cuking!
       s.add_dependency(%q<spork>, [">= 0.8.3"])
     end
   else
-    s.add_dependency(%q<gherkin>, [">= 1.0.24"])
+    s.add_dependency(%q<gherkin>, [">= 1.0.27"])
     s.add_dependency(%q<term-ansicolor>, [">= 1.0.4"])
     s.add_dependency(%q<builder>, [">= 2.1.2"])
     s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])

data/examples/javascript/features/fibonacci.feature

@@ -37,5 +37,10 @@ Feature: Fibonacci
   Scenario: Single series with Before hook with a tag label
     Then it should give me [1, 1, 2]
 
+  @another-do-fibonnacci-in-before-hook
+  Scenario: Single series with Before hook with a tag label
+    Then it should give me [1, 1, 2]
+
+
   Scenario: Single series by calling a step from within a step
     Then it should give me [1, 1] via calling another step definition

data/examples/javascript/features/step_definitions/fib_steps.js

@@ -2,7 +2,7 @@ Before(function(){
   fibResult = 0;
 });
 
-Before('@do-fibonnacci-in-before-hook', function(){
+Before(['@another-do-fibonnacci-in-before-hook,@do-fibonnacci-in-before-hook'], function(){
   fibResult = fibonacciSeries(3);
 });
 
@@ -38,7 +38,6 @@ Then(/^it should contain:$/, function(table){
   assertMatches(hashes[0]['cell 2'], fibResult);
 });
 
-
 Then(/^it should give me (\[.*\]) via calling another step definition$/, function(expectedResult){
   Given("I ask Javascript to calculate fibonacci up to 2");
   assertEqual(expectedResult, fibResult);

data/features/around_hooks.feature

@@ -0,0 +1,188 @@
+Feature: Around hooks
+  In order to support transactional scenarios for database libraries
+  that provide only a block syntax for transactions, Cucumber should
+  permit definition of Around hooks.
+
+  Scenario: A single Around hook
+    Given a standard Cucumber project directory structure
+    And a file named "features/step_definitions/steps.rb" with:
+      """
+      Then /^the hook is called$/ do
+        $hook_called.should == true
+      end
+      """
+    And a file named "features/support/hooks.rb" with:
+      """
+      Around do |scenario, block|
+        $hook_called = true
+        block.call
+      end
+      """
+    And a file named "features/f.feature" with:
+      """
+      Feature: Around hooks
+        Scenario: using hook
+          Then the hook is called
+      """
+    When I run cucumber features/f.feature
+    Then it should pass with
+      """
+      Feature: Around hooks
+
+        Scenario: using hook      # features/f.feature:2
+          Then the hook is called # features/step_definitions/steps.rb:1
+
+      1 scenario (1 passed)
+      1 step (1 passed)
+
+      """
+
+  Scenario: Multiple Around hooks
+    Given a standard Cucumber project directory structure
+    And a file named "features/step_definitions/steps.rb" with:
+      """
+      Then /^the hooks are called in the correct order$/ do
+        $hooks_called.should == ['A', 'B', 'C']
+      end
+      """
+    And a file named "features/support/hooks.rb" with:
+      """
+      Around do |scenario, block|
+        $hooks_called ||= []
+        $hooks_called << 'A'
+        block.call
+      end
+
+      Around do |scenario, block|
+        $hooks_called ||= []
+        $hooks_called << 'B'
+        block.call
+      end
+
+      Around do |scenario, block|
+        $hooks_called ||= []
+        $hooks_called << 'C'
+        block.call
+      end
+      """
+    And a file named "features/f.feature" with:
+      """
+      Feature: Around hooks
+        Scenario: using multiple hooks
+          Then the hooks are called in the correct order
+      """
+    When I run cucumber features/f.feature
+    Then it should pass with
+      """
+      Feature: Around hooks
+
+        Scenario: using multiple hooks                   # features/f.feature:2
+          Then the hooks are called in the correct order # features/step_definitions/steps.rb:1
+
+      1 scenario (1 passed)
+      1 step (1 passed)
+
+      """
+
+  Scenario: Mixing Around, Before, and After hooks
+    Given a standard Cucumber project directory structure
+    And a file named "features/step_definitions/steps.rb" with:
+      """
+      Then /^the Around hook is called around Before and After hooks$/ do
+        $hooks_called.should == ['Around', 'Before']
+      end
+      """
+    And a file named "features/support/hooks.rb" with:
+      """
+      Around do |scenario, block|
+        $hooks_called ||= []
+        $hooks_called << 'Around'
+        block.call
+        $hooks_called << 'Around'
+        $hooks_called.should == ['Around', 'Before', 'After', 'Around']
+      end
+
+      Before do |scenario|
+        $hooks_called ||= []
+        $hooks_called << 'Before'
+      end
+
+      After do |scenario|
+        $hooks_called ||= []
+        $hooks_called << 'After'
+        $hooks_called.should == ['Around', 'Before', 'After']
+      end
+      """
+    And a file named "features/f.feature" with:
+      """
+      Feature: Around hooks
+        Scenario: Mixing Around, Before, and After hooks
+          Then the Around hook is called around Before and After hooks
+      """
+    When I run cucumber features/f.feature
+    Then it should pass with
+      """
+      Feature: Around hooks
+
+        Scenario: Mixing Around, Before, and After hooks               # features/f.feature:2
+          Then the Around hook is called around Before and After hooks # features/step_definitions/steps.rb:1
+
+      1 scenario (1 passed)
+      1 step (1 passed)
+
+      """
+
+  Scenario: Around hooks with tags
+    Given a standard Cucumber project directory structure
+    And a file named "features/step_definitions/steps.rb" with:
+      """
+      Then /^the Around hooks with matching tags are called$/ do
+        $hooks_called.should == ['one', 'one or two']
+      end
+      """
+    And a file named "features/support/hooks.rb" with:
+      """
+      Around('@one') do |scenario, block|
+        $hooks_called ||= []
+        $hooks_called << 'one'
+        block.call
+      end
+
+      Around('@one,@two') do |scenario, block|
+        $hooks_called ||= []
+        $hooks_called << 'one or two'
+        block.call
+      end
+
+      Around('@one', '@two') do |scenario, block|
+        $hooks_called ||= []
+        $hooks_called << 'one and two'
+        block.call
+      end
+
+      Around('@two') do |scenario, block|
+        $hooks_called ||= []
+        $hooks_called << 'two'
+        block.call
+      end
+      """
+    And a file named "features/f.feature" with:
+      """
+      Feature: Around hooks
+        @one
+        Scenario: Around hooks with tags
+          Then the Around hooks with matching tags are called
+      """
+    When I run cucumber -q -t @one features/f.feature
+    Then it should pass with
+      """
+      Feature: Around hooks
+
+        @one
+        Scenario: Around hooks with tags
+          Then the Around hooks with matching tags are called
+
+      1 scenario (1 passed)
+      1 step (1 passed)
+
+      """

data/features/language_help.feature

@@ -54,6 +54,7 @@ Feature: Language help
             | ja        | Japanese               | 日本語                  |
             | ko        | Korean                 | 한국어                  |
             | lt        | Lithuanian             | lietuvių kalba       |
+            | lu        | Luxemburgish           | Lëtzebuergesch       |
             | lv        | Latvian                | latviešu             |
             | nl        | Dutch                  | Nederlands           |
             | no        | Norwegian              | norsk                |

data/lib/cucumber/ast/feature_element.rb

@@ -28,13 +28,13 @@ module Cucumber
 
       def name_line_lengths
         if @name.strip.empty?
-          [Ast::Step::INDENT + @keyword.jlength + ': '.jlength]
+          [Ast::Step::INDENT + @keyword.unpack('U*').length + ': '.length]
         else
           @name.split("\n").enum_for(:each_with_index).map do |line, line_number|
             if line_number == 0
-              Ast::Step::INDENT + @keyword.jlength + ': '.jlength + line.jlength
+              Ast::Step::INDENT + @keyword.unpack('U*').length + ': '.length + line.unpack('U*').length
             else
-              Ast::Step::INDENT + Ast::Step::INDENT + line.jlength
+              Ast::Step::INDENT + Ast::Step::INDENT + line.unpack('U*').length
             end
           end
         end

data/lib/cucumber/ast/scenario.rb

@@ -48,9 +48,11 @@ module Cucumber
           visitor.visit_scenario_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
 
           skip_invoke! if @background.failed?
-          visitor.step_mother.before_and_after(self, skip_hooks?) do
-            skip_invoke! if failed?
-            visitor.visit_steps(@steps)
+          visitor.step_mother.around(self, skip_hooks?) do
+            visitor.step_mother.before_and_after(self, skip_hooks?) do
+              skip_invoke! if failed?
+              visitor.visit_steps(@steps)
+            end
           end
           @executed = true
         end

data/lib/cucumber/ast/step.rb

@@ -69,7 +69,7 @@ module Cucumber
       end
 
       def text_length(name=@name)
-        INDENT + INDENT + @keyword.jlength + name.jlength
+        INDENT + INDENT + @keyword.unpack('U*').length + name.unpack('U*').length
       end
 
       def backtrace_line

data/lib/cucumber/ast/table.rb

@@ -1,4 +1,5 @@
 require 'gherkin/rubify'
+require 'gherkin/formatter/escaping'
 
 module Cucumber
   module Ast
@@ -585,6 +586,8 @@ module Cucumber
       # Represents a row of cells or columns of cells
       class Cells #:nodoc:
         include Enumerable
+        include Gherkin::Formatter::Escaping
+
         attr_reader :exception
 
         def initialize(table, cells)
@@ -631,7 +634,7 @@ module Cucumber
         end
 
         def width
-          map{|cell| cell.value ? cell.value.to_s.jlength : 0}.max
+          map{|cell| cell.value ? escape_cell(cell.value.to_s).unpack('U*').length : 0}.max
         end
 
         def each(&proc)

data/lib/cucumber/core_ext/string.rb

@@ -6,11 +6,4 @@ class String #:nodoc:
       gsub(/^ {0,#{-n}}/, "")
     end
   end
-  
-  if (Cucumber::JRUBY && Cucumber::RAILS) || Cucumber::RUBY_1_9
-    # Workaround for http://tinyurl.com/55uu3u 
-    alias jlength length
-  else
-    require 'jcode'
-  end
 end

data/lib/cucumber/feature_file.rb

@@ -32,7 +32,8 @@ module Cucumber
       lexer           = Gherkin::I18nLexer.new(parser, false)
 
       begin
-        lexer.scan(source)
+        s = ENV['FILTER_PML_CALLOUT'] ? source.gsub(C_CALLOUT, '') : source
+        lexer.scan(s)
         ast = builder.ast
         return nil if ast.nil? # Filter caused nothing to match
         ast.language = lexer.i18n_language
@@ -59,14 +60,10 @@ module Cucumber
       end
     end
     
-    def lang
-      # TODO: Gherkin has logic for this. Remove.
-      line_one = source.split(/\n/)[0]
-      if line_one =~ LANGUAGE_PATTERN
-        $1.strip
-      else
-        nil
-      end
-    end
+    private
+    
+    # Special PML markup that we want to filter out.
+    CO = %{\\s*<(label|callout)\s+id=".*?"\s*/>\\s*}
+    C_CALLOUT = %r{/\*#{CO}\*/|//#{CO}}o
   end
 end

data/lib/cucumber/formatter/pretty.rb

@@ -1,6 +1,7 @@
+require 'fileutils'
 require 'cucumber/formatter/console'
 require 'cucumber/formatter/io'
-require 'fileutils'
+require 'gherkin/formatter/escaping'
 
 module Cucumber
   module Formatter
@@ -15,6 +16,7 @@ module Cucumber
       include FileUtils
       include Console
       include Io
+      include Gherkin::Formatter::Escaping
       attr_writer :indent
       attr_reader :step_mother
 
@@ -198,8 +200,8 @@ module Cucumber
         return if !@table || @hide_this_step
         status ||= @status || :passed
         width = @table.col_width(@col_index)
-        cell_text = value.to_s || ''
-        padded = cell_text + (' ' * (width - cell_text.jlength))
+        cell_text = escape_cell(value.to_s || '')
+        padded = cell_text + (' ' * (width - cell_text.unpack('U*').length))
         prefix = cell_prefix(status)
         @io.print(' ' + format_string("#{prefix}#{padded}", status) + ::Term::ANSIColor.reset(" |"))
         @io.flush

data/lib/cucumber/formatter/steps.rb

@@ -24,7 +24,7 @@ module Cucumber
           source_indent = source_indent(sources)
           sources.sort.each do |file_colon_line, regexp_source|
             @io.print regexp_source.indent(2)
-            @io.print " # #{file_colon_line}".indent(source_indent - regexp_source.jlength)
+            @io.print " # #{file_colon_line}".indent(source_indent - regexp_source.unpack('U*').length)
             @io.puts
           end
           @io.puts

data/lib/cucumber/formatter/usage.rb

@@ -68,7 +68,7 @@ module Cucumber
         @io.print format_string(sprintf("%.7f", stepdef_key.mean_duration), :skipped) + " " unless @options[:dry_run]
         @io.print format_string(stepdef_key.regexp_source, stepdef_key.status)
         if @options[:source]
-          indent = max_length - stepdef_key.regexp_source.jlength
+          indent = max_length - stepdef_key.regexp_source.unpack('U*').length
           line_comment = "   # #{stepdef_key.file_colon_line}".indent(indent)
           @io.print(format_string(line_comment, :comment))
         end
@@ -81,7 +81,7 @@ module Cucumber
           @io.print format_string(sprintf("%.7f", step[:duration]), :skipped) + " " unless @options[:dry_run]
           @io.print format_step(step[:keyword], step[:step_match], step[:status], nil)
           if @options[:source]
-            indent = max_length - (step[:keyword].jlength + step[:step_match].format_args.jlength)
+            indent = max_length - (step[:keyword].unpack('U*').length + step[:step_match].format_args.unpack('U*').length)
             line_comment = " # #{step[:file_colon_line]}".indent(indent)
             @io.print(format_string(line_comment, :comment))
           end
@@ -94,12 +94,12 @@ module Cucumber
       end
 
       def max_stepdef_length
-        @stepdef_to_match.keys.flatten.map{|key| key.regexp_source.jlength}.max
+        @stepdef_to_match.keys.flatten.map{|key| key.regexp_source.unpack('U*').length}.max
       end
 
       def max_step_length
         @stepdef_to_match.values.to_a.flatten.map do |step|
-          step[:keyword].jlength + step[:step_match].format_args.jlength
+          step[:keyword].unpack('U*').length + step[:step_match].format_args.unpack('U*').length
         end.max
       end
 

data/lib/cucumber/js_support/js_dsl.js

@@ -12,28 +12,27 @@ var CucumberJsDsl = {
     jsLanguage.registerJsTransform(regexp, func);
   },
 
-  beforeHook: function(tag_or_func, func){
-    CucumberJsDsl.__registerJsHook('before', tag_or_func, func);
+  beforeHook: function(tag_expressions_or_func, func){
+    CucumberJsDsl.__registerJsHook('before', tag_expressions_or_func, func);
   },
 
-  afterHook: function(tag_or_func, func){
-    CucumberJsDsl.__registerJsHook('after', tag_or_func, func);
+  afterHook: function(tag_expressions_or_func, func){
+    CucumberJsDsl.__registerJsHook('after', tag_expressions_or_func, func);
   },
 
   Table: function(raw_table){
      this.raw = raw_table;
   },
 
-  __registerJsHook: function(label, tag_or_func, func){
+  __registerJsHook: function(label, tag_expressions_or_func, func){
     if(func != null){
       var hook_func = func;
-      var tag = tag_or_func;
+      var tag_expressions = tag_expressions_or_func;
+    } else {
+      var hook_func = tag_expressions_or_func;
+      var tag_expressions = [];
     }
-    else{
-      var hook_func = tag_or_func;
-      var tag = null;
-    }
-    jsLanguage.registerJsHook(label, hook_func, tag);
+    jsLanguage.registerJsHook(label, tag_expressions, hook_func);
   }
 }
 

data/lib/cucumber/js_support/js_language.rb

@@ -58,12 +58,12 @@ module Cucumber
     end
 
     class JsHook
-      def initialize(js_language, tag_names, js_function)
-        @js_language, @tag_names, @js_function = js_language, tag_names, js_function
+      def initialize(js_language, tag_expressions, js_function)
+        @js_language, @tag_expressions, @js_function = js_language, tag_expressions, js_function
       end
 
       def tag_expressions
-        @tag_names
+        @tag_expressions
       end
 
       def invoke(location, scenario)
@@ -145,10 +145,8 @@ module Cucumber
         @step_mother.step_match(name).invoke(multiline_argument)
       end
 
-      #TODO: support multiple tag_names
-      def register_js_hook(phase, js_function, tag_name = nil)
-        tag_names = tag_name ? [tag_name] : []
-        add_hook(phase, JsHook.new(self, tag_names, js_function))
+      def register_js_hook(phase, tag_expressions, js_function)
+        add_hook(phase, JsHook.new(self, tag_expressions, js_function))
       end
 
       def register_js_transform(regexp, js_function)

data/lib/cucumber/language_support/language_methods.rb

@@ -8,6 +8,12 @@ module Cucumber
         StepMatch.new(step_definition, step_name, name_to_report, step_arguments)
       end
 
+      def around(scenario)
+        execute_around(scenario) do
+          yield
+        end
+      end
+
       def before(scenario)
         begin_scenario(scenario)
         execute_before(scenario)
@@ -85,6 +91,16 @@ module Cucumber
         @transforms ||= []
       end
 
+      def execute_around(scenario, &block)
+        hooks_for(:around, scenario).reverse.inject(block) do |blk, hook|
+          proc do
+            invoke(hook, 'Around', scenario, true) do
+              blk.call(scenario)
+            end
+          end
+        end.call
+      end
+
       def execute_before(scenario)
         hooks_for(:before, scenario).each do |hook|
           invoke(hook, 'Before', scenario, true)
@@ -97,9 +113,9 @@ module Cucumber
         end
       end
 
-      def invoke(hook, location, scenario, exception_fails_scenario)
+      def invoke(hook, location, scenario, exception_fails_scenario, &block)
         begin
-          hook.invoke(location, scenario)
+          hook.invoke(location, scenario, &block)
         rescue Exception => exception
           if exception_fails_scenario
             scenario.fail!(exception)

data/lib/cucumber/rb_support/rb_dsl.rb

@@ -50,18 +50,27 @@ module Cucumber
         RbDsl.build_rb_world_factory(world_modules, proc)
       end
 
-      # Registers a proc that will run before each Scenario. You can register as 
+      # Registers a proc that will run before each Scenario. You can register as many
       # as you want (typically from ruby scripts under <tt>support/hooks.rb</tt>).
       def Before(*tag_expressions, &proc)
         RbDsl.register_rb_hook('before', tag_expressions, proc)
       end
 
-      # Registers a proc that will run after each Scenario. You can register as 
+      # Registers a proc that will run after each Scenario. You can register as many
       # as you want (typically from ruby scripts under <tt>support/hooks.rb</tt>).
       def After(*tag_expressions, &proc)
         RbDsl.register_rb_hook('after', tag_expressions, proc)
       end
 
+      # Registers a proc that will be wrapped around each scenario. The proc
+      # should accept two arguments: two arguments: the scenario and a "block"
+      # argument (but passed as a regular argument, since blocks cannot accept
+      # blocks in 1.8), on which it should call the .call method. You can register
+      # as many  as you want (typically from ruby scripts under <tt>support/hooks.rb</tt>).
+      def Around(*tag_expressions, &proc)
+        RbDsl.register_rb_hook('around', tag_expressions, proc)
+      end
+
       # Registers a proc that will run after each Step. You can register as 
       # as you want (typically from ruby scripts under <tt>support/hooks.rb</tt>).
       def AfterStep(*tag_expressions, &proc)

data/lib/cucumber/rb_support/rb_hook.rb

@@ -10,8 +10,8 @@ module Cucumber
         @proc = proc
       end
 
-      def invoke(location, argument)
-        @rb_language.current_world.cucumber_instance_exec(false, location, argument, &@proc)
+      def invoke(location, argument, &block)
+        @rb_language.current_world.cucumber_instance_exec(false, location, *[argument, block].compact, &@proc)
       end
     end
   end

data/lib/cucumber/rb_support/rb_language.rb

@@ -92,8 +92,8 @@ module Cucumber
         connect_world(scenario)
       end
 
-      def register_rb_hook(phase, tag_names, proc)
-        add_hook(phase, RbHook.new(self, tag_names, proc))
+      def register_rb_hook(phase, tag_expressions, proc)
+        add_hook(phase, RbHook.new(self, tag_expressions, proc))
       end
 
       def register_rb_transform(regexp, proc)

data/lib/cucumber/step_match.rb

@@ -54,7 +54,7 @@ module Cucumber
     end
 
     def text_length
-      @step_definition.regexp_source.jlength
+      @step_definition.regexp_source.unpack('U*').length
     end
 
     def replace_arguments(string, step_arguments, format, &proc)
@@ -72,7 +72,7 @@ module Cucumber
         end
 
         s[step_argument.byte_offset + offset, step_argument.val.length] = replacement
-        offset += replacement.jlength - step_argument.val.jlength
+        offset += replacement.unpack('U*').length - step_argument.val.unpack('U*').length
         past_offset = step_argument.byte_offset + step_argument.val.length
       end
       s

data/lib/cucumber/step_mother.rb

@@ -311,6 +311,20 @@ module Cucumber
       @programming_languages.empty?
     end
 
+    def around(scenario, skip_hooks=false, &block) #:nodoc:
+      unless skip_hooks
+        @programming_languages.reverse.inject(block) do |blk, programming_language|
+          proc do
+            programming_language.around(scenario) do
+              blk.call(scenario)
+            end
+          end
+        end.call
+      else
+        yield
+      end
+    end
+
     def before_and_after(scenario, skip_hooks=false) #:nodoc:
       before(scenario) unless skip_hooks
       yield scenario

data/spec/cucumber/step_mother_spec.rb

@@ -171,6 +171,20 @@ or http://wiki.github.com/aslakhellesoy/cucumber/a-whole-new-world.
       
       @rb.hooks_for(:before, scenario).should == [fish]
     end
+
+    it "should find around hooks" do
+      a = @dsl.Around do |scenario, block|
+      end
+
+      b = @dsl.Around('@tag') do |scenario, block|
+      end
+
+      scenario = mock('Scenario')
+      scenario.should_receive(:accept_hook?).with(a).and_return(true)
+      scenario.should_receive(:accept_hook?).with(b).and_return(false)
+
+      @rb.hooks_for(:around, scenario).should == [a]
+    end
   end
 
   describe StepMother, "step argument transformations" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-04 00:00:00 +02:00
+date: 2010-05-18 00:00:00 +02:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 1
         - 0
-        - 24
-        version: 1.0.24
+        - 27
+        version: 1.0.27
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -518,6 +518,7 @@ files:
 - examples/webrat/features/step_definitions/kvasir_steps.rb
 - examples/webrat/features/support/env.rb
 - features/announce.feature
+- features/around_hooks.feature
 - features/background.feature
 - features/bug_371.feature
 - features/bug_464.feature
@@ -720,7 +721,7 @@ post_install_message: |+
   
                        (::)   U P G R A D I N G    (::)
   
-  Thank you for installing cucumber-0.7.2.
+  Thank you for installing cucumber-0.7.3.
   Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading
   for important information about this release. Happy cuking!
   
@@ -880,6 +881,7 @@ test_files:
 - examples/ruby2python/features/support/env.rb
 - examples/self_test/features/step_definitions/sample_steps.rb
 - examples/self_test/features/support/env.rb
+- examples/self_test/tmp/features/step_definitions/steps.rb
 - examples/sinatra/app.rb
 - examples/sinatra/features/step_definitions/add_steps.rb
 - examples/sinatra/features/support/env.rb