aslakhellesoy-cucumber 0.3.102 → 0.3.102.1

data/History.txt

@@ -1,3 +1,15 @@
+== (In Git)
+
+This release gives you back some of the control over the Rails environment that was accidentally taken away from you in the 
+previous release.
+
+Using this release on a Rails project requires a rerun of script/generate cucumber.
+
+=== New Features
+* Added a new @no-txn tag to selectively turn off transactions for a particluar scenario.
+* Added back a way to globally turn off transactions.
+* Renamed @allow_rescue tag to @allow-rescue.
+
 == 2009-09-22
 
 This release has some changes in the Rails support, so make sure you run "script/generate cucumber" after you upgrade.

data/Manifest.txt

@@ -385,13 +385,14 @@ lib/cucumber/rails/test_unit.rb
 lib/cucumber/rails/world.rb
 lib/cucumber/rake/task.rb
 lib/cucumber/rb_support/rb_dsl.rb
-lib/cucumber/rb_support/rb_group.rb
 lib/cucumber/rb_support/rb_hook.rb
 lib/cucumber/rb_support/rb_language.rb
 lib/cucumber/rb_support/rb_step_definition.rb
 lib/cucumber/rb_support/rb_transform.rb
 lib/cucumber/rb_support/rb_world.rb
+lib/cucumber/rb_support/regexp_argument_matcher.rb
 lib/cucumber/rspec_neuter.rb
+lib/cucumber/step_argument.rb
 lib/cucumber/step_match.rb
 lib/cucumber/step_mother.rb
 lib/cucumber/version.rb
@@ -427,7 +428,6 @@ spec/cucumber/cli/main_spec.rb
 spec/cucumber/cli/options_spec.rb
 spec/cucumber/cli/profile_loader_spec.rb
 spec/cucumber/core_ext/proc_spec.rb
-spec/cucumber/core_ext/string_spec.rb
 spec/cucumber/formatter/ansicolor_spec.rb
 spec/cucumber/formatter/color_io_spec.rb
 spec/cucumber/formatter/duration_spec.rb
@@ -436,7 +436,9 @@ spec/cucumber/formatter/progress_spec.rb
 spec/cucumber/parser/feature_parser_spec.rb
 spec/cucumber/parser/table_parser_spec.rb
 spec/cucumber/rb_support/rb_step_definition_spec.rb
+spec/cucumber/rb_support/regexp_argument_matcher_spec.rb
 spec/cucumber/sell_cucumbers.feature
+spec/cucumber/step_match_spec.rb
 spec/cucumber/step_mother_spec.rb
 spec/cucumber/treetop_parser/empty_feature.feature
 spec/cucumber/treetop_parser/empty_scenario.feature

data/features/steps_formatter.feature

@@ -8,7 +8,8 @@ Feature: --formatter steps option - Steps Formatter
 
   Scenario: Printing steps
     When I run cucumber -f steps features
-    Then it should pass with
+    Then STDERR should be empty
+    And it should pass with
     """
     features/step_definitions/steps_lib1.rb
       /^I defined a first step$/           # features/step_definitions/steps_lib1.rb:1

data/lib/cucumber/core_ext/string.rb

@@ -7,28 +7,6 @@ class String #:nodoc:
     end
   end
   
-  # TODO: Move to StepMatch
-  # +groups+ is an array of 2-element arrays, where
-  # the 1st element is the value of a regexp match group,
-  # and the 2nd element is its start index.
-  def gzub(groups, format=nil, &proc)
-    s = dup
-    offset = 0
-    groups.each do |group|
-      replacement = if block_given?
-        proc.call(group.val)
-      elsif Proc === format
-        format.call(group.val)
-      else
-        format % group.val
-      end
-      
-      s[group.start + offset, group.val.length] = replacement
-      offset += replacement.length - group.val.length
-    end
-    s
-  end
-
   if (Cucumber::JRUBY && Cucumber::RAILS) || Cucumber::RUBY_1_9
     # Workaround for http://tinyurl.com/55uu3u 
     alias jlength length

data/lib/cucumber/formatter/steps.rb

@@ -23,9 +23,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 +37,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/usage.rb

@@ -44,7 +44,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 +55,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 +76,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,20 @@
+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
+            StepArgument.new(val, match.offset(n)[0])
+          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,24 @@ 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|
+        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:

data/lib/cucumber/version.rb

@@ -3,7 +3,7 @@ module Cucumber #:nodoc:
     MAJOR = 0
     MINOR = 3
     TINY  = 102
-    PATCH = nil # Set to nil for official release
+    PATCH = 1 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/rails_generators/cucumber/templates/env.rb

@@ -3,6 +3,20 @@ ENV["RAILS_ENV"] ||= "cucumber"
 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
 require 'cucumber/rails/world'
 
+# Whether or not to run each scenario within a database transaction.
+#
+# If you leave this to true, you can turn off traqnsactions on a
+# per-scenario basis, simply tagging it with @no-txn
+Cucumber::Rails::World.use_transactional_fixtures = true
+
+# Whether or not to allow Rails to rescue errors and render them on
+# an error page. Default is false, which will cause an error to be
+# raised.
+#
+# If you leave this to false, you can turn on Rails rescuing on a
+# per-scenario basis, simply tagging it with @allow-rescue
+ActionController::Base.allow_rescue = false
+
 # Comment out the next line if you don't want Cucumber Unicode support
 require 'cucumber/formatter/unicode'
 

data/spec/cucumber/rb_support/regexp_argument_matcher_spec.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'cucumber/rb_support/regexp_argument_matcher'
+
+module Cucumber
+  module RbSupport
+    describe RegexpArgumentMatcher do
+      it "should create 2 arguments" do
+        arguments = RegexpArgumentMatcher.arguments_from(/I (\w+) (\w+)/, "I like fish")
+        arguments.map{|argument| [argument.val, argument.pos]}.should == [["like", 2], ["fish", 7]]
+      end
+    end
+  end
+end

data/spec/cucumber/step_match_spec.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'cucumber/rb_support/rb_step_definition'
+require 'cucumber/rb_support/rb_language'
+
+module Cucumber
+  describe StepMatch do
+    before do
+      @rb_language = RbSupport::RbLanguage.new(nil)
+    end
+
+    def stepdef(regexp)
+      RbSupport::RbStepDefinition.new(@rb_language, regexp, lambda{})
+    end
+
+    it "should format groups with format string" do
+      m = stepdef(/I (\w+) (\d+) (\w+) this (\w+)/).step_match("I ate 1 egg this morning", nil)
+      m.format_args("<span>%s</span>").should == "I <span>ate</span> <span>1</span> <span>egg</span> this <span>morning</span>"
+    end
+
+    it "should format groups with format string when there are dupes" do
+      m = stepdef(/I (\w+) (\d+) (\w+) this (\w+)/).step_match("I bob 1 bo this bobs", nil)
+      m.format_args("<span>%s</span>").should == "I <span>bob</span> <span>1</span> <span>bo</span> this <span>bobs</span>"
+    end
+
+    it "should format groups with block" do
+      m = stepdef(/I (\w+) (\d+) (\w+) this (\w+)/).step_match("I ate 1 egg this morning", nil)
+      m.format_args(&lambda{|m| "<span>#{m}</span>"}).should == "I <span>ate</span> <span>1</span> <span>egg</span> this <span>morning</span>"
+    end
+
+    it "should format groups with proc object" do
+      m = stepdef(/I (\w+) (\d+) (\w+) this (\w+)/).step_match("I ate 1 egg this morning", nil)
+      m.format_args(lambda{|m| "<span>#{m}</span>"}).should == "I <span>ate</span> <span>1</span> <span>egg</span> this <span>morning</span>"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.102
+  version: 0.3.102.1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-22 00:00:00 -07:00
+date: 2009-09-23 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -463,13 +463,14 @@ files:
 - lib/cucumber/rails/world.rb
 - lib/cucumber/rake/task.rb
 - lib/cucumber/rb_support/rb_dsl.rb
-- lib/cucumber/rb_support/rb_group.rb
 - lib/cucumber/rb_support/rb_hook.rb
 - lib/cucumber/rb_support/rb_language.rb
 - lib/cucumber/rb_support/rb_step_definition.rb
 - lib/cucumber/rb_support/rb_transform.rb
 - lib/cucumber/rb_support/rb_world.rb
+- lib/cucumber/rb_support/regexp_argument_matcher.rb
 - lib/cucumber/rspec_neuter.rb
+- lib/cucumber/step_argument.rb
 - lib/cucumber/step_match.rb
 - lib/cucumber/step_mother.rb
 - lib/cucumber/version.rb
@@ -505,7 +506,6 @@ files:
 - spec/cucumber/cli/options_spec.rb
 - spec/cucumber/cli/profile_loader_spec.rb
 - spec/cucumber/core_ext/proc_spec.rb
-- spec/cucumber/core_ext/string_spec.rb
 - spec/cucumber/formatter/ansicolor_spec.rb
 - spec/cucumber/formatter/color_io_spec.rb
 - spec/cucumber/formatter/duration_spec.rb
@@ -514,7 +514,9 @@ files:
 - spec/cucumber/parser/feature_parser_spec.rb
 - spec/cucumber/parser/table_parser_spec.rb
 - spec/cucumber/rb_support/rb_step_definition_spec.rb
+- spec/cucumber/rb_support/regexp_argument_matcher_spec.rb
 - spec/cucumber/sell_cucumbers.feature
+- spec/cucumber/step_match_spec.rb
 - spec/cucumber/step_mother_spec.rb
 - spec/cucumber/treetop_parser/empty_feature.feature
 - spec/cucumber/treetop_parser/empty_scenario.feature

data/lib/cucumber/rb_support/rb_group.rb

@@ -1,11 +0,0 @@
-module Cucumber
-  module RbSupport
-    class RbGroup
-      attr_reader :val, :start
-      
-      def initialize(val, start)
-        @val, @start = val, start
-      end
-    end
-  end
-end

data/spec/cucumber/core_ext/string_spec.rb

@@ -1,41 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require 'cucumber/core_ext/string'
-require 'cucumber/rb_support/rb_group'
-
-describe String, "#gzub" do
-  def groups(a)
-    a.map{|c| Cucumber::RbSupport::RbGroup.new(c[0], c[1])}
-  end
-  
-  it "should format groups with format string" do
-    "I ate 1 egg this morning".gzub(groups([['ate', 2], ['1', 6], ['egg', 8],  ['morning', 17]]), "<span>%s</span>").should ==
-    "I <span>ate</span> <span>1</span> <span>egg</span> this <span>morning</span>"
-  end
-
-  it "should format groups with format string when there are dupes" do
-    "I bob 1 bo this bobs".gzub(groups([['bob', 2], ['1', 6], ['bo', 8],  ['bobs', 16]]), "<span>%s</span>").should ==
-    "I <span>bob</span> <span>1</span> <span>bo</span> this <span>bobs</span>"
-  end
-
-  it "should format groups with block" do
-    f = "I ate 1 egg this morning".gzub(groups([['ate', 2], ['1', 6], ['egg', 8],  ['morning', 17]])) do |m|
-      "<span>#{m}</span>"
-    end
-    f.should == "I <span>ate</span> <span>1</span> <span>egg</span> this <span>morning</span>"
-  end
-
-  it "should format groups with proc object" do
-    proc = lambda do |m|
-      "<span>#{m}</span>"
-    end
-    f = "I ate 1 egg this morning".gzub(groups([['ate', 2], ['1', 6], ['egg', 8],  ['morning', 17]]), proc)
-    f.should == "I <span>ate</span> <span>1</span> <span>egg</span> this <span>morning</span>"
-  end
-  
-  it "should format groups with block with not all placeholders having a value" do
-    f = "another member named Bob joins the group".gzub(groups([['another', 0], ['member', 8], ['Bob', 21]])) do |m|
-      "<span>#{m}</span>"
-    end
-    f.should == "<span>another</span> <span>member</span> named <span>Bob</span> joins the group"
-  end
-end