gherkin 2.0.1-i386-mingw32 → 2.0.2-i386-mingw32

data/lib/gherkin/tools/reformat.rb

@@ -1,16 +1,19 @@
 require 'stringio'
 require 'gherkin/tools/files'
 require 'gherkin/formatter/pretty_formatter'
+require 'gherkin/parser/formatter_listener'
 
 module Gherkin
   module Tools
     class Reformat < Files
       def run
         each do |file|
-          purdy = StringIO.new
-          listener = Formatter::PrettyFormatter.new(purdy)
+          io = defined?(JRUBY_VERSION) ? Java.java.io.StringWriter.new : StringIO.new
+          formatter = Formatter::PrettyFormatter.new(io, true)
+          listener = Parser::FormatterListener.new(formatter)
           scan(file, listener)
-          File.open(file, 'w') {|io| io.write(purdy.string)}
+          string = defined?(JRUBY_VERSION) ? io.getBuffer.toString : io.string
+          File.open(file, 'w') {|io| io.write(string)}
         end
       end
     end

data/lib/gherkin/tools/stats_listener.rb

@@ -14,6 +14,9 @@ module Gherkin
         @steps     = 0
       end
 
+      def location(file, uri)
+      end
+
       def tag(name, line)
       end
 

data/ragel/lexer.java.rl.erb

