gherkin 1.0.2-java → 1.0.3-java

data/.gitattributes

@@ -0,0 +1 @@
+spec/gherkin/fixtures/dos_line_endings.feature -crlf

data/History.txt

@@ -1,3 +1,21 @@
+== In Git
+
+== Bugfixes
+* The C lexer correctly instantiates a new array for each table, instead of reusing the old one. (Aslak Hellesøy)
+* Emit keywords with space instead of stripping (< keywords are emmitted without space) (Aslak Hellesøy)
+* gherkin reformat now prints comments, and does it with proper indentation (Aslak Hellesøy)
+* .NET resource files are now automatically copied into the .dll (#46 Aslak Hellesøy)
+
+== New features
+* The Pure Java implementation now has a simple main method that pretty prints a feature. (#39 Aslak Hellesøy) 
+* Writing code generated i18n syntax highlighters for Gherkin is a lot easier thanks to several convenience methods in Gherkin::I18n. (Aslak Hellesøy)
+* .NET (C#) port (#36, #37 Attila Sztupak)
+* Tables parsed and sent by row rather than by table. (Mike Sassak)
+
+== Changed features
+* Switced to ISO 639-1 (language) and ISO 3166 alpha-2 (region - if applicable). Applies to Catalan,
+  Swedish, Welsh, Romanian and Serbian. (Aslak Hellesøy)
+
 == 1.0.2 (2009-12-30)
 
 == Bugfixes

data/README.rdoc

@@ -9,6 +9,9 @@ Fast Gherkin lexer and parser based on Ragel. Gherkin is two things:
 
 rake clean spec cucumber
 
+If the RL_LANG environment variable is set, only the parsers for the languages specified there will be built.
+E.g. in Bash, export RL_LANG="en,fr,no". This can be quite helpful when modifying the Ragel grammar.
+
 == Release process
 
 * Run "rake clean spec cucumber" for each platform (1.8.6, 1.8.7, 1.9, jruby) to make sure all is green.
@@ -17,7 +20,7 @@ rake clean spec cucumber
 * rake clean jar compile
 * rake gemspec
 * git commit -a -m "Release vX.Y.Z"
-* rake release
+* rake gemcutter:release
 * ./nativegems.sh
 * gem push pkg/... (for each native gem)
 

data/Rakefile

@@ -15,10 +15,12 @@ begin
     gem.authors = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Hellesøy"]
     gem.executables = ["gherkin"]
     gem.add_dependency "trollop", ">= 1.15"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "cucumber", ">= 0.5.1"
+    gem.add_development_dependency "rspec", ">= 1.3.0"
+    gem.add_development_dependency "cucumber", ">= 0.6.2"
     gem.add_development_dependency "rake-compiler", ">= 0.7.0" unless defined?(JRUBY_VERSION)
+    gem.add_development_dependency "albacore", ">= 0.1.0"
     
+    gem.files -= FileList['dotnet/**/*']
     case ENV['PLATFORM']
     when 'java'
       gem.platform = 'java'

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 2
+:patch: 3
 :major: 1

data/bin/gherkin

@@ -2,4 +2,4 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
 
 require 'gherkin/cli/main'
-Gherkin::Cli::Main.run(ARGV)
+Gherkin::Cli::Main.run(ARGV)

data/dotnet/.gitignore

@@ -0,0 +1,13 @@
+*.user
+*.suo
+bin
+obj
+Gherkin/StateMachine/meta.txt
+Gherkin/StateMachine/root.txt
+Gherkin/StateMachine/steps.txt
+Gherkin/Lexer/*.cs
+*.sln.cache
+_ReSharper*
+Gherkin.sln.proj
+*.pidb
+*.userprefs

data/features/feature_parser.feature

@@ -6,7 +6,7 @@ Feature: Gherkin Feature lexer
   make all the syntax decisions for me
 
   Background: 
-    Given a "en", "ruby" "root" parser
+    Given a "ruby" "root" parser
 
   Scenario: Correctly formed feature
     Given the following text is parsed:
@@ -92,7 +92,7 @@ Feature: Gherkin Feature lexer
       """
     Then there should be parse errors on lines 5, 10 and 12
 
-  Scenario: Tables
+  Scenario: Malformed Tables
     Given the following text is parsed:
       """
       Feature: Antiques Roadshow
@@ -115,6 +115,26 @@ Feature: Gherkin Feature lexer
       """
     Then there should be parse errors on lines 10 and 17
 
+  Scenario: Well-formed Tables
+    Given the following text is parsed:
+      """
+      Feature: Row-by-row
+      
+      Scenario: Tables with comments!
+        Given I can now comment out a row:
+          | Key  | Value |
+          # | Yes  | No  |
+          # | Good | Bad |
+          | Good | Evil  |
+        Then I am pleased by these things:
+          | Raindrops     | Roses   |
+          # | Whiskers    | Kittens |
+          | Bright Copper | Kettles |
+          # | Warm woolen   | Mittens |
+          | Also Oban | And Hendricks |
+      """
+    Then there should be no parse errors
+
   Scenario: Multiline keyword descriptions
     Given the following text is parsed:
       """

data/features/native_lexer.feature

@@ -1,7 +1,7 @@
 Feature: Native (C/Java) Lexer
 
   Background: 
-    Given a "en", "native" "root" parser
+    Given a "native" "root" parser
 
   Scenario: Parsing an empty feature
     Given the following text is parsed:

data/features/parser_with_native_lexer.feature

@@ -5,7 +5,7 @@ Feature: Gherkin Feature lexer/parser
   make all the syntax decisions for me
 
   Background: 
-    Given a "en", "native" "root" parser
+    Given a "native" "root" parser
 
   Scenario: Correctly formed feature
     When the following text is parsed:

data/features/step_definitions/gherkin_steps.rb

@@ -1,10 +1,6 @@
-Given /^a "([^\"]*)", "([^\"]*)" "([^\"]*)" parser$/ do |i18n_language, impl, parser_name|
+Given /^a "([^\"]*)" "([^\"]*)" parser$/ do |ruby_or_native, parser_name|
   parser = Gherkin::Parser.new(@listener, false, parser_name)
-  programming_language = {
-    'ruby' => 'rb',
-    'native' => (defined?(JRUBY_VERSION) ? 'java' : 'c')
-  }[impl]
-  @lexer = Gherkin::Lexer.send(programming_language)[i18n_language].new(parser)
+  @lexer = Gherkin::I18nLexer.new(parser, ruby_or_native == "ruby")
 end
 
 Given "the following text is parsed:" do |text|

data/features/step_definitions/pretty_printer_steps.rb

@@ -31,13 +31,12 @@ When /^I parse the prettified representation of each of them$/ do
     pretty1 = nil
     pretty2 = nil
     begin
-#      announce "========== #{feature}:"
       pretty1 = pretty(IO.read(feature))
       pretty2 = pretty(pretty1)
       pretty2.should == pretty1
     rescue Spec::Expectations::ExpectationNotMetError => e
-      File.open("p1.feature", "w") {|io| io.write(pretty1)}
-      File.open("p2.feature", "w") {|io| io.write(pretty2)}
+      File.open("p1.feature", "wb") {|io| io.write(pretty1)}
+      File.open("p2.feature", "wb") {|io| io.write(pretty2)}
       announce "========== #{feature}:"
       if(e.message =~ /(@@.*)/m)
         announce $1

data/features/steps_parser.feature

@@ -4,7 +4,7 @@ Feature: Gherkin Steps parser
   I want a steps parser to make writing compound steps easier
 
   Background: 
-    Given a "en", "ruby" "steps" parser
+    Given a "ruby" "steps" parser
 
   Scenario: Parsing steps
     Given the following text is parsed:

data/gherkin.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gherkin}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
   s.platform = %q{java}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Helles\303\270y"]
-  s.date = %q{2009-12-30}
+  s.date = %q{2010-03-30}
   s.default_executable = %q{gherkin}
   s.description = %q{A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.}
   s.email = %q{cukes@googlegroups.com}
@@ -20,7 +20,8 @@ Gem::Specification.new do |s|
      "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
+    ".gitattributes",
+     ".gitignore",
      ".mailmap",
      "History.txt",
      "LICENSE",
@@ -29,6 +30,7 @@ Gem::Specification.new do |s|
      "VERSION.yml",
      "bin/gherkin",
      "cucumber.yml",
+     "dotnet/.gitignore",
      "features/feature_parser.feature",
      "features/native_lexer.feature",
      "features/parser_with_native_lexer.feature",
@@ -42,23 +44,33 @@ Gem::Specification.new do |s|
      "java/Gherkin.iml",
      "java/build.xml",
      "java/src/gherkin/FixJava.java",
+     "java/src/gherkin/I18nLexer.java",
      "java/src/gherkin/Lexer.java",
      "java/src/gherkin/LexingError.java",
      "java/src/gherkin/Listener.java",
+     "java/src/gherkin/Main.java",
      "java/src/gherkin/ParseError.java",
      "java/src/gherkin/Parser.java",
+     "java/src/gherkin/formatter/Argument.java",
+     "java/src/gherkin/formatter/ArgumentFormat.java",
+     "java/src/gherkin/formatter/Colors.java",
+     "java/src/gherkin/formatter/Formatter.java",
+     "java/src/gherkin/formatter/PrettyFormatter.java",
      "java/src/gherkin/lexer/.gitignore",
      "java/src/gherkin/parser/StateMachineReader.java",
+     "java/test/gherkin/formatter/ArgumentTest.java",
      "lib/.gitignore",
      "lib/gherkin.jar",
      "lib/gherkin.rb",
      "lib/gherkin/c_lexer.rb",
      "lib/gherkin/cli/main.rb",
      "lib/gherkin/core_ext/array.rb",
+     "lib/gherkin/csharp_lexer.rb",
+     "lib/gherkin/format/argument.rb",
+     "lib/gherkin/format/monochrome_format.rb",
      "lib/gherkin/i18n.rb",
      "lib/gherkin/i18n.yml",
      "lib/gherkin/i18n_lexer.rb",
-     "lib/gherkin/java_lexer.rb",
      "lib/gherkin/lexer.rb",
      "lib/gherkin/parser.rb",
      "lib/gherkin/parser/meta.txt",
@@ -69,6 +81,7 @@ Gem::Specification.new do |s|
      "lib/gherkin/rb_lexer/README.rdoc",
      "lib/gherkin/rb_parser.rb",
      "lib/gherkin/tools.rb",
+     "lib/gherkin/tools/colors.rb",
      "lib/gherkin/tools/files.rb",
      "lib/gherkin/tools/pretty_listener.rb",
      "lib/gherkin/tools/reformat.rb",
@@ -77,18 +90,23 @@ Gem::Specification.new do |s|
      "nativegems.sh",
      "ragel/i18n/.gitignore",
      "ragel/lexer.c.rl.erb",
+     "ragel/lexer.csharp.rl.erb",
      "ragel/lexer.java.rl.erb",
      "ragel/lexer.rb.rl.erb",
      "ragel/lexer_common.rl.erb",
      "spec/gherkin/c_lexer_spec.rb",
+     "spec/gherkin/csharp_lexer_spec.rb",
      "spec/gherkin/fixtures/1.feature",
+     "spec/gherkin/fixtures/comments_in_table.feature",
      "spec/gherkin/fixtures/complex.feature",
+     "spec/gherkin/fixtures/dos_line_endings.feature",
      "spec/gherkin/fixtures/i18n_fr.feature",
      "spec/gherkin/fixtures/i18n_no.feature",
      "spec/gherkin/fixtures/i18n_zh-CN.feature",
      "spec/gherkin/fixtures/simple.feature",
      "spec/gherkin/fixtures/simple_with_comments.feature",
      "spec/gherkin/fixtures/simple_with_tags.feature",
+     "spec/gherkin/format/argument_spec.rb",
      "spec/gherkin/i18n_lexer_spec.rb",
      "spec/gherkin/i18n_spec.rb",
      "spec/gherkin/java_lexer_spec.rb",
@@ -97,8 +115,10 @@ Gem::Specification.new do |s|
      "spec/gherkin/sexp_recorder.rb",
      "spec/gherkin/shared/lexer_spec.rb",
      "spec/gherkin/shared/py_string_spec.rb",
-     "spec/gherkin/shared/table_spec.rb",
+     "spec/gherkin/shared/row_spec.rb",
      "spec/gherkin/shared/tags_spec.rb",
+     "spec/gherkin/tools/colors_spec.rb",
+     "spec/gherkin/tools/pretty_listener_spec.rb",
      "spec/spec_helper.rb",
      "tasks/bench.rake",
      "tasks/bench/feature_builder.rb",
@@ -113,10 +133,12 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/aslakhellesoy/gherkin}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Fast Gherkin lexer/parser}
   s.test_files = [
     "spec/gherkin/c_lexer_spec.rb",
+     "spec/gherkin/csharp_lexer_spec.rb",
+     "spec/gherkin/format/argument_spec.rb",
      "spec/gherkin/i18n_lexer_spec.rb",
      "spec/gherkin/i18n_spec.rb",
      "spec/gherkin/java_lexer_spec.rb",
@@ -125,8 +147,10 @@ Gem::Specification.new do |s|
      "spec/gherkin/sexp_recorder.rb",
      "spec/gherkin/shared/lexer_spec.rb",
      "spec/gherkin/shared/py_string_spec.rb",
-     "spec/gherkin/shared/table_spec.rb",
+     "spec/gherkin/shared/row_spec.rb",
      "spec/gherkin/shared/tags_spec.rb",
+     "spec/gherkin/tools/colors_spec.rb",
+     "spec/gherkin/tools/pretty_listener_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -136,20 +160,23 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<trollop>, [">= 1.15"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<cucumber>, [">= 0.5.1"])
+      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_development_dependency(%q<cucumber>, [">= 0.6.2"])
       s.add_development_dependency(%q<rake-compiler>, [">= 0.7.0"])
+      s.add_development_dependency(%q<albacore>, [">= 0.1.0"])
     else
       s.add_dependency(%q<trollop>, [">= 1.15"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<cucumber>, [">= 0.5.1"])
+      s.add_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_dependency(%q<cucumber>, [">= 0.6.2"])
       s.add_dependency(%q<rake-compiler>, [">= 0.7.0"])
+      s.add_dependency(%q<albacore>, [">= 0.1.0"])
     end
   else
     s.add_dependency(%q<trollop>, [">= 1.15"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<cucumber>, [">= 0.5.1"])
+    s.add_dependency(%q<rspec>, [">= 1.3.0"])
+    s.add_dependency(%q<cucumber>, [">= 0.6.2"])
     s.add_dependency(%q<rake-compiler>, [">= 0.7.0"])
+    s.add_dependency(%q<albacore>, [">= 0.1.0"])
   end
 end
 

data/java/Gherkin.iml

@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
+<module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.6.jar!/" />
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.7.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="TEST" name="Mockito" level="application" />
   </component>
 </module>
 

data/java/build.xml

@@ -8,6 +8,9 @@
     <jar destfile="${basedir}/../lib/gherkin.jar">
       <fileset dir="${basedir}/target/classes" />
       <fileset dir="${basedir}/../lib" includes="gherkin/parser/*.txt" />
+      <manifest>
+        <attribute name="Main-Class" value="gherkin.Main" />
+      </manifest>
     </jar>
   </target>
 </project>

data/java/src/gherkin/FixJava.java

@@ -17,14 +17,17 @@ public class FixJava {
         return sb.toString();
     }
 
-    public static String readResourceAsString(String filePath) throws IOException {
-        Reader machine = new InputStreamReader(FixJava.class.getResourceAsStream(filePath));
+    public static String readResource(String filePath) throws IOException {
+        Reader reader = new InputStreamReader(FixJava.class.getResourceAsStream(filePath));
+        return readReader(reader);
+    }
 
+    public static String readReader(Reader reader) throws IOException {
         final char[] buffer = new char[0x10000];
         StringBuilder sb = new StringBuilder();
         int read;
         do {
-            read = machine.read(buffer, 0, buffer.length);
+            read = reader.read(buffer, 0, buffer.length);
             if (read > 0) {
                 sb.append(buffer, 0, read);
             }

data/java/src/gherkin/I18nLexer.java

@@ -0,0 +1,48 @@
+package gherkin;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class I18nLexer implements Lexer {
+    private static final Pattern LANGUAGE_PATTERN = Pattern.compile("language\\s*:\\s*(.*)");
+    private final Listener listener;
+    private String i18nLanguage;
+
+    public I18nLexer(Listener listener) {
+        this.listener = listener;
+    }
+
+    /**
+     * @return the i18n language code from the previous scanned source.
+     */
+    public String getI18nLanguage() {
+        return i18nLanguage;
+    }
+
+    public void scan(CharSequence source) {
+        createDelegate(source).scan(source);
+    }
+
+    private Lexer createDelegate(CharSequence source) {
+        i18nLanguage = lang(source);
+        String i18nLanguage = this.i18nLanguage.replaceAll("[\\s-]", "").toLowerCase();
+        String i18nLexerClassName = i18nLanguage.substring(0,1).toUpperCase() + i18nLanguage.substring(1);
+        String qualifiedI18nLexerClassName = "gherkin.lexer." + i18nLexerClassName;
+        try {
+            Class<?> delegateClass = Class.forName(qualifiedI18nLexerClassName);
+            return (Lexer) delegateClass.getConstructor(Listener.class).newInstance(listener);
+        } catch (Exception e) {
+            throw new RuntimeException("Couldn't load lexer class: " + qualifiedI18nLexerClassName, e);
+        }
+    }
+
+    private String lang(CharSequence source) {
+        String lineOne = source.toString().split("\\n")[0];
+        Matcher matcher = LANGUAGE_PATTERN.matcher(lineOne);
+        if(matcher.find()) {
+            return matcher.group(1);
+        } else {
+            return "en";            
+        }
+    }
+}