cucumber 0.3.11 → 0.3.90

data/lib/cucumber/parser/feature.tt

@@ -7,10 +7,8 @@ module Cucumber
     # Treetop will then generate the parser in-memory. When you're happy, just generate
     # the rb file with tt feature.tt
     grammar Feature
-      include I18n
-      include Table
 
-      rule feature
+      rule feature_sub
         white 
         comment 
         white 

data/lib/cucumber/parser/i18n.tt

@@ -1,35 +1,42 @@
 module Cucumber
   module Parser
-    grammar I18n
+    module I18n
+      grammar <%= keywords('grammar_name', true) %>
+        include Feature
+        include Table
 
-      rule background_keyword
-        (<%= keywords('background') %>) ':'
-      end
+        rule feature
+          feature_sub
+        end
 
-      rule scenario_keyword
-        (<%= keywords('scenario') %>) ':'
-      end
+        rule background_keyword
+          (<%= keywords('background') %>) ':'
+        end
 
-      rule scenario_outline_keyword
-        (<%= keywords('scenario_outline') %>) ':'
-      end
+        rule scenario_keyword
+          (<%= keywords('scenario') %>) ':'
+        end
 
-      rule step_keyword
-        (<%= keywords('given') %>) /
-        (<%= keywords('when') %>) /
-        (<%= keywords('then') %>) /
-        (<%= keywords('and') %>) /
-        (<%= keywords('but') %>)
-      end
+        rule scenario_outline_keyword
+          (<%= keywords('scenario_outline') %>) ':'
+        end
 
-      rule keyword_space
-        <%= keywords('space_after_keyword', true) ? 'space+' : 'space*' %>
-      end
+        rule step_keyword
+          (<%= keywords('given') %>) /
+          (<%= keywords('when') %>) /
+          (<%= keywords('then') %>) /
+          (<%= keywords('and') %>) /
+          (<%= keywords('but') %>)
+        end
 
-      rule examples_keyword
-        (<%= keywords('examples') %>) ':'?
-      end
+        rule keyword_space
+          <%= keywords('space_after_keyword', true) ? 'space+' : 'space*' %>
+        end
 
+        rule examples_keyword
+          (<%= keywords('examples') %>) ':'?
+        end
+      end
     end
   end
 end

data/lib/cucumber/parser/i18n/language.rb

@@ -0,0 +1,83 @@
+module Cucumber
+  module Parser
+    module I18n
+      class Language
+        KEYWORD_KEYS = %w{name native encoding feature background scenario scenario_outline examples given when then but}
+
+        class << self
+          LANGUAGES = Hash.new{|h,k| h[k] = Language.new(k)}
+          
+          def [](key)
+            LANGUAGES[key]
+          end
+
+          def alias_step_definitions(keywords) #:nodoc:
+            all_keywords = %w{given when then and but}.map{|keyword| keywords[keyword].split('|')}.flatten
+            alias_steps(all_keywords)
+          end
+
+          # Sets up additional method aliases for Given, When and Then.
+          # This does *not* affect how feature files are parsed. If you
+          # want to create aliases in the parser, you have to do this in
+          # languages.yml. For example:
+          #
+          # and: And|With
+          def alias_steps(keywords)
+            keywords.each do |adverb|
+              StepMother.alias_adverb(adverb)
+              World.alias_adverb(adverb)
+            end
+          end
+        end
+
+        alias_step_definitions(Cucumber::LANGUAGES['en'])
+
+        def initialize(lang)
+          @keywords = Cucumber::LANGUAGES[lang]
+          raise "Language not supported: #{lang.inspect}" if @keywords.nil?
+          @keywords['grammar_name'] = @keywords['name'].gsub(/\s/, '')
+        end
+        
+        def parser
+          return @parser if @parser
+          i18n_tt = File.expand_path(File.dirname(__FILE__) + '/../i18n.tt')
+          template = File.open(i18n_tt, Cucumber.file_mode('r')).read
+          erb = ERB.new(template)
+          grammar = erb.result(binding)
+          Treetop.load_from_string(grammar)
+          self.class.alias_step_definitions(@keywords)
+          @parser = Parser::I18n.const_get("#{@keywords['grammar_name']}Parser").new
+        end
+
+        def parse(source, path, filter)
+          feature = parser.parse_or_fail(source, path, filter)
+          feature.language = self if feature
+          feature
+        end
+
+        def keywords(key, raw=false)
+          return @keywords[key] if raw
+          return nil unless @keywords[key]
+          values = @keywords[key].split('|')
+          values.map{|value| "'#{value}'"}.join(" / ")
+        end
+
+        def incomplete?
+          KEYWORD_KEYS.detect{|key| @keywords[key].nil?}
+        end
+
+        def scenario_keyword
+          @keywords['scenario'].split('|')[0] + ':'
+        end
+
+        def but_keywords
+          @keywords['but'].split('|')
+        end
+
+        def and_keywords
+          @keywords['and'].split('|')
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/parser/treetop_ext.rb

