msgpack 0.5.0-x86-mingw32 → 0.5.1-x86-mingw32

data/ChangeLog

@@ -1,4 +1,10 @@
 
+2012-12-23 version 0.5.1:
+
+* Fixed compile error with Rubinius 2.0.0-dev
+* Optimized msgpack_packer_write_hash for Rubinius
+
+
 2012-12-20 version 0.5.0:
 
 * Rewrote all code and improved performance significantly

data/README.rdoc

@@ -54,7 +54,7 @@ Packer provides advanced API to serialize objects in streaming style:
     pk = MessagePack::Packer.new(io)
     pk.write_array_header(2).write(e1).write(e2).flush
 
-See API reference for details.
+See {API reference}[http://ruby.msgpack.org/MessagePack/Packer.html] for details.
 
 = Deserializing objects
 
@@ -83,14 +83,14 @@ or event-driven style which works well with EventMachine:
       }
     end
 
-See API reference for details.
+See {API reference}[http://ruby.msgpack.org/MessagePack/Unpacker.html] for details.
 
 
 = Buffer API
 
 MessagePack for Ruby provides a buffer API so that you can read or write data by hand, not via Packer or Unpacker API.
 
-This MessagePack::Buffer API is backed with a fixed-length shared memory pool which is very fast for small data (<= 4KB),
+This {MessagePack::Buffer}[http://ruby.msgpack.org/MessagePack/Buffer.html] is backed with a fixed-length shared memory pool which is very fast for small data (<= 4KB),
 and has zero-copy capability which significantly affects performance to handle large binary data.
 
 

data/ext/msgpack/buffer.c

@@ -23,10 +23,6 @@
 int s_enc_ascii8bit;
 #endif
 
-#ifdef RUBY_VM
-#define HAVE_RB_STR_REPLACE
-#endif
-
 #ifndef HAVE_RB_STR_REPLACE
 static ID s_replace;
 #endif

data/ext/msgpack/compat.h

@@ -42,17 +42,18 @@
 
 /*
  * define STR_DUP_LIKELY_DOES_COPY
+ * check rb_str_dup actually copies the string or not
  */
-#if defined(RUBY_VM)  /* MRI 1.9 */
-   /* if FL_ALL(str, FL_USER1|FL_USER3) == STR_ASSOC_P(str) returns true,
-    * rb_str_dup will copy the string */
-#  define STR_DUP_LIKELY_DOES_COPY(str) FL_ALL(str, FL_USER1|FL_USER3)
+#if defined(RUBY_VM) && defined(FL_ALL) && defined(FL_USER1) && defined(FL_USER3)  /* MRI 1.9 */
+#  define STR_DUP_LIKELY_DOES_COPY(str) FL_ALL(str, FL_USER1|FL_USER3)  /* same as STR_ASSOC_P(str) */
+
+#elif defined(FL_TEST) && defined(ELTS_SHARED)  /* MRI 1.8 */
+#  define STR_DUP_LIKELY_DOES_COPY(str) (!FL_TEST(str, ELTS_SHARED))
 
-#elif defined(RUBINIUS) || defined(JRUBY)  /* Rubinius and JRuby */
+//#elif defined(RUBINIUS) || defined(JRUBY)  /* Rubinius and JRuby */
+#else
 #  define STR_DUP_LIKELY_DOES_COPY(str) (1)
 
-#else  /* MRI 1.8 */
-#  define STR_DUP_LIKELY_DOES_COPY(str) (!FL_TEST(str, ELTS_SHARED))
 #endif
 
 

data/ext/msgpack/extconf.rb

@@ -2,6 +2,7 @@ require 'mkmf'
 
 have_header("ruby/st.h")
 have_header("st.h")
+have_func("rb_str_replace", ["ruby.h"])
 
 $CFLAGS << %[ -I.. -Wall -O3 -g -std=c99]
 #$CFLAGS << %[ -DDISABLE_RMEM]

data/ext/msgpack/packer.c

@@ -18,6 +18,26 @@
 
 #include "packer.h"
 
+#ifdef RUBINIUS
+static ID s_to_iter;
+static ID s_next;
+static ID s_key;
+static ID s_value;
+#endif
+
+void msgpack_packer_static_init()
+{
+#ifdef RUBINIUS
+    s_to_iter = rb_intern("to_iter");
+    s_next = rb_intern("next");
+    s_key = rb_intern("key");
+    s_value = rb_intern("value");
+#endif
+}
+
+void msgpack_packer_static_destroy()
+{ }
+
 void msgpack_packer_init(msgpack_packer_t* pk)
 {
     memset(pk, 0, sizeof(msgpack_packer_t));
@@ -89,7 +109,17 @@ void msgpack_packer_write_hash_value(msgpack_packer_t* pk, VALUE v)
     unsigned int len32 = (unsigned int)len;
     msgpack_packer_write_map_header(pk, len32);
 
+#ifdef RUBINIUS
+    VALUE iter = rb_funcall(v, s_to_iter, 0);
+    VALUE entry = Qnil;
+    while(RTEST(entry = rb_funcall(iter, s_next, 1, entry))) {
+        VALUE key = rb_funcall(entry, s_key, 0);
+        VALUE val = rb_funcall(entry, s_value, 0);
+        write_hash_foreach(key, val, (VALUE) pk);
+    }
+#else
     rb_hash_foreach(v, write_hash_foreach, (VALUE) pk);
+#endif
 }
 
 static void _msgpack_packer_write_other_value(msgpack_packer_t* pk, VALUE v)

data/ext/msgpack/packer.h

@@ -41,6 +41,10 @@ struct msgpack_packer_t {
 
 #define PACKER_BUFFER_(pk) (&(pk)->buffer)
 
+void msgpack_packer_static_init();
+
+void msgpack_packer_static_destroy();
+
 void msgpack_packer_init(msgpack_packer_t* pk);
 
 void msgpack_packer_destroy(msgpack_packer_t* pk);

data/ext/msgpack/packer_class.c

@@ -250,6 +250,8 @@ void MessagePack_Packer_module_init(VALUE mMessagePack)
     s_to_msgpack = rb_intern("to_msgpack");
     s_write = rb_intern("write");
 
+    msgpack_packer_static_init();
+
     cMessagePack_Packer = rb_define_class_under(mMessagePack, "Packer", rb_cObject);
 
     rb_define_alloc_func(cMessagePack_Packer, Packer_alloc);

data/lib/msgpack/version.rb

@@ -1,3 +1,3 @@
 module MessagePack
-	VERSION = "0.5.0"
+	VERSION = "0.5.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: msgpack
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: x86-mingw32
 authors: 
 - FURUHASHI Sadayuki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-21 00:00:00 +09:00
+date: 2012-12-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency