gherkin 1.0.26-java → 1.0.27-java

data/History.txt

@@ -1,3 +1,9 @@
+== 1.0.27 (2010-05-17)
+
+=== New Features
+* Table cells can now contain escaped bars - \| and escaped backslashes - \\. (#48. Gregory Hnatiuk, Aslak Hellesøy)
+* Luxemburgish (lu) added. (Christoph König)
+
 == 1.0.26 (2010-05-09)
 
 === New Features

data/Rakefile

@@ -18,9 +18,9 @@ begin
     gem.homepage = "http://github.com/aslakhellesoy/gherkin"
     gem.authors = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Hellesøy"]
     gem.executables = ["gherkin"]
-    gem.add_dependency "trollop", ">= 1.15"
+    gem.add_dependency "trollop", ">= 1.16.2"
     gem.add_development_dependency "rspec", ">= 1.3.0"
-    gem.add_development_dependency "cucumber", ">= 0.7.2"
+#    gem.add_development_dependency "cucumber", ">= 0.7.2"
     gem.add_development_dependency "rake-compiler", ">= 0.7.0" unless defined?(JRUBY_VERSION)
 
     gem.files -= FileList['ikvm/**/*']

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 1
 :minor: 0
 :build: 
-:patch: 26
+:patch: 27

data/features/escaped_pipes.feature

@@ -0,0 +1,8 @@
+Feature: Escaped pipes
+  Scenario: They are the future
+    Given they have arrived
+      | æ | o |
+      | a | ø |
+    Given they have arrived
+      | æ   | \|o |
+      | \|a | ø\\ |

data/features/step_definitions/eyeball_steps.rb

@@ -0,0 +1,3 @@
+Given /^they have arrived$/ do |table|
+  announce table.raw
+end

data/lib/gherkin/formatter/escaping.rb

@@ -0,0 +1,15 @@
+module Gherkin
+  module Formatter
+    module Escaping
+      # Escapes a pipes and backslashes:
+      #
+      # * | becomes \|
+      # * \ becomes \\
+      #
+      # This is used in the pretty formatter.
+      def escape_cell(s)
+        s.gsub(/\|/, "\\|").gsub(/\\(?!\|)/, "\\\\\\\\")
+      end
+    end
+  end
+end

data/lib/gherkin/formatter/pretty_formatter.rb

@@ -3,6 +3,7 @@
 require 'gherkin/formatter/colors'
 require 'gherkin/formatter/monochrome_format'
 require 'gherkin/formatter/argument'
+require 'gherkin/formatter/escaping'
 
 module Gherkin
   module Formatter
@@ -11,6 +12,7 @@ module Gherkin
       java_impl('gherkin.jar')
 
       include Colors
+      include Escaping
 
       def initialize(io, monochrome=false)
         @io = io
@@ -67,7 +69,7 @@ module Gherkin
 
       def row(row, line)
         @rows ||= []
-        @rows << row
+        @rows << row.map{|cell| escape_cell(cell)}
       end
 
       def py_string(string, line)

data/lib/gherkin/i18n.rb

@@ -8,10 +8,10 @@ module Gherkin
       java_impl('gherkin.jar')
     end
 
-    ALL_KEYS = %w{name native feature background scenario scenario_outline examples given when then and but}
-    KEYWORD_KEYS = ALL_KEYS - %w{name native}
-    STEP_KEYWORD_KEYS = %w{given when then and but}
-    LANGUAGES    = YAML.load_file(File.dirname(__FILE__) + '/i18n.yml')
+    FEATURE_ELEMENT_KEYS = %w{feature background scenario scenario_outline examples}
+    STEP_KEYWORD_KEYS    = %w{given when then and but}
+    KEYWORD_KEYS         = FEATURE_ELEMENT_KEYS + STEP_KEYWORD_KEYS
+    LANGUAGES            = YAML.load_file(File.dirname(__FILE__) + '/i18n.yml')
 
     class << self
       include Rubify
@@ -141,7 +141,7 @@ module Gherkin
     def keywords(iso_code)
       iso_code = iso_code.to_s
       raise "No #{iso_code.inspect} in #{@keywords.inspect}" if @keywords[iso_code].nil?
-      @keywords[iso_code].split('|').map{|keyword| keyword_space(iso_code, keyword)}
+      @keywords[iso_code].split('|').map{|keyword| real_keyword(iso_code, keyword)}
     end
 
     def keyword_table
@@ -167,9 +167,9 @@ module Gherkin
 
     private
 
-    def keyword_space(iso_code, keyword)
+    def real_keyword(iso_code, keyword)
       if(STEP_KEYWORD_KEYS.index(iso_code))
-        (keyword + ' ').sub(/< $/,'')
+        (keyword + ' ').sub(/< $/, '')
       else
         keyword
       end

data/lib/gherkin/i18n.yml

@@ -339,6 +339,19 @@
   then: "*|Tada"
   and: "*|Ir"
   but: "*|Bet"
+"lu":
+  name: Luxemburgish
+  native: Lëtzebuergesch
+  feature: Funktionalitéit
+  background: Hannergrond
+  scenario: Szenario
+  scenario_outline: Plang vum Szenario
+  examples: Beispiller
+  given: "*|ugeholl"
+  when: "*|wann"
+  then: "*|dann"
+  and: "*|an|a"
+  but: "*|awer|mä"
 "lv":
   name: Latvian
   native: latviešu

data/ragel/lexer.c.rl.erb

@@ -181,6 +181,10 @@ static VALUE rb_eGherkinLexingError;
   action store_cell_content {
     VALUE con = ENCODED_STR_NEW(PTR_TO(content_start), LEN(content_start, p));
     rb_funcall(con, rb_intern("strip!"), 0);
+    VALUE re_pipe      = rb_reg_regcomp(rb_str_new2("\\\\\\|"));
+    VALUE re_backslash = rb_reg_regcomp(rb_str_new2("\\\\\\\\"));
+    rb_funcall(con, rb_intern("gsub!"), 2, re_pipe,      rb_str_new2("|"));
+    rb_funcall(con, rb_intern("gsub!"), 2, re_backslash, rb_str_new2("\\"));
 
     rb_ary_push(current_row, con);
   }

data/ragel/lexer.java.rl.erb

@@ -114,7 +114,8 @@ public class <%= @i18n.underscored_iso_code.upcase %> implements Lexer {
     }
 
     action store_cell_content {
-      currentRow.add(substring(data, contentStart, p).trim());
+      String con = substring(data, contentStart, p).trim();
+      currentRow.add(con.replaceAll("\\\\\\|", "|").replaceAll("\\\\\\\\", "\\\\"));
     }
 
     action store_row {

data/ragel/lexer.rb.rl.erb

@@ -103,7 +103,7 @@ module Gherkin
 
         action store_cell_content {
           con = utf8_pack(data[@content_start...p]).strip
-          current_row << con
+          current_row << con.gsub(/\\\|/, "|").gsub(/\\\\/, "\\")
         }
 
         action store_row {

data/ragel/lexer_common.rl.erb

@@ -11,6 +11,10 @@
 
   EOF = '%_FEATURE_END_%'; # Explicit EOF added before scanning begins 
   EOL = ('\n' | '\r\n') @inc_line_number @last_newline;
+  BOM = 0xEF 0xBB 0xBF; # http://en.wikipedia.org/wiki/Byte_order_mark
+
+  PIPE = '|';
+  ESCAPED_PIPE = '\\|';
 
   FeatureHeadingEnd = EOL+ space* (I18N_Background | I18N_Scenario | I18N_ScenarioOutline | '@' | '#' | EOF) >next_keyword_start;
   ScenarioHeadingEnd = EOL+ space* ( I18N_Scenario | I18N_ScenarioOutline | I18N_Step | '@' | '#' | EOF ) >next_keyword_start;
@@ -30,16 +34,15 @@
   Tag = ( ('@' [^@\r\n\t ]+) >begin_content ) %store_tag_content;
   Tags = space* (Tag space*)+ EOL+;
   
-  StartRow = space* '|' >start_row;
-  EndRow = EOL space* ^('|') >next_keyword_start;    
-  Cell = '|' (any - '|')* >begin_cell_content %store_cell_content;
-  RowBody = space* Cell* '|' :>> (space* EOL+ space*) %store_row;
+  StartRow = space* PIPE >start_row;
+  EndRow = EOL space* ^PIPE >next_keyword_start;    
+  Cell = PIPE (ESCAPED_PIPE | (any - PIPE)+ )* >begin_cell_content %store_cell_content;
+  RowBody = space* Cell** PIPE :>> (space* EOL+ space*) %store_row;
   Row = StartRow :>> RowBody <: EndRow?;
   
   StartPyString = '"""' >start_pystring space* :>> EOL; 
   EndPyString = (space* '"""') >next_keyword_start; 
   PyString = space* StartPyString %begin_pystring_content (^EOL | EOL)* :>> EndPyString %store_pystring_content space* EOL+;
-  BOM = 0xEF 0xBB 0xBF; # http://en.wikipedia.org/wiki/Byte_order_mark
   
   Tokens = BOM? (space | EOL)* (Tags | Comment | FeatureHeading | BackgroundHeading | ScenarioHeading | ScenarioOutlineHeading | ExamplesHeading | Step | Row | PyString)* (space | EOL)* EOF;
 

data/spec/gherkin/formatter/pretty_formatter_spec.rb

@@ -112,8 +112,8 @@ module Gherkin
         pystrings
       """
     And there is another step
-      | æ | o |
-      | a | ø |
+      | æ   | \\|o |
+      | \\|a | ø\\\\ |
     Then we will see steps
 })
       end
@@ -148,6 +148,15 @@ Feature: Feature Description
       it "should preserve tabs" do
         assert_pretty(IO.read(File.dirname(__FILE__) + '/tabs.feature'), IO.read(File.dirname(__FILE__) + '/spaces.feature'))
       end
+
+      it "should escape backslashes and pipes" do
+        io = StringIO.new
+        l = PrettyFormatter.new(io, true)
+        l.row(['|', '\\'], 1)
+        l.flush_table
+        io.rewind
+        io.read.should == '      | \\| | \\\\ |' + "\n"
+      end
     end
   end
 end

data/spec/gherkin/i18n_spec.rb

@@ -96,6 +96,7 @@ module Gherkin
       | ja        | Japanese               | 日本語                  |
       | ko        | Korean                 | 한국어                  |
       | lt        | Lithuanian             | lietuvių kalba       |
+      | lu        | Luxemburgish           | Lëtzebuergesch       |
       | lv        | Latvian                | latviešu             |
       | nl        | Dutch                  | Nederlands           |
       | no        | Norwegian              | norsk                |

data/spec/gherkin/shared/row_spec.rb

@@ -25,6 +25,11 @@ module Gherkin
         @listener.should_receive(:row).with(r(%w{foo bar}), 1)
         @lexer.scan("| foo | bar |\n")
       end
+
+      it "should escape backslashed pipes" do
+        @listener.should_receive(:row).with(r(['|', 'the', '\a', '\\', '|\\|']), 1)
+        @lexer.scan('| \| | the | \a | \\ |   \|\\\|    |' + "\n")
+      end
     
       it "should parse cells with spaces within the content" do
         @listener.should_receive(:row).with(r(["Dill pickle", "Valencia orange"]), 1)
@@ -32,14 +37,6 @@ module Gherkin
       end
       
       it "should allow utf-8" do
-        #  Fails in 1.9.1! 
-        #  'Gherkin::Lexer::Table should allow utf-8 with using == to evaluate' FAILED 
-        #    expected: [[:row, [["ůﻚ", "2"]], 1]],
-        #         got: [[:row, [["\xC5\xAF\xEF\xBB\x9A", "2"]], 1]] (using ==)
-        #  BUT, simply running:
-        #     [[:row, [["ůﻚ", "2"]], 1]].should == [[:row, [["\xC5\xAF\xEF\xBB\x9A", "2"]], 1]] 
-        #  passes
-        #
         @lexer.scan(" | ůﻚ | 2 | \n")
         @listener.to_sexp.should == [
           [:row, ["ůﻚ", "2"], 1],

data/tasks/ragel_task.rb

@@ -29,8 +29,7 @@ class RagelTask
     {
       'c'    => "ext/gherkin_lexer_#{@i18n.underscored_iso_code}/gherkin_lexer_#{@i18n.underscored_iso_code}.c",
       'java' => "java/src/main/java/gherkin/lexer/#{@i18n.underscored_iso_code.upcase}.java",
-      'rb'   => "lib/gherkin/rb_lexer/#{@i18n.underscored_iso_code}.rb",
-      'csharp'   => "tmp/#{@i18n.underscored_iso_code}.cs"
+      'rb'   => "lib/gherkin/rb_lexer/#{@i18n.underscored_iso_code}.rb"
     }[@lang]
   end
 
@@ -54,8 +53,7 @@ class RagelTask
     {
       'c'      => '-C',
       'java'   => '-J',
-      'rb'     => '-R',
-      'csharp' => '-A -L -T0'
+      'rb'     => '-R'
     }[@lang]
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 0
-    - 26
-  version: 1.0.26
+    - 27
+  version: 1.0.27
 platform: java
 authors: 
   - Mike Sassak
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-09 00:00:00 +02:00
+date: 2010-05-18 00:00:00 +02:00
 default_executable: gherkin
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -28,8 +28,9 @@ dependencies:
           - !ruby/object:Gem::Version 
             segments: 
               - 1
-              - 15
-            version: "1.15"
+              - 16
+              - 2
+            version: 1.16.2
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -46,20 +47,6 @@ dependencies:
             version: 1.3.0
     type: :development
     version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: cucumber
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 7
-              - 2
-            version: 0.7.2
-    type: :development
-    version_requirements: *id003
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: 
@@ -80,10 +67,12 @@ files:
   - VERSION.yml
   - bin/gherkin
   - cucumber.yml
+  - features/escaped_pipes.feature
   - features/feature_parser.feature
   - features/native_lexer.feature
   - features/parser_with_native_lexer.feature
   - features/pretty_printer.feature
+  - features/step_definitions/eyeball_steps.rb
   - features/step_definitions/gherkin_steps.rb
   - features/step_definitions/pretty_formatter_steps.rb
   - features/steps_parser.feature
@@ -99,6 +88,7 @@ files:
   - lib/gherkin/cli/main.rb
   - lib/gherkin/formatter/argument.rb
   - lib/gherkin/formatter/colors.rb
+  - lib/gherkin/formatter/escaping.rb
   - lib/gherkin/formatter/monochrome_format.rb
   - lib/gherkin/formatter/pretty_formatter.rb
   - lib/gherkin/i18n.rb