gherkin3 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a81f75966e784b53f08bc889ca623b5cec3ead69
-  data.tar.gz: f309592aed98e2edf99898075097e3fab25b0fac
+  metadata.gz: b01f87ff376d17629e22eea00b781a1927f49fa8
+  data.tar.gz: c30f9c6938ff0b8da9efcab944f7bf6ce98376ae
 SHA512:
-  metadata.gz: 47b1295ebe8c60d5e936e7c672dca0ccebb22c34d61740dbe7bd774f298a9321843b244ea4e202d719931ab99e91d13f5a7924b4272541a48da983cf2bb1ab5b
-  data.tar.gz: ce03ffe0eb6dab329deb7941720c63ae52917202cf7b828bd091310fe69627a3353f3c710e37427ca1f9f732fb4aa7c9e7ce2f7f215cd914e66efa31cd846038
+  metadata.gz: 1af62f02da64aab37a8a3f9b7692f6ffe5a55638f60c22f1ac6cf885de43a473fdb17c99efbf4eb473b22a0aaa370bb6520d099461ee967ad6d7fba730bdfb44
+  data.tar.gz: 754a0d3728fbe8fb56bb65c91c391a3501aefaa52caf35fd2f0352e536aa52031ef3c59443465d385bc7d3167f6336785c116271f5d795e1fdeaddf4baf6a94c

data/README.md

@@ -1,3 +1,13 @@
 [![Build Status](https://secure.travis-ci.org/cucumber/gherkin-ruby.png)](http://travis-ci.org/cucumber/gherkin-ruby)
 
 Gherkin parser/compiler for Ruby. Please see [Gherkin3](https://github.com/cucumber/gherkin3) for details.
+
+## Developers
+
+Some files are generated from the `gherkin-ruby.razor` file. Please run the
+following command to generate the ruby files.
+
+~~~bash
+cd <project_root>/ruby
+make
+~~~

data/bin/gherkin-generate-ast

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__),"../lib"))
 require 'gherkin3/parser'
-require 'gherkin3/token_scanner'
 require 'json'
 
 parser = Gherkin3::Parser.new
@@ -9,9 +8,10 @@ parser.stop_at_first_error = false
 files = ARGV.any? ? ARGV : (STDIN.tty? ? [] : [STDIN])
 start_time = Time.now
 files.each do |file|
-  scanner = Gherkin3::TokenScanner.new(file)
   begin
-    puts JSON.generate(parser.parse(scanner))
+    File.open(file) do |io|
+      puts JSON.generate(parser.parse(io))
+    end
   rescue Gherkin3::ParserError => e
     STDERR.puts e.message
     exit 1

data/bin/gherkin-generate-tokens

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__),"../lib"))
 require 'gherkin3/parser'
-require 'gherkin3/token_scanner'
 require 'gherkin3/token_formatter_builder'
 
 parser = Gherkin3::Parser.new(Gherkin3::TokenFormatterBuilder.new)
 files = ARGV + (STDIN.tty? ? [] : [STDIN])
 files.each do |file|
-  scanner = Gherkin3::TokenScanner.new(file)
-  print parser.parse(scanner)
+  File.open(file) do |io|
+    print parser.parse(io)
+  end
 end

data/gherkin-ruby.razor

@@ -28,6 +28,7 @@
 # This file is generated. Do not edit! Edit gherkin-ruby.razor instead.
 require_relative 'ast_builder'
 require_relative 'token_matcher'
+require_relative 'token_scanner'
 require_relative 'errors'
 
 module Gherkin3
@@ -58,6 +59,8 @@ module Gherkin3
     end
 
     def parse(token_scanner, token_matcher=TokenMatcher.new)
+      token_scanner = token_scanner.is_a?(TokenScanner) ? token_scanner : TokenScanner.new(token_scanner)
+
       @@ast_builder.reset
       token_matcher.reset
       context = ParserContext.new(
@@ -175,7 +178,7 @@ module Gherkin3
       loop do
         token = read_token(context)
         token.detach
-        queue.unshift(token)
+        queue.push(token)
 
         if (false @foreach(var tokenType in lookAheadHint.ExpectedTokens) {<text>|| @MatchToken(tokenType)</text>})
           match = true

data/gherkin3.gemspec

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

data/lib/gherkin3/parser.rb

@@ -1,6 +1,7 @@
 # This file is generated. Do not edit! Edit gherkin-ruby.razor instead.
 require_relative 'ast_builder'
 require_relative 'token_matcher'
+require_relative 'token_scanner'
 require_relative 'errors'
 
 module Gherkin3
@@ -64,6 +65,8 @@ module Gherkin3
     end
 
     def parse(token_scanner, token_matcher=TokenMatcher.new)
+      token_scanner = token_scanner.is_a?(TokenScanner) ? token_scanner : TokenScanner.new(token_scanner)
+
       @ast_builder.reset
       token_matcher.reset
       context = ParserContext.new(
@@ -1868,7 +1871,7 @@ module Gherkin3
       loop do
         token = read_token(context)
         token.detach
-        queue.unshift(token)
+        queue.push(token)
 
         if (false || match_ExamplesLine(context, token))
           match = true

data/lib/gherkin3/token_matcher.rb

@@ -6,12 +6,13 @@ module Gherkin3
     LANGUAGE_PATTERN = /^\s*#\s*language\s*:\s*([a-zA-Z\-_]+)\s*$/
 
     def initialize(dialect_name = 'en')
+      @default_dialect_name = dialect_name
       change_dialect(dialect_name, nil)
       reset
     end
 
     def reset
-      change_dialect('en', nil) unless @dialect_name == 'en'
+      change_dialect(@default_dialect_name, nil) unless @dialect_name == @default_dialect_name
       @active_doc_string_separator = nil
       @indent_to_remove = 0
     end

data/lib/gherkin3/token_scanner.rb

@@ -1,19 +1,26 @@
+require 'stringio'
 require_relative 'token'
 require_relative 'gherkin_line'
 
 module Gherkin3
+  # The scanner reads a gherkin doc (typically read from a .feature file) and
+  # creates a token for line. The tokens are passed to the parser, which outputs
+  # an AST (Abstract Syntax Tree).
+  #
+  # If the scanner sees a # language header, it will reconfigure itself dynamically
+  # to look for Gherkin keywords for the associated language. The keywords are defined
+  # in gherkin-languages.json.
   class TokenScanner
-
-    def initialize(source_or_path_or_io)
+    def initialize(source_or_io)
       @line_number = 0
-      if String === source_or_path_or_io
-        if File.file?(source_or_path_or_io)
-          @io = File.open(source_or_path_or_io, 'r:BOM|UTF-8')
-        else
-          @io = StringIO.new(source_or_path_or_io)
-        end
+
+      case(source_or_io)
+      when String
+        @io = StringIO.new(source_or_io)
+      when StringIO, IO
+        @io = source_or_io
       else
-        @io = source_or_path_or_io
+        fail ArgumentError, "Please a pass String, StringIO or IO. I got a #{source_or_io.class}"
       end
     end
 

data/spec/gherkin3/parser_spec.rb

@@ -23,6 +23,37 @@ module Gherkin3
       })
     end
 
+    it "parses string feature" do
+      parser = Parser.new
+      ast = parser.parse("Feature: test")
+      expect(ast).to eq({
+        type: :Feature,
+        tags: [],
+        location: {line: 1, column: 1},
+        language: "en",
+        keyword: "Feature",
+        name: "test",
+        scenarioDefinitions: [],
+        comments: []
+      })
+    end
+
+    it "parses io feature" do
+      parser = Parser.new
+      ast = parser.parse(StringIO.new("Feature: test"))
+
+      expect(ast).to eq({
+        type: :Feature,
+        tags: [],
+        location: {line: 1, column: 1},
+        language: "en",
+        keyword: "Feature",
+        name: "test",
+        scenarioDefinitions: [],
+        comments: []
+      })
+    end
+
     it "can parse multiple features" do
       parser = Parser.new
       ast1 = parser.parse(TokenScanner.new("Feature: test"))
@@ -95,5 +126,22 @@ module Gherkin3
         comments: []
       })
     end
+
+    it "can change the default language" do
+      parser = Parser.new
+      matcher = TokenMatcher.new("no")
+      scanner = TokenScanner.new("Egenskap: i18n support")
+      ast = parser.parse(scanner, matcher)
+      expect(ast).to eq({
+        type: :Feature,
+        tags: [],
+        location: {line: 1, column: 1},
+        language: "no",
+        keyword: "Egenskap",
+        name: "i18n support",
+        scenarioDefinitions: [],
+        comments: []
+      })
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin3
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Gáspár Nagy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-10-03 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.1.1
+summary: gherkin-3.1.2
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb