zipruby 0.3.4 → 0.3.5

data/README.txt

@@ -72,6 +72,7 @@ https://rubyforge.org/frs/?group_id=6124
     
     Zip::Archive.open('filename.zip', Zip::CREATE) do |ar|
       # if overwrite: ..., Zip::CREATE | Zip::TRUNC) do |ar|
+      # specifies compression level: ..., Zip::CREATE, Zip::BEST_SPEED) do |ar|
     
         ar.add_file('foo.txt') # add file to zip archive
     
@@ -183,6 +184,10 @@ https://rubyforge.org/frs/?group_id=6124
     Zip::Archive.open_buffer(buf, Zip::CREATE) do |ar|
       ar.add_buffer('bar.txt', 'zoo');
     end
+
+    buf2 = Zip::Archive.open_buffer(Zip::CREATE) do |ar|
+      ar.add_buffer('bar.txt', 'zoo');
+    end
     
     Zip::Archive.open_buffer(buf) do |ar|
       ar.each do |f|

data/ext/zip_close.c

@@ -55,8 +55,11 @@
 static int add_data(struct zip *, int, struct zip_dirent *, FILE *);
 static int add_data_comp(zip_source_callback, void *, struct zip_stat *,
 			 FILE *, struct zip_error *);
+// modified for Zip/Ruby by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+//static int add_data_uncomp(zip_source_callback, void *, struct zip_stat *,
+//			   FILE *, struct zip_error *);
 static int add_data_uncomp(zip_source_callback, void *, struct zip_stat *,
-			   FILE *, struct zip_error *);
+			   FILE *, struct zip_error *, int comp_level);
 static void ch_set_error(struct zip_error *, zip_source_callback, void *);
 // modified for Zip/Ruby by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
 //static int copy_data(FILE *, off_t, FILE *, struct zip_error *);
@@ -297,7 +300,7 @@ add_data(struct zip *za, int idx, struct zip_dirent *de, FILE *ft)
 	    return -1;
     }
     else {
-	if (add_data_uncomp(cb, ud, &st, ft, &za->error) < 0)
+	if (add_data_uncomp(cb, ud, &st, ft, &za->error, za->comp_level) < 0)
 	    return -1;
     }
 
@@ -358,9 +361,13 @@ add_data_comp(zip_source_callback cb, void *ud, struct zip_stat *st,FILE *ft,
 
 
 
+// modified for Zip/Ruby by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+//static int
+//add_data_uncomp(zip_source_callback cb, void *ud, struct zip_stat *st,
+//		FILE *ft, struct zip_error *error)
 static int
 add_data_uncomp(zip_source_callback cb, void *ud, struct zip_stat *st,
-		FILE *ft, struct zip_error *error)
+		FILE *ft, struct zip_error *error, int comp_level)
 {
     char b1[BUFSIZE], b2[BUFSIZE];
     int end, flush, ret;
@@ -379,7 +386,9 @@ add_data_uncomp(zip_source_callback cb, void *ud, struct zip_stat *st,
     zstr.avail_out = 0;
 
     /* -15: undocumented feature of zlib to _not_ write a zlib header */
-    deflateInit2(&zstr, Z_BEST_COMPRESSION, Z_DEFLATED, -15, 9,
+    // modified for Zip/Ruby by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+    //deflateInit2(&zstr, Z_BEST_COMPRESSION, Z_DEFLATED, -15, 9,
+    deflateInit2(&zstr, comp_level, Z_DEFLATED, -15, 9,
 		 Z_DEFAULT_STRATEGY);
 
     zstr.next_out = (Bytef *)b2;

data/ext/zip_new.c

@@ -66,6 +66,7 @@ _zip_new(struct zip_error *error)
     za->entry = NULL;
     za->nfile = za->nfile_alloc = 0;
     za->file = NULL;
+    za->comp_level = Z_BEST_COMPRESSION;
     
     return za;
 }

data/ext/zipint.h

@@ -112,6 +112,8 @@ struct zip {
     int nfile;			/* number of opened files within archive */
     int nfile_alloc;		/* number of files allocated */
     struct zip_file **file;	/* opened files within archive */
+    // modified for Zip/Ruby by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+    int comp_level;
 };
 
 /* file in zip archive, part of API */

data/ext/zipruby.h

@@ -21,7 +21,7 @@
 
 #define TIME2LONG(v) NUM2LONG(rb_funcall((v), rb_intern("tv_sec"), 0))
 
-#define VERSION "0.3.4"
+#define VERSION "0.3.5"
 #define ERRSTR_BUFSIZE 256
 #define DATA_BUFSIZE 8192
 

data/ext/zipruby_archive.c

@@ -1,6 +1,8 @@
 #include <errno.h>
+#include <zlib.h>
 
 #include "zip.h"
+#include "zipint.h"
 #include "zipruby.h"
 #include "zipruby_archive.h"
 #include "zipruby_zip_source_proc.h"
@@ -140,19 +142,28 @@ static void zipruby_archive_free(struct zipruby_archive *p) {
 
 /* */
 static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self) {
-  VALUE path, flags;
+  VALUE path, flags, comp_level;
   VALUE archive;
   struct zipruby_archive *p_archive;
   int i_flags = 0;
   int errorp;
+  int i_comp_level = Z_BEST_COMPRESSION;
 
-  rb_scan_args(argc, argv, "11", &path, &flags);
+  rb_scan_args(argc, argv, "12", &path, &flags, &comp_level);
   Check_Type(path, T_STRING);
 
   if (!NIL_P(flags)) {
     i_flags = NUM2INT(flags);
   }
 
+  if (!NIL_P(comp_level)) {
+    i_comp_level = NUM2INT(comp_level);
+
+    if (i_comp_level != Z_DEFAULT_COMPRESSION && i_comp_level != Z_NO_COMPRESSION && (i_comp_level < Z_BEST_SPEED || Z_BEST_COMPRESSION < i_comp_level)) {
+      rb_raise(rb_eArgError, "Wrong compression level %d", i_comp_level);
+    }
+  }
+
   archive = rb_funcall(Archive, rb_intern("new"), 0);
   Data_Get_Struct(archive, struct zipruby_archive, p_archive);
 
@@ -162,6 +173,7 @@ static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self) {
     rb_raise(Error, "Open archive failed - %s: %s", RSTRING_PTR(path), errstr);
   }
 
+  p_archive->archive->comp_level = i_comp_level;
   p_archive->path = path;
   p_archive->flags = i_flags;
   p_archive->sources = rb_ary_new();
@@ -185,16 +197,19 @@ static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self) {
 
 /* */
 static VALUE zipruby_archive_s_open_buffer(int argc, VALUE *argv, VALUE self) {
-  VALUE buffer, flags;
+  VALUE buffer, flags, comp_level;
   VALUE archive;
   struct zipruby_archive *p_archive;
   void *data = NULL;
   int len = 0, i_flags = 0;
   int errorp;
+  int i_comp_level = Z_BEST_COMPRESSION;
+  int buffer_is_temporary = 0;
 
-  rb_scan_args(argc, argv, "02", &buffer, &flags);
+  rb_scan_args(argc, argv, "03", &buffer, &flags, &comp_level);
 
-  if (FIXNUM_P(buffer) && NIL_P(flags)) {
+  if (FIXNUM_P(buffer) && NIL_P(comp_level)) {
+    comp_level = flags;
     flags = buffer;
     buffer = Qnil;
   }
@@ -203,9 +218,20 @@ static VALUE zipruby_archive_s_open_buffer(int argc, VALUE *argv, VALUE self) {
     i_flags = NUM2INT(flags);
   }
 
+  if (!NIL_P(comp_level)) {
+    i_comp_level = NUM2INT(comp_level);
+
+    if (i_comp_level != Z_DEFAULT_COMPRESSION && i_comp_level != Z_NO_COMPRESSION && (i_comp_level < Z_BEST_SPEED || Z_BEST_COMPRESSION < i_comp_level)) {
+      rb_raise(rb_eArgError, "Wrong compression level %d", i_comp_level);
+    }
+  }
+
   if (i_flags & ZIP_CREATE) {
     if (!NIL_P(buffer)) {
       Check_Type(buffer, T_STRING);
+    } else {
+      buffer = rb_str_new("", 0);
+      buffer_is_temporary = 1;
     }
 
     i_flags = (i_flags | ZIP_TRUNC);
@@ -232,6 +258,7 @@ static VALUE zipruby_archive_s_open_buffer(int argc, VALUE *argv, VALUE self) {
     rb_raise(Error, "Open archive failed: %s", errstr);
   }
 
+  p_archive->archive->comp_level = i_comp_level;
   p_archive->path = rb_str_new2(p_archive->tmpfilnam);
   p_archive->flags = i_flags;
   p_archive->buffer = buffer;
@@ -248,7 +275,7 @@ static VALUE zipruby_archive_s_open_buffer(int argc, VALUE *argv, VALUE self) {
       rb_jump_tag(status);
     }
 
-    return retval;
+    return buffer_is_temporary ? buffer : retval;
   } else {
     return archive;
   }

data/ext/zipruby_zip.c

@@ -1,3 +1,5 @@
+#include <zlib.h>
+
 #include "ruby.h"
 #include "zip.h"
 #include "zipruby.h"
@@ -35,4 +37,9 @@ void Init_zipruby_zip() {
   rb_define_const(Zip, "EM_NONE",        INT2NUM(ZIP_EM_NONE));
   rb_define_const(Zip, "EM_TRAD_PKWARE", INT2NUM(ZIP_EM_TRAD_PKWARE));
   // XXX: Strong Encryption Header not parsed yet
+
+  rb_define_const(Zip, "NO_COMPRESSION",      INT2NUM(Z_NO_COMPRESSION));
+  rb_define_const(Zip, "BEST_SPEED",          INT2NUM(Z_BEST_SPEED));
+  rb_define_const(Zip, "BEST_COMPRESSION",    INT2NUM(Z_BEST_COMPRESSION));
+  rb_define_const(Zip, "DEFAULT_COMPRESSION", INT2NUM(Z_DEFAULT_COMPRESSION));
 }

data/zipruby.c

@@ -193,8 +193,10 @@ void Init_zipruby() {
   Init_zipruby_error();
 }
 #include <errno.h>
+#include <zlib.h>
 
 #include "zip.h"
+#include "zipint.h"
 #include "zipruby.h"
 #include "zipruby_archive.h"
 #include "zipruby_zip_source_proc.h"
@@ -334,19 +336,28 @@ static void zipruby_archive_free(struct zipruby_archive *p) {
 
 /* */
 static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self) {
-  VALUE path, flags;
+  VALUE path, flags, comp_level;
   VALUE archive;
   struct zipruby_archive *p_archive;
   int i_flags = 0;
   int errorp;
+  int i_comp_level = Z_BEST_COMPRESSION;
 
-  rb_scan_args(argc, argv, "11", &path, &flags);
+  rb_scan_args(argc, argv, "12", &path, &flags, &comp_level);
   Check_Type(path, T_STRING);
 
   if (!NIL_P(flags)) {
     i_flags = NUM2INT(flags);
   }
 
+  if (!NIL_P(comp_level)) {
+    i_comp_level = NUM2INT(comp_level);
+
+    if (i_comp_level != Z_DEFAULT_COMPRESSION && i_comp_level != Z_NO_COMPRESSION && (i_comp_level < Z_BEST_SPEED || Z_BEST_COMPRESSION < i_comp_level)) {
+      rb_raise(rb_eArgError, "Wrong compression level %d", i_comp_level);
+    }
+  }
+
   archive = rb_funcall(Archive, rb_intern("new"), 0);
   Data_Get_Struct(archive, struct zipruby_archive, p_archive);
 
@@ -356,6 +367,7 @@ static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self) {
     rb_raise(Error, "Open archive failed - %s: %s", RSTRING_PTR(path), errstr);
   }
 
+  p_archive->archive->comp_level = i_comp_level;
   p_archive->path = path;
   p_archive->flags = i_flags;
   p_archive->sources = rb_ary_new();
@@ -379,16 +391,19 @@ static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self) {
 
 /* */
 static VALUE zipruby_archive_s_open_buffer(int argc, VALUE *argv, VALUE self) {
-  VALUE buffer, flags;
+  VALUE buffer, flags, comp_level;
   VALUE archive;
   struct zipruby_archive *p_archive;
   void *data = NULL;
   int len = 0, i_flags = 0;
   int errorp;
+  int i_comp_level = Z_BEST_COMPRESSION;
+  int buffer_is_temporary = 0;
 
-  rb_scan_args(argc, argv, "02", &buffer, &flags);
+  rb_scan_args(argc, argv, "03", &buffer, &flags, &comp_level);
 
-  if (FIXNUM_P(buffer) && NIL_P(flags)) {
+  if (FIXNUM_P(buffer) && NIL_P(comp_level)) {
+    comp_level = flags;
     flags = buffer;
     buffer = Qnil;
   }
@@ -397,9 +412,20 @@ static VALUE zipruby_archive_s_open_buffer(int argc, VALUE *argv, VALUE self) {
     i_flags = NUM2INT(flags);
   }
 
+  if (!NIL_P(comp_level)) {
+    i_comp_level = NUM2INT(comp_level);
+
+    if (i_comp_level != Z_DEFAULT_COMPRESSION && i_comp_level != Z_NO_COMPRESSION && (i_comp_level < Z_BEST_SPEED || Z_BEST_COMPRESSION < i_comp_level)) {
+      rb_raise(rb_eArgError, "Wrong compression level %d", i_comp_level);
+    }
+  }
+
   if (i_flags & ZIP_CREATE) {
     if (!NIL_P(buffer)) {
       Check_Type(buffer, T_STRING);
+    } else {
+      buffer = rb_str_new("", 0);
+      buffer_is_temporary = 1;
     }
 
     i_flags = (i_flags | ZIP_TRUNC);
@@ -426,6 +452,7 @@ static VALUE zipruby_archive_s_open_buffer(int argc, VALUE *argv, VALUE self) {
     rb_raise(Error, "Open archive failed: %s", errstr);
   }
 
+  p_archive->archive->comp_level = i_comp_level;
   p_archive->path = rb_str_new2(p_archive->tmpfilnam);
   p_archive->flags = i_flags;
   p_archive->buffer = buffer;
@@ -442,7 +469,7 @@ static VALUE zipruby_archive_s_open_buffer(int argc, VALUE *argv, VALUE self) {
       rb_jump_tag(status);
     }
 
-    return retval;
+    return buffer_is_temporary ? buffer : retval;
   } else {
     return archive;
   }
@@ -2262,6 +2289,8 @@ VALUE zipruby_stat_is_directory(VALUE self) {
     return Qfalse;
   }
 }
+#include <zlib.h>
+
 #include "ruby.h"
 #include "zip.h"
 #include "zipruby.h"
@@ -2299,6 +2328,11 @@ void Init_zipruby_zip() {
   rb_define_const(Zip, "EM_NONE",        INT2NUM(ZIP_EM_NONE));
   rb_define_const(Zip, "EM_TRAD_PKWARE", INT2NUM(ZIP_EM_TRAD_PKWARE));
   // XXX: Strong Encryption Header not parsed yet
+
+  rb_define_const(Zip, "NO_COMPRESSION",      INT2NUM(Z_NO_COMPRESSION));
+  rb_define_const(Zip, "BEST_SPEED",          INT2NUM(Z_BEST_SPEED));
+  rb_define_const(Zip, "BEST_COMPRESSION",    INT2NUM(Z_BEST_COMPRESSION));
+  rb_define_const(Zip, "DEFAULT_COMPRESSION", INT2NUM(Z_DEFAULT_COMPRESSION));
 }
 #include <string.h>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zipruby
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - winebarrel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 +09:00
+date: 2010-01-24 00:00:00 +09:00
 default_executable: 
 dependencies: []