rcstorable 0.2.4 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/ext/Makefile

@@ -4,23 +4,23 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin10.0
+topdir = /Users/blibbey/.rvm/rubies/ruby-1.8.7-p248/lib/ruby/1.8/i686-darwin10.2.0
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
 exec_prefix = $(prefix)
-prefix = $(DESTDIR)/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr
+prefix = $(DESTDIR)/Users/blibbey/.rvm/rubies/ruby-1.8.7-p248
 sharedstatedir = $(prefix)/com
-mandir = $(DESTDIR)/usr/share/man
+mandir = $(datarootdir)/man
 psdir = $(docdir)
 oldincludedir = $(DESTDIR)/usr/include
 localedir = $(datarootdir)/locale
 bindir = $(exec_prefix)/bin
 libexecdir = $(exec_prefix)/libexec
-sitedir = $(DESTDIR)/Library/Ruby/Site
+sitedir = $(libdir)/ruby/site_ruby
 htmldir = $(docdir)
 vendorarchdir = $(vendorlibdir)/$(sitearch)
 includedir = $(prefix)/include
-infodir = $(DESTDIR)/usr/share/info
+infodir = $(datarootdir)/info
 vendorlibdir = $(vendordir)/$(ruby_version)
 sysconfdir = $(prefix)/etc
 libdir = $(exec_prefix)/lib
@@ -38,31 +38,31 @@ localstatedir = $(prefix)/var
 sitelibdir = $(sitedir)/$(ruby_version)
 
 CC = gcc
-LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY = $(LIBRUBY_A)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)
+LIBRUBYARG_SHARED = 
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -fno-common -arch i386 -arch x86_64 -g -Os -pipe -fno-common -DENABLE_DTRACE  -fno-common  -pipe -fno-common $(cflags) 
+CFLAGS   =  -fno-common -g -O2 -pipe -fno-common $(cflags) 
 INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
 DEFS     = 
 CPPFLAGS =   -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
 CXXFLAGS = $(CFLAGS) 
-ldflags  = -L. -arch i386 -arch x86_64 
+ldflags  = -L. 
 dldflags = 
 archflag = 
 DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
-LDSHARED = cc -arch i386 -arch x86_64 -pipe -bundle -undefined dynamic_lookup
+LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
 AR = ar
 EXEEXT = 
 
 RUBY_INSTALL_NAME = ruby
 RUBY_SO_NAME = ruby
-arch = universal-darwin10.0
-sitearch = universal-darwin10.0
+arch = i686-darwin10.2.0
+sitearch = i686-darwin10.2.0
 ruby_version = 1.8
-ruby = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+ruby = /Users/blibbey/.rvm/rubies/ruby-1.8.7-p248/bin/ruby
 RUBY = $(ruby)
 RM = rm -f
 MAKEDIRS = mkdir -p
@@ -86,7 +86,7 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl  
+LIBS =   -ldl -lobjc  
 SRCS = rcstorable.c
 OBJS = rcstorable.o
 TARGET = rcstorable
@@ -148,7 +148,7 @@ site-install-rb: install-rb
 .c.o:
 	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
 
-$(DLLIB): $(OBJS)
+$(DLLIB): $(OBJS) Makefile
 	@-$(RM) $@
 	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
 

data/ext/rcstorable.c

@@ -41,6 +41,8 @@ static uchar *serialized_end;
 VALUE
 thaw(VALUE self, VALUE str)
 {
+  if (str == Qnil) return Qnil; // Do something logical with nil.
+  
   Check_Type(str, T_STRING);
   extern uchar *serialized, *serialized_end;
 
@@ -101,7 +103,7 @@ read_object()
     read_n_hash_pairs(object, size);
     break;
   case PT_INT32:
-    object = read_32_bit_integer();
+    object = INT2FIX(read_32_bit_integer());
     break;
   case PT_ARRAY:
     object = rb_ary_new();
@@ -169,6 +171,8 @@ read_string(bool extended_size)
   extern uchar *serialized;
   check_pointer(serialized);
 
+  VALUE ret;
+  
   uint32_t size = extended_size ? read_32_bit_integer() : read_compact_size();
 
   uint32_t actual_size = 0;
@@ -184,7 +188,7 @@ read_string(bool extended_size)
   }
   rem = size;
   
-  uchar *np = ALLOCA_N(char, size+1);
+  uchar *np = malloc(size+1);
   uchar *cnp = np;
   
   check_pointer(serialized+rem-1);
@@ -195,7 +199,9 @@ read_string(bool extended_size)
 
   *cnp++ = '\0';
 
-  return rb_str_new(np, size);
+  ret = rb_str_new(np, size);
+  free(np);
+  return ret;
 }
 
 /*

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rcstorable
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Burke Libbey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 -06:00
+date: 2010-01-20 00:00:00 -06:00
 default_executable: 
 dependencies: []