ext gem conf

ext/.gitignore

@@ -0,0 +1,4 @@
+Makefile
+.bundle
+.o
+.so

ext/extconf.rb

@@ -4,46 +4,7 @@
 extension_name = 'ruby_cpickle'
 dir_config extension_name
 
-LIBDIR = Config::CONFIG['libdir']
-INCLUDEDIR = Config::CONFIG['includedir']
 
-HEADER_DIRS = [
-  # First search /opt/local for macports
-  '/opt/local/include',
-
-  # Then search /usr/local for people that installed from source
-  '/usr/local/include',
-
-  # Check the ruby install locations
-  INCLUDEDIR,
-
-  # Finally fall back to /usr
-  '/usr/include',
-  '/usr/include/libxml2',
-]
-
-LIB_DIRS = [
-  # First search /opt/local for macports
-  '/opt/local/lib',
-
-  # Then search /usr/local for people that installed from source
-  '/usr/local/lib',
-
-  # Check the ruby install locations
-  LIBDIR,
-
-  # Finally fall back to /usr
-  '/usr/lib',
-]
-
-XML2_HEADER_DIRS = [
-  '/opt/local/include/libxml2',
-  '/usr/local/include/libxml2',
-  File.join(INCLUDEDIR, "libxml2")
-] + HEADER_DIRS
-
-dir_config('iconv', HEADER_DIRS, LIB_DIRS)
-have_func('iconv_open', 'iconv.h') or have_library('iconv', 'iconv_open', 'iconv.h')
 
 create_makefile extension_name
 

ext/ruby_cpickle.c

@@ -2,22 +2,24 @@
 #include <ruby.h> 
 #include <stdio.h>
 #include "util.h"
-#include <iconv.h>
 
 // Array to hold function pointers to all operations
 static void(*dispatch[256])(VirtualMachine*, VALUE) = {};
 
 // Hold a global Marker
 static VALUE Marker;
 
-static iconv_t iconv_cd;
-
 uchar read_one(VALUE stream) {
   VALUE byte = rb_funcall(stream, meth_read, 0);
 
   return NUM2CHR(byte);
 }
 
+VALUE pack_to_utf8(VALUE ary) {
+  VALUE unicode = rb_str_new2("U*");
+  return rb_funcall(ary, meth_pack, 1, unicode);
+}
+
 VALUE read_to_nl(VALUE stream) {
   VALUE string = rb_ary_new();
 
@@ -28,7 +30,7 @@ VALUE read_to_nl(VALUE stream) {
     buf = read_one(stream);
   }
 
-  string = rb_funcall(string, meth_pack, 1, rb_str_new2("U*"));
+  string = pack_to_utf8(string);
   return string;
 }
 
@@ -153,7 +155,6 @@ static void dispatcher(VirtualMachine *vm, uchar op_code, VALUE stream) {
 }
 
 static VALUE reader(VALUE self) {
-  iconv_cd = iconv_open("UTF-8", "UTF-16");
   VALUE stream = rb_iv_get(self, "@stream");
   rb_funcall(stream, meth_rewind, 0);
 
@@ -167,7 +168,6 @@ static VALUE reader(VALUE self) {
   }
   VALUE retval = vmpop(vm);
 
-  iconv_close(iconv_cd);
   // free_vm(vm);
   return retval;
 }
@@ -463,7 +463,7 @@ static void load_unicode(VirtualMachine *vm, VALUE stream) {
     buf = read_one(stream);
   }
 
-  VALUE string = rb_funcall(bytes, meth_pack, 1, rb_str_new2("U*"));
+  VALUE string = pack_to_utf8(bytes);
   vmpush(vm, string);
 }
 

ruby_pickle.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-
+  s.extensions << 'ext/extconf.rb'
+
   s.add_dependency "activesupport", ">= 3.0.0"
 
   s.add_development_dependency 'yard'

spec/pickler/basic_types_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module RubyPickle
-  describe Unpickler do
+  describe Pickler do
     include SpecHelper
 
     it 'pickles Integers' do