gherkin 2.11.7 → 2.11.8

data/ext/gherkin_lexer_zh_tw/gherkin_lexer_zh_tw.c

@@ -1,5 +1,5 @@
 
-#line 1 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 1 "ragel/i18n/zh_tw.c.rl"
 #include <assert.h>
 #include <ruby.h>
 
@@ -80,7 +80,7 @@ static VALUE rb_eGherkinLexingError;
       lexer->line_number)
 
 
-#line 254 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 254 "ragel/i18n/zh_tw.c.rl"
 
 
 /** Data **/
@@ -739,7 +739,7 @@ static const int lexer_error = 0;
 static const int lexer_en_main = 1;
 
 
-#line 258 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 258 "ragel/i18n/zh_tw.c.rl"
 
 static VALUE 
 unindent(VALUE con, int start_col)
@@ -912,7 +912,7 @@ static VALUE CLexer_scan(VALUE self, VALUE input)
 	cs = lexer_start;
 	}
 
-#line 425 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 425 "ragel/i18n/zh_tw.c.rl"
     
 #line 918 "ext/gherkin_lexer_zh_tw/gherkin_lexer_zh_tw.c"
 	{
@@ -988,7 +988,7 @@ _match:
 		switch ( *_acts++ )
 		{
 	case 0:
-#line 83 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 83 "ragel/i18n/zh_tw.c.rl"
 	{
 		MARK(content_start, p);
     lexer->current_line = lexer->line_number;
@@ -996,20 +996,20 @@ _match:
   }
 	break;
 	case 1:
-#line 89 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 89 "ragel/i18n/zh_tw.c.rl"
 	{
     MARK(content_start, p);
   }
 	break;
 	case 2:
-#line 93 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 93 "ragel/i18n/zh_tw.c.rl"
 	{
     lexer->current_line = lexer->line_number;
     lexer->start_col = p - data - lexer->last_newline;
   }
 	break;
 	case 3:
-#line 98 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 98 "ragel/i18n/zh_tw.c.rl"
 	{
     int len = LEN(content_start, PTR_TO(final_newline));
     int type_len = LEN(docstring_content_type_start, PTR_TO(docstring_content_type_end));
@@ -1021,49 +1021,49 @@ _match:
   }
 	break;
 	case 4:
-#line 108 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 108 "ragel/i18n/zh_tw.c.rl"
 	{ 
     MARK(docstring_content_type_start, p);
   }
 	break;
 	case 5:
-#line 112 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 112 "ragel/i18n/zh_tw.c.rl"
 	{ 
     MARK(docstring_content_type_end, p);
   }
 	break;
 	case 6:
-#line 116 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 116 "ragel/i18n/zh_tw.c.rl"
 	{
     STORE_KW_END_CON(feature);
   }
 	break;
 	case 7:
-#line 120 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 120 "ragel/i18n/zh_tw.c.rl"
 	{
     STORE_KW_END_CON(background);
   }
 	break;
 	case 8:
-#line 124 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 124 "ragel/i18n/zh_tw.c.rl"
 	{
     STORE_KW_END_CON(scenario);
   }
 	break;
 	case 9:
-#line 128 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 128 "ragel/i18n/zh_tw.c.rl"
 	{
     STORE_KW_END_CON(scenario_outline);
   }
 	break;
 	case 10:
-#line 132 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 132 "ragel/i18n/zh_tw.c.rl"
 	{
     STORE_KW_END_CON(examples);
   }
 	break;
 	case 11:
-#line 136 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 136 "ragel/i18n/zh_tw.c.rl"
 	{
     store_kw_con(listener, "step",
       PTR_TO(keyword_start), LEN(keyword_start, PTR_TO(keyword_end)),
@@ -1072,34 +1072,34 @@ _match:
   }
 	break;
 	case 12:
-#line 143 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 143 "ragel/i18n/zh_tw.c.rl"
 	{
     STORE_ATTR(comment);
     lexer->mark = 0;
   }
 	break;
 	case 13:
-#line 148 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 148 "ragel/i18n/zh_tw.c.rl"
 	{
     STORE_ATTR(tag);
     lexer->mark = 0;
   }
 	break;
 	case 14:
-#line 153 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 153 "ragel/i18n/zh_tw.c.rl"
 	{
     lexer->line_number += 1;
     MARK(final_newline, p);
   }
 	break;
 	case 15:
-#line 158 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 158 "ragel/i18n/zh_tw.c.rl"
 	{
     MARK(last_newline, p + 1);
   }
 	break;
 	case 16:
-#line 162 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 162 "ragel/i18n/zh_tw.c.rl"
 	{
     if (lexer->mark == 0) {
       MARK(mark, p);
@@ -1107,7 +1107,7 @@ _match:
   }
 	break;
 	case 17:
-#line 168 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 168 "ragel/i18n/zh_tw.c.rl"
 	{
     MARK(keyword_end, p);
     MARK(keyword_start, PTR_TO(mark));
@@ -1116,13 +1116,13 @@ _match:
   }
 	break;
 	case 18:
-#line 175 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 175 "ragel/i18n/zh_tw.c.rl"
 	{
     MARK(content_end, p);
   }
 	break;
 	case 19:
-#line 179 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 179 "ragel/i18n/zh_tw.c.rl"
 	{
     p = p - 1;
     lexer->current_line = lexer->line_number;
@@ -1130,13 +1130,13 @@ _match:
   }
 	break;
 	case 20:
-#line 185 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 185 "ragel/i18n/zh_tw.c.rl"
 	{
 		MARK(content_start, p);
   }
 	break;
 	case 21:
-#line 189 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 189 "ragel/i18n/zh_tw.c.rl"
 	{
     VALUE re_pipe, re_newline, re_backslash;
     VALUE con = ENCODED_STR_NEW(PTR_TO(content_start), LEN(content_start, p));
@@ -1152,13 +1152,13 @@ _match:
   }
 	break;
 	case 22:
-#line 203 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 203 "ragel/i18n/zh_tw.c.rl"
 	{
     rb_funcall(listener, rb_intern("row"), 2, current_row, INT2FIX(lexer->current_line));
   }
 	break;
 	case 23:
-#line 207 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 207 "ragel/i18n/zh_tw.c.rl"
 	{
     int line;
     if (cs < lexer_first_final) {
@@ -1221,7 +1221,7 @@ _again:
 	while ( __nacts-- > 0 ) {
 		switch ( *__acts++ ) {
 	case 23:
-#line 207 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 207 "ragel/i18n/zh_tw.c.rl"
 	{
     int line;
     if (cs < lexer_first_final) {
@@ -1275,7 +1275,7 @@ _again:
 	_out: {}
 	}
 
-#line 426 "/home/son/work/github/cucumber/gherkin/tasks/../ragel/i18n/zh_tw.c.rl"
+#line 426 "ragel/i18n/zh_tw.c.rl"
 
     assert(p <= pe && "data overflow after parsing execute");
     assert(lexer->content_start <= len && "content starts after data end");

data/gherkin.gemspec

@@ -60,14 +60,14 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('multi_json', '~> 1.3')
 
-  s.add_development_dependency('cucumber', '>= 1.2.1')
+  s.add_development_dependency('cucumber', '>= 1.2.5')
   s.add_development_dependency('rake', '>= 10.0.3')
   s.add_development_dependency('bundler', '>= 1.2.3') # Make sure it's in sync with /.travis.yml
-  s.add_development_dependency('rspec', '~> 2.12.0')
+  s.add_development_dependency('rspec', '~> 2.13.0')
   s.add_development_dependency('rubyzip', '>= 0.9.9')
 
   unless ENV['RUBY_CC_VERSION'] || Gherkin::JRUBY
-    s.add_development_dependency('therubyracer', '>= 0.11.2') if ENV['GHERKIN_JS']
+    s.add_development_dependency('therubyracer', '>= 0.11.4') if ENV['GHERKIN_JS']
     # For Documentation:
     s.add_development_dependency('yard', '>= 0.8.3')
     s.add_development_dependency('rdiscount', '>= 1.6.8')

data/install_mingw_os_x.sh

@@ -1,7 +1,5 @@
 #!/bin/sh
-
 mkdir -p /usr/local/mingw
-cd /usr/local/mingw
-# Don't attempt any of the newer versions - they don't work (gcc 4.7.0)
-wget http://downloads.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Automated%20Builds/mingw-w32-1.0-bin_i686-darwin_20110819.tar.bz2
-tar xvfj mingw-w32-1.0-bin_i686-darwin_20110819.tar.bz2
+
+# We need GCC 4.7 in order to build ruby 1.8.7. When we drop support for that we can use a more recent one
+cd /usr/local/mingw && curl --silent --location http://downloads.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Automated%20Builds/mingw-w32-1.0-bin_i686-darwin_20120227.tar.bz2 | tar xvj

data/lib/gherkin/i18n.json

@@ -307,6 +307,20 @@
 	  "and": "*|Et",
 	  "but": "*|Mais"
 	},
+	"gl": {
+	  "name": "Galician",
+	  "native": "galego",
+	  "background": "Contexto",
+	  "feature": "Característica",
+	  "scenario": "Escenario",
+	  "scenario_outline": "Esbozo do escenario",
+	  "examples": "Exemplos",
+	  "given": "*|Dado|Dada|Dados|Dadas",
+	  "when": "*|Cando",
+	  "then": "*|Entón|Logo",
+	  "and": "*|E",
+	  "but": "*|Mais|Pero"
+	},
 	"he": {
 	  "name": "Hebrew",
 	  "native": "עברית",

data/lib/gherkin/i18n.rb

@@ -131,6 +131,7 @@ module Gherkin
     def code_keywords
       result = step_keywords.map{|keyword| self.class.code_keyword_for(keyword)}
       result.delete('*')
+      result.delete_if {|kw| kw =~ /^\d/}
       result
     end
 

data/lib/gherkin/lexer/i18n_lexer.rb

@@ -14,9 +14,10 @@ module Gherkin
       LANGUAGE_PATTERN = /^(\xEF\xBB\xBF)?\s*#\s*language\s*:\s*([a-zA-Z\-]+)/ #:nodoc:
       attr_reader :i18n_language
 
-      def initialize(listener, force_ruby=false)
+      def initialize(listener, force_ruby=false, iso_code='en')
         @listener = listener
         @force_ruby = force_ruby
+        @iso_code = iso_code
       end
 
       def scan(source)
@@ -31,7 +32,7 @@ module Gherkin
       end
 
       def lang(source)
-        key = 'en'
+        key = @iso_code
         source.each_line do |line|
           break unless COMMENT_OR_EMPTY_LINE_PATTERN =~ line
           if LANGUAGE_PATTERN =~ line

data/lib/gherkin/parser/parser.rb

@@ -15,13 +15,13 @@ module Gherkin
       native_impl('gherkin')
 
       # Initialize the parser. +machine_name+ refers to a state machine table.
-      def initialize(formatter, raise_on_error=true, machine_name='root', force_ruby=false)
+      def initialize(formatter, raise_on_error=true, machine_name='root', force_ruby=false, iso_code = 'en')
         @formatter = formatter
         @listener = Listener::FormatterListener.new(@formatter)
         @raise_on_error = raise_on_error
         @machine_name = machine_name
         @machines = []
-        @lexer = Gherkin::Lexer::I18nLexer.new(self, force_ruby)
+        @lexer = Gherkin::Lexer::I18nLexer.new(self, force_ruby, iso_code)
       end
 
       def parse(gherkin, feature_uri, line_offset)

data/lib/gherkin/platform.rb

@@ -2,7 +2,7 @@
 
 module Gherkin
 unless defined?(Gherkin::VERSION)
-  VERSION       = '2.11.7'
+  VERSION       = '2.11.8'
   JRUBY         = defined?(JRUBY_VERSION)
 
   if !JRUBY && !(RUBY_VERSION =~ /^(1\.8\.7|1\.9\.3|2\.0)/)

data/spec/gherkin/i18n_spec.rb

@@ -189,6 +189,7 @@ module Gherkin
       | fa        | Persian             | فارسی             |
       | fi        | Finnish             | suomi             |
       | fr        | French              | français          |
+      | gl        | Galician            | galego            |
       | he        | Hebrew              | עברית             |
       | hi        | Hindi               | हिंदी             |
       | hr        | Croatian            | hrvatski          |
@@ -241,6 +242,11 @@ module Gherkin
       | but (code)       | "Mais"                                                                                                                                                |
 }
         end
+
+        it "should not list keywords that start with a number" do
+          Gherkin::I18n.get('en-old').code_keywords.should include("Ðaðe")
+          Gherkin::I18n.get('en-old').code_keywords.should_not include("7")
+        end
       end
     end
   end

data/spec/gherkin/lexer/i18n_lexer_spec.rb

@@ -4,39 +4,57 @@ require 'spec_helper'
 module Gherkin
   module Lexer
     describe I18nLexer do
-      before do
-        @lexer = Gherkin::Lexer::I18nLexer.new(Gherkin::SexpRecorder.new, false)
-      end
+      context "when default ios_code is 'en'" do
+        before do
+          @lexer = Gherkin::Lexer::I18nLexer.new(Gherkin::SexpRecorder.new, false)
+        end
 
-      it "should store the i18n language of the last scanned feature" do
-        @lexer.scan("# language: fr\n")
-        @lexer.i18n_language.iso_code.should == "fr"
-        @lexer.scan("# language: no\n")
-        @lexer.i18n_language.iso_code.should == "no"
-      end
+        it "should store the i18n language of the last scanned feature" do
+          @lexer.scan("# language: fr\n")
+          @lexer.i18n_language.iso_code.should == "fr"
+          @lexer.scan("# language: no\n")
+          @lexer.i18n_language.iso_code.should == "no"
+        end
 
-      it "should detect language when there are spaces and CRLF" do
-        @lexer.scan("# language: da  \r\n")
-        @lexer.i18n_language.iso_code.should == "da"
-      end
+        it "should detect language when there are spaces and CRLF" do
+          @lexer.scan("# language: da  \r\n")
+          @lexer.i18n_language.iso_code.should == "da"
+        end
 
-      it "should detect language when the language comment is not the first line" do
-        @lexer.scan("# hello\n# language: no\n")
-        @lexer.i18n_language.iso_code.should == "no"
-      end
+        it "should detect language when the language comment is not the first line" do
+          @lexer.scan("# hello\n# language: no\n")
+          @lexer.i18n_language.iso_code.should == "no"
+        end
 
-      it "should detect language when the language is on the third line, and there are empty lines above" do
-        @lexer.scan("# hello\n\n# language: no\n")
-        @lexer.i18n_language.iso_code.should == "no"
-      end
+        it "should detect language when the language is on the third line, and there are empty lines above" do
+          @lexer.scan("# hello\n\n# language: no\n")
+          @lexer.i18n_language.iso_code.should == "no"
+        end
+
+        it "should use English i18n by default" do
+          @lexer.scan("Feature: foo\n")
+          @lexer.i18n_language.iso_code.should == "en"
+        end
 
-      it "should use English i18n by default" do
-        @lexer.scan("Feature: foo\n")
-        @lexer.i18n_language.iso_code.should == "en"
+        it "should === its ruby class, even when the impl is Java" do
+          Gherkin::Lexer::I18nLexer.should === Gherkin::Lexer::I18nLexer.new(Gherkin::SexpRecorder.new, true)
+        end
       end
 
-      it "should === its ruby class, even when the impl is Java" do
-        Gherkin::Lexer::I18nLexer.should === Gherkin::Lexer::I18nLexer.new(Gherkin::SexpRecorder.new, true)
+      context "when default ios_code is 'ja'" do
+        before do
+          @lexer = Gherkin::Lexer::I18nLexer.new(Gherkin::SexpRecorder.new, false, 'ja')
+        end
+
+        it "should store the i18n language of the last scanned feature" do
+          @lexer.scan("# language: en")
+          @lexer.i18n_language.iso_code.should == "en"
+        end
+
+        it "should use Japanese" do
+          @lexer.scan("機能: foo\n")
+          @lexer.i18n_language.iso_code.should == "ja"
+        end
       end
     end
   end