@@ -142,9 +142,9 @@ public class <%= @i18n.underscored_iso_code.upcase %> implements Lexer {
 
   %% write data noerror;
 
-  public void scan(String inputSequence, String uri, int offset)  {
+  public void scan(String source, String uri, int offset)  {
     listener.location(uri, offset);
-    String input = inputSequence + "\n%_FEATURE_END_%";
+    String input = source + "\n%_FEATURE_END_%";
     byte[] data = null;
     try {
       data = input.getBytes("UTF-8");

data/ragel/lexer_common.rl.erb

@@ -20,7 +20,7 @@
   ScenarioHeadingEnd = EOL+ space* ( I18N_Feature | I18N_Background | I18N_Scenario | I18N_ScenarioOutline | I18N_Step | '@' | '#' | EOF ) >next_keyword_start;
   BackgroundHeadingEnd = EOL+ space* ( I18N_Feature | I18N_Scenario | I18N_ScenarioOutline | I18N_Step | '@' | '#'| EOF ) >next_keyword_start;
   ScenarioOutlineHeadingEnd = EOL+ space* ( I18N_Feature | I18N_Scenario | I18N_Step | '@' | '#' | EOF ) >next_keyword_start;
-  ExamplesHeadingEnd = EOL+ space* ( I18N_Feature | '|' ) >next_keyword_start;
+  ExamplesHeadingEnd = EOL+ space* ( I18N_Feature | '|' | '#') >next_keyword_start;
  
   FeatureHeading = space* I18N_Feature %begin_content ^FeatureHeadingEnd* :>> FeatureHeadingEnd @store_feature_content;
   BackgroundHeading = space* I18N_Background %begin_content ^BackgroundHeadingEnd* :>> BackgroundHeadingEnd @store_background_content;

data/spec/gherkin/fixtures/complex.json

@@ -0,0 +1,124 @@
+{ "name": "Feature Text",
+  "keyword": "Feature",
+  "description": "In order to test multiline forms",
+  "tags": [
+    "@tag1",
+    "@tag2"
+  ],
+  "background" : {
+    "description": "",
+    "name": "", 
+    "keyword": "Background",
+    "steps": [
+      { "name": "this is a background step",
+        "keyword": "Given " },
+      { "name": "this is another one",
+        "keyword": "When ",
+        "line": 412 }
+    ]
+  },
+  "elements": [
+    { "type": "scenario_outline",
+      "keyword": "Scenario Outline",
+      "name": "An Scenario Outline",
+      "description": "",
+      "tags": [ "@foo" ],
+      "steps": [
+        { "name": "A step with a table",
+          "keyword": "Given ",
+          "table" : [
+            {"cells":
+              [ "a","row","for","a","step" ]
+            }
+          ]
+        }
+      ],
+      "examples": [
+        { "name": "Sweet Example", 
+          "keyword": "Examples",
+          "description": "",
+          "table" : [
+            {"cells" :
+              [ "Fill","In" ]
+            },
+            {"cells" :
+              [ "The","Blanks" ]
+            }
+          ],
+          "tags" : [ "@exampletag" ]
+        }
+      ]
+    },
+    { "type" : "scenario",
+      "keyword": "Scenario",
+      "name" : "Reading a Scenario",
+      "description": "",
+      "tags" : [
+        "@tag3",
+        "@tag4"
+      ],
+      "steps" : [
+        { "name" : "there is a step",
+          "keyword": "Given "},
+        { "name" : "not another step",
+          "keyword": "But " }
+      ]
+    },
+    { "type" : "scenario",
+      "keyword": "Scenario",
+      "name" : "Reading a second scenario",
+      "description": "With two lines of text",
+      "tags" : [ "@tag3" ],
+      "steps" : [
+        { "name" : "a third step with a table",
+          "keyword": "Given ",
+          "table" : [
+            { "cells" :
+              [ "a","b" ]
+            },
+            { "cells" :
+              [ "c","d" ]
+            },
+            { "cells" :
+              [ "e", "f" ]
+            }
+          ]
+        },
+        { "name" : "I am still testing things",
+          "keyword": "Given ",
+          "table" : [
+            { "cells" :
+              [ "g","h" ]
+            },
+            { "cells" :
+              [ "e","r" ]
+            },
+            { "cells" :
+              [ "k", "i" ]
+            },
+            { "cells" :
+              [ "n", "" ]
+            }
+          ]
+        },
+        { "name" : "I am done testing these tables",
+          "keyword": "Given " },
+        { "name" : "I am happy",
+          "keyword": "Given " }
+      ]
+    },
+    { "type" : "scenario",
+      "keyword": "Scenario",
+      "name" : "Hammerzeit", 
+      "description": "",
+      "steps" : [
+        { "name" : "All work and no play", 
+          "keyword": "Given ",
+          "py_string" : "Makes Homer something something\nAnd something else" },
+        { "name" : "crazy",
+          "keyword": "Given " }
+      ]
+    }
+  ]
+}
+

data/spec/gherkin/formatter/pretty_formatter_spec.rb

@@ -79,6 +79,7 @@ module Gherkin
 
   Scenario: Scenario Description
     description has multiple lines
+
     Given there is a step
       """
       with
@@ -97,6 +98,8 @@ module Gherkin
 @foo
 Feature: Feature Description
   Some preamble
+  on several
+  lines
 
   # A Scenario Outline comment
   @bar

data/spec/gherkin/json_lexer_spec.rb

@@ -0,0 +1,97 @@
+#encoding: utf-8
+require 'spec_helper'
+require 'gherkin/json_lexer'
+
+module Gherkin
+  describe JSONLexer do 
+
+    before do
+      @listener = Gherkin::SexpRecorder.new
+      @lexer = Gherkin::JSONLexer.new(@listener)
+    end
+
+    describe "An empty feature" do
+      it "should scan empty features" do
+        @lexer.scan('{}')
+        @listener.to_sexp.should == [
+          [:eof]
+        ]
+      end
+    end
+
+    describe "A barely empty feature" do
+      it "should scan a feature with no elements" do
+        @lexer.scan('{ "keyword": "Feature", "name": "One", "description": "", "line" : 3 }')
+        @listener.to_sexp.should == [
+          [:feature, "Feature", "One", "", 3],
+          [:eof]
+        ]
+      end
+    end
+
+    describe "Missing line numbers" do
+      it "should indicate a line number of 0 if a line attribute doesn't exist" do
+        @lexer.scan('{ "name": "My Sweet Featur", "keyword": "Feature", "description": "" }')
+        @listener.to_sexp.should == [
+          [:feature, "Feature", "My Sweet Featur", "", 0],
+          [:eof]
+        ]
+      end
+    end
+
+    describe "Keywords" do
+      it "should use the keyword from the source when provided" do
+        @lexer.scan('{ "name" : "My Sweet Featur", "language": "fr", "keyword": "Feature", "description": "" }')
+        @listener.to_sexp.should == [
+          [:feature, "Feature", "My Sweet Featur", "",  0],
+          [:eof]
+        ]
+      end
+    end
+
+    describe "A complex feature with tags, comments, multiple scenarios, and multiple steps and tables" do
+      it "should find things in the right order" do
+        scan_file("complex.json")
+        @listener.to_sexp.should == [
+          [:tag, "@tag1", 0],
+          [:tag, "@tag2", 0],
+          [:feature, "Feature", "Feature Text","In order to test multiline forms", 0],
+          [:background, "Background", "", "", 0],
+          [:step, "Given ", "this is a background step", 0],
+          [:step, "When ", "this is another one", 412],
+          [:tag, "@foo", 0],
+          [:scenario_outline, "Scenario Outline", "An Scenario Outline","", 0],
+          [:step, "Given ", "A step with a table", 0],
+          [:row, %w{a row for a step}, 0],
+          [:tag, "@exampletag", 0],
+          [:examples, "Examples", "Sweet Example", "", 0],
+          [:row, %w{Fill In}, 0],
+          [:row, %w{The Blanks}, 0],
+          [:tag, "@tag3", 0],
+          [:tag, "@tag4", 0],
+          [:scenario, "Scenario", "Reading a Scenario", "", 0],
+          [:step, "Given ", "there is a step", 0],
+          [:step, "But ", "not another step", 0],
+          [:tag, "@tag3", 0],
+          [:scenario, "Scenario", "Reading a second scenario", "With two lines of text", 0],
+          [:step, "Given ", "a third step with a table", 0],
+          [:row, %w{a b}, 0],
+          [:row, %w{c d}, 0],
+          [:row, %w{e f}, 0],
+          [:step, "Given ", "I am still testing things", 0],
+          [:row, %w{g h}, 0],
+          [:row, %w{e r}, 0],
+          [:row, %w{k i}, 0],
+          [:row, ['n', ''], 0], 
+          [:step, "Given ", "I am done testing these tables", 0],
+          [:step, "Given ", "I am happy", 0],
+          [:scenario, "Scenario", "Hammerzeit", "", 0],
+          [:step, "Given ", "All work and no play", 0],
+          [:py_string, "Makes Homer something something\nAnd something else", 0 ],
+          [:step, "Given ", "crazy", 0],
+          [:eof]
+        ]
+      end        
+    end
+  end
+end

data/spec/gherkin/shared/lexer_group.rb

@@ -39,6 +39,18 @@ module Gherkin
           ]
         end
 
+        it "should not consume comments as part of a multiline example name" do
+          scan("Examples: thing\n# ho hum\n| 1 | 2 |\n| 3 | 4 |\n")
+          @listener.to_sexp.should == [
+            [:location, 'test.feature', 0],
+            [:examples, "Examples", "thing", "", 1],
+            [:comment,  "# ho hum", 2],
+            [:row, ["1","2"], 3],
+            [:row, ["3","4"], 4],
+            [:eof]
+          ]
+        end
+
         it "should allow empty comment lines" do 
           scan("#\n   # A comment\n   #\n")
           @listener.to_sexp.should == [

data/spec/spec_helper.rb

@@ -1,25 +1,19 @@
+require 'rubygems'
+require 'rspec/autorun'
 require 'gherkin'
 require 'stringio'
 require 'gherkin/sexp_recorder'
 require 'gherkin/output_stream_string_io'
-require 'rubygems'
-require 'rspec/autorun'
 require 'gherkin/shared/lexer_group'
 require 'gherkin/shared/tags_group'
 require 'gherkin/shared/py_string_group'
 require 'gherkin/shared/row_group'
 
 module GherkinSpecHelper
-  # TODO: Rename to gherkin_scan_file
   def scan_file(file)
     @lexer.scan(File.new(File.dirname(__FILE__) + "/gherkin/fixtures/" + file).read, file, 0)
   end
 
-  # TODO: Remove
-  def parse_file(file)
-    @parser.parse(File.new(File.dirname(__FILE__) + "/gherkin/fixtures/" + file).read)
-  end
-
   def rubify_hash(hash)
     if defined?(JRUBY_VERSION)
       h = {}

data/tasks/compile.rake

@@ -24,15 +24,29 @@ end
 rl_langs = ENV['RL_LANGS'] ? ENV['RL_LANGS'].split(',') : []
 langs = Gherkin::I18n.all.select { |lang| rl_langs.empty? || rl_langs.include?(lang.iso_code) }
 
+# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6457127
+file 'lib/gherkin.jar' => "java/src/main/resources/gherkin/I18nKeywords_in.properties"
+file "java/src/main/resources/gherkin/I18nKeywords_in.properties" => "java/src/main/resources/gherkin/I18nKeywords_id.properties" do
+  cp "java/src/main/resources/gherkin/I18nKeywords_id.properties", "java/src/main/resources/gherkin/I18nKeywords_in.properties"
+end
+
+# http://forums.sun.com/thread.jspa?threadID=5335461
+file 'lib/gherkin.jar' => "java/src/main/resources/gherkin/I18nKeywords_iw.properties"
+file "java/src/main/resources/gherkin/I18nKeywords_iw.properties" => "java/src/main/resources/gherkin/I18nKeywords_he.properties" do
+  cp "java/src/main/resources/gherkin/I18nKeywords_he.properties", "java/src/main/resources/gherkin/I18nKeywords_iw.properties"
+end
+
 langs.each do |i18n|
   java = RagelTask.new('java', i18n)
   rb   = RagelTask.new('rb', i18n)
 
-  java_properties = "java/src/main/resources/gherkin/I18nKeywords_#{i18n.iso_code.gsub(/-/, '_')}.properties"
+  lang_country = i18n.iso_code.split(/-/)
+  suffix = lang_country.length == 1 ? lang_country[0] : "#{lang_country[0]}_#{lang_country[1].upcase}"
+  java_properties = "java/src/main/resources/gherkin/I18nKeywords_#{suffix}.properties"
   file java_properties => 'lib/gherkin/i18n.yml' do
     File.open(java_properties, 'wb') do |io|
       io.puts("# Generated file. Do not edit.")
-      Gherkin::I18n::KEYWORD_KEYS.each do |key|
+      (Gherkin::I18n::KEYWORD_KEYS + %w{name native}).each do |key|
         value = Gherkin::I18n.unicode_escape(i18n.keywords(key).join("|"))
         io.puts("#{key}:#{value}")
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gherkin
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: i386-mingw32
 authors: 
 - Mike Sassak
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 +02:00
+date: 2010-06-16 00:00:00 +02:00
 default_executable: gherkin
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,12 +110,14 @@ files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature
 - features/json_formatter.feature
+- features/json_parser.feature
 - features/native_lexer.feature
 - features/parser_with_native_lexer.feature
 - features/pretty_formatter.feature
 - features/step_definitions/eyeball_steps.rb
 - features/step_definitions/gherkin_steps.rb
 - features/step_definitions/json_formatter_steps.rb
+- features/step_definitions/json_lexer_steps.rb
 - features/step_definitions/pretty_formatter_steps.rb
 - features/steps_parser.feature
 - features/support/env.rb
@@ -224,6 +226,7 @@ files:
 - lib/gherkin/i18n.rb
 - lib/gherkin/i18n.yml
 - lib/gherkin/i18n_lexer.rb
+- lib/gherkin/json_lexer.rb
 - lib/gherkin/native.rb
 - lib/gherkin/native/ikvm.rb
 - lib/gherkin/native/java.rb
@@ -231,7 +234,6 @@ files:
 - lib/gherkin/parser/event.rb
 - lib/gherkin/parser/filter_listener.rb
 - lib/gherkin/parser/formatter_listener.rb
-- lib/gherkin/parser/json_parser.rb
 - lib/gherkin/parser/meta.txt
 - lib/gherkin/parser/parser.rb
 - lib/gherkin/parser/root.txt
@@ -256,7 +258,7 @@ files:
 - spec/gherkin/fixtures/1.feature
 - spec/gherkin/fixtures/comments_in_table.feature
 - spec/gherkin/fixtures/complex.feature
-- spec/gherkin/fixtures/complex.js
+- spec/gherkin/fixtures/complex.json
 - spec/gherkin/fixtures/dos_line_endings.feature
 - spec/gherkin/fixtures/i18n_fr.feature
 - spec/gherkin/fixtures/i18n_no.feature
@@ -272,10 +274,10 @@ files:
 - spec/gherkin/i18n_lexer_spec.rb
 - spec/gherkin/i18n_spec.rb
 - spec/gherkin/java_lexer_spec.rb
+- spec/gherkin/json_lexer_spec.rb
 - spec/gherkin/output_stream_string_io.rb
 - spec/gherkin/parser/filter_listener_spec.rb
 - spec/gherkin/parser/formatter_listener_spec.rb
-- spec/gherkin/parser/json_parser_spec.rb
 - spec/gherkin/parser/parser_spec.rb
 - spec/gherkin/parser/tag_expression_spec.rb
 - spec/gherkin/rb_lexer_spec.rb
@@ -339,10 +341,10 @@ test_files:
 - spec/gherkin/i18n_lexer_spec.rb
 - spec/gherkin/i18n_spec.rb
 - spec/gherkin/java_lexer_spec.rb
+- spec/gherkin/json_lexer_spec.rb
 - spec/gherkin/output_stream_string_io.rb
 - spec/gherkin/parser/filter_listener_spec.rb
 - spec/gherkin/parser/formatter_listener_spec.rb
-- spec/gherkin/parser/json_parser_spec.rb
 - spec/gherkin/parser/parser_spec.rb
 - spec/gherkin/parser/tag_expression_spec.rb
 - spec/gherkin/rb_lexer_spec.rb