cucumber 0.3.102 → 0.3.103

data/lib/cucumber/formatter/profile.rb

@@ -12,13 +12,13 @@ module Cucumber
         @step_definition_durations = Hash.new { |h,step_definition| h[step_definition] = [] }
       end
 
-      def visit_step(step)
+      def step(step)
         @step_duration = Time.now
         @step = step
         super
       end
 
-      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+      def step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
         duration = Time.now - @step_duration
         super
 

data/lib/cucumber/formatter/progress.rb

@@ -3,33 +3,39 @@ require 'cucumber/formatter/console'
 module Cucumber
   module Formatter
     # The formatter used for <tt>--format progress</tt>
-    class Progress < Ast::Visitor
+    class Progress
       include Console
+      attr_reader :step_mother
 
       def initialize(step_mother, io, options)
-        super(step_mother)
-        @io = io
-        @options = options
+        @step_mother, @io, @options = step_mother, io, options
       end
 
-      def visit_features(features)
-        super
+      def after_features(features)
         @io.puts
         @io.puts
         print_summary(features)
       end
 
-      def visit_feature_element(feature_element)
+      def before_feature_element(feature_element)
         record_tag_occurrences(feature_element, @options)
-        super
       end
 
-      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+      def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
         progress(status)
         @status = status
       end
+      
+      def before_outline_table(outline_table)
+        @outline_table = outline_table
+      end
+      
+      def after_outline_table(outline_table)
+        @outline_table = nil
+      end
 
-      def visit_table_cell_value(value, status)
+      def table_cell_value(value, status)
+        return unless @outline_table
         status ||= @status
         progress(status) unless table_header_cell?(status)
       end

data/lib/cucumber/formatter/rerun.rb

@@ -10,16 +10,15 @@ module Cucumber
     # This formatter is used by AutoTest - it will use the output to decide what
     # to run the next time, simply passing the output string on the command line.
     #
-    class Rerun < Ast::Visitor
+    class Rerun
       def initialize(step_mother, io, options)
-        super(step_mother)
         @io = io
         @options = options
         @file_names = []
         @file_colon_lines = Hash.new{|h,k| h[k] = []}
       end
 
-      def visit_features(features)
+      def features(features)
         super
         files = @file_names.uniq.map do |file|
           lines = @file_colon_lines[file]
@@ -28,7 +27,7 @@ module Cucumber
         @io.puts files.join(' ')
       end
 
-      def visit_feature_element(feature_element)
+      def feature_element(feature_element)
         @rerun = false
         super
         if @rerun
@@ -38,7 +37,7 @@ module Cucumber
         end
       end
 
-      def visit_step_name(keyword, step_match, status, source_indent, background)
+      def step_name(keyword, step_match, status, source_indent, background)
         @rerun = true if [:failed].index(status)
       end
     end

data/lib/cucumber/formatter/steps.rb

@@ -1,16 +1,15 @@
 module Cucumber
   module Formatter
     # The formatter used for <tt>--format steps</tt>
-    class Steps < Ast::Visitor
+    class Steps
 
       def initialize(step_mother, io, options)
-        super(step_mother)
         @io = io
         @options = options
         @step_definition_files = collect_steps(step_mother)
       end
 
-      def visit_features(features)
+      def after_features(features)
         print_summary
       end
 
@@ -23,9 +22,9 @@ module Cucumber
           
           sources = @step_definition_files[step_definition_file]
           source_indent = source_indent(sources)
-          sources.sort.each do |file_colon_line, regexp|
-            @io.print "#{regexp}".indent(2)
-            @io.print " # #{file_colon_line}".indent(source_indent - regexp.size)
+          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.puts
           end
           @io.puts
@@ -37,7 +36,7 @@ module Cucumber
       def collect_steps(step_mother)
         step_mother.step_definitions.inject({}) do |step_definitions, step_definition|
           step_definitions[step_definition.file] ||= []
-          step_definitions[step_definition.file] << [ step_definition.file_colon_line, step_definition.regexp.inspect ]
+          step_definitions[step_definition.file] << [ step_definition.file_colon_line, step_definition.regexp_source ]
           step_definitions
         end
       end

data/lib/cucumber/formatter/tag_cloud.rb

@@ -2,27 +2,28 @@ module Cucumber
   module Formatter
     # The formatter used for <tt>--format tag_cloud</tt>
     # Custom formatter that prints a tag cloud as a table.
-    class TagCloud < Cucumber::Ast::Visitor
+    class TagCloud
       def initialize(step_mother, io, options)
-        super(step_mother)
         @io = io
         @options = options
         @counts = Hash.new{|h,k| h[k] = 0}
       end
 
-      def visit_features(features)
-        super
+      def after_features(features)
         print_summary(features)
       end
 
-      def visit_tag_name(tag_name)
+      def tag_name(tag_name)
         @counts[tag_name] += 1
       end
+      
+      private
   
       def print_summary(features)
         matrix = @counts.to_a.sort{|paira, pairb| paira[0] <=> pairb[0]}.transpose
         table = Cucumber::Ast::Table.new(matrix)
-        Cucumber::Formatter::Pretty.new(@step_mother, @io, {}).visit_multiline_arg(table)
+        formatter = Cucumber::Formatter::Pretty.new(@step_mother, @io, {})
+        Cucumber::Ast::TreeWalker.new(@step_mother, [formatter], {}).visit_multiline_arg(table)
       end
     end
   end

data/lib/cucumber/formatter/usage.rb

@@ -3,11 +3,10 @@ require 'cucumber/formatter/progress'
 module Cucumber
   module Formatter
     # The formatter used for <tt>--format usage</tt>
-    class Usage < Ast::Visitor
+    class Usage
       include Console
 
       def initialize(step_mother, io, options)
-        super(step_mother)
         @io = io
         @options = options
         @step_definitions = Hash.new { |h,step_definition| h[step_definition] = [] }
@@ -15,17 +14,15 @@ module Cucumber
         @locations = []
       end
 
-      def visit_features(features)
-        super
+      def after_features(features)
         print_summary(features)
       end
 
-      def visit_step(step)
+      def before_step(step)
         @step = step
-        super
       end
 
-      def visit_step_name(keyword, step_match, status, source_indent, background)
+      def step_name(keyword, step_match, status, source_indent, background)
         if step_match.step_definition
           location = @step.file_colon_line
           return if @locations.index(location)
@@ -44,7 +41,7 @@ module Cucumber
         sorted_defs.each do |step_definition|          
           step_matches_and_descriptions = @step_definitions[step_definition].sort_by do |step_match_and_description|
             step_match = step_match_and_description[0]
-            step_match.step_definition.regexp.inspect
+            step_match.step_definition.regexp_source
           end
 
           step_matches = step_matches_and_descriptions.map{|step_match_and_description| step_match_and_description[0]}
@@ -55,7 +52,7 @@ module Cucumber
           lengths << step_definition.text_length
           max_length = lengths.max
 
-          @io.print step_definition.regexp.inspect
+          @io.print step_definition.regexp_source
           @io.puts format_string("   # #{step_definition.file_colon_line}".indent(max_length - step_definition.text_length), :comment)
           da = step_matches_and_descriptions.map do |step_match_and_description|
             step_match      = step_match_and_description[0]
@@ -76,7 +73,7 @@ module Cucumber
 
           @io.puts format_string("(::) UNUSED (::)", :failed)
           @all_step_definitions.each do |step_definition|
-            @io.print format_string(step_definition.regexp.inspect, :failed)
+            @io.print format_string(step_definition.regexp_source, :failed)
             @io.puts format_string("  # #{step_definition.file_colon_line}".indent(max_length - step_definition.text_length), :comment)
           end
         end

data/lib/cucumber/language_support/step_definition_methods.rb

@@ -4,19 +4,19 @@ module Cucumber
   module LanguageSupport
     module StepDefinitionMethods
       def step_match(name_to_match, name_to_report)
-        if(groups = groups(name_to_match))
-          StepMatch.new(self, name_to_match, name_to_report, groups)
+        if(arguments = arguments_from(name_to_match))
+          StepMatch.new(self, name_to_match, name_to_report, arguments)
         else
           nil
         end
       end
 
       def backtrace_line
-        "#{file_colon_line}:in `#{regexp.inspect}'"
+        "#{file_colon_line}:in `#{regexp_source}'"
       end
 
       def text_length
-        regexp.inspect.jlength
+        regexp_source.jlength
       end
     end
   end

data/lib/cucumber/rails/action_controller.rb

@@ -28,6 +28,6 @@ rescue NameError # Failsafe was introduced in Rails 2.3.2
   end
 end
 
-Before('@allow_rescue') do
+Before('@allow-rescue') do
   ActionController::Base.allow_rescue = true
 end

data/lib/cucumber/rails/active_record.rb

@@ -1,24 +1,37 @@
 if defined?(ActiveRecord::Base)
-  Cucumber::Rails::World.use_transactional_fixtures = true
-  
+  Before('~@no-txn') do
+    @__cucumber_use_txn = Cucumber::Rails::World.use_transactional_fixtures
+    Cucumber::Rails::World.use_transactional_fixtures = true
+  end
+
+  Before('@no-txn') do
+    @__cucumber_use_txn = Cucumber::Rails::World.use_transactional_fixtures
+    Cucumber::Rails::World.use_transactional_fixtures = false
+  end
+
   Before do
-    @__cucumber_ar_connection = ActiveRecord::Base.connection
-    if @__cucumber_ar_connection.respond_to?(:increment_open_transactions)
-      @__cucumber_ar_connection.increment_open_transactions
-    else
-      ActiveRecord::Base.__send__(:increment_open_transactions)
+    if Cucumber::Rails::World.use_transactional_fixtures
+      @__cucumber_ar_connection = ActiveRecord::Base.connection
+      if @__cucumber_ar_connection.respond_to?(:increment_open_transactions)
+        @__cucumber_ar_connection.increment_open_transactions
+      else
+        ActiveRecord::Base.__send__(:increment_open_transactions)
+      end
+      @__cucumber_ar_connection.begin_db_transaction
     end
-    @__cucumber_ar_connection.begin_db_transaction
     ActionMailer::Base.deliveries = [] if defined?(ActionMailer::Base)
   end
-  
+
   After do
-    @__cucumber_ar_connection.rollback_db_transaction
-    if @__cucumber_ar_connection.respond_to?(:decrement_open_transactions)
-      @__cucumber_ar_connection.decrement_open_transactions
-    else
-      ActiveRecord::Base.__send__(:decrement_open_transactions)
+    if Cucumber::Rails::World.use_transactional_fixtures
+      @__cucumber_ar_connection.rollback_db_transaction
+      if @__cucumber_ar_connection.respond_to?(:decrement_open_transactions)
+        @__cucumber_ar_connection.decrement_open_transactions
+      else
+        ActiveRecord::Base.__send__(:decrement_open_transactions)
+      end
     end
+    Cucumber::Rails::World.use_transactional_fixtures = @__cucumber_use_txn
   end
 else
   module Cucumber::Rails

data/lib/cucumber/rb_support/rb_language.rb

@@ -3,6 +3,7 @@ require 'cucumber/rb_support/rb_world'
 require 'cucumber/rb_support/rb_step_definition'
 require 'cucumber/rb_support/rb_hook'
 require 'cucumber/rb_support/rb_transform'
+require 'cucumber/rb_support/regexp_argument_matcher'
 
 module Cucumber
   module RbSupport
@@ -55,6 +56,10 @@ module Cucumber
         end
       end
 
+      def arguments_from(regexp, step_name)
+        @regexp_argument_matcher.arguments_from(regexp, step_name)
+      end
+
       def snippet_text(step_keyword, step_name, multiline_arg_class = nil)
         escaped = Regexp.escape(step_name).gsub('\ ', ' ').gsub('/', '\/')
         escaped = escaped.gsub(PARAM_PATTERN, ESCAPED_PARAM_PATTERN)

data/lib/cucumber/rb_support/rb_step_definition.rb

@@ -1,7 +1,7 @@
 require 'cucumber/step_match'
 require 'cucumber/core_ext/string'
 require 'cucumber/core_ext/proc'
-require 'cucumber/rb_support/rb_group'
+require 'cucumber/rb_support/regexp_argument_matcher'
 
 module Cucumber
   module RbSupport
@@ -24,8 +24,6 @@ module Cucumber
         end
       end
 
-      attr_reader :proc, :regexp
-
       def initialize(rb_language, regexp, proc)
         raise MissingProc if proc.nil?
         if String === regexp
@@ -35,28 +33,23 @@ module Cucumber
         @rb_language, @regexp, @proc = rb_language, regexp, proc
       end
 
+      def regexp_source
+        @regexp.inspect
+      end
+
       def ==(step_definition)
-        self.regexp == step_definition.regexp
+        regexp_source == step_definition.regexp_source
       end
 
-      def groups(step_name)
-        match = regexp.match(step_name)
-        if match
-          n = 0
-          match.captures.map do |val|
-            n += 1
-            RbGroup.new(val, match.offset(n)[0])
-          end
-        else
-          nil
-        end
+      def arguments_from(step_name)
+        RegexpArgumentMatcher.arguments_from(@regexp, step_name)
       end
 
       def invoke(args)
         args = args.map{|arg| Ast::PyString === arg ? arg.to_s : arg}
         begin
           args = @rb_language.execute_transforms(args)
-          @rb_language.current_world.cucumber_instance_exec(true, regexp.inspect, *args, &@proc)
+          @rb_language.current_world.cucumber_instance_exec(true, regexp_source, *args, &@proc)
         rescue Cucumber::ArityMismatchError => e
           e.backtrace.unshift(self.backtrace_line)
           raise e

data/lib/cucumber/rb_support/regexp_argument_matcher.rb

@@ -0,0 +1,21 @@
+require 'cucumber/step_argument'
+
+module Cucumber
+  module RbSupport
+    class RegexpArgumentMatcher
+      def self.arguments_from(regexp, step_name)
+        match = regexp.match(step_name)
+        if match
+          n = 0
+          match.captures.map do |val|
+            n += 1
+            start = match.offset(n)[0]
+            StepArgument.new(val, start)
+          end
+        else
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/step_argument.rb

@@ -0,0 +1,9 @@
+module Cucumber
+  class StepArgument
+    attr_reader :val, :pos
+
+    def initialize(val, pos)
+      @val, @pos = val, pos
+    end
+  end
+end

data/lib/cucumber/step_match.rb

@@ -2,12 +2,12 @@ module Cucumber
   class StepMatch #:nodoc:
     attr_reader :step_definition
 
-    def initialize(step_definition, step_name, formatted_step_name, groups)
-      @step_definition, @step_name, @formatted_step_name, @groups = step_definition, step_name, formatted_step_name, groups
+    def initialize(step_definition, step_name, formatted_step_name, step_arguments)
+      @step_definition, @step_name, @formatted_step_name, @step_arguments = step_definition, step_name, formatted_step_name, step_arguments
     end
 
     def args
-      @groups.map{|g| g.val}
+      @step_arguments.map{|g| g.val}
     end
 
     def name
@@ -35,8 +35,8 @@ module Cucumber
     #
     #   lambda { |param| "[#{param}]" }
     #
-    def format_args(format = lambda{|a| a})
-      @formatted_step_name || @step_name.gzub(@groups, format)
+    def format_args(format = lambda{|a| a}, &proc)
+      @formatted_step_name || replace_arguments(@step_name, @step_arguments, format, &proc)
     end
     
     def file_colon_line
@@ -50,6 +50,25 @@ module Cucumber
     def text_length
       @step_definition.text_length
     end
+
+    def replace_arguments(string, step_arguments, format, &proc)
+      s = string.dup
+      offset = 0
+      step_arguments.each do |step_argument|
+        next if step_argument.pos.nil?
+        replacement = if block_given?
+          proc.call(step_argument.val)
+        elsif Proc === format
+          format.call(step_argument.val)
+        else
+          format % step_argument.val
+        end
+
+        s[step_argument.pos + offset, step_argument.val.jlength] = replacement
+        offset += replacement.length - step_argument.val.jlength
+      end
+      s
+    end
   end
   
   class NoStepMatch #:nodoc: