zipruby 0.3.2 → 0.3.3

data/ChangeLog

@@ -1,3 +1,11 @@
+2010-01-23 winebarrel
+
+   * fixes bug: [ruby-dev:40120] SEGV on zipruby with irb
+
+2009-06-11 winebarrel
+
+   * fixes bug: C macro mistake (reported by SHITAMORI Akira)
+
 2009-05-16 winebarrel
 
 	* improve Zip::Archive#add_io, replace_io, add, replace

data/README.txt

@@ -1,6 +1,6 @@
 = Zip/Ruby
 
-Copyright (c) 2008 SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+Copyright (c) 2008-2010 SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
 
 == Description
 
@@ -86,6 +86,7 @@ https://rubyforge.org/frs/?group_id=6124
     
     # include directory in zip archive
     Zip::Archive.open('filename.zip') do |ar|
+      ar.add_dir('dirname')
       ar.add_file('dirname/foo.txt', 'foo.txt')
           # args: <entry name>     ,  <source>
     

data/ext/zipruby_archive.c

@@ -118,6 +118,7 @@ static VALUE zipruby_archive_alloc(VALUE klass) {
   p->flags = 0;
   p->tmpfilnam = NULL;
   p->buffer = Qnil;
+  p->sources = Qnil;
 
   return Data_Wrap_Struct(klass, zipruby_archive_mark, zipruby_archive_free, p);
 }
@@ -125,6 +126,7 @@ static VALUE zipruby_archive_alloc(VALUE klass) {
 static void zipruby_archive_mark(struct zipruby_archive *p) {
   rb_gc_mark(p->path);
   rb_gc_mark(p->buffer);
+  rb_gc_mark(p->sources);
 }
 
 static void zipruby_archive_free(struct zipruby_archive *p) {
@@ -162,6 +164,7 @@ static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self) {
 
   p_archive->path = path;
   p_archive->flags = i_flags;
+  p_archive->sources = rb_ary_new();
 
   if (rb_block_given_p()) {
     VALUE retval;
@@ -232,6 +235,7 @@ static VALUE zipruby_archive_s_open_buffer(int argc, VALUE *argv, VALUE self) {
   p_archive->path = rb_str_new2(p_archive->tmpfilnam);
   p_archive->flags = i_flags;
   p_archive->buffer = buffer;
+  p_archive->sources = rb_ary_new();
 
   if (rb_block_given_p()) {
     VALUE retval;
@@ -683,6 +687,7 @@ static VALUE zipruby_archive_add_io(int argc, VALUE *argv, VALUE self) {
   }
 
   z->io = file;
+  rb_ary_push(p_archive->sources, file);
   z->mtime = TIME2LONG(mtime);
 
   if ((zsource = zip_source_io(p_archive->archive, z)) == NULL) {
@@ -745,6 +750,7 @@ static VALUE zipruby_archive_replace_io(int argc, VALUE *argv, VALUE self) {
   }
 
   z->io = file;
+  rb_ary_push(p_archive->sources, file);
   z->mtime = TIME2LONG(mtime);
 
   if ((zsource = zip_source_io(p_archive->archive, z)) == NULL) {
@@ -817,6 +823,7 @@ static VALUE zipruby_archive_add_function(int argc, VALUE *argv, VALUE self) {
   }
 
   z->proc = rb_block_proc();
+  rb_ary_push(p_archive->sources, z->proc);
   z->mtime = TIME2LONG(mtime);
 
   if ((zsource = zip_source_proc(p_archive->archive, z)) == NULL) {
@@ -875,6 +882,7 @@ static VALUE zipruby_archive_replace_function(int argc, VALUE *argv, VALUE self)
   }
 
   z->proc = rb_block_proc();
+  rb_ary_push(p_archive->sources, z->proc);
   z->mtime = TIME2LONG(mtime);
 
   if ((zsource = zip_source_proc(p_archive->archive, z)) == NULL) {

data/ext/zipruby_archive.h

@@ -10,6 +10,7 @@ struct zipruby_archive {
   int flags;
   char *tmpfilnam;
   VALUE buffer;
+  VALUE sources;
 };
 
 void Init_zipruby_archive();

data/ext/zipruby_zip_source_proc.c

@@ -41,8 +41,9 @@ static ssize_t read_proc(void *state, void *data, size_t len, enum zip_source_cm
       return -1;
     }
 
+
     if (TYPE(src) != T_STRING) {
-      return 0;
+      src = rb_funcall(src, rb_intern("to_s"), 0);
     }
 
     n = RSTRING_LEN(src);

data/zipruby.c

@@ -312,6 +312,7 @@ static VALUE zipruby_archive_alloc(VALUE klass) {
   p->flags = 0;
   p->tmpfilnam = NULL;
   p->buffer = Qnil;
+  p->sources = Qnil;
 
   return Data_Wrap_Struct(klass, zipruby_archive_mark, zipruby_archive_free, p);
 }
@@ -319,6 +320,7 @@ static VALUE zipruby_archive_alloc(VALUE klass) {
 static void zipruby_archive_mark(struct zipruby_archive *p) {
   rb_gc_mark(p->path);
   rb_gc_mark(p->buffer);
+  rb_gc_mark(p->sources);
 }
 
 static void zipruby_archive_free(struct zipruby_archive *p) {
@@ -356,6 +358,7 @@ static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self) {
 
   p_archive->path = path;
   p_archive->flags = i_flags;
+  p_archive->sources = rb_ary_new();
 
   if (rb_block_given_p()) {
     VALUE retval;
@@ -426,6 +429,7 @@ static VALUE zipruby_archive_s_open_buffer(int argc, VALUE *argv, VALUE self) {
   p_archive->path = rb_str_new2(p_archive->tmpfilnam);
   p_archive->flags = i_flags;
   p_archive->buffer = buffer;
+  p_archive->sources = rb_ary_new();
 
   if (rb_block_given_p()) {
     VALUE retval;
@@ -877,6 +881,7 @@ static VALUE zipruby_archive_add_io(int argc, VALUE *argv, VALUE self) {
   }
 
   z->io = file;
+  rb_ary_push(p_archive->sources, file);
   z->mtime = TIME2LONG(mtime);
 
   if ((zsource = zip_source_io(p_archive->archive, z)) == NULL) {
@@ -939,6 +944,7 @@ static VALUE zipruby_archive_replace_io(int argc, VALUE *argv, VALUE self) {
   }
 
   z->io = file;
+  rb_ary_push(p_archive->sources, file);
   z->mtime = TIME2LONG(mtime);
 
   if ((zsource = zip_source_io(p_archive->archive, z)) == NULL) {
@@ -1011,6 +1017,7 @@ static VALUE zipruby_archive_add_function(int argc, VALUE *argv, VALUE self) {
   }
 
   z->proc = rb_block_proc();
+  rb_ary_push(p_archive->sources, z->proc);
   z->mtime = TIME2LONG(mtime);
 
   if ((zsource = zip_source_proc(p_archive->archive, z)) == NULL) {
@@ -1069,6 +1076,7 @@ static VALUE zipruby_archive_replace_function(int argc, VALUE *argv, VALUE self)
   }
 
   z->proc = rb_block_proc();
+  rb_ary_push(p_archive->sources, z->proc);
   z->mtime = TIME2LONG(mtime);
 
   if ((zsource = zip_source_proc(p_archive->archive, z)) == NULL) {
@@ -2420,8 +2428,9 @@ static ssize_t read_proc(void *state, void *data, size_t len, enum zip_source_cm
       return -1;
     }
 
+
     if (TYPE(src) != T_STRING) {
-      return 0;
+      src = rb_funcall(src, rb_intern("to_s"), 0);
     }
 
     n = RSTRING_LEN(src);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zipruby
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - winebarrel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-12 00:00:00 +09:00
+date: 2010-01-23 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -104,6 +104,8 @@ files:
 - ChangeLog
 has_rdoc: true
 homepage: http://zipruby.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -125,9 +127,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: zipruby
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ruby bindings for libzip.
 test_files: []