gherkin 8.2.1 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: febbe75fb7b4a0b1dad916d53ba8e16953b4e49b5c8b6e0d7dc55e4bd5bb2182
-  data.tar.gz: b0c6d742f803f96c4ab04e2e9d7a6f17b0c72c3166dae18f812d17730f53e473
+  metadata.gz: 9fed72d45d24c5932634aa88d0b4fc260d407989b45875e340e28f21eab073a1
+  data.tar.gz: 9494dc078667ebba46fa354eba291d8fa2437ea1e68954835190d9989d2950eb
 SHA512:
-  metadata.gz: 117041fe3c8799de6a2d7ce6e60623b63ac8bba03e9de286b952001c2582f67ecef187a5a30837db7fa20e9bd6b468d0f4cb458e13d99cc18ce6623a54343456
-  data.tar.gz: e7e08085ce274f049f7d16f5e0db9cb64f919f528a71549dad975744e87b4c6e560c5d26b8fe81f810952ce220863cfefd3ab6907d4e8e4fb41f373a570d48b9
+  metadata.gz: c97ce1a4436c38a6bfc214f62595e93d809013ea7ab99698b9adb43907635385a01b68e12c5c077242ec74abfef00503a6b5f0e82bff34267d220eccac7d910f
+  data.tar.gz: 928daf1069cc5bfeaa8b1c14a11fa273c4b9d366402cbed9e8daa2502a50a9cc412a0255554588733f17bef00aa6a1d31ffbd4855aa76b74b4ab4d725d7f388b

data/bin/gherkin

@@ -12,7 +12,7 @@ options = {
   include_source: true,
   include_gherkin_document: true,
   include_pickles: true,
-  json: false,
+  format: 'protobuf',
   predictable_ids: false
 }
 
@@ -26,8 +26,8 @@ OptionParser.new do |opts|
   opts.on("--[no-]pickles", "Don't print pickle messages") do |v|
     options[:include_pickles] = v
   end
-  opts.on("--json", "Print messages as JSON") do |v|
-    options[:json] = v
+  opts.on("--format ndjson|protobuf", "Output format") do |v|
+    options[:format] = v
   end
   opts.on("--predictable-ids", "Generate incrementing ids rather than UUIDs") do |v|
     options[:predictable_ids] = v
@@ -36,29 +36,12 @@ end.parse!
 
 def process_messages(messages, options)
   messages.each do |message|
-    if options[:json]
-      json = message.class.encode_json(message)
-      ob = JSON.parse(json)
-      remove_empties(ob)
-      puts JSON.generate(ob)
-    else
+    if options[:format] == 'ndjson'
+      message.write_ndjson_to(STDOUT)
+    elsif options[:format] == 'protobuf'
       message.write_delimited_to(STDOUT)
-    end
-  end
-end
-
-def remove_empties(ob)
-  if Hash === ob
-    ob.each do |key, value|
-      if value == []
-        ob.delete(key)
-      else
-        remove_empties(value)
-      end
-    end
-  elsif Array === ob
-    ob.each do |value|
-      remove_empties(value)
+    else
+      raise "Unsupported format: #{options[:format]}"
     end
   end
 end
@@ -66,7 +49,7 @@ end
 gherkin_executable = ENV['GHERKIN_EXECUTABLE']
 if ARGV.empty?
   # Read protobuf from STDIN
-  messages = Cucumber::Messages::ProtobufIoEnumerator.call(STDIN)
+  messages = Cucumber::Messages::BinaryToMessageEnumerator.new(STDIN)
 elsif gherkin_executable
   # Read protobuf from STDIN
   messages = Gherkin::Stream::SubprocessMessageStream.new(

data/lib/gherkin/ast_builder.rb

@@ -1,10 +1,9 @@
 require 'cucumber/messages'
 require 'gherkin/ast_node'
-require 'gherkin/id_generator'
 
 module Gherkin
   class AstBuilder
-    def initialize(id_generator = Gherkin::IdGenerator::UUID.new)
+    def initialize(id_generator)
       @id_generator = id_generator
       reset
     end

data/lib/gherkin/pickles/compiler.rb

@@ -1,10 +1,7 @@
-require 'cucumber/messages'
-require 'gherkin/id_generator'
-
 module Gherkin
   module Pickles
     class Compiler
-      def initialize(id_generator = Gherkin::IdGenerator::UUID.new)
+      def initialize(id_generator)
         @id_generator = id_generator
       end
 
@@ -71,7 +68,7 @@ module Gherkin
           tags: pickle_tags(tags),
           name: scenario.name,
           language: language,
-          sourceIds: [scenario.id],
+          ast_node_ids: [scenario.id],
           steps: steps
         )
         pickles.push(pickle)
@@ -97,7 +94,7 @@ module Gherkin
               language: language,
               steps: steps,
               tags: pickle_tags(tags),
-              sourceIds: [
+              ast_node_ids: [
                 scenario.id,
                 values_row.id
               ],
@@ -130,11 +127,11 @@ module Gherkin
         value_cells = values_row ? values_row.cells : []
         props = {
           id: @id_generator.new_id,
-          sourceIds: [step.id],
+          ast_node_ids: [step.id],
           text: interpolate(step.text, variable_cells, value_cells),
         }
         if values_row
-          props[:sourceIds].push(values_row.id)
+          props[:ast_node_ids].push(values_row.id)
         end
 
         if step.data_table
@@ -171,7 +168,7 @@ module Gherkin
           content: interpolate(doc_string.content, variable_cells, value_cells)
         }
         if doc_string.content_type
-          props[:contentType] = interpolate(doc_string.content_type, variable_cells, value_cells)
+          props[:content_type] = interpolate(doc_string.content_type, variable_cells, value_cells)
         end
         Cucumber::Messages::PickleStepArgument::PickleDocString.new(props)
       end
@@ -183,7 +180,7 @@ module Gherkin
       def pickle_tag(tag)
         Cucumber::Messages::Pickle::PickleTag.new(
           name: tag.name,
-          sourceId: tag.id
+          ast_node_id: tag.id
         )
       end
     end

data/lib/gherkin/stream/parser_message_stream.rb

@@ -2,7 +2,6 @@ require 'cucumber/messages'
 require 'gherkin/parser'
 require 'gherkin/token_matcher'
 require 'gherkin/pickles/compiler'
-require 'gherkin/id_generator'
 
 module Gherkin
   module Stream
@@ -17,10 +16,6 @@ module Gherkin
         @compiler = Pickles::Compiler.new(id_generator)
       end
 
-      def id_generator_class
-        @options[:predictable_ids] ? Gherkin::IdGenerator::Incrementing : Gherkin::IdGenerator::UUID
-      end
-
       def messages
         Enumerator.new do |y|
           sources.each do |source|
@@ -30,7 +25,7 @@ module Gherkin
 
               if @options[:include_gherkin_document]
                 gherkin_document = build_gherkin_document(source)
-                y.yield(Cucumber::Messages::Envelope.new(gherkinDocument: gherkin_document))
+                y.yield(Cucumber::Messages::Envelope.new(gherkin_document: gherkin_document))
               end
               if @options[:include_pickles]
                 gherkin_document ||= build_gherkin_document(source)
@@ -50,6 +45,10 @@ module Gherkin
 
       private
 
+      def id_generator_class
+        @options[:predictable_ids] ? Cucumber::Messages::IdGenerator::Incrementing : Cucumber::Messages::IdGenerator::UUID
+      end
+
       def yield_error_attachments(y, errors, uri)
         errors.each do |err|
           attachment = Cucumber::Messages::Attachment.new(

data/lib/gherkin/stream/subprocess_message_stream.rb

@@ -19,7 +19,7 @@ module Gherkin
           error = stderr.read
           raise error
         end
-        Cucumber::Messages::ProtobufIoEnumerator.call(stdout)
+        Cucumber::Messages::BinaryToMessageEnumerator.new(stdout)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 8.2.1
+  version: 9.0.0
 platform: ruby
 authors:
 - Gáspár Nagy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-messages
@@ -18,20 +18,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,6 @@ files:
 - lib/gherkin/errors.rb
 - lib/gherkin/gherkin-languages.json
 - lib/gherkin/gherkin_line.rb
-- lib/gherkin/id_generator.rb
 - lib/gherkin/parser.rb
 - lib/gherkin/pickles/compiler.rb
 - lib/gherkin/stream/parser_message_stream.rb
@@ -124,7 +123,6 @@ files:
 - spec/coverage.rb
 - spec/gherkin/dialect_spec.rb
 - spec/gherkin/gherkin_spec.rb
-- spec/gherkin/id_generator_spec.rb
 - spec/gherkin/stream/subprocess_message_stream_spec.rb
 homepage: https://github.com/cucumber/gherkin-ruby
 licenses:
@@ -155,11 +153,10 @@ rubyforge_project:
 rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
-summary: gherkin-8.2.1
+summary: gherkin-9.0.0
 test_files:
 - spec/gherkin/dialect_spec.rb
 - spec/gherkin/stream/subprocess_message_stream_spec.rb
-- spec/gherkin/id_generator_spec.rb
 - spec/gherkin/gherkin_spec.rb
 - spec/capture_warnings.rb
 - spec/coverage.rb

data/lib/gherkin/id_generator.rb

@@ -1,22 +0,0 @@
-require 'securerandom'
-
-module Gherkin
-  module IdGenerator
-    class Incrementing
-      def initialize
-        @index = -1
-      end
-
-      def new_id
-        @index += 1
-        @index.to_s
-      end
-    end
-
-    class UUID
-      def new_id
-        SecureRandom.uuid
-      end
-    end
-  end
-end

data/spec/gherkin/id_generator_spec.rb

@@ -1,29 +0,0 @@
-require 'rspec'
-require 'gherkin/id_generator'
-
-describe Gherkin::IdGenerator::Incrementing do
-  subject { Gherkin::IdGenerator::Incrementing.new }
-
-  context '#new_id' do
-    it 'returns 0 the first time' do
-      expect(subject.new_id).to eq("0")
-    end
-
-    it 'increments on every call' do
-      expect(subject.new_id).to eq("0")
-      expect(subject.new_id).to eq("1")
-      expect(subject.new_id).to eq("2")
-    end
-  end
-end
-
-describe Gherkin::IdGenerator::UUID do
-  subject { Gherkin::IdGenerator::UUID.new }
-
-  context '#new_id' do
-    it 'generates a UUID' do
-      allowed_characters = "[0-9a-fA-F]"
-      expect(subject.new_id).to match(/#{allowed_characters}{8}\-#{allowed_characters}{4}\-#{allowed_characters}{4}\-#{allowed_characters}{4}\-#{allowed_characters}{12}/)
-    end
-  end
-end