lwes 0.8.5 → 0.8.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7d62fc6afb8a36f919d448037c91b33586ac1776
+  data.tar.gz: 0f0162861c07777ef845e989ee1c8f6e6db467e9
+SHA512:
+  metadata.gz: 3a7834f09cafd4ab8ba7c4c9ff6243f92ac9fc14e3cbe957f4c3a229b3743a2898b5e1c9c46e766471f9a6e75a61c1be00e2608e4db749547a88247ae2afbd59
+  data.tar.gz: 189ed6c5a8f779477d3fbb851058808e65b63325e4c116b7243337159f40e6076d68f45a7fa0f7f4e53078feb8e32c7d2f41fe878da31a75f2792ff2912b9414

data/.gitignore

@@ -2,3 +2,4 @@
 *.so
 *.log
 /tmp
+*.tar.gz

data/ChangeLog

@@ -1,3 +1,6 @@
+Version 0.8.6 (erik-s-chang)
+  * Fix Ruby 2.1.0preview1 compatibility
+
 Version 0.8.5 (erik-s-chang)
   * Fix Ruby 2.0.0 compatibility
 

data/ext/lwes_ext/emitter.c

@@ -7,7 +7,7 @@
 
 static VALUE ENC; /* LWES_ENCODING */
 static ID id_TYPE_DB, id_TYPE_LIST, id_NAME, id_HAVE_ENCODING;
-static ID id_new, id_enc, id_size;
+static ID id_new, id_enc, id_size, id_to_a;
 static VALUE sym_enc;
 
 static void dump_name(char *name, LWES_BYTE_P buf, size_t *off)
@@ -111,13 +111,12 @@ static VALUE event_hash_iter_i(VALUE kv, VALUE memo)
 	int rv = 0;
 	LWES_BYTE_P buf = hash_memo->buf;
 	size_t *off = &hash_memo->off;
-	VALUE *tmp;
 
 	if (TYPE(kv) != T_ARRAY || RARRAY_LEN(kv) != 2)
 		rb_raise(rb_eTypeError,
 		         "hash iteration not giving key-value pairs");
-	tmp = RARRAY_PTR(kv);
-	name = tmp[0];
+
+	name = rb_ary_entry(kv, 0);
 
 	if (name == sym_enc) return Qnil; /* already dumped first */
 
@@ -127,7 +126,7 @@ static VALUE event_hash_iter_i(VALUE kv, VALUE memo)
 	if (strcmp(attr_name, LWES_ENCODING) == 0)
 		return Qnil;
 
-	val = tmp[1];
+	val = rb_ary_entry(kv, 1);
 
 	switch (TYPE(val)) {
 	case T_TRUE:
@@ -243,30 +242,15 @@ static void lwes_struct_class(
 	*have_enc = rb_const_get(*event_class, id_HAVE_ENCODING);
 }
 
-#if !defined(RSTRUCT_PTR) && defined(RSTRUCT)
-#  define RSTRUCT_PTR(s) (RSTRUCT(s)->ptr)
-#endif
-static VALUE * rstruct_ptr(VALUE *ary, VALUE rstruct)
-{
-#ifdef RSTRUCT_PTR
-	return RSTRUCT_PTR(*ary = rstruct);
-#else
-	*ary = rb_funcall(rstruct, rb_intern("to_a"), 0, 0);
-	return RARRAY_PTR(*ary);
-#endif
-}
-
 static VALUE emit_struct(VALUE self, VALUE event)
 {
-	VALUE event_class, name, type_list, have_enc;
+	VALUE event_class, name, type_list, have_enc, event_ary;
 	struct _rb_lwes_emitter *rle = _rle(self);
 	LWES_BYTE_P buf = rle->emitter->buffer;
 	size_t off = 0;
-	long i;
-	VALUE *tmp;
+	long i, len;
 	LWES_U_INT_16 num_attr = 0;
 	size_t num_attr_off;
-	VALUE *flds;
 	char *str;
 
 	lwes_struct_class(&event_class, &name, &type_list, &have_enc, event);
@@ -290,24 +274,26 @@ static VALUE emit_struct(VALUE self, VALUE event)
 		}
 	}
 
-	i = RARRAY_LEN(type_list);
-	flds = rstruct_ptr(&name, event);
-	tmp = RARRAY_PTR(type_list);
-	for (; --i >= 0; tmp++, flds++) {
-		/* inner: [ :field_sym, "field_name", type ] */
-		VALUE *inner = RARRAY_PTR(*tmp);
+	len = RARRAY_LEN(type_list);
+	event_ary = rb_funcall(event, id_to_a, 0, 0);
+	for (i = 0; i < len; i++) {
+		/* type_list [ [ :field_sym, "field_name", ltype ] ] */
+		VALUE tlent = rb_ary_entry(type_list, i);
+		VALUE field_sym = rb_ary_entry(tlent, 0);
+		VALUE field_name;
 		VALUE val;
 		LWES_TYPE type;
 
-		if (inner[0] == sym_enc) /* encoding was already dumped */
+		if (field_sym == sym_enc) /* encoding was already dumped */
 			continue;
 
-		val = *flds;
+		val = rb_ary_entry(event_ary, i);
 		if (NIL_P(val))
 			continue; /* LWES doesn't know nil */
 
-		str = StringValueCStr(inner[1]);
-		type = NUM2INT(inner[2]);
+		field_name = rb_ary_entry(tlent, 1);
+		str = StringValueCStr(field_name);
+		type = NUM2INT(rb_ary_entry(tlent, 2));
 		++num_attr;
 		marshal_field(str, type, val, buf, &off);
 	}
@@ -565,6 +551,7 @@ void lwesrb_init_emitter(void)
 	LWESRB_MKID(new);
 	LWESRB_MKID(size);
 	id_enc = rb_intern(LWES_ENCODING);
+	id_to_a = rb_intern("to_a");
 	sym_enc = ID2SYM(id_enc);
 
 	ENC = rb_obj_freeze(rb_str_new2(LWES_ENCODING));

data/ext/lwes_ext/lwes_ruby.h

@@ -36,8 +36,7 @@ void lwesrb_dump_num_ary(VALUE array, LWES_BYTE_P buf, size_t *off);
 #  define RSTRING_LEN(s) (RSTRING(s)->len)
 #endif
 
-#ifndef RARRAY_PTR
-#  define RARRAY_PTR(s) (RARRAY(s)->ptr)
+#ifndef RARRAY_LEN
 #  define RARRAY_LEN(s) (RARRAY(s)->len)
 #endif
 

data/ext/lwes_ext/numeric.c

@@ -111,7 +111,6 @@ void lwesrb_dump_num_ary(VALUE array, LWES_BYTE_P buf, size_t *off)
 	volatile VALUE raise_inspect;
 	int i, rv;
 	struct _type_fn_map *head;
-	VALUE *ary;
 	ID type;
 
 	assert(TYPE(array) == T_ARRAY && "need array here");
@@ -119,15 +118,14 @@ void lwesrb_dump_num_ary(VALUE array, LWES_BYTE_P buf, size_t *off)
 	if (RARRAY_LEN(array) != 2)
 		rb_raise(rb_eArgError, "expected a two element array");
 
-	ary = RARRAY_PTR(array);
-	type = ary[0];
+	type = rb_ary_entry(array, 0);
 
 	i = sizeof(type_fn_map) / sizeof(type_fn_map[0]);
 	for (head = type_fn_map; --i >= 0; head++) {
 		if (head->type != type)
 			continue;
 
-		rv = head->fn(ary[1], buf, off);
+		rv = head->fn(rb_ary_entry(array, 1), buf, off);
 		if (rv > 0)
 			return;
 

data/lwes.gemspec

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lwes
 version: !ruby/object:Gem::Version
-  version: 0.8.5
-  prerelease: 
+  version: 0.8.6
 platform: ruby
 authors:
 - Erik S. Chang
@@ -10,34 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.6
-description: ! 'The LWES Light-Weight Event System is a framework for allowing the
-  exchange of
-
+description: |-
+  The LWES Light-Weight Event System is a framework for allowing the exchange of
   information from many machines to many machines in a controlled, platform
-
   neutral, language neutral way.  The exchange of information is done in a
-
   connectless fashion using multicast or unicast UDP, and using self describing
-
-  data so that any platform or language can translate it to it''s local dialect.'
+  data so that any platform or language can translate it to it's local dialect.
 email: lwes-devel@lists.sourceforge.net
 executables: []
 extensions:
@@ -86,27 +79,26 @@ files:
 - ext/lwes_ext/lwes-0.23.1.tar.gz
 homepage: http://lwes.rubyforge.org/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: lwes
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby bindings for the Light Weight Event System
 test_files:
 - test/unit/test_emit_struct.rb