lwes 0.4.0 → 0.5.0

data/README

@@ -25,6 +25,12 @@ may support listening and journaling capabilities as time allows.
 
 See the SourceForge project.
 
+== DEVELOPMENT:
+
+Our SVN repository is here:
+
+  https://lwes.svn.sourceforge.net/svnroot/lwes/lwes-ruby
+
 == INSTALL:
 
 This library is easy to install, if you have the LWES library already

data/ext/lwes/emitter.c

@@ -34,14 +34,19 @@ static int dump_bool(VALUE name, VALUE val, LWES_BYTE_P buf, size_t *off)
 
 static int dump_string(VALUE name, VALUE val, LWES_BYTE_P buf, size_t *off)
 {
-	volatile VALUE raise_inspect;
+	char *dst;
+
+	switch (TYPE(val)) {
+	case T_FLOAT:
+	case T_BIGNUM:
+	case T_FIXNUM:
+		val = rb_obj_as_string(val);
+	}
+	dst = StringValuePtr(val);
 
-	if (TYPE(val) != T_STRING)
-		rb_raise(rb_eTypeError, "not a string: %s",
-		         RAISE_INSPECT(val));
 	dump_name(name, buf, off);
 	lwesrb_dump_type(LWES_STRING_TOKEN, buf, off);
-	return marshall_LONG_STRING(RSTRING_PTR(val), buf, MAX_MSG_SIZE, off);
+	return marshall_LONG_STRING(dst, buf, MAX_MSG_SIZE, off);
 }
 
 static void dump_enc(VALUE enc, LWES_BYTE_P buf, size_t *off)
@@ -234,7 +239,6 @@ static void lwes_struct_class(
 	VALUE event)
 {
 	VALUE type_db;
-	volatile VALUE raise_inspect;
 
 	*event_class = CLASS_OF(event);
 	type_db = rb_const_get(*event_class, id_TYPE_DB);
@@ -243,16 +247,9 @@ static void lwes_struct_class(
 		rb_raise(rb_eArgError, "class does not have valid TYPE_DB");
 
 	*name = rb_const_get(*event_class, id_NAME);
-	if (TYPE(*name) != T_STRING)
-		rb_raise(rb_eArgError,
-		         "could not get valid const NAME: %s",
-		         RAISE_INSPECT(event));
-
+	Check_Type(*name, T_STRING);
 	*type_list = rb_const_get(*event_class, id_TYPE_LIST);
-	if (TYPE(*type_list) != T_ARRAY)
-		rb_raise(rb_eArgError,
-		         "could not get valid const TYPE_LIST: %s",
-		         RAISE_INSPECT(event));
+	Check_Type(*type_list, T_ARRAY);
 
 	*have_enc = rb_const_get(*event_class, id_HAVE_ENCODING);
 }
@@ -330,12 +327,9 @@ static VALUE emit_struct(VALUE self, VALUE event)
  */
 static VALUE emitter_ltlt(VALUE self, VALUE event)
 {
-	volatile VALUE raise_inspect;
+	Check_Type(event, T_STRUCT);
 
-	if (TYPE(event) == T_STRUCT)
-		return emit_struct(self, event);
-
-	rb_raise(rb_eArgError, "Must be a Struct: %s", RAISE_INSPECT(event));
+	return emit_struct(self, event);
 }
 
 /*
@@ -373,7 +367,7 @@ static VALUE emitter_emit(int argc, VALUE *argv, VALUE self)
 		return emit_struct(self, event);
 	case T_CLASS:
 		if (TYPE(event) != T_HASH)
-			rb_raise(rb_eArgError,
+			rb_raise(rb_eTypeError,
 			         "second argument must be a Hash when first"
 			         " is a Class");
 

data/ext/lwes/numeric.c

@@ -6,6 +6,7 @@ static ID
   sym_int32, sym_uint32,
   sym_int64, sym_uint64,
   sym_ip_addr;
+static ID id_to_i;
 
 void lwesrb_dump_type(LWES_BYTE type, LWES_BYTE_P buf, size_t *off)
 {
@@ -136,6 +137,9 @@ static int dump_num(
 	LWES_BYTE_P buf,
 	size_t *off)
 {
+	if (type != LWES_TYPE_IP_ADDR && TYPE(val) == T_STRING)
+		val = rb_funcall(val, id_to_i, 0, 0);
+
 	switch (type) {
 	case LWES_TYPE_U_INT_16: return dump_uint16(val, buf, off);
 	case LWES_TYPE_INT_16: return dump_int16(val, buf, off);
@@ -210,6 +214,7 @@ void lwesrb_init_numeric(void)
 	LWESRB_MKSYM(int64);
 	LWESRB_MKSYM(uint64);
 	LWESRB_MKSYM(ip_addr);
+	id_to_i = rb_intern("to_i");
 
 	/*
 	 * we needed to have constants for compilation, so we set the

data/lwes.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{lwes}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
   s.date = Time.now
   s.authors = ["Erik S. Chang", "Frank Maritato"]
   s.email = %q{lwes-devel@lists.sourceforge.net}
@@ -24,6 +24,7 @@ examples/my_events.esf
 ext/lwes/emitter.c
 ext/lwes/extconf.rb
 ext/lwes/lwes-0.22.3.diff
+ext/lwes/lwes-0.22.3.tar.gz
 ext/lwes/lwes.c
 ext/lwes/lwes_ruby.h
 ext/lwes/numeric.c

data/test/unit/test_emit_struct.rb

@@ -19,9 +19,9 @@ class TestEmitStruct < Test::Unit::TestCase
 
   def test_emit_crap
     emitter = LWES::Emitter.new(@options)
-    assert_raise(ArgumentError) { emitter << "HHI" }
-    assert_raise(ArgumentError) { emitter << [] }
-    assert_raise(ArgumentError) { emitter << {} }
+    assert_raise(TypeError) { emitter << "HHI" }
+    assert_raise(TypeError) { emitter << [] }
+    assert_raise(TypeError) { emitter << {} }
   end
 
   def test_emit_struct_full
@@ -51,6 +51,33 @@ class TestEmitStruct < Test::Unit::TestCase
     end
   end
 
+  def test_emit_struct_coerce_type
+    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 = 1234567
+        emitter.emit(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_struct_cplusplus
     s = nil
     out = lwes_listener do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: lwes
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Erik S. Chang
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 +00:00
+date: 2010-09-14 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +42,7 @@ files:
 - ext/lwes/emitter.c
 - ext/lwes/extconf.rb
 - ext/lwes/lwes-0.22.3.diff
+- ext/lwes/lwes-0.22.3.tar.gz
 - ext/lwes/lwes.c
 - ext/lwes/lwes_ruby.h
 - ext/lwes/numeric.c
@@ -65,21 +71,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: lwes
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby API for the Light Weight Event System