@@ -12,80 +12,19 @@ end
 
 module Cucumber
   module Parser
-    class Filter
-      def initialize(lines, options)
-        @lines = lines
-        @include_tags = options[:include_tags] || []
-        @exclude_tags = options[:exclude_tags] || []
-        @name_regexps = options[:name_regexps] || []
-      end
-
-      def accept?(syntax_node)
-        at_line?(syntax_node) &&
-        matches_tags?(syntax_node) &&
-        matches_names?(syntax_node)
-      end
-
-      def accept_example?(syntax_node, outline)
-        (at_line?(syntax_node) || outline_at_line?(outline)) && 
-        (matches_names?(syntax_node) || outline_matches_names?(outline))
-      end
-      
-      def at_line?(syntax_node)
-        @lines.nil? || @lines.empty? || @lines.detect{|line| syntax_node.at_line?(line)}
-      end
-
-      def outline_at_line?(syntax_node)
-         @lines.nil? || @lines.empty? || @lines.detect{|line| syntax_node.outline_at_line?(line)}
-      end
-
-      def matches_tags?(syntax_node)
-        !excluded_by_tags?(syntax_node) &&
-        included_by_tags?(syntax_node)
-      end
-
-      def included_by_tags?(syntax_node)
-        @include_tags.empty? || syntax_node.has_tags?(@include_tags)
-      end
-
-      def excluded_by_tags?(syntax_node)
-        @exclude_tags.any? && syntax_node.has_tags?(@exclude_tags)
-      end
-      
-      def outline_matches_names?(syntax_node)
-        @name_regexps.nil? || @name_regexps.empty? || @name_regexps.detect{|name_regexp| syntax_node.outline_matches_name?(name_regexp)}
-      end
-      
-      def matches_names?(syntax_node)
-        @name_regexps.nil? || @name_regexps.empty? || @name_regexps.detect{|name_regexp| syntax_node.matches_name?(name_regexp)}
+    class SyntaxError < StandardError
+      def initialize(parser, file, line_offset)
+        tf = parser.terminal_failures
+        expected = tf.size == 1 ? tf[0].expected_string.inspect : "one of #{tf.map{|f| f.expected_string.inspect}.uniq*', '}"
+        line = parser.failure_line + line_offset
+        message = "#{file}:#{line}:#{parser.failure_column}: Parse error, expected #{expected}."
+        super(message)
       end
     end
-
-    module TreetopExt      
-      FILE_COLON_LINE_PATTERN = /^([\w\W]*?):([\d:]+)$/
-
-      # Parses a file and returns a Cucumber::Ast
-      def parse_file(file, options)
-        _, path, lines = *FILE_COLON_LINE_PATTERN.match(file)
-        if path
-          lines = lines.split(':').map { |line| line.to_i }
-        else
-          path = file
-        end
-        filter = Filter.new(lines, options)
-
-        loader = lambda { |io| parse_or_fail(io.read, filter, path) }
-        feature = if path =~ /^http/
-          require 'open-uri'
-          open(path, &loader)
-        else
-          File.open(path, Cucumber.file_mode('r'), &loader) 
-        end
-        feature
-      end
-
-      def parse_or_fail(string, filter=nil, file=nil, line_offset=0)
-        parse_tree = parse(string)
+    
+    module TreetopExt
+      def parse_or_fail(source, file=nil, filter=nil, line_offset=0)
+        parse_tree = parse(source)
         if parse_tree.nil?
           raise Cucumber::Parser::SyntaxError.new(self, file, line_offset)
         else
@@ -95,16 +34,6 @@ module Cucumber
         end
       end
     end
-
-    class SyntaxError < StandardError
-      def initialize(parser, file, line_offset)
-        tf = parser.terminal_failures
-        expected = tf.size == 1 ? tf[0].expected_string.inspect : "one of #{tf.map{|f| f.expected_string.inspect}.uniq*', '}"
-        line = parser.failure_line + line_offset
-        message = "#{file}:#{line}:#{parser.failure_column}: Parse error, expected #{expected}."
-        super(message)
-      end
-    end
   end
 end
 
@@ -115,7 +44,7 @@ module Treetop
         input.line_of(interval.first)
       end
     end
-    
+
     class CompiledParser
       include Cucumber::Parser::TreetopExt
     end

data/lib/cucumber/platform.rb

@@ -4,9 +4,11 @@ require 'rbconfig'
 require 'yaml'
 
 module Cucumber
