cucumber 1.2.1 → 1.2.2

data/lib/cucumber/runtime.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'multi_json'
 require 'gherkin/rubify'
 require 'gherkin/i18n'
 require 'cucumber/configuration'
@@ -13,7 +14,7 @@ module Cucumber
   # This is the meaty part of Cucumber that ties everything together.
   class Runtime
     attr_reader :results
-    
+
     include Formatter::Duration
     include Runtime::UserInterface
 
@@ -24,28 +25,28 @@ module Cucumber
       @support_code = SupportCode.new(self, @configuration)
       @results = Results.new(@configuration)
     end
-    
+
     # Allows you to take an existing runtime and change it's configuration
     def configure(new_configuration)
       @configuration = Configuration.parse(new_configuration)
       @support_code.configure(@configuration)
       @results.configure(@configuration)
     end
-    
+
     def load_programming_language(language)
       @support_code.load_programming_language(language)
     end
-    
+
     def run!
       load_step_definitions
       fire_after_configuration_hook
 
       tree_walker = @configuration.build_tree_walker(self)
       self.visitor = tree_walker # Ugly circular dependency, but needed to support World#puts
-      
+
       tree_walker.visit_features(features)
     end
-    
+
     def features_paths
       @configuration.paths
     end
@@ -151,7 +152,7 @@ module Cucumber
           FileUtils.mkdir_p(@configuration.dotcucumber)
         end
         File.open(File.join(@configuration.dotcucumber, 'stepdefs.json'), 'w') do |io|
-          io.write(JSON.pretty_generate(stepdefs))
+          io.write(MultiJson.dump(stepdefs, :pretty => true))
         end
       end
     end
@@ -164,8 +165,8 @@ module Cucumber
 
     def features
       @loader ||= Runtime::FeaturesLoader.new(
-        @configuration.feature_files, 
-        @configuration.filters, 
+        @configuration.feature_files,
+        @configuration.filters,
         @configuration.tag_expression)
       @loader.features
     end
@@ -180,4 +181,4 @@ module Cucumber
     end
   end
 
-end
+end

data/lib/cucumber/runtime/features_loader.rb

@@ -2,21 +2,21 @@ require 'cucumber/errors'
 
 module Cucumber
   class Runtime
-    
+
     class FeaturesLoader
       include Formatter::Duration
 
       def initialize(feature_files, filters, tag_expression)
         @feature_files, @filters, @tag_expression = feature_files, filters, tag_expression
       end
-      
+
       def features
-        load unless @features
+        load unless (defined? @features) and @features
         @features
       end
-      
+
     private
-    
+
       def load
         features = Ast::Features.new
 
@@ -52,7 +52,7 @@ module Cucumber
         end
         raise TagExcess.new(error_messages) if error_messages.any?
       end
-      
+
       def log
         Cucumber.logger
       end

data/lib/cucumber/runtime/for_programming_languages.rb

@@ -3,12 +3,12 @@ require 'forwardable'
 module Cucumber
   class Runtime
     # This is what a programming language will consider to be a runtime.
-    # 
+    #
     # It's a thin class that directs the handul of methods needed by the
     # programming languages to the right place.
     class ForProgrammingLanguages
       extend Forwardable
-    
+
       def initialize(support_code, user_interface)
         @support_code, @user_interface = support_code, user_interface
       end
@@ -19,12 +19,12 @@ module Cucumber
         :puts,
         :features_paths,
         :step_match
-    
+
       def_delegators :@support_code,
         :invoke_steps,
         :invoke,
         :load_programming_language
-    
+
       # Returns a Cucumber::Ast::Table for +text_or_table+, which can either
       # be a String:
       #
@@ -50,18 +50,11 @@ module Cucumber
         end
       end
 
-      # Returns a regular String for +string_with_triple_quotes+. Example:
-      #
-      #   """
-      #    hello
-      #   world
-      #   """
-      #
-      # Is retured as: " hello\nworld"
+      # Returns Ast::DocString for +string_without_triple_quotes+.
       #
-      def doc_string(string_with_triple_quotes, file=nil, line_offset=0)
-        Ast::DocString.parse(string_with_triple_quotes)
+      def doc_string(string_without_triple_quotes, content_type='', line_offset=0)
+        Ast::DocString.new(string_without_triple_quotes,content_type)
       end
     end
   end
-end
+end

data/lib/cucumber/runtime/results.rb

@@ -1,6 +1,6 @@
 module Cucumber
   class Runtime
-    
+
     class Results
       def initialize(configuration)
         @configuration = configuration
@@ -22,7 +22,7 @@ module Cucumber
           steps.push(step)
         end
       end
-      
+
       def scenario_visited(scenario) #:nodoc:
         scenario_id = scenario.object_id
 
@@ -31,7 +31,7 @@ module Cucumber
           scenarios.push(scenario)
         end
       end
-      
+
       def steps(status = nil) #:nodoc:
         @steps ||= []
         if(status)
@@ -40,7 +40,7 @@ module Cucumber
           @steps
         end
       end
-      
+
       def scenarios(status = nil) #:nodoc:
         @scenarios ||= []
         if(status)
@@ -49,7 +49,7 @@ module Cucumber
           @scenarios
         end
       end
-      
+
       def failure?
         if @configuration.wip?
           scenarios(:passed).any?
@@ -59,6 +59,6 @@ module Cucumber
         end
       end
     end
-    
+
   end
 end

data/lib/cucumber/runtime/support_code.rb

@@ -5,9 +5,9 @@ require 'cucumber/runtime/for_programming_languages'
 module Cucumber
 
   class Runtime
-    
+
     class SupportCode
-      
+
       require 'forwardable'
       class StepInvoker
         include Gherkin::Rubify
@@ -20,15 +20,15 @@ module Cucumber
         end
 
         def step(step)
-          @support_code.invoke(step.name, Ast::MultilineArgument.from(step.doc_string || step.rows)) 
+          @support_code.invoke(step.name, Ast::MultilineArgument.from(step.doc_string || step.rows))
         end
 
         def eof
         end
       end
-    
+
       include Constantize
-      
+
       def initialize(user_interface, configuration={})
         @configuration = Configuration.parse(configuration)
         @runtime_facade = Runtime::ForProgrammingLanguages.new(self, user_interface)
@@ -36,11 +36,11 @@ module Cucumber
         @programming_languages = []
         @language_map = {}
       end
-      
+
       def configure(new_configuration)
         @configuration = Configuration.parse(new_configuration)
       end
-    
+
       # Invokes a series of steps +steps_text+. Example:
       #
       #   invoke(%Q{
@@ -55,7 +55,7 @@ module Cucumber
 
       def invoke(step_name, multiline_argument=nil)
         multiline_argument = Cucumber::Ast::MultilineArgument.from(multiline_argument)
-        # It is very important to leave multiline_argument=nil as a vararg. Cuke4Duke needs it that way. 
+        # It is very important to leave multiline_argument=nil as a vararg. Cuke4Duke needs it that way.
         begin
           step_match(step_name).invoke(multiline_argument)
         rescue Exception => e
@@ -63,7 +63,7 @@ module Cucumber
           raise e
         end
       end
-      
+
       # Loads and registers programming language implementation.
       # Instances are cached, so calling with the same argument
       # twice will return the same instance.
@@ -76,7 +76,7 @@ module Cucumber
         @language_map[ext] = programming_language
         programming_language
       end
-    
+
       def load_files!(files)
         log.debug("Code:\n")
         files.each do |file|
@@ -84,14 +84,14 @@ module Cucumber
         end
         log.debug("\n")
       end
-      
+
       def load_files_from_paths(paths)
         files = paths.map { |path| Dir["#{path}/**/*"] }.flatten
         load_files! files
       end
-    
+
       def unmatched_step_definitions
-        @programming_languages.map do |programming_language| 
+        @programming_languages.map do |programming_language|
           programming_language.unmatched_step_definitions
         end.flatten
       end
