tuple 0.1.1 → 0.1.2

data/ext/extconf.rb

@@ -1,2 +1,12 @@
 require 'mkmf'
+
+case RUBY_VERSION
+when /\A1\.8/
+  $CFLAGS += ' -DRUBY_1_8_x'
+when /\A1\.9/
+  $CFLAGS += ' -DRUBY_1_9_x'
+else
+  raise "unsupported Ruby version: #{RUBY_VERSION}"
+end
+
 create_makefile('tuple')

data/ext/tuple.c

@@ -59,8 +59,15 @@ static VALUE tuple_dump(VALUE self, VALUE tuple) {
 
   if (TYPE(tuple) != T_ARRAY) tuple = rb_ary_new4(1, &tuple);
 
-  for (i = 0; i < RARRAY(tuple)->len; i++) {
-    item = RARRAY(tuple)->ptr[i];
+#if defined(RUBY_1_9_x)
+  for (i = 0; i < RARRAY_LEN(tuple); i++) {
+      item = RARRAY_PTR(tuple)[i];
+#elif defined(RUBY_1_8_x)
+    for (i = 0; i < RARRAY(tuple)->len; i++) {
+        item = RARRAY(tuple)->ptr[i];
+#else
+#error unsupported RUBY_VERSION
+#endif
     header[0] = header[1] = header[2] = header[3] = 0;
     if (FIXNUM_P(item)) {
       fixnum = FIX2LONG(item);
@@ -80,13 +87,26 @@ static VALUE tuple_dump(VALUE self, VALUE tuple) {
       digit = htonl(sign ? digit : UINT_MAX - digit);
       rb_str_cat(data, (char*)&digit, sizeof(digit));
     } else if (TYPE(item) == T_BIGNUM) {
+#if defined(RUBY_1_9_x)
+      sign = RBIGNUM_SIGN(item);
+      len  = RBIGNUM_LEN(item);
+#elif defined(RUBY_1_8_x)
       sign = RBIGNUM(item)->sign;
       len  = RBIGNUM(item)->len;
+#else
+#error unsupported RUBY_VERSION
+#endif
       header[2] = sign ? INTP_SORT : INTN_SORT;
       header[3] = sign ? len : UCHAR_MAX - len;
       rb_str_cat(data, (char*)&header, sizeof(header));
 
+#if defined(RUBY_1_9_x)
+      digits = RBIGNUM_DIGITS(item);
+#elif defined(RUBY_1_8_x)
       digits = BDIGITS(item);
+#else
+#error unsupported RUBY_VERSION
+#endif
       for (j = len-1; j >= 0; j--) {
         digit = htonl(sign ? digits[j] : (UINT_MAX - digits[j]));
         rb_str_cat(data, (char*)&digit, sizeof(digit));
@@ -138,14 +158,21 @@ static VALUE tuple_dump(VALUE self, VALUE tuple) {
 }
 
 static VALUE empty_bignum(int sign, int len) {
+#if defined(RUBY_1_9_x)
+  return rb_big_new(len, sign);
+#elif defined(RUBY_1_8_x)
   /* Create an empty bignum with the right number of digits. */
   NEWOBJ(num, struct RBignum);
   OBJSETUP(num, rb_cBignum, T_BIGNUM);
+
   num->sign = sign ? 1 : 0;
   num->len = len;
   num->digits = ALLOC_N(BDIGIT, len);
 
   return (VALUE)num;
+#else
+#error unsupported RUBY_VERSION
+#endif
 }
 
 static VALUE tuple_parse(void **data, int data_len) {
@@ -172,7 +199,13 @@ static VALUE tuple_parse(void **data, int data_len) {
       len   = sign ? header[3] : (UCHAR_MAX - header[3]);
 
       item = empty_bignum(sign, len);
+#if defined(RUBY_1_9_x)
+      digits = RBIGNUM_DIGITS(item);
+#elif defined(RUBY_1_8_x)
       digits = BDIGITS(item);
+#else
+#error unsupported RUBY_VERSION
+#endif
       for (i = len-1; i >= 0; i--) {
         digit = ntohl(*(u_int32_t*)ptr);
         digits[i] = sign ? digit : UINT_MAX - digit;

metadata

@@ -1,62 +1,54 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tuple
-version: !ruby/object:Gem::Version 
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.1.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Justin Balthrop
+- Ash Moran
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-11-20 00:00:00 -08:00
-default_executable: 
+date: 2011-08-24 00:00:00.000000000Z
 dependencies: []
-
 description: Fast, binary-sortable serialization for arrays of simple Ruby types.
 email: code@justinbalthrop.com
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - README.rdoc
 - ext/extconf.rb
 - ext/tuple.c
 - test/test_helper.rb
 - test/tuple_test.rb
 - LICENSE
-has_rdoc: true
 homepage: http://github.com/ninjudd/tuple
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+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: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Tuple serialization functions.
-test_files: 
-- test/test_helper.rb
-- test/tuple_test.rb
+test_files: []