cucumber 0.4.4 → 0.4.5.rc1

data/lib/cucumber/parser/feature.tt

@@ -76,8 +76,8 @@ module Cucumber
             steps.at_line?(line)
           end
 
-          def matches_tags?(tag_name_lists)
-            Ast::Tags.matches?(self.parent.tags.tag_names, tag_name_lists)
+          def matches_tags?(tag_names)
+            Ast::Tags.matches?(self.parent.tags.tag_names, tag_names)
           end
 
           def build
@@ -116,10 +116,10 @@ module Cucumber
             tags.at_line?(line)
           end
 
-          def matches_tags?(tag_name_lists)
+          def matches_tags?(tag_names)
             feature_tag_names = self.parent.parent.tags.tag_names
             source_tag_names = (feature_tag_names + tags.tag_names).uniq
-            Ast::Tags.matches?(source_tag_names, tag_name_lists)
+            Ast::Tags.matches?(source_tag_names, tag_names)
           end
 
           def matches_name?(regexp_to_match)
@@ -153,10 +153,10 @@ module Cucumber
             steps.at_line?(line)
           end
 
-          def matches_tags?(tag_name_lists)
+          def matches_tags?(tag_names)
             feature_tag_names = self.parent.parent.tags.tag_names
             source_tag_names = (feature_tag_names + tags.tag_names).uniq
-            Ast::Tags.matches?(source_tag_names, tag_name_lists)
+            Ast::Tags.matches?(source_tag_names, tag_names)
           end
 
           def matches_name?(regexp_to_match)
@@ -195,7 +195,7 @@ module Cucumber
       end
 
       rule step
-        comment space* step_keyword keyword_space name:line_to_eol (eol+ / eof) multi:multiline_arg? white {
+        comment space* step_keyword space* name:line_to_eol (eol+ / eof) multi:multiline_arg? white {
           def at_line?(line)
             step_keyword.line == line ||
             (multi.respond_to?(:at_line?) && multi.at_line?(line))
@@ -203,9 +203,9 @@ module Cucumber
 
           def build
             if multi.respond_to?(:build)
-              Ast::Step.new(step_keyword.line, step_keyword.text_value, name.text_value.strip, multi.build)
+              Ast::Step.new(step_keyword.line, step_keyword.text_value.strip, name.text_value.strip, multi.build)
             else
-              Ast::Step.new(step_keyword.line, step_keyword.text_value, name.text_value.strip)
+              Ast::Step.new(step_keyword.line, step_keyword.text_value.strip, name.text_value.strip)
             end
           end
         }
@@ -238,7 +238,7 @@ module Cucumber
             table.at_line?(line)
           end
 
-          def matches_tags?(tag_name_lists)
+          def matches_tags?(tag_names)
             true
           end
 
@@ -273,7 +273,43 @@ module Cucumber
       end
 
       rule reserved_words_and_symbols
-        (step_keyword keyword_space) / scenario_keyword / scenario_outline_keyword / table / tag / comment_line
+        (step_keyword) / scenario_keyword / scenario_outline_keyword / table / tag / comment_line
+      end
+
+      rule py_string
+        open_py_string s:(!close_py_string .)* close_py_string {
+          def at_line?(line)
+            line >= open_py_string.line && line <= close_py_string.line
+          end
+
+          def build
+            Ast::PyString.new(open_py_string.line, close_py_string.line, s.text_value, open_py_string.indentation)
+          end
+        }
+      end
+
+      rule open_py_string
+        indent:space* '"""' space* eol {
+          def indentation
+            indent.text_value.length
+          end
+
+          def line
+            indent.line
+          end
+        }
+      end
+
+      rule close_py_string
+        eol space* quotes:'"""' white {
+          def line
+            quotes.line
+          end
+        }
+      end
+
+      rule white
+        (space / eol)*
       end
 
     end

data/lib/cucumber/parser/i18n.tt

@@ -1,44 +1,34 @@
 module Cucumber
   module Parser
     module I18n
-      grammar <%= keywords('grammar_name', true) %>
-        include Common
+      grammar <%= keywords('grammar_name')[0] %>
         include Feature
         include Table
-        include PyString
 
         rule feature
           feature_sub
         end
 
         rule background_keyword
-          (<%= keywords('background') %>) ':'
+          <%= treetop_keywords(background_keywords) %> ':'
         end
 
         rule scenario_keyword
-          (<%= keywords('scenario') %>) ':'
+          <%= treetop_keywords(scenario_keywords) %> ':'
         end
 
         rule scenario_outline_keyword
-          (<%= keywords('scenario_outline') %>) ':'
+          <%= treetop_keywords(scenario_outline_keywords) %> ':'
         end
 
         rule step_keyword
-          (<%= keywords('given') %>) /
-          (<%= keywords('when') %>) /
-          (<%= keywords('then') %>) /
-          (<%= keywords('and') %>) /
-          (<%= keywords('but') %>)
-        end
-
-        rule keyword_space
-          <%= keywords('space_after_keyword', true) ? 'space+' : 'space*' %>
+          <%= treetop_keywords(step_keywords) %>
         end
 
         rule examples_keyword
-          (<%= keywords('examples') %>) ':'?
+          <%= treetop_keywords(examples_keywords) %> ':'?
         end
       end
     end
   end
-end
+end

data/lib/cucumber/parser/natural_language.rb

@@ -1,7 +1,9 @@
+# TODO: REMOVE ME
+# Most of this class now lives in Gherkin's i18n.rb
 module Cucumber
   module Parser
     class NaturalLanguage
-      KEYWORD_KEYS = %w{name native encoding space_after_keyword feature background scenario scenario_outline examples given when then and but}
+      KEYWORD_KEYS = %w{name native feature background scenario scenario_outline examples given when then and but}
 
       class << self
         def get(step_mother, lang)
@@ -11,6 +13,11 @@ module Cucumber
         def languages
           @languages ||= {}
         end
+
+        # Used by code generators for other lexer tools like pygments lexer and textmate bundle
+        def all(step_mother=nil)
+          Cucumber::LANGUAGES.keys.sort.map{|lang| get(step_mother, lang)}
+        end
       end
 
       def initialize(step_mother, lang)
@@ -22,7 +29,7 @@ module Cucumber
       end
 
       def register_adverbs(step_mother)
-        adverbs = %w{given when then and but}.map{|keyword| @keywords[keyword].split('|').map{|w| w.gsub(/\s/, '')}}.flatten
+        adverbs = %w{given when then and but}.map{|keyword| @keywords[keyword].split('|').map{|w| w.gsub(/[\s<']/, '')}}.flatten
         step_mother.register_adverbs(adverbs) if step_mother
       end
 
@@ -46,35 +53,55 @@ module Cucumber
         feature
       end
 
-      def keywords(key, raw=false)
-        return @keywords[key] if raw
-        return nil unless @keywords[key]
-        values = @keywords[key].to_s.split('|')
-        values.map{|value| "'#{value}'"}.join(" / ")
-      end
-
       def incomplete?
         KEYWORD_KEYS.detect{|key| @keywords[key].nil?}
       end
 
-      def scenario_keyword
-        @keywords['scenario'].split('|')[0] + ':'
+      def feature_keywords
+        keywords('feature')
       end
 
-      def but_keywords
-        @keywords['but'].split('|')
+      def scenario_keywords
+        keywords('scenario')
       end
 
-      def and_keywords
-        @keywords['and'].split('|')
+      def scenario_outline_keywords
+        keywords('scenario_outline')
+      end
+
+      def background_keywords
+        keywords('background')
+      end
+
+      def examples_keywords
+        keywords('examples')
+      end
+
+      def but_keywords(space=true)
+        keywords('but', space)
+      end
+
+      def and_keywords(space=true)
+        keywords('and', space)
       end
 
       def step_keywords
-        %w{given when then and but}.map{|key| @keywords[key].split('|')}.flatten.uniq
+        %w{given when then and but}.map{|key| keywords(key, true)}.flatten.uniq
+      end
+
+      def keywords(key, space=false)
+        raise "No #{key} in #{@keywords.inspect}" if @keywords[key].nil?
+        @keywords[key].split('|').map{|kw| space ? keyword_space(kw) : kw}
+      end
+
+      private
+
+      def treetop_keywords(keywords)
+        "(" + keywords.map{|k| %{"#{k}"}}.join(" / ") + ")"
       end
 
-      def space_after_keyword
-        @keywords['space_after_keyword']
+      def keyword_space(val)
+        (val + ' ').sub(/< $/,'')
       end
     end
   end

data/lib/cucumber/rb_support/rb_transform.rb

@@ -23,7 +23,7 @@ module Cucumber
       end
 
       def match(arg)
-        arg.match(@regexp)
+        arg ? arg.match(@regexp) : nil
       end
 
       def invoke(arg)

data/lib/cucumber/step_mother.rb

@@ -171,14 +171,13 @@ module Cucumber
     #     Then I should not be thirsty
     #   })
     def invoke_steps(steps_text, natural_language)
-      ored_keywords = natural_language.step_keywords.join("|")
-      after_keyword = natural_language.space_after_keyword ? ' ' : ''
+      ored_keywords = natural_language.step_keywords.map{|kw| Regexp.escape(kw)}.join("|")
       # TODO Gherkin:
       # This a bit hacky and fragile. When we move to Gherkin we should replace this entire method body
       # with a call to the parser - parsing the body of a scenario. We may need to put the parser/policy in the
       # appropriate state (the same state it's in after parsing a Scenario: line).
       steps_text.strip.split(/(?=^\s*(?:#{ored_keywords}))/).map { |step| step.strip }.each do |step|
-        output = step.match(/^\s*(#{ored_keywords})#{after_keyword}([^\n]+)(\n.*)?$/m)
+        output = step.match(/^\s*(#{ored_keywords})([^\n]+)(\n.*)?$/m)
 
         action, step_name, table_or_string = output[1], output[2], output[3]
         if table_or_string.to_s.strip =~ /^\|/

data/lib/cucumber/webrat/element_locator.rb

@@ -1,3 +1,7 @@
+warning = "\nWARNING: #{caller.detect{|l| l =~ /features/}}: cucumber/webrat/element_locator.rb is deprecated and will be removed in Cucumber 0.5.0.\nUse cucumber/web/tableish instead.\n"
+at_exit do
+  warn warning
+end
 require 'webrat'
 
 module Webrat
@@ -28,8 +32,8 @@ module Webrat
     
     def table_from_table #:nodoc:
       col_count = nil
-      Webrat::XML.css_search(element, 'tr').map do |row|
-        cols = Webrat::XML.css_search(row, 'th,td')
+      element.css('tr').map do |row|
+        cols = row.css('th,td')
         col_count ||= cols.length
         cols[0...col_count].map do |col|
           col.inner_html
@@ -38,7 +42,7 @@ module Webrat
     end
 
     def table_from_dl #:nodoc:
-      Webrat::XML.css_search(@element, 'dt').map do |dt|
+      element.css('dt').map do |dt|
         next_node = dt.next_sibling
         while next_node.name != 'dd'
           next_node = next_node.next_sibling
@@ -48,7 +52,7 @@ module Webrat
     end
 
     def table_from_list #:nodoc:
-      Webrat::XML.css_search(@element, 'li').map do |li|
+      element.css('li').map do |li|
         [li.inner_html]
       end
     end
@@ -63,7 +67,7 @@ module Webrat
       end
 
       def table_element
-        Webrat::XML.css_search(@dom, @value)[0]
+        @dom.css(@value)[0]
       end
 
       def error_message

data/spec/cucumber/cli/options_spec.rb

@@ -63,9 +63,6 @@ module Cli
             when_parsing('--language help') { Kernel.should_receive(:exit) }
           end
         end
-        it "sets the langauge" do
-          after_parsing('-l en') { options[:lang].should == 'en' }
-        end
       end
 
       context "--port PORT" do

data/spec/cucumber/formatter/html_spec.rb

@@ -26,13 +26,26 @@ module Cucumber
       it "should not raise an error when visiting a blank feature name" do
         lambda { @formatter.feature_name("") }.should_not raise_error
       end
-    
+      
       describe "given a single feature" do
         before(:each) do
           run_defined_feature
           @doc = Nokogiri.HTML(@out.string)
         end
-      
+        
+        describe "basic feature" do
+          define_feature <<-FEATURE
+            Feature: Bananas
+              In order to find my inner monkey
+              As a human
+              I must eat bananas
+          FEATURE
+                
+          it "should output a main container div" do
+            @out.string.should =~ /\<div class="cucumber"\>/
+          end
+        end
+        
         describe "with a comment" do
           define_feature <<-FEATURE
             # Healthy

data/spec/cucumber/formatter/junit_spec.rb

@@ -61,6 +61,9 @@ module Cucumber::Formatter
 
             Scenario Outline: Eat things
               Given <Things>
+              And stuff:
+                | foo |
+                | bar |
             
             Examples: Good
               | Things   |

data/spec/cucumber/treetop_parser/fit_scenario.feature

@@ -1,8 +1,8 @@
-Some title  
+Feature: Some title  
 
   Scenario: second  
     Given 'bind me please'
   
-  More Examples:
+  Examples:
   |c|
   |I can have spaces|

data/spec/cucumber/treetop_parser/given_scenario.feature

@@ -1,4 +1,4 @@
-Some title  
+Feature: Some title  
 
   Scenario: first     
     Given a

data/spec/cucumber/treetop_parser/multiple_tables.feature

@@ -9,7 +9,7 @@ Feature: Addition
     When I press add
     Then the result should be 120 on the screen
 
-  More Examples:
+  Examples:
     | input_1 | input_2 | button | output |
     | 20      | 30      | add    | 50     |
     | 2       | 5       | add    | 7      |
@@ -22,6 +22,6 @@ Feature: Addition
     When I press add
     Then the result should be 50 on the screen
 
-  More Examples:
+  Examples:
     | input_1 | input_2 | input_3 | button | output |
     | 1       | 2       | 3       | add    | 6      |

data/spec/cucumber/treetop_parser/test_dos.feature

@@ -8,7 +8,7 @@ Feature: Search
     When the string is reversed
     Then the string should be "cba"
     
-  More Examples:
+  Examples:
     |input |output|
     |a     |a     |
     |ab    |ba    |    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5.rc1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 +01:00
+date: 2009-12-07 00:00:00 +01:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.3
+        version: 1.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: prawn
@@ -114,9 +114,9 @@ extra_rdoc_files:
 files: 
 - .gitattributes
 - .gitignore
+- Caliper.yml
 - History.txt
 - LICENSE
-- Manifest.txt
 - README.rdoc
 - Rakefile
 - VERSION.yml
@@ -182,6 +182,7 @@ files:
 - examples/i18n/fi/lib/laskin.rb
 - examples/i18n/fr/Rakefile
 - examples/i18n/fr/features/addition.feature
+- examples/i18n/fr/features/addition2.feature
 - examples/i18n/fr/features/step_definitions/calculatrice_steps.rb
 - examples/i18n/fr/lib/calculatrice.rb
 - examples/i18n/he/Rakefile
@@ -363,6 +364,12 @@ files:
 - examples/sinatra/views/layout.erb
 - examples/steps_library/features/step_definitions/steps_lib1.rb
 - examples/steps_library/features/step_definitions/steps_lib2.rb
+- examples/tcl/README.textile
+- examples/tcl/Rakefile
+- examples/tcl/features/fibonnacci.feature
+- examples/tcl/features/step_definitions/fib_steps.rb
+- examples/tcl/features/support/env.rb
+- examples/tcl/src/fib.tcl
 - examples/test_unit/Rakefile
 - examples/test_unit/features/step_definitions/test_unit_steps.rb
 - examples/test_unit/features/test_unit.feature
@@ -508,6 +515,7 @@ files:
 - lib/cucumber/formatter/debug.rb
 - lib/cucumber/formatter/duration.rb
 - lib/cucumber/formatter/html.rb
+- lib/cucumber/formatter/io.rb
 - lib/cucumber/formatter/junit.rb
 - lib/cucumber/formatter/ordered_xml_markup.rb
 - lib/cucumber/formatter/pdf.rb
@@ -539,11 +547,6 @@ files:
 - lib/cucumber/py_support/py_dsl.py
 - lib/cucumber/py_support/py_language.py
 - lib/cucumber/py_support/py_language.rb
-- lib/cucumber/rails/action_controller.rb
-- lib/cucumber/rails/active_record.rb
-- lib/cucumber/rails/rspec.rb
-- 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_hook.rb
@@ -566,20 +569,6 @@ files:
 - lib/cucumber/wire_support/wire_packet.rb
 - lib/cucumber/wire_support/wire_protocol.rb
 - lib/cucumber/wire_support/wire_step_definition.rb
-- rails_generators/cucumber/USAGE
-- rails_generators/cucumber/cucumber_generator.rb
-- rails_generators/cucumber/templates/cucumber
-- rails_generators/cucumber/templates/cucumber.rake
-- rails_generators/cucumber/templates/cucumber_environment.rb
-- rails_generators/cucumber/templates/env.rb
-- rails_generators/cucumber/templates/paths.rb
-- rails_generators/cucumber/templates/spork_env.rb
-- rails_generators/cucumber/templates/version_check.rb
-- rails_generators/cucumber/templates/webrat_steps.rb
-- rails_generators/feature/USAGE
-- rails_generators/feature/feature_generator.rb
-- rails_generators/feature/templates/feature.erb
-- rails_generators/feature/templates/steps.erb
 - spec/cucumber/ast/background_spec.rb
 - spec/cucumber/ast/feature_element_spec.rb
 - spec/cucumber/ast/feature_factory.rb
@@ -643,7 +632,7 @@ post_install_message: |+
   
                        (::)   U P G R A D I N G    (::)
   
-  Thank you for installing cucumber-0.4.4.
+  Thank you for installing cucumber-0.4.5.
   Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading
   for important information about this release. Happy cuking!
   
@@ -661,9 +650,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
@@ -804,6 +793,8 @@ test_files:
 - examples/sinatra/features/support/env.rb
 - examples/steps_library/features/step_definitions/steps_lib1.rb
 - examples/steps_library/features/step_definitions/steps_lib2.rb
+- examples/tcl/features/step_definitions/fib_steps.rb
+- examples/tcl/features/support/env.rb
 - examples/test_unit/features/step_definitions/test_unit_steps.rb
 - examples/tickets/features/229/tagged_hooks.rb
 - examples/tickets/features/270/back.steps.rb