lwes 0.8.2 → 0.8.3

data/ChangeLog

@@ -1,3 +1,7 @@
+Version 0.8.3 (erik-s-chang)
+  * Emitter can auto-create+emit sparse LWES::Event objects in
+    addition to Struct-based objects.
+
 Version 0.8.2 (erik-s-chang)
   * 100% RDoc coverage.
 

data/ext/lwes_ext/emitter.c

@@ -1,4 +1,9 @@
 #include "lwes_ruby.h"
+#ifdef HAVE_RUBY_UTIL_H
+#  include <ruby/util.h>
+#else
+#  include "util.h"
+#endif
 
 static VALUE ENC; /* LWES_ENCODING */
 static ID id_TYPE_DB, id_TYPE_LIST, id_NAME, id_HAVE_ENCODING;
@@ -41,16 +46,6 @@ static void dump_enc(VALUE enc, LWES_BYTE_P buf, size_t *off)
 	lwesrb_dump_num(LWES_INT_16_TOKEN, enc, buf, off);
 }
 
-static char *my_strdup(const char *str)
-{
-	long len = strlen(str) + 1;
-	char *rv = xmalloc(len);
-
-	memcpy(rv, str, len);
-
-	return rv;
-}
-
 /* the underlying struct for LWES::Emitter */
 struct _rb_lwes_emitter {
 	struct lwes_emitter *emitter;
@@ -376,6 +371,7 @@ static VALUE emitter_ltlt(VALUE self, VALUE event)
 static VALUE emitter_emit(int argc, VALUE *argv, VALUE self)
 {
 	volatile VALUE raise_inspect;
+	char *err;
 	VALUE name = Qnil;
 	VALUE event = Qnil;
 	argc = rb_scan_args(argc, argv, "11", &name, &event);
@@ -405,7 +401,15 @@ static VALUE emitter_emit(int argc, VALUE *argv, VALUE self)
 		 * struct created
 		 */
 		event = rb_funcall(name, id_new, 1, event);
-		return emit_struct(self, event);
+		if (TYPE(event) == T_STRUCT)
+			return emit_struct(self, event);
+		if (rb_obj_is_kind_of(event, cLWES_Event))
+			return emit_event(self, event);
+		name = rb_class_name(name);
+		err = StringValuePtr(name);
+		rb_raise(rb_eArgError,
+		         "%s created a bad event: %s",
+			 err, RAISE_INSPECT(event));
 	default:
 		if (rb_obj_is_kind_of(name, cLWES_Event))
 			return emit_event(self, name);
@@ -467,9 +471,9 @@ static VALUE init_copy(VALUE dest, VALUE obj)
 	struct _rb_lwes_emitter *src = _rle(obj);
 
 	memcpy(dst, src, sizeof(*dst));
-	dst->address = my_strdup(src->address);
+	dst->address = ruby_strdup(src->address);
 	if (dst->iface)
-		dst->iface = my_strdup(src->iface);
+		dst->iface = ruby_strdup(src->iface);
 	lwesrb_emitter_create(dst);
 
 	assert(dst->emitter && dst->emitter != src->emitter &&
@@ -496,7 +500,7 @@ static VALUE _create(VALUE self, VALUE options)
 	address = rb_hash_aref(options, ID2SYM(rb_intern("address")));
 	if (TYPE(address) != T_STRING)
 		rb_raise(rb_eTypeError, ":address must be a string");
-	rle->address = my_strdup(StringValueCStr(address));
+	rle->address = ruby_strdup(StringValueCStr(address));
 
 	iface = rb_hash_aref(options, ID2SYM(rb_intern("iface")));
 	switch (TYPE(iface)) {
@@ -504,7 +508,7 @@ static VALUE _create(VALUE self, VALUE options)
 		rle->iface = NULL;
 		break;
 	case T_STRING:
-		rle->iface = my_strdup(StringValueCStr(iface));
+		rle->iface = ruby_strdup(StringValueCStr(iface));
 		break;
 	default:
 		rb_raise(rb_eTypeError, ":iface must be a String or nil");

data/lwes.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{lwes}
-  s.version = "0.8.2"
+  s.version = "0.8.3"
   s.date = Time.now
   s.authors = ["Erik S. Chang", "Frank Maritato"]
   s.email = %q{lwes-devel@lists.sourceforge.net}

data/test/unit/test_event.rb

@@ -141,6 +141,23 @@ class TestEvent < Test::Unit::TestCase
       receiver.close
   end
 
+  def test_emit_class_from_hash_subclassed
+    receiver = UDPSocket.new
+    receiver.bind(nil, @options[:port])
+    emitter = LWES::Emitter.new(@options)
+    tmp = { :t_string => 'hello' }
+
+    tdb = LWES::TypeDB.new("#{File.dirname(__FILE__)}/test1.esf")
+    ev1 = LWES::Event.subclass :name => "Event1", :db => tdb
+    emitter.emit ev1, tmp
+    buf, _ = receiver.recvfrom(65536)
+    parsed = LWES::Event.parse(buf)
+    assert_instance_of ev1, parsed
+    assert_equal parsed.to_hash, ev1.new(tmp).to_hash
+    ensure
+      receiver.close
+  end
+
   def teardown
     new_classes = LWES::Event::CLASSES
     new_classes.each_key { |k| Object.__send__ :remove_const, k.to_sym }

metadata

@@ -2,7 +2,7 @@
 name: lwes
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Erik S. Chang
@@ -11,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 +00:00
-default_executable: 
+date: 2012-06-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
@@ -79,7 +78,6 @@ files:
 - test/unit/test_type_db.rb
 - test/unit/test_type_db_events.rb
 - ext/lwes_ext/lwes-0.23.1.tar.gz
-has_rdoc: true
 homepage: http://lwes.rubyforge.org/
 licenses: []
 
@@ -103,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: lwes
-rubygems_version: 1.6.0
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for the Light Weight Event System