zipruby 0.2.8 → 0.2.9

data/README.txt

@@ -73,7 +73,7 @@ https://rubyforge.org/frs/?group_id=6124
     
       # add file to zip archive from File object
       open('bar.txt') do |f|
-        ar << f # or ar.add_filep(f)
+        ar << f # or ar.add_io(f)
       end
     
       # add file to zip archive from buffer
@@ -86,7 +86,7 @@ https://rubyforge.org/frs/?group_id=6124
           # args: <entry name>,      <source>
     
       open('bar.txt') do |f|
-        ar.add_filep('dirname/bar.txt', f)
+        ar.add_io('dirname/bar.txt', f)
              # args: <entry name>,      <source>
       end
     
@@ -114,7 +114,7 @@ https://rubyforge.org/frs/?group_id=6124
     
       # replace file in zip archive with File object
       open('bar.txt') do |f|
-        ar.replace_filep(1, f)
+        ar.replace_io(1, f)
       end
       
       # if commit changes
@@ -165,6 +165,39 @@ https://rubyforge.org/frs/?group_id=6124
     #   ar.decrypt('filename.zip', 'password')
     # end
 
+=== modifying zip data in memory
+
+    require 'zipruby'
+    
+    $stdout.binmode
+    
+    buf = ''
+    
+    Zip::Archive.open_buffer(buf, Zip::CREATE) do |ar|
+      ar.add_buffer('bar.txt', 'zoo');
+    end
+    
+    Zip::Archive.open_buffer(buf) do |ar|
+      ar.each do |f|
+        puts f.name
+      end
+    end
+
+    # read from stream    
+    zip_data = open('foo.zip').raed
+    stream = lambda { return !zip_data.slice(0, 256) }
+    
+    Zip::Archive.open_buffer(stream) do |ar|
+      puts ar.num_files
+    end
+    
+    # output huge zip data to stdout
+    Zip::Archive.open_buffer(zip_data) do |ar|
+      ar.read do |chunk|
+        print chunk
+      end
+    end
+
 == License
     Copyright (c) 2008 SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
     All rights reserved.

data/ext/{libzip.vcproj.IBM-62EEBFAE94C.sugawara.user → libzip.vcproj.LENOVO-72DB7FA8.sugawara.user}

@@ -2,7 +2,7 @@
 <VisualStudioUserFile
 	ProjectType="Visual C++"
 	Version="9.00"
-	ShowAllFiles="true"
+	ShowAllFiles="false"
 	>
 	<Configurations>
 		<Configuration
@@ -15,7 +15,7 @@
 				Attach="false"
 				DebuggerType="3"
 				Remote="1"
-				RemoteMachine="IBM-62EEBFAE94C"
+				RemoteMachine="LENOVO-72DB7FA8"
 				RemoteCommand=""
 				HttpUrl=""
 				PDBPath=""

data/ext/tmpfile.c

@@ -150,16 +150,16 @@ static int write_from_proc(VALUE proc, int fd) {
       break;
     }
 
-    if (RSTRING(src)->len < 1) {
+    if (RSTRING_LEN(src) < 1) {
       break;
     }
 
 #ifdef _WIN32
-    if (_write(fd, StringValuePtr(src), RSTRING(src)->len) == -1) {
+    if (_write(fd, RSTRING_PTR(src), RSTRING_LEN(src)) == -1) {
       return -1;
     }
 #else
-    if (write(fd, StringValuePtr(src), RSTRING(src)->len) == -1) {
+    if (write(fd, RSTRING_PTR(src), RSTRING_LEN(src)) == -1) {
       return -1;
     }
 #endif

data/ext/zip_crypt.c

@@ -219,6 +219,7 @@ static int copy_encrypt(FILE *src, off_t len, const char *pwd, int pwdlen, struc
 }
 
 static int _zip_crypt(struct zip *za, const char *pwd, int pwdlen, int decrypt, int *wrongpwd) {
+  int translated = 0;
   int i, error = 0;
   char *temp;
   FILE *out;
@@ -296,11 +297,13 @@ static int _zip_crypt(struct zip *za, const char *pwd, int pwdlen, int decrypt,
       de.bitflags &= ~ZIP_GPBF_ENCRYPTED;
       cd->entry[i].comp_size -= ZIPENC_HEAD_LEN;
       cd->entry[i].bitflags &= ~ZIP_GPBF_ENCRYPTED;
+      translated = 1;
     } else if (!decrypt && !encrypted) {
       de.comp_size += ZIPENC_HEAD_LEN;
       de.bitflags |= ZIP_GPBF_ENCRYPTED;
       cd->entry[i].comp_size += ZIPENC_HEAD_LEN;
       cd->entry[i].bitflags |= ZIP_GPBF_ENCRYPTED;
+      translated = 1;
     }
 
     if (_zip_dirent_write(&de, out, 1, &za->error) < 0) {
@@ -370,7 +373,7 @@ static int _zip_crypt(struct zip *za, const char *pwd, int pwdlen, int decrypt,
 #endif
 
   free(temp);
-  return 0;
+  return translated;
 }
 
 int zip_decrypt(const char *path, const char *pwd, int pwdlen, int *errorp, int *wrongpwd) {

data/ext/zipruby.h

@@ -1,7 +1,22 @@
 #ifndef __ZIPRUBY_H__
 #define __ZIPRUBY_H__
 
-#define VERSION "0.2.8"
+#include "ruby.h"
+
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+
+#define Check_IO(x) do { \
+  if (!rb_obj_is_instance_of((x), rb_cIO)) { \
+    rb_raise(rb_eTypeError, "wrong argument type %s (expected IO)", rb_class2name(CLASS_OF(x))); \
+  } \
+} while(0)
+
+#define VERSION "0.2.9"
 #define ERRSTR_BUFSIZE 256
 #define DATA_BUFSIZE 8192