+  # TODO: Move these constants and the file to Language. Update wiki
   LANGUAGE_FILE = File.expand_path(File.dirname(__FILE__) + '/languages.yml')
   LANGUAGES     = YAML.load_file(LANGUAGE_FILE)
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
+  LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)
   IRONRUBY      = Config::CONFIG['sitedir'] =~ /IronRuby/
   WINDOWS       = Config::CONFIG['host_os'] =~ /mswin|mingw/
@@ -14,4 +16,8 @@ module Cucumber
   RAILS         = defined?(Rails)
   RUBY_BINARY   = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
   RUBY_1_9      = RUBY_VERSION =~ /^1\.9/
+  
+  def self.file_mode(m)
+    RUBY_1_9 ? "#{m}:UTF-8" : m
+  end
 end

data/lib/cucumber/rake/task.rb

@@ -194,6 +194,7 @@ module Cucumber
           result = []
           result += feature_list.to_a if feature_list
           result += FileList[feature_pattern].to_a if feature_pattern
+          result = make_command_line_safe(result)
           FileList[result]
         end
       end
@@ -208,6 +209,11 @@ module Cucumber
           FileList[result]
         end
       end
+
+      private
+      def make_command_line_safe(list)
+        list.map{|string| string.gsub(' ', '\ ')}
+      end
     end
 
     class FeatureTask < Task

data/lib/cucumber/step_definition.rb

@@ -86,6 +86,8 @@ module Cucumber
 
     include StepDefinitionMethods
 
+    attr_reader :regexp, :proc
+
     def initialize(pattern, &proc)
       raise MissingProc if proc.nil?
       if String === pattern
@@ -112,5 +114,9 @@ module Cucumber
     def file_colon_line
       @proc.file_colon_line
     end
+    
+    def file
+      @file ||= file_colon_line.split(':')[0]
+    end
   end
 end

data/lib/cucumber/step_match.rb

@@ -34,7 +34,7 @@ module Cucumber
   end
   
   class NoStepMatch
-    attr_reader :step_definition
+    attr_reader :step_definition, :name
 
     def initialize(step, name)
       @step = step

data/lib/cucumber/step_mother.rb

@@ -254,12 +254,12 @@ module Cucumber
       @snippet_generator.snippet_text(step_keyword, step_name, multiline_arg_class)
     end
 
-    def before_and_after(scenario, skip=false)
-      before(scenario) unless skip
+    def before_and_after(scenario, skip_hooks=false)
+      before(scenario) unless skip_hooks
       @current_scenario = scenario
       yield scenario
       @current_scenario = nil
-      after(scenario) unless skip
+      after(scenario) unless skip_hooks
       scenario_visited(scenario)
     end
     

data/lib/cucumber/version.rb

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

data/lib/cucumber/webrat/table_locator.rb

@@ -0,0 +1,66 @@
+module Webrat
+  class Table < Element
+    def self.xpath_search
+      ".//table"
+    end
+
+    # Converts this Table element into a 2-dimensional array of String where each cell
+    # represents the inner_html of the <td> and <th> elements. The number of columns is
+    # determined by the number of cells in the first row.
+    def to_a
+      col_count = nil
+      Webrat::XML.css_search(@element, 'tr').map do |row|
+        cols = Webrat::XML.css_search(row, 'th,td')
+        col_count ||= cols.length
+        cols[0...col_count].map do |col|
+          col.inner_html
+        end
+      end
+    end
+  end
+  
+  module Locators
+    class TableLocator < Locator
+      def locate
+        Table.load(@session, table_element)
+      end
+
+      def table_element
+        table_elements.detect do |table_element|
+          matches_id?(table_element) ||
+          matches_css_selector?(table_element)
+        end
+      end
+
+      def matches_id?(table_element)
+        Webrat::XML.attribute(table_element, "id") == @value.to_s
+      end
+
+      def matches_css_selector?(table_element)
+        Webrat::XML.css_at(@dom, @value)
+      end
+
+      def table_elements
+        Webrat::XML.xpath_search(@dom, *Table.xpath_search)
+      end
+
+      def error_message
+        "Could not find table matching '#{@value}'"
+      end
+    end
+
+    # Returns a Table element located by +id_or_selector+, which can
+    # be a DOM id or a CSS selector.
+    def table_at(id_or_selector)
+      TableLocator.new(@session, dom, id_or_selector).locate!
+    end
+  end
+  
+  module Methods
+    delegate_to_session :table_at
+  end
+  
+  class Session
+    def_delegators :current_scope, :table_at
+  end
+end

data/rails_generators/cucumber/templates/cucumber.rake

@@ -1,5 +1,7 @@
 $LOAD_PATH.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') if File.directory?(RAILS_ROOT + '/vendor/plugins/cucumber/lib')
 
+unless ARGV.any? {|a| a =~ /^gems/}
+
 begin
   require 'cucumber/rake/task'
 
@@ -14,3 +16,5 @@ rescue LoadError
     abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
   end
 end
+
+end