zipruby 0.1.2-mswin32 → 0.2.0-mswin32

data/README.txt

@@ -43,7 +43,24 @@ https://rubyforge.org/frs/?group_id=6124
     
       # Zip::Archive includes Enumerable
       entry_names = ar.map do |f|
-        f.naem
+        f.name
+      end
+    end
+    
+    # read huge entry
+    BUFSIZE = 8192
+    
+    Zip::Archive.open('filename.zip') do |ar|
+      ar.each do |f|
+        buf = ''
+    
+        while chunk = f.read(BUFSIZE)
+          buf << chunk
+        end
+        # or
+        # f.read do |chunk|
+        #   buf << chunk
+        # end
       end
     end
 
@@ -62,6 +79,20 @@ https://rubyforge.org/frs/?group_id=6124
       # add file to zip archive from buffer
       ar.add_buffer('zoo.txt', 'Hello, world!')
     end
+    
+    # include directory in zip archive
+    Zip::Archive.open('filename.zip') do |ar|
+      ar.add_file('dirname/foo.txt', 'foo.txt')
+          # args: <entry name>,      <source>
+    
+      open('bar.txt') do |f|
+        ar.add_filep('dirname/bar.txt', f)
+             # args: <entry name>,      <source>
+      end
+    
+      ar.add_buffer('dirname/zoo.txt', 'Hello, world!')
+            # args: <entry name>,      <source>
+    end
 
 === modifying zip archives
 
@@ -83,13 +114,28 @@ https://rubyforge.org/frs/?group_id=6124
       ar.add_or_replace_file(3, 'foo.txt')
     end
     
-    # ar1 imports ar2 entries
+    # append comment    
+    Zip::Archive.open('filename.zip') do |ar|
+      ar.comment = <<-EOS
+        jugem jugem gokou no surikere
+        kaijari suigyo no
+        suigyoumatsu unraimatsu furaimatsu
+      EOS
+    end
+    
+    # ar1 import ar2 entries
     Zip::Archive.open('ar1.zip') do |ar1|
       Zip::Archive.open('ar2.zip') do |ar2|
         ar1.update(ar2)
       end
     end
 
+=== decrypt zip archives
+
+    require 'zipruby'
+    
+    Zip::Archive.decrypt('filename.zip', 'password')
+
 == License
     Copyright (c) 2008 SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
     All rights reserved.

data/zipruby.c

@@ -28,6 +28,7 @@ void Init_zipruby() {
 static VALUE zipruby_archive_alloc(VALUE klass);
 static void zipruby_archive_free(struct zipruby_archive *p);
 static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self);
+static VALUE zipruby_archive_s_decrypt(VALUE self, VALUE path, VALUE password);
 static VALUE zipruby_archive_close(VALUE self);
 static VALUE zipruby_archive_num_files(VALUE self);
 static VALUE zipruby_archive_get_name(int argc, VALUE *argv, VALUE self);
@@ -67,6 +68,7 @@ void Init_zipruby_archive() {
   rb_define_alloc_func(Archive, zipruby_archive_alloc);
   rb_include_module(Archive, rb_mEnumerable);
   rb_define_singleton_method(Archive, "open", zipruby_archive_s_open, -1);
+  rb_define_singleton_method(Archive, "decrypt", zipruby_archive_s_decrypt, 2);
   rb_define_method(Archive, "close", zipruby_archive_close, 0);
   rb_define_method(Archive, "num_files", zipruby_archive_num_files, 0);
   rb_define_method(Archive, "get_name", zipruby_archive_get_name, -1);
@@ -150,7 +152,27 @@ static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self) {
   } else {
     return archive;
   }
-};
+}
+
+/* */
+static VALUE zipruby_archive_s_decrypt(VALUE self, VALUE path, VALUE password) {
+  int errorp, wrongpwd;
+
+  Check_Type(path, T_STRING);
+  Check_Type(password, T_STRING);
+
+  if (zip_decrypt(StringValuePtr(path), StringValuePtr(password), RSTRING(password)->len, &errorp, &wrongpwd) == -1) {
+    if (wrongpwd) {
+      rb_raise(Error, "Decrypt archive failed - %s: Wrong password", StringValuePtr(path));
+    } else {
+      char errstr[ERRSTR_BUFSIZE];
+      zip_error_to_str(errstr, ERRSTR_BUFSIZE, errorp, errno);
+      rb_raise(Error, "Decrypt archive failed - %s: %s", StringValuePtr(path), errstr);
+    }
+  }
+
+  return Qnil;
+}
 
 /* */
 static VALUE zipruby_archive_close(VALUE self) {
@@ -288,7 +310,11 @@ static VALUE zipruby_archive_replace_buffer(VALUE self, VALUE index, VALUE sourc
   Check_Archive(p_archive);
 
   len = RSTRING(source)->len;
-  data = malloc(len);
+
+  if ((data = malloc(len)) == NULL) {
+    rb_raise(rb_eRuntimeError, "Replace file failed: Cannot allocate memory");
+  }
+
   memcpy(data, StringValuePtr(source), len);
 
   if ((zsource = zip_source_buffer(p_archive->archive, data, len, 1)) == NULL) {
@@ -825,13 +851,15 @@ void Init_zipruby_error() {
 #include "zipruby_stat.h"
 #include "ruby.h"
 
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+
 static VALUE zipruby_file(VALUE klass);
 static VALUE zipruby_file_alloc(VALUE klass);
 static void zipruby_file_mark(struct zipruby_file *p);
 static void zipruby_file_free(struct zipruby_file *p);
 static VALUE zipruby_file_initialize(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_file_close(VALUE self);
-static VALUE zipruby_file_read(VALUE self);
+static VALUE zipruby_file_read(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_file_stat(VALUE self);
 static VALUE zipruby_file_get_comment(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_file_set_comment(VALUE self, VALUE comment);
@@ -858,7 +886,7 @@ void Init_zipruby_file() {
   rb_define_alloc_func(File, zipruby_file_alloc);
   rb_define_method(File, "initialize", zipruby_file_initialize, -1);
   rb_define_method(File, "close", zipruby_file_close, 0);
-  rb_define_method(File, "read", zipruby_file_read, 0);
+  rb_define_method(File, "read", zipruby_file_read, -1);
   rb_define_method(File, "stat", zipruby_file_stat, 0);
   rb_define_method(File, "get_comment", zipruby_file_get_comment, -1);
   rb_define_method(File, "comment", zipruby_file_get_comment, -1);
@@ -974,27 +1002,55 @@ static VALUE zipruby_file_close(VALUE self) {
 }
 
 /* */
-static VALUE zipruby_file_read(VALUE self) {
+static VALUE zipruby_file_read(int argc, VALUE *argv, VALUE self) {
+  VALUE size, retval = Qnil;
   struct zipruby_file *p_file;
   struct zip_stat sb;
-  char *buf;
+  int block_given;
+  size_t bytes_left;
+  char buf[DATA_BUFSIZE];
+  ssize_t n;
 
+  rb_scan_args(argc, argv, "01", &size);
   Data_Get_Struct(self, struct zipruby_file, p_file);
   Check_File(p_file);
-
   zip_stat_init(&sb);
 
   if (zip_stat_index(p_file->archive, p_file->sb->index, 0, &sb)) {
     rb_raise(Error, "Read file failed: %s", zip_strerror(p_file->archive));
   }
 
-  buf = alloca(sb.size);
-  
-  if (zip_fread(p_file->file, buf, sb.size) == -1) {
+  if (NIL_P(size)) {
+    bytes_left = sb.size;
+  } else {
+    bytes_left = NUM2LONG(size);
+  }
+
+  if (bytes_left <= 0) {
+    return Qnil;
+  }
+
+  block_given = rb_block_given_p();
+
+  while ((n = zip_fread(p_file->file, buf, MIN(bytes_left, sizeof(buf)))) > 0) {
+    if (block_given) {
+      rb_yield(rb_str_new(buf, n));
+    } else {
+      if (NIL_P(retval)) {
+        retval = rb_str_new(buf, n);
+      } else {
+        rb_str_buf_cat(retval, buf, n);
+      }
+    }
+
+    bytes_left -= n;
+  }
+
+  if (n == -1) {
     rb_raise(Error, "Read file failed: %s", zip_file_strerror(p_file->file));
   }
 
-  return rb_str_new(buf, sb.size);
+  return retval;
 }
 
 /* */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zipruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: mswin32
 authors: 
 - winebarrel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-26 00:00:00 +09:00
+date: 2008-04-30 00:00:00 +09:00
 default_executable: 
 dependencies: []