zyre 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc86fa098a17006c4e470186fb0f98910f0d443ef62351f18aa2c1f8962c9bcc
-  data.tar.gz: aac8d6fa401e07df184f74fa0f9ef4e31e46bb91997b5af9eafe71f8048460c8
+  metadata.gz: e427448e7167b7f7d7dfb181f6be8d0f99f34f6d2e5db0df91483a1a3c0283fe
+  data.tar.gz: 4444b34e17f9751aace7634320756521c6ff922aeddef3d70b369449fb4cea8b
 SHA512:
-  metadata.gz: 6d44fcc7a7c5b63a6e471957d5361ea9595b34b2d35f458f61cb6ee5e19db8f624e5e857203fac49992dab6160937e57571069057894ec2d8e2c51801744e88f
-  data.tar.gz: d5be9dc4fd921a16679850d505bb8d81ad1bcd3029ad7b1ec84277957653c345f0ebdcedf3e7a9139111a7320fccdc797f1a316ff74c2860b3b56c098ffc546f
+  metadata.gz: '038d430e4345f383a4634daeaaeb51103ccb34fb2d370b55cb9a0fd5fe93b27fb94299f94b61139d1ea7faa2059203cae14578addbb49c4b2d441fc1474624d4'
+  data.tar.gz: 50503df7839c8d98c83d6f17bf2e4bfafef429949314b578fbbb35dce7245809439d417975b718d50e34d34ce019057273133506fb54fdc36a4a8f43f4e9df48

data/History.md

@@ -1,6 +1,14 @@
 # Release History for zyre
 
 ---
+
+## v0.3.0 [2020-11-16] Michael Granger <ged@faeriemud.org>
+
+Improvements:
+
+- Fixed use of binary data in event frames.
+
+
 ## v0.2.0 [2020-11-09] Michael Granger <ged@faeriemud.org>
 
 Improvements:

data/ext/zyre_ext/event.c

@@ -443,12 +443,10 @@ rzyre_event_msg( VALUE self ) {
 
 	if ( msg ) {
 		zframe_t *frame = zmsg_first( msg );
-		char *str = zframe_strdup( frame );
+		byte *data = zframe_data( frame );
 
-		rval = rb_enc_str_new( str, zframe_size(frame), rb_ascii8bit_encoding() );
+		rval = rb_enc_str_new( (const char *)data, zframe_size(frame), rb_ascii8bit_encoding() );
 		rb_obj_freeze( rval );
-
-		free( str );
 	}
 
 	return rval;

data/ext/zyre_ext/zyre_ext.c

@@ -87,11 +87,14 @@ static VALUE
 rzyre_add_frames_to_zmsg( VALUE call )
 {
 	add_frames_to_zmsg_call_t *call_ptr = (add_frames_to_zmsg_call_t *)call;
-	VALUE msg_part;
+	VALUE msg_part, msg_str;
+	zframe_t *frame;
 
 	for ( long i = 0 ; i < RARRAY_LEN(call_ptr->msg_parts) ; i++ ) {
-		msg_part = rb_ary_entry( call_ptr->msg_parts, i );
-		zmsg_addstr( call_ptr->msg, StringValueCStr(msg_part) );
+		msg_part = rb_ary_entry(call_ptr->msg_parts, i);
+		msg_str = StringValue( msg_part );
+		frame = zframe_new( RSTRING_PTR(msg_part), RSTRING_LEN(msg_part) );
+		zmsg_append( call_ptr->msg, &frame );
 	}
 
 	return Qtrue;

data/lib/zyre.rb

@@ -12,7 +12,7 @@ module Zyre
 
 
 	# Gem version (semver)
-	VERSION = '0.2.0'
+	VERSION = '0.3.0'
 
 
 	# Set up a logger for Zyre classes

data/spec/zyre/event_spec.rb

@@ -136,6 +136,19 @@ RSpec.describe( Zyre::Event ) do
 		end
 
 
+		it "can generate a SHOUT event with binary data in its msg" do
+			data = "\xBF\x8D\x00\x9D\xDDg\x03_\xF2Nr\x01\xF0I8Au\x95\xC6L\xD37".b +
+				"\xFFt\xC7\xE1\xC0<l\x17\xA2N\xE3".b
+
+			result = described_class.synthesize( :SHOUT, peer_uuid, group: 'stream', msg: data )
+
+			expect( result ).to be_a( described_class::Shout )
+			expect( result.peer_uuid ).to eq( peer_uuid )
+			expect( result.group ).to eq( 'stream' )
+			expect( result.msg ).to eq( data )
+		end
+
+
 		it "raises when creating a WHISPER with no msg" do
 			expect {
 				described_class.synthesize( :WHISPER, peer_uuid )

data/spec/zyre/node_spec.rb

@@ -2,6 +2,7 @@
 
 require_relative '../spec_helper'
 
+require 'securerandom'
 require 'zyre/node'
 
 
@@ -17,6 +18,13 @@ RSpec.describe( Zyre::Node ) do
 	I sound my barbaric yawp over the roofs of the world.
 	END_SHOUT
 
+	TEST_BINARY_STRING_PARTS = [
+		SecureRandom.bytes( 128 ),
+		"\x00".b,
+		SecureRandom.bytes( 128 )
+	]
+	TEST_BINARY_STRING = TEST_BINARY_STRING_PARTS.join( '' )
+
 
 	it "can be created anonymously" do
 		node = described_class.new
@@ -236,6 +244,60 @@ RSpec.describe( Zyre::Node ) do
 	end
 
 
+	it "can shout a binary message to a group of nodes" do
+		node1 = started_node()
+		node2 = started_node()
+		node3 = started_node()
+
+		node1.join( 'stream' )
+		node2.join( 'stream' )
+		node3.join( 'stream' )
+
+		2.times do
+			node1.wait_for( :JOIN, group: 'stream' )
+		end
+		node1.shout( 'stream', TEST_BINARY_STRING )
+
+		ev = node2.wait_for( :SHOUT, group: 'stream' )
+		expect( ev ).to be_a( Zyre::Event::Shout )
+		expect( ev ).to_not be_multipart
+		expect( ev.msg ).to eq( TEST_BINARY_STRING )
+
+		ev = node3.wait_for( :SHOUT, group: 'stream' )
+		expect( ev ).to be_a( Zyre::Event::Shout )
+		expect( ev ).to_not be_multipart
+		expect( ev.msg ).to eq( TEST_BINARY_STRING )
+	end
+
+
+	it "can shout a multipart binary message to a group of nodes" do
+		node1 = started_node()
+		node2 = started_node()
+		node3 = started_node()
+
+		node1.join( 'stream' )
+		node2.join( 'stream' )
+		node3.join( 'stream' )
+
+		2.times do
+			node1.wait_for( :JOIN, group: 'stream' )
+		end
+		node1.shout( 'stream', *TEST_BINARY_STRING_PARTS )
+
+		ev = node2.wait_for( :SHOUT, group: 'stream' )
+		expect( ev ).to be_a( Zyre::Event::Shout )
+		expect( ev ).to be_multipart
+		expect( ev.msg ).to eq( TEST_BINARY_STRING_PARTS[0] )
+		expect( ev.multipart_msg ).to eq( TEST_BINARY_STRING_PARTS )
+
+		ev = node3.wait_for( :SHOUT, group: 'stream' )
+		expect( ev ).to be_a( Zyre::Event::Shout )
+		expect( ev ).to be_multipart
+		expect( ev.msg ).to eq( TEST_BINARY_STRING_PARTS[0] )
+		expect( ev.multipart_msg ).to eq( TEST_BINARY_STRING_PARTS )
+	end
+
+
 	it "handles unstringifiable messages gracefully" do
 		node1 = started_node()
 		node1.join( 'ROOFTOP' )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zyre
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Granger
@@ -33,7 +33,7 @@ cert_chain:
   83uuAYSy65yXDGXXPVBeKPVnYrqp91pqpS5Nh7wfuiCrE8lgU8PATh7K4BV1UhAT
   0MHbAT42wTYkfUj3
   -----END CERTIFICATE-----
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability