cucumber-messages 12.4.0 → 13.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 443941d78b852c1f1b2972dd1e2f3fd38a7c899282e93c1d8d02e42f1866ed30
-  data.tar.gz: 53be902b36e5f78ffd708e7c51e2ee11b4539466ac6374d8c2edf575cfa51894
+  metadata.gz: 6fbd2a2fcaa7e4afd1eb56bece2ee4907661049c0ed7ca5eade53335595b625a
+  data.tar.gz: 95fe3cf9d70ae3ac95a9eb00e6936c40eef40864fa034f87394f29ed8ae7f5e8
 SHA512:
-  metadata.gz: b62aade5572e6a5287c6ee693f4904472f510ca73bde0dd5b6daa1e762415826656b03adbd639d4ea181e52704ee6fbaec36bbeffbf90c90bf87795261e48092
-  data.tar.gz: c2e20522d03e515bf774729f798dc8ccb2a3dc18effd73131f16b4c8f22890d6c96a9aa61fab3ff95384af13064bd48d6ebef2d15c7c4a8920fc8ce9f538a9ee
+  metadata.gz: 4a679068f177a07425a8311880185f66036f80eadb07de274d1c4c59e467e4142a852403602f281792755f268f30721142705ac9219b4b9d0c4794b43a1db7a7
+  data.tar.gz: dfd3d4af835c4f4cdbf72ac01facb0972a06ef7d401b1bb06c638967f914a84afbe13f2ff3e116a6248e88b23c16d80027c79e16642d2dad5aba37fadbde7f88

data/VERSION

@@ -1 +1 @@
-12.4.0
+13.2.1

data/lib/cucumber/messages.pb.rb

@@ -26,9 +26,12 @@ module Cucumber
     class Timestamp < ::Protobuf::Message; end
     class Duration < ::Protobuf::Message; end
     class Location < ::Protobuf::Message; end
-    class SourceReference < ::Protobuf::Message; end
-    class JavaMethod < ::Protobuf::Message; end
-    class JavaStackTraceElement < ::Protobuf::Message; end
+    class SourceReference < ::Protobuf::Message
+      class JavaMethod < ::Protobuf::Message; end
+      class JavaStackTraceElement < ::Protobuf::Message; end
+
+    end
+
     class Source < ::Protobuf::Message; end
     class GherkinDocument < ::Protobuf::Message
       class Comment < ::Protobuf::Message; end
@@ -220,22 +223,22 @@ module Cucumber
     end
 
     class SourceReference
-      optional :string, :uri, 1
-      optional ::Cucumber::Messages::JavaMethod, :java_method, 3
-      optional ::Cucumber::Messages::JavaStackTraceElement, :java_stack_trace_element, 4
-      optional ::Cucumber::Messages::Location, :location, 2
-    end
+      class JavaMethod
+        optional :string, :class_name, 1
+        optional :string, :method_name, 2
+        repeated :string, :method_parameter_types, 3
+      end
 
-    class JavaMethod
-      optional :string, :class_name, 1
-      optional :string, :method_name, 2
-      repeated :string, :method_parameter_types, 3
-    end
+      class JavaStackTraceElement
+        optional :string, :class_name, 1
+        optional :string, :method_name, 2
+        optional :string, :file_name, 3
+      end
 
-    class JavaStackTraceElement
-      optional :string, :class_name, 1
-      optional :string, :method_name, 2
-      optional :string, :file_name, 3
+      optional :string, :uri, 1
+      optional ::Cucumber::Messages::SourceReference::JavaMethod, :java_method, 3
+      optional ::Cucumber::Messages::SourceReference::JavaStackTraceElement, :java_stack_trace_element, 4
+      optional ::Cucumber::Messages::Location, :location, 2
     end
 
     class Source
@@ -362,6 +365,7 @@ module Cucumber
       optional :string, :media_type, 5
       optional ::Cucumber::Messages::Attachment::ContentEncoding, :content_encoding, 6
       optional :string, :file_name, 7
+      optional :string, :url, 8
     end
 
     class Pickle

data/lib/cucumber/messages/ndjson_to_message_enumerator.rb

@@ -5,8 +5,13 @@ module Cucumber
     class NdjsonToMessageEnumerator < Enumerator
       def initialize(io)
         super() do |yielder|
-          io.each_line do |json|
-            m = Cucumber::Messages::Envelope.from_json(json)
+          io.each_line do |line|
+            next if line.strip.empty?
+            begin
+              m = Cucumber::Messages::Envelope.from_json(line)
+            rescue => e
+              raise "Not JSON: #{line.strip}"
+            end
             yielder.yield(m)
           end
         end

data/spec/cucumber/messages/ndjson_serialization_spec.rb

@@ -69,6 +69,22 @@ module Cucumber
         expect(incoming_messages.to_a).to(eq(outgoing_messages))
       end
 
+      it "ignores empty lines" do
+        outgoing_messages = [
+          Envelope.new(source: Source.new(data: 'Feature: Hello')),
+          Envelope.new(attachment: Attachment.new(binary: [1,2,3,4].pack('C*')))
+        ]
+
+        io = StringIO.new
+        write_outgoing_messages(outgoing_messages, io)
+        io.write("\n\n")
+
+        io.rewind
+        incoming_messages = NdjsonToMessageEnumerator.new(io)
+
+        expect(incoming_messages.to_a).to(eq(outgoing_messages))
+      end
+
       it "ignores missing fields" do
         io = StringIO.new
         io.puts('{"unused": 99}')
@@ -79,6 +95,16 @@ module Cucumber
         expect(incoming_messages.to_a).to(eq([Envelope.new]))
       end
 
+      it "includes offending line in error message" do
+        io = StringIO.new
+        io.puts('BLA BLA')
+
+        io.rewind
+        incoming_messages = NdjsonToMessageEnumerator.new(io)
+
+        expect { incoming_messages.to_a }.to(raise_error('Not JSON: BLA BLA'))
+      end
+
       def write_outgoing_messages(messages, out)
         messages.each do |message|
           message.write_ndjson_to(out)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-messages
 version: !ruby/object:Gem::Version
-  version: 12.4.0
+  version: 13.2.1
 platform: ruby
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protobuf-cucumber
@@ -56,20 +56,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
 description: Protocol Buffer messages for Cucumber's inter-process communication
 email: cukes@googlegroups.com
 executables: []
@@ -122,11 +122,11 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-messages-12.4.0
+summary: cucumber-messages-13.2.1
 test_files:
 - spec/capture_warnings.rb
-- spec/cucumber/messages/time_conversion_spec.rb
 - spec/cucumber/messages/id_generator_spec.rb
 - spec/cucumber/messages/ndjson_serialization_spec.rb
-- spec/cucumber/messages/version_spec.rb
 - spec/cucumber/messages/protobuf_serialization_spec.rb
+- spec/cucumber/messages/time_conversion_spec.rb
+- spec/cucumber/messages/version_spec.rb