@@ -102,17 +102,17 @@ module Cucumber
           programming_language.snippet_text(step_keyword, step_name, multiline_arg_class)
         end.join("\n")
       end
-    
+
       def unknown_programming_language?
         @programming_languages.empty?
       end
-    
+
       def fire_hook(name, *args)
         @programming_languages.each do |programming_language|
           programming_language.send(name, *args)
         end
       end
-    
+
       def around(scenario, block)
         @programming_languages.reverse.inject(block) do |blk, programming_language|
           proc do
@@ -122,29 +122,38 @@ module Cucumber
           end
         end.call
       end
-      
+
       def step_definitions
         @programming_languages.map do |programming_language|
           programming_language.step_definitions
         end.flatten
       end
-    
+
       def step_match(step_name, name_to_report=nil) #:nodoc:
+        @match_cache ||= {}
+
+        match = @match_cache[[step_name, name_to_report]]
+        return match if match
+
+        @match_cache[[step_name, name_to_report]] = step_match_without_cache(step_name, name_to_report)
+      end
+
+      private
+
+      def step_match_without_cache(step_name, name_to_report=nil)
         matches = matches(step_name, name_to_report)
         raise Undefined.new(step_name) if matches.empty?
         matches = best_matches(step_name, matches) if matches.size > 1 && guess_step_matches?
         raise Ambiguous.new(step_name, matches, guess_step_matches?) if matches.size > 1
         matches[0]
       end
-    
-    private
-  
+
       def guess_step_matches?
         @configuration.guess?
       end
-    
+
       def matches(step_name, name_to_report)
-        @programming_languages.map do |programming_language| 
+        @programming_languages.map do |programming_language|
           programming_language.step_matches(step_name, name_to_report).to_a
         end.flatten
       end
@@ -164,7 +173,7 @@ module Cucumber
           top_groups
         end
       end
-    
+
       def load_file(file)
         if programming_language = programming_language_for(file)
           log.debug("  * #{file}\n")
@@ -173,11 +182,11 @@ module Cucumber
           log.debug("  * #{file} [NOT SUPPORTED]\n")
         end
       end
-    
+
       def log
         Cucumber.logger
       end
-    
+
       def programming_language_for(step_def_file)
         if ext = File.extname(step_def_file)[1..-1]
           return nil if @unsupported_programming_languages.index(ext)
@@ -192,7 +201,7 @@ module Cucumber
           nil
         end
       end
-    
+
     end
   end
-end
+end

data/lib/cucumber/runtime/user_interface.rb

@@ -47,7 +47,7 @@ module Cucumber
       end
 
       # Embed +src+ of MIME type +mime_type+ into the output. The +src+ argument may
-      # be a path to a file, or if it's an image it may also be a Base64 encoded image. 
+      # be a path to a file, or if it's an image it may also be a Base64 encoded image.
       # The embedded data may or may not be ignored, depending on what kind of formatter(s) are active.
       #
       def embed(src, mime_type, label)
@@ -55,13 +55,13 @@ module Cucumber
       end
 
     private
-    
+
       def mri_gets(timeout_seconds)
         begin
           Timeout.timeout(timeout_seconds) do
             STDIN.gets
           end
-        rescue Timeout::Error => e
+        rescue Timeout::Error
           nil
         end
       end
@@ -76,6 +76,6 @@ module Cucumber
         answer
       end
     end
-    
+
   end
 end

data/lib/cucumber/step_definition_light.rb

@@ -4,17 +4,17 @@ module Cucumber
   # Used for reporting purposes only (usage formatter).
   class StepDefinitionLight
     attr_reader :regexp_source, :file_colon_line
-    
+
     def initialize(regexp_source, file_colon_line)
       @regexp_source, @file_colon_line = regexp_source, file_colon_line
     end
-    
+
     def eql?(o)
       regexp_source == o.regexp_source && file_colon_line == o.file_colon_line
     end
-    
+
     def hash
       regexp_source.hash + 31*file_colon_line.hash
     end
   end
-end
+end