gherkin3 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a35039bc80ab11815655fae5a6aa3e06e91f8756
-  data.tar.gz: 49f19d25217b0d84e71283d0f773694af94a3ddc
+  metadata.gz: 4b5220c8f72cd396ab0a8ec44e0c4ec82e7e0cdf
+  data.tar.gz: c0229d0cf820b457b5e7a09aa309c86db07ecdfa
 SHA512:
-  metadata.gz: dcd7b24e67be72f4d4535fe52b6d9d9f38e03747e70c87c525284d5119c85234ecc833876551aadae5326e93c38091b0e189c84a977eb0ab107d44ccd383b7c6
-  data.tar.gz: 216ed4b205d4f36952413d1af516d56fc021a813f030db9308c858d64cda3f55f101f43f6d1eec28621ed7d6e76c81ab37fa633debd8577fc14d180968c53895
+  metadata.gz: 46ce5c3083f84024343c7648c32504e2470a46830839700ba9ca2fbbb1805c2f527dc6ce18786d63adf660e2a84867f895c3b15e02be0712a7a4fa74e2d48621
+  data.tar.gz: e3b7e5f8ba2717fe48ab65cb2fd74e581c27dc94b71c4a6bd58090878a2aca1da42eedae0e1aed69cc0873ede6a361ba57ac5bd745f5d3071804b0f5bec8ab69

data/.travis.yml

@@ -1 +1,2 @@
 language: ruby
+sudo: false

data/bin/gherkin-generate-ast

@@ -2,8 +2,6 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__),"../lib"))
 require 'gherkin3/parser'
 require 'gherkin3/token_scanner'
-require 'gherkin3/token_matcher'
-require 'gherkin3/ast_builder'
 require 'json'
 
 parser = Gherkin3::Parser.new
@@ -12,9 +10,8 @@ files = ARGV.any? ? ARGV : (STDIN.tty? ? [] : [STDIN])
 start_time = Time.now
 files.each do |file|
   scanner = Gherkin3::TokenScanner.new(file)
-  builder = Gherkin3::AstBuilder.new
   begin
-    puts JSON.generate(parser.parse(scanner, builder, Gherkin3::TokenMatcher.new))
+    puts JSON.generate(parser.parse(scanner))
   rescue Gherkin3::ParserError => e
     STDERR.puts e.message
     exit 1

data/bin/gherkin-generate-tokens

@@ -3,12 +3,10 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__),"../lib"))
 require 'gherkin3/parser'
 require 'gherkin3/token_scanner'
 require 'gherkin3/token_formatter_builder'
-require 'gherkin3/token_matcher'
 
-parser = Gherkin3::Parser.new
+parser = Gherkin3::Parser.new(Gherkin3::TokenFormatterBuilder.new)
 files = ARGV + (STDIN.tty? ? [] : [STDIN])
 files.each do |file|
   scanner = Gherkin3::TokenScanner.new(file)
-  builder = Gherkin3::TokenFormatterBuilder.new
-  print parser.parse(scanner, builder, Gherkin3::TokenMatcher.new)
+  print parser.parse(scanner)
 end

data/gherkin-ruby.razor

@@ -40,11 +40,10 @@ module Gherkin3
   ]
 
   class ParserContext
-    attr_reader :token_scanner, :ast_builder, :token_matcher, :token_queue, :errors
+    attr_reader :token_scanner, :token_matcher, :token_queue, :errors
 
-    def initialize(token_scanner, ast_builder, token_matcher, token_queue, errors)
+    def initialize(token_scanner, token_matcher, token_queue, errors)
       @@token_scanner = token_scanner
-      @@ast_builder = ast_builder
       @@token_matcher = token_matcher
       @@token_queue = token_queue
       @@errors = errors
@@ -54,10 +53,15 @@ module Gherkin3
   class @Model.ParserClassName
     attr_accessor :stop_at_first_error
 
-    def parse(token_scanner, ast_builder=AstBuilder.new, token_matcher=TokenMatcher.new)
+    def initialize(ast_builder=AstBuilder.new)
+      @@ast_builder = ast_builder
+    end
+
+    def parse(token_scanner, token_matcher=TokenMatcher.new)
+      @@ast_builder.reset
+      token_matcher.reset
       context = ParserContext.new(
         token_scanner,
-        ast_builder,
         token_matcher,
         [],
         []
@@ -75,12 +79,12 @@ module Gherkin3
 
       raise CompositeParserException.new(context.errors) if context.errors.any?
 
-      get_result(context)
+      get_result()
     end
 
     def build(context, token)
       handle_ast_error(context) do
-        context.ast_builder.build(token)
+        @@ast_builder.build(token)
       end
     end
 
@@ -91,18 +95,18 @@ module Gherkin3
 
     def start_rule(context, rule_type)
       handle_ast_error(context) do
-        context.ast_builder.start_rule(rule_type)
+        @@ast_builder.start_rule(rule_type)
       end
     end
 
     def end_rule(context, rule_type)
       handle_ast_error(context) do
-        context.ast_builder.end_rule(rule_type)
+        @@ast_builder.end_rule(rule_type)
       end
     end
 
-    def get_result(context)
-      context.ast_builder.get_result
+    def get_result()
+      @@ast_builder.get_result
     end
 
     def read_token(context)

data/gherkin3.gemspec

@@ -1,7 +1,7 @@
 # encoding: utf-8
 Gem::Specification.new do |s|
   s.name        = 'gherkin3'
-  s.version     = '3.0.0'
+  s.version     = '3.1.0'
   s.authors     = ["Gáspár Nagy", "Aslak Hellesøy", "Steve Tooke"]
   s.description = 'Gherkin parser'
   s.summary     = "gherkin-#{s.version}"

data/lib/gherkin3/ast_builder.rb

@@ -3,6 +3,10 @@ require_relative 'ast_node'
 module Gherkin3
   class AstBuilder
     def initialize
+      reset
+    end
+
+    def reset
       @stack = [AstNode.new(:None)]
       @comments = []
     end

data/lib/gherkin3/parser.rb

@@ -46,11 +46,10 @@ module Gherkin3
   ]
 
   class ParserContext
-    attr_reader :token_scanner, :ast_builder, :token_matcher, :token_queue, :errors
+    attr_reader :token_scanner, :token_matcher, :token_queue, :errors
 
-    def initialize(token_scanner, ast_builder, token_matcher, token_queue, errors)
+    def initialize(token_scanner, token_matcher, token_queue, errors)
       @token_scanner = token_scanner
-      @ast_builder = ast_builder
       @token_matcher = token_matcher
       @token_queue = token_queue
       @errors = errors
@@ -60,10 +59,15 @@ module Gherkin3
   class Parser
     attr_accessor :stop_at_first_error
 
-    def parse(token_scanner, ast_builder=AstBuilder.new, token_matcher=TokenMatcher.new)
+    def initialize(ast_builder=AstBuilder.new)
+      @ast_builder = ast_builder
+    end
+
+    def parse(token_scanner, token_matcher=TokenMatcher.new)
+      @ast_builder.reset
+      token_matcher.reset
       context = ParserContext.new(
         token_scanner,
-        ast_builder,
         token_matcher,
         [],
         []
@@ -81,12 +85,12 @@ module Gherkin3
 
       raise CompositeParserException.new(context.errors) if context.errors.any?
 
-      get_result(context)
+      get_result()
     end
 
     def build(context, token)
       handle_ast_error(context) do
-        context.ast_builder.build(token)
+        @ast_builder.build(token)
       end
     end
 
@@ -97,18 +101,18 @@ module Gherkin3
 
     def start_rule(context, rule_type)
       handle_ast_error(context) do
-        context.ast_builder.start_rule(rule_type)
+        @ast_builder.start_rule(rule_type)
       end
     end
 
     def end_rule(context, rule_type)
       handle_ast_error(context) do
-        context.ast_builder.end_rule(rule_type)
+        @ast_builder.end_rule(rule_type)
       end
     end
 
-    def get_result(context)
-      context.ast_builder.get_result
+    def get_result()
+      @ast_builder.get_result
     end
 
     def read_token(context)

data/lib/gherkin3/token_formatter_builder.rb

@@ -1,6 +1,10 @@
 module Gherkin3
   class TokenFormatterBuilder
     def initialize
+      reset
+    end
+
+    def reset
       @tokens_text = ""
     end
 

data/lib/gherkin3/token_matcher.rb

@@ -7,6 +7,11 @@ module Gherkin3
 
     def initialize(dialect_name = 'en')
       change_dialect(dialect_name, nil)
+      reset
+    end
+
+    def reset
+      change_dialect('en', nil) unless @dialect_name == 'en'
       @active_doc_string_separator = nil
       @indent_to_remove = 0
     end

data/spec/gherkin3/parser_spec.rb

@@ -2,6 +2,7 @@ require 'gherkin3/parser'
 require 'gherkin3/token_scanner'
 require 'gherkin3/token_matcher'
 require 'gherkin3/ast_builder'
+require 'gherkin3/errors'
 require 'rspec'
 
 module Gherkin3
@@ -9,8 +10,7 @@ module Gherkin3
     it "parses a simple feature" do
       parser = Parser.new
       scanner = TokenScanner.new("Feature: test")
-      builder = AstBuilder.new
-      ast = parser.parse(scanner, builder, TokenMatcher.new)
+      ast = parser.parse(scanner)
       expect(ast).to eq({
         type: :Feature,
         tags: [],
@@ -22,5 +22,78 @@ module Gherkin3
         comments: []
       })
     end
+
+    it "can parse multiple features" do
+      parser = Parser.new
+      ast1 = parser.parse(TokenScanner.new("Feature: test"))
+      ast2 = parser.parse(TokenScanner.new("Feature: test2"))
+
+      expect(ast1).to eq({
+        type: :Feature,
+        tags: [],
+        location: {line: 1, column: 1},
+        language: "en",
+        keyword: "Feature",
+        name: "test",
+        scenarioDefinitions: [],
+        comments: []
+      })
+      expect(ast2).to eq({
+        type: :Feature,
+        tags: [],
+        location: {line: 1, column: 1},
+        language: "en",
+        keyword: "Feature",
+        name: "test2",
+        scenarioDefinitions: [],
+        comments: []
+      })
+    end
+
+    it "can parse feature after parse error" do
+      parser = Parser.new
+      matcher = TokenMatcher.new
+
+      expect { parser.parse(TokenScanner.new("# a comment\n" +
+                                             "Feature: Foo\n" +
+                                             "  Scenario: Bar\n" +
+                                             "    Given x\n" +
+                                             "      ```\n" +
+                                             "      unclosed docstring\n"),
+                            matcher)
+      }.to raise_error(ParserError)
+      ast = parser.parse(TokenScanner.new("Feature: Foo\n" +
+                                          "  Scenario: Bar\n" +
+                                          "    Given x\n" +
+                                          '      """' + "\n" +
+                                          "      closed docstring\n" +
+                                          '      """' + "\n"),
+                         matcher)
+
+      expect(ast).to eq({
+        type: :Feature,
+        tags: [],
+        location: {line: 1, column: 1},
+        language: "en",
+        keyword: "Feature",
+        name: "Foo",
+        scenarioDefinitions: [{
+          :type=>:Scenario, 
+          :tags=>[], 
+          :location=>{:line=>2, :column=>3}, 
+          :keyword=>"Scenario", 
+          :name=>"Bar", 
+          :steps=>[{
+            :type=>:Step, 
+            :location=>{:line=>3, :column=>5}, 
+            :keyword=>"Given ", 
+            :text=>"x", 
+            :argument=>{:type=>:DocString, 
+                        :location=>{:line=>4, :column=>7}, 
+                        :contentType=>"", 
+                        :content=>"closed docstring"}}]}],
+        comments: []
+      })
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin3
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Gáspár Nagy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,7 +123,7 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: gherkin-3.0.0
+summary: gherkin-3.1.0
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb