lwes 0.1.2 → 0.2.1

data/ChangeLog

@@ -1,3 +1,8 @@
+Version 0.2.1 (erik-s-chang)
+  * Emitter#<< for structs
+  * fix full installs OSX
+  * check arguments for invalid structs due to code errors
+
 Version 0.1.2 (erik-s-chang)
   * TypeDB.new raises ArgumentError on non-String args
   * extra test for empty Event definitions (MetaEventInfo-only)

data/README

@@ -63,7 +63,7 @@ gem.
   my_event.field2 = value2
   my_event.field3 = value3
   my_event.finished = Time.now.to_i
-  emitter.emit my_event
+  emitter << my_event
 
   # Alternatively, if you know ahead of time all the fields you want to
   # set for an event, you can emit an event in one step:

data/Rakefile

@@ -9,3 +9,10 @@ Rake::TestTask.new('test:unit') do |t|
   t.test_files = FileList['test/unit/test_*.rb']
   t.verbose = true if ENV["VERBOSE"].to_i > 0
 end
+
+gem 'rdoc', '>= 2.4.3'
+require 'rdoc/task'
+RDoc::Task.new do |rd|
+  rd.main = "README"
+  rd.rdoc_files.include("README", "lib/**/*.rb", "ext/lwes/*.c")
+end

data/ext/lwes/emitter.c

@@ -1,7 +1,7 @@
 #include "lwes_ruby.h"
 
 static VALUE cLWES_Emitter;
-static ID sym_TYPE_DB, sym_TYPE_LIST, sym_NAME;
+static ID id_TYPE_DB, id_TYPE_LIST, id_NAME;
 static ID id_new;
 
 /* the underlying struct for LWES::Emitter */
@@ -132,10 +132,14 @@ static VALUE _emit_struct(VALUE _argv)
 	VALUE self = argv[0];
 	VALUE _event = argv[1];
 	struct lwes_event *event = (struct lwes_event *)argv[2];
-	VALUE type_list = rb_const_get(CLASS_OF(_event), SYM2ID(sym_TYPE_LIST));
-	long i = RARRAY_LEN(type_list);
+	VALUE type_list = argv[3];
+	long i;
 	VALUE *tmp;
 
+	if (TYPE(type_list) != T_ARRAY)
+		rb_raise(rb_eArgError, "could not get TYPE_LIST const");
+
+	i = RARRAY_LEN(type_list);
 	for (tmp = RARRAY_PTR(type_list); --i >= 0; tmp++) {
 		/* inner: [ :field_sym, "field_name", type ] */
 		VALUE *inner = RARRAY_PTR(*tmp);
@@ -191,30 +195,60 @@ static VALUE emit_hash(VALUE self, VALUE name, VALUE _event)
 	return _event;
 }
 
-static struct lwes_event_type_db * get_type_db(VALUE event)
+static struct lwes_event_type_db * get_type_db(VALUE event_class)
 {
-	VALUE type_db = rb_const_get(CLASS_OF(event), SYM2ID(sym_TYPE_DB));
+	VALUE type_db = rb_const_get(event_class, id_TYPE_DB);
+
+        if (CLASS_OF(type_db) != cLWES_TypeDB)
+		rb_raise(rb_eArgError, "class does not have valid TYPE_DB");
 
 	return lwesrb_get_type_db(type_db);
 }
 
-static VALUE emit_struct(VALUE self, VALUE name, VALUE _event)
+static VALUE emit_struct(VALUE self, VALUE _event)
 {
-	VALUE argv[3];
-	struct lwes_event_type_db *db = get_type_db(_event);
-	struct lwes_event *event = lwes_event_create(db, RSTRING_PTR(name));
+	VALUE argv[4];
+	VALUE event_class = CLASS_OF(_event);
+	struct lwes_event_type_db *db = get_type_db(event_class);
+	struct lwes_event *event;
+	VALUE name = rb_const_get(event_class, id_NAME);
+	VALUE type_list = rb_const_get(event_class, id_TYPE_LIST);
+
+	if (TYPE(name) != T_STRING || TYPE(type_list) != T_ARRAY)
+		rb_raise(rb_eArgError,
+		         "could not get class NAME or TYPE_LIST from: %s",
+		         RSTRING_PTR(rb_inspect(_event)));
 
+	event = lwes_event_create(db, RSTRING_PTR(name));
 	if (!event)
 		rb_raise(rb_eRuntimeError, "failed to create lwes_event");
 
 	argv[0] = self;
 	argv[1] = _event;
 	argv[2] = (VALUE)event;
+	argv[3] = type_list;
 	rb_ensure(_emit_struct, (VALUE)&argv, _destroy_event, (VALUE)event);
 
 	return _event;
 }
 
+/*
+ * call-seq:
+ *   emitter = LWES::Emitter.new
+ *   event = EventStruct.new
+ *   event.foo = "bar"
+ *   emitter << event
+ */
+static VALUE emitter_ltlt(VALUE self, VALUE event)
+{
+	if (TYPE(event) != T_STRUCT)
+		rb_raise(rb_eArgError,
+		         "Must be a Struct: %s",
+		         RSTRING_PTR(rb_inspect(event)));
+
+	return emit_struct(self, event);
+}
+
 /*
  * call-seq:
  *   emitter = LWES::Emitter.new
@@ -246,8 +280,7 @@ static VALUE emitter_emit(int argc, VALUE *argv, VALUE self)
 			         "second argument not allowed when first"
 			         " is a Struct");
 		event = name;
-		name = rb_const_get(CLASS_OF(event), SYM2ID(sym_NAME));
-		return emit_struct(self, name, event);
+		return emit_struct(self, event);
 	case T_CLASS:
 		if (TYPE(event) != T_HASH)
 			rb_raise(rb_eArgError,
@@ -259,8 +292,7 @@ static VALUE emitter_emit(int argc, VALUE *argv, VALUE self)
 		 * struct created
 		 */
 		event = rb_funcall(name, id_new, 1, event);
-		name = rb_const_get(name, SYM2ID(sym_NAME));
-		return emit_struct(self, name, event);
+		return emit_struct(self, event);
 	default:
 		rb_raise(rb_eArgError,
 		         "bad argument: %s, must be a String, Struct or Class",
@@ -355,12 +387,13 @@ void lwesrb_init_emitter(void)
 	VALUE mLWES = rb_define_module("LWES");
 	cLWES_Emitter = rb_define_class_under(mLWES, "Emitter", rb_cObject);
 
+	rb_define_method(cLWES_Emitter, "<<", emitter_ltlt, 1);
 	rb_define_method(cLWES_Emitter, "emit", emitter_emit, -1);
 	rb_define_method(cLWES_Emitter, "_create", _create, 1);
 	rb_define_method(cLWES_Emitter, "close", emitter_close, 0);
 	rb_define_alloc_func(cLWES_Emitter, rle_alloc);
-	LWESRB_MKSYM(TYPE_DB);
-	LWESRB_MKSYM(TYPE_LIST);
-	LWESRB_MKSYM(NAME);
-	id_new = rb_intern("new");
+	LWESRB_MKID(TYPE_DB);
+	LWESRB_MKID(TYPE_LIST);
+	LWESRB_MKID(NAME);
+        LWESRB_MKID(new);
 }

data/ext/lwes/extconf.rb

@@ -37,7 +37,8 @@ unless have_library('lwes') && have_header('lwes.h')
       FileUtils.rm_rf(dir)
       system('tar', 'zxf', tgz) or abort "tar failed with #{$?}"
       Dir.chdir(dir) do
-        system("./configure", "--prefix=#{inst}", "--disable-hardcore") or
+        args = %w(--disable-hardcore --with-pic --disable-dependency-tracking)
+        system("./configure", "--prefix=#{inst}", *args) or
           abort "configure failed with #{$?}"
         system("make") or abort "make failed with #{$?}"
         system("make", "install") or abort "make install failed with #{$?}"
@@ -46,7 +47,8 @@ unless have_library('lwes') && have_header('lwes.h')
       File.open("#{inst}/.ok", "wb") { }
     end
     $CFLAGS = "-I#{inst}/include/lwes-0 #{$CFLAGS}"
-    $LDFLAGS = "-Wl,-rpath=#{inst}/lib -L#{inst}/lib #{$LDFLAGS}"
+    Dir.glob("#{inst}/lib/*") { |f| f =~ /\.l?a\z/ or FileUtils.rm_rf(f) }
+    $LDFLAGS = "-L#{inst}/lib #{$LDFLAGS}"
     have_library('lwes') && have_header('lwes.h') or
       abort "installation failed"
   end

data/ext/lwes/lwes_ruby.h

@@ -7,6 +7,9 @@
 #include <stdint.h>
 
 #define LWESRB_MKSYM(SYM) sym_##SYM = ID2SYM(rb_intern(#SYM))
+#define LWESRB_MKID(NAME) id_##NAME = rb_intern(#NAME)
+
+extern VALUE cLWES_TypeDB;
 
 struct lwes_event_type_db * lwesrb_get_type_db(VALUE self);
 

data/ext/lwes/type_db.c

@@ -1,6 +1,6 @@
 #include "lwes_ruby.h"
 
-static VALUE cLWES_TypeDB;
+VALUE cLWES_TypeDB;
 
 struct _tdb {
 	struct lwes_event_type_db *db;

data/lib/lwes.rb

@@ -1,5 +1,5 @@
 module LWES
-  VERSION = "0.1.2"
+  VERSION = "0.2.1"
   autoload :TypeDB, "lwes/type_db"
   autoload :Struct, "lwes/struct"
   autoload :Emitter, "lwes/emitter"

data/lwes.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{lwes}
-  s.version = "0.1.2"
+  s.version = "0.2.1"
   s.date = Time.now
   s.authors = ["Erik S. Chang", "Frank Maritato"]
   s.email = %q{lwes-devel@lists.sourceforge.net}
@@ -33,6 +33,8 @@ lib/lwes/struct.rb
 lib/lwes/type_db.rb
 lwes.gemspec
 test/test_helper.rb
+test/unit/meta_only.esf
+test/unit/namespaced.esf
 test/unit/test1.esf
 test/unit/test2.esf
 test/unit/test_emit_struct.rb

data/test/unit/meta_only.esf

@@ -0,0 +1,8 @@
+MetaEventInfo
+{
+  ip_addr SenderIP;
+}
+
+Meta::Info::Only
+{
+}

data/test/unit/namespaced.esf

@@ -0,0 +1,19 @@
+MetaEventInfo
+{
+  ip_addr SenderIP;
+}
+
+A::B::C::Event
+{
+  boolean ok;
+}
+
+A::B::C::Event::Bool
+{
+  boolean B;
+}
+
+A::B::C::Event::String
+{
+  string S;
+}

data/test/unit/test_emit_struct.rb

@@ -1,5 +1,9 @@
 require "#{File.dirname(__FILE__)}/../test_helper"
 
+class InvalidStruct1 < Struct.new(:invalid)
+  TYPE_DB = []
+end
+
 class TestEmitStruct < Test::Unit::TestCase
 
   def setup
@@ -8,6 +12,18 @@ class TestEmitStruct < Test::Unit::TestCase
     @options = LISTENER_DEFAULTS.dup
   end
 
+  def test_emit_non_lwes_struct
+    emitter = LWES::Emitter.new(@options)
+    assert_raise(ArgumentError) { emitter << InvalidStruct1.new }
+  end
+
+  def test_emit_crap
+    emitter = LWES::Emitter.new(@options)
+    assert_raise(ArgumentError) { emitter << "HHI" }
+    assert_raise(ArgumentError) { emitter << [] }
+    assert_raise(ArgumentError) { emitter << {} }
+  end
+
   def test_emit_struct_full
     s = nil
     out = lwes_listener do
@@ -35,6 +51,33 @@ class TestEmitStruct < Test::Unit::TestCase
     end
   end
 
+  def test_emit_struct_cplusplus
+    s = nil
+    out = lwes_listener do
+      assert_nothing_raised do
+        emitter = LWES::Emitter.new(@options)
+        s = Event1.new
+        s.t_bool = true
+        s.t_int16 = -1000
+        s.t_uint16 = 1000
+        s.t_int32 = -64444
+        s.t_uint32 = 64444
+        s.t_int64 = 10_000_000_000
+        s.t_uint64 = 10_000_000_000
+        s.t_ip_addr = '192.168.0.1'
+        s.t_string = "STRING"
+        emitter << s
+      end
+    end
+    out = out.readlines
+    s.members.each do |m|
+      value = s[m.to_sym] or next
+      regex = /\b#{m} = #{value};/
+      assert_equal 1, out.grep(regex).size,
+                   "#{regex.inspect} didn't match #{out.inspect}"
+    end
+  end
+
   def test_emit_from_class
     opt = {
       :t_bool => true,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lwes
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors: 
 - Erik S. Chang
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-01 00:00:00 +00:00
+date: 2009-12-09 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -46,6 +46,8 @@ files:
 - lib/lwes/type_db.rb
 - lwes.gemspec
 - test/test_helper.rb
+- test/unit/meta_only.esf
+- test/unit/namespaced.esf
 - test/unit/test1.esf
 - test/unit/test2.esf
 - test/unit/test_emit_struct.rb