rjb 1.3.3-universal-darwin-10 → 1.3.4-universal-darwin-10

data/ext/rjb.c

@@ -12,10 +12,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.c 159 2010-11-16 16:35:49Z arton $
+ * $Id: rjb.c 163 2010-11-22 07:31:27Z arton $
  */
 
-#define RJB_VERSION "1.3.3"
+#define RJB_VERSION "1.3.4"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -75,6 +75,7 @@ static VALUE jarray2rv(JNIEnv* jenv, jvalue val);
 static jarray r2objarray(JNIEnv* jenv, VALUE v, const char* cls);
 static VALUE jv2rv_withprim(JNIEnv* jenv, jobject o);
 static J2R get_arrayconv(const char* cname, char* depth);
+static jarray r2barray(JNIEnv* jenv, VALUE v, const char* cls);
 
 static VALUE rjb;
 static VALUE jklass;
@@ -748,7 +749,7 @@ static void rv2jstring(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
 		    return; /* never delete at this time */
 		}
 	    }
-	}
+        }
 	(*jenv)->DeleteLocalRef(jenv, jv->l);
     }
 }
@@ -814,7 +815,11 @@ static void rv2jobject(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
 		}
 		break;
 	    case T_STRING:
-		rv2jstring(jenv, val, jv, NULL, 0);
+                if (psig && *psig == '[' && *(psig + 1) == 'B') {
+                    jv->l = r2barray(jenv, val, NULL);
+                } else {
+                    rv2jstring(jenv, val, jv, NULL, 0);
+                }
 		break;
 	    case T_FLOAT:
 		arg.d = NUM2DBL(val);
@@ -1115,6 +1120,22 @@ static void rv2jarray(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int
     }
     if (release)
     {
+        if (TYPE(val) == T_STRING && *(psig + 1) == 'B')
+        {
+            // copy array's contents into arg string
+            jsize len = (*jenv)->GetArrayLength(jenv, jv->l);
+            jbyte* p = (*jenv)->GetByteArrayElements(jenv, jv->l, NULL);
+            if (len <= RSTRING_LEN(val))
+            {
+                memcpy(StringValuePtr(val), p, len);
+            }
+            else
+            {
+                VALUE src = rb_str_new(p, len);
+                rb_str_set_len(val, 0);
+                rb_str_append(val, src);
+            }
+        }
 	(*jenv)->DeleteLocalRef(jenv, jv->l);
     }
     else
@@ -2099,7 +2120,7 @@ static int check_rtype(JNIEnv* jenv, VALUE v, char* p)
     case T_FLOAT:
 	return strchr("DF", *p) != NULL;
     case T_STRING:
-      return pcls && !strcmp("java.lang.String", pcls);
+        return pcls && !strcmp("java.lang.String", pcls) || *p == '[' && *(p + 1) == 'B';
     case T_TRUE:
     case T_FALSE:
         return *p == 'Z';
@@ -3057,11 +3078,13 @@ static VALUE rjb_class_forname(int argc, VALUE* argv, VALUE self)
  */
 void Init_rjbcore()
 {
-#if defined(RUBINIUS)
+#if RJB_RUBY_VERSION_CODE < 190
+  #if defined(RUBINIUS)
     rb_require("iconv");
-#else
+  #else
     rb_protect((VALUE(*)(VALUE))rb_require, (VALUE)"iconv", NULL);
-#endif
+  #endif
+#endif    
     rjb_loaded_classes = rb_hash_new();
 #ifndef RUBINIUS
     OBJ_FREEZE(rjb_loaded_classes);

data/samples/unzip.rb

@@ -0,0 +1,66 @@
+require 'rjb'
+
+if Rjb::VERSION < '1.3.4'
+  $stderr.puts "require rjb-1.3.4 or later, bye."
+  exit 1
+end
+
+class ZipFile
+  include Enumerable
+  Zip = Rjb::import('java.util.zip.ZipFile')
+  def initialize(file, &block)
+    @zipfile = Zip.new(file)
+    if block
+      yield self
+      @zipfile.close
+    end
+  end
+  def close
+    @zipfile.close
+  end
+  def each(&block)
+    unless block
+      Enumerator.new(self)
+    else
+      e = @zipfile.entries
+      while e.has_more_elements
+        yield e.next_element
+      end
+    end
+  end
+  def size
+    @zipfile.size
+  end
+  def unzip(ent)
+    if String === ent
+      ent = @zipfile.entry(ent)
+    end
+    is = @zipfile.input_stream(ent)
+    buff = "\0" * 4096
+    File.open(ent.name, 'wb') do |fout|
+      loop do
+        len = is.read(buff, 0, buff.size)
+        break if len < 0
+        fout.write(buff[0, len])
+      end
+      is.close
+    end
+  end
+end
+
+if __FILE__ == $0
+  if ARGV.size == 0
+    puts 'usage: ruby unzip.rb filename'
+  else
+    ARGV.each do |file|
+      ZipFile.new(file) do |zip|
+        zip.each do |f|
+          puts "#{f.name}, #{f.size}"
+          unless f.directory?
+            zip.unzip(f)
+          end
+        end
+      end
+    end
+  end
+end

data/test/test.rb

@@ -1,6 +1,6 @@
 #!/usr/local/env ruby -Ku
 # encoding: utf-8
-# $Id: test.rb 147 2010-10-23 05:10:33Z arton $
+# $Id: test.rb 161 2010-11-22 07:18:00Z arton $
 
 begin
   require 'rjb'
@@ -750,5 +750,15 @@ class TestRjb < Test::Unit::TestCase
     jt = import('jp.co.infoseek.hp.arton.rjb.JarTest')
     assert_equal 'abcd', jt.new.add('ab', 'cd')
   end
+  def test_bothdirection_buffer
+    org = "abcdefghijklmn"
+    baip = import('java.io.ByteArrayInputStream')
+    ba = baip.new(org)
+    buff = "\0" * org.size
+    assert_equal org.size, ba.read(buff)
+    assert_equal -1, ba.read(buff)
+    ba.close
+    assert_equal org, buff
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.3.3
+  version: 1.3.4
 platform: universal-darwin-10
 authors: 
 - arton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +09:00
+date: 2010-11-23 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -39,6 +39,7 @@ files:
 - lib/rjb.rb
 - lib/rjbextension.rb
 - samples/filechooser.rb
+- samples/unzip.rb
 - test/exttest.rb
 - test/gctest.rb
 - test/test.rb