square-cucumber 0.3.12.2 → 0.3.93.1

data/lib/cucumber/parser/feature.tt

@@ -21,7 +21,11 @@ module Cucumber
           def has_tags?(tag_names)
             tags.has_tags?(tag_names)
           end
-          
+
+          def has_all_tags?(tag_names)
+            tags.has_all_tags?(tag_names)
+          end
+
           def build(filter)
             if(filter.nil? || feature_elements.accept?(filter) || (!bg.empty? && filter.accept?(bg)))
               background = bg.respond_to?(:build) ? bg.build : nil      
@@ -47,6 +51,10 @@ module Cucumber
             (tag_names & tags).any?
           end
 
+          def has_all_tags?(tags)
+            (tags & tag_names) == tags
+          end
+
           def build
             Ast::Tags.new(ts.line, tag_names)
           end
@@ -89,6 +97,11 @@ module Cucumber
             feature_tags.has_tags?(tag_names)
           end
 
+          def has_all_tags?(tag_names)
+            feature_tags = self.parent.tags
+            feature_tags.has_all_tags?(tag_names)
+          end
+
           def build
             Ast::Background.new(
               comment.build, 
@@ -130,6 +143,11 @@ module Cucumber
             tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
           end
 
+          def has_all_tags?(tag_names)
+            feature_tags = self.parent.parent.tags
+            tags.has_all_tags?(tag_names) || feature_tags.has_all_tags?(tag_names)
+          end
+
           def matches_name?(regexp_to_match)
             name.build =~ regexp_to_match
           end
@@ -166,6 +184,11 @@ module Cucumber
             tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
           end
 
+          def has_all_tags?(tag_names)
+            feature_tags = self.parent.parent.tags
+            tags.has_all_tags?(tag_names) || feature_tags.has_all_tags?(tag_names)
+          end
+
           def matches_name?(regexp_to_match)
             outline_matches_name?(regexp_to_match) || examples_sections.matches_name?(regexp_to_match)
           end
@@ -249,6 +272,10 @@ module Cucumber
             true
           end
 
+          def has_all_tags?(tag_names)
+            true
+          end
+
           def outline_at_line?(line)
             true
           end

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

@@ -32,34 +32,41 @@ module Cucumber
 
         alias_step_definitions(Cucumber::LANGUAGES['en'])
 
-        attr_reader :parser
-
         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)
-          @parser = Parser::I18n.const_get("#{@keywords['grammar_name']}Parser").new
           self.class.alias_step_definitions(@keywords)
+          @parser = Parser::I18n.const_get("#{@keywords['grammar_name']}Parser").new
+          def @parser.inspect
+            "#<#{self.class.name}>"
+          end
+          @parser
         end
 
         def parse(source, path, filter)
-          feature = @parser.parse_or_fail(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 language_incomplete?
+        def incomplete?
           KEYWORD_KEYS.detect{|key| @keywords[key].nil?}
         end
 

data/lib/cucumber/parser/table.rb

@@ -49,7 +49,7 @@ module Cucumber
           end
         end
         if s0.empty?
-          self.index = i0
+          @index = i0
           r0 = nil
         else
           r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
@@ -58,7 +58,7 @@ module Cucumber
 
         node_cache[:table][start_index] = r0
 
-        return r0
+        r0
       end
 
       module TableRow0
@@ -116,7 +116,7 @@ module Cucumber
         r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
         s0 << r1
         if r1
-          if input.index('|', index) == index
+          if has_terminal?('|', false, index)
             r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
@@ -131,7 +131,7 @@ module Cucumber
               r6 = _nt_cell
               s5 << r6
               if r6
-                if input.index('|', index) == index
+                if has_terminal?('|', false, index)
                   r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
                   @index += 1
                 else
@@ -144,7 +144,7 @@ module Cucumber
                 r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 r5.extend(TableRow0)
               else
-                self.index = i5
+                @index = i5
                 r5 = nil
               end
               if r5
@@ -154,7 +154,7 @@ module Cucumber
               end
             end
             if s4.empty?
-              self.index = i4
+              @index = i4
               r4 = nil
             else
               r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
@@ -184,7 +184,7 @@ module Cucumber
                   end
                 end
                 if s11.empty?
-                  self.index = i11
+                  @index = i11
                   r11 = nil
                 else
                   r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
@@ -196,7 +196,7 @@ module Cucumber
                   if r13
                     r10 = r13
                   else
-                    self.index = i10
+                    @index = i10
                     r10 = nil
                   end
                 end
@@ -210,13 +210,13 @@ module Cucumber
           r0.extend(TableRow1)
           r0.extend(TableRow2)
         else
-          self.index = i0
+          @index = i0
           r0 = nil
         end
 
         node_cache[:table_row][start_index] = r0
 
-        return r0
+        r0
       end
 
       module Cell0
@@ -235,7 +235,7 @@ module Cucumber
           i1, s1 = index, []
           i2 = index
           i3 = index
-          if input.index('|', index) == index
+          if has_terminal?('|', false, index)
             r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
@@ -249,14 +249,14 @@ module Cucumber
             if r5
               r3 = r5
             else
-              self.index = i3
+              @index = i3
               r3 = nil
             end
           end
           if r3
             r2 = nil
           else
-            self.index = i2
+            @index = i2
             r2 = instantiate_node(SyntaxNode,input, index...index)
           end
           s1 << r2
@@ -274,7 +274,7 @@ module Cucumber
             r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
             r1.extend(Cell0)
           else
-            self.index = i1
+            @index = i1
             r1 = nil
           end
           if r1
@@ -287,7 +287,7 @@ module Cucumber
 
         node_cache[:cell][start_index] = r0
 
-        return r0
+        r0
       end
 
       def _nt_space
@@ -298,7 +298,7 @@ module Cucumber
           return cached
         end
 
-        if input.index(Regexp.new('[ \\t]'), index) == index
+        if has_terminal?('\G[ \\t]', true, index)
           r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
@@ -307,7 +307,7 @@ module Cucumber
 
         node_cache[:space][start_index] = r0
 
-        return r0
+        r0
       end
 
       module Eol0
@@ -322,7 +322,7 @@ module Cucumber
         end
 
         i0 = index
-        if input.index("\n", index) == index
+        if has_terminal?("\n", false, index)
           r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
@@ -333,7 +333,7 @@ module Cucumber
           r0 = r1
         else
           i2, s2 = index, []
-          if input.index("\r", index) == index
+          if has_terminal?("\r", false, index)
             r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
@@ -342,7 +342,7 @@ module Cucumber
           end
           s2 << r3
           if r3
-            if input.index("\n", index) == index
+            if has_terminal?("\n", false, index)
               r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
@@ -360,20 +360,20 @@ module Cucumber
             r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
             r2.extend(Eol0)
           else
-            self.index = i2
+            @index = i2
             r2 = nil
           end
           if r2
             r0 = r2
           else
-            self.index = i0
+            @index = i0
             r0 = nil
           end
         end
 
         node_cache[:eol][start_index] = r0
 
-        return r0
+        r0
       end
 
       def _nt_eof
@@ -395,13 +395,13 @@ module Cucumber
         if r1
           r0 = nil
         else
-          self.index = i0
+          @index = i0
           r0 = instantiate_node(SyntaxNode,input, index...index)
         end
 
         node_cache[:eof][start_index] = r0
 
-        return r0
+        r0
       end
 
     end

data/lib/cucumber/rake/task.rb

@@ -8,8 +8,8 @@ module Cucumber
     #
     #   Cucumber::Rake::Task.new
     #
-    # This will create a task named 'features' described as 'Run Features with 
-    # Cucumber'. It will use steps from 'features/**/*.rb' and features in 'features/**/*.feature'.
+    # This will create a task named 'cucumber' described as 'Run Cucumber features'. 
+    # It will use steps from 'features/**/*.rb' and features in 'features/**/*.feature'.
     #
     # To further configure the task, you can pass a block:
     #
@@ -148,7 +148,7 @@ module Cucumber
       end
 
       # Define Cucumber Rake task
-      def initialize(task_name = "features", desc = "Run Features with Cucumber")
+      def initialize(task_name = "cucumber", desc = "Run Cucumber features")
         @task_name, @desc = task_name, desc
         @fork = true
         @libs = ['lib']
@@ -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,7 +86,7 @@ module Cucumber
 
     include StepDefinitionMethods
 
-    attr_reader :regexp, :proc
+    attr_reader :proc
 
     def initialize(pattern, &proc)
       raise MissingProc if proc.nil?

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

@@ -127,7 +127,9 @@ module Cucumber
     end
 
     # Registers a new StepDefinition. This method is aliased
-    # to <tt>Given</tt>, <tt>When</tt> and <tt>Then</tt>.
+    # to <tt>Given</tt>, <tt>When</tt> and <tt>Then</tt>, and
+    # also to the i18n translations whenever a feature of a
+    # new language is loaded.
     #
     # See Cucumber#alias_steps for details on how to
     # create your own aliases.

data/lib/cucumber/version.rb

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

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 an Array of 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