java_bin 0.3.1 → 0.3.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.3.2 (2010/01/25)
+  * windows 1.9.x build
+  * fix pure parser bug
+
 0.3.1 (2010/01/22)
   * performance improve (shared and frozen string when extern string).
 

data/README.rdoc

@@ -46,7 +46,7 @@ This is an Apache Solr JavaBin format (binary format) implementation for Ruby.
 
 * Ruby1.8.7 or later (include 1.9.x)
 * (recommended) C compiler (gcc or vc++): you can also use java_bin without c extension, but 'pure' is 30 times slower than 'ext'.
-* JavaBin has been tested with MRI 1.8.7, REE 1.8.7, YARV 1.9.2 pre1 on Ubuntu Linux 9.10 (32bit) and MRI 1.8.6 on Windows Vista (32bit), and Apache Solr 1.4  
+* JavaBin has been tested with MRI 1.8.7, REE 1.8.7, YARV 1.9.2 pre1 on Ubuntu Linux 9.10 (32bit) and MRI 1.8.6, YARV 1.9.1 on Windows Vista (32bit), and Apache Solr 1.4  
 
 == Install
 
@@ -91,9 +91,7 @@ This is an Apache Solr JavaBin format (binary format) implementation for Ruby.
 
 * more parse speed
 * license
-* pure parse encoding bug (1.9.x)
 * shared string over parsing
-* windows build(1.9.x)
 * 64bit build
 * builder(writer)作成
 * JRuby support

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/ext/java_bin/ext/extconf.rb

@@ -9,6 +9,8 @@ unless RUBY_PLATFORM =~ /mswin32/ # Linux
   if CONFIG['CC'] =~ /gcc/
     $CFLAGS << ' -Wall'
   end
+  have_header("byteswap.h")
+  have_header("sys/types.h")
 else # Windows 
   $CFLAGS.gsub!(/-O2b2xg-/, '/O2b2x')
   $CFLAGS.gsub!(/-MD/, ' /MT')
@@ -18,8 +20,6 @@ end
 
 $CFLAGS << ' -DRUBY_19' if RUBY_VERSION >= '1.9'
 
-have_header("byteswap.h")
-have_header("sys/types.h")
 have_header("ruby.h")
 have_header("ruby/encoding.h")
 

data/ext/java_bin/ext/parser.h

@@ -102,10 +102,12 @@ typedef struct java_bin_parser {
 #endif
 
 #ifdef _WIN32
-  typedef signed char        int8_t;
-  typedef signed short      int16_t;
-  typedef signed int        int32_t;
-  typedef signed __int64    int64_t;
+  #ifndef RUBY_19
+    typedef signed char        int8_t;
+    typedef signed short      int16_t;
+    typedef signed int        int32_t;
+    typedef signed __int64    int64_t;
+  #endif
   typedef unsigned char     u_int8_t;
   typedef unsigned short   u_int16_t;
   typedef unsigned int     u_int32_t;

data/java_bin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{java_bin}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kennyj"]
-  s.date = %q{2010-01-22}
+  s.date = %q{2010-01-26}
   s.description = %q{Apache Solr JavaBin format (binary format) implementation for Ruby.}
   s.email = %q{kennyj@gmail.com}
   s.extensions = ["ext/java_bin/ext/extconf.rb"]

data/lib/java_bin/pure/parser.rb

@@ -47,7 +47,7 @@ module JavaBin
       end
     
       def parse(input)
-        array = input.bytes.to_a
+        array = input.unpack("C*")
         check_version(array[0])
         @input = array
         @current = 1 # HINT VERSIONをとばす
@@ -191,7 +191,7 @@ module JavaBin
     
       def read_chars
         size = read_size
-        str = ''
+        str = []
         size.times {
           # HINT. read utf-8 char
           b = getbyte
@@ -208,6 +208,7 @@ module JavaBin
             str << getbyte
           end
         }
+	str = str.pack("C*")
         str.force_encoding('utf-8') if str.respond_to? :force_encoding
         str
       end

data/test/test_java_bin_parser.rb

@@ -13,7 +13,8 @@ end
 
 class TestJavaBinParser < Test::Unit::TestCase
 
-  READ_FLAG = (RUBY_VERSION >= '1.9' ? 'r:utf-8' : 'rb')
+  READ_UTF8 = (RUBY_VERSION >= '1.9' ? 'rb:utf-8' : 'rb')
+  READ_ASCII = (RUBY_VERSION >= '1.9' ? 'rb:ascii' : 'rb')
 
   private
   def write_v_int(i, output)
@@ -63,22 +64,22 @@ class TestJavaBinParser < Test::Unit::TestCase
   end
 
   def test_javabin_dat
-    result = @parser.parse(open("fixtures/javabin.dat", READ_FLAG).read)
+    result = @parser.parse(open("fixtures/javabin.dat", READ_ASCII).read)
     assert result['response']['docs'][0]['features'].include?('eaiou with umlauts: ëäïöü')
     assert_equal result['response']['docs'][1]['incubationdate_dt'], Time.local(2006, 1, 17, 9, 0, 0)
     assert_equal result['response']['docs'][1]['score'], 0.5030758380889893
   end
 
   def test_javabin2_dat
-    result = @parser.parse(open("fixtures/javabin2.dat", READ_FLAG).read)
+    result = @parser.parse(open("fixtures/javabin2.dat", READ_ASCII).read)
     assert_equal 19, result['response']['docs'].size
   end
 
 
   TIMES = 5000
   def test_javabin_parse_and_ruby_eval
-    r  = open("fixtures/ruby.dat", READ_FLAG).read
-    jb = open("fixtures/javabin.dat", READ_FLAG).read
+    r  = open("fixtures/ruby.dat", READ_UTF8).read
+    jb = open("fixtures/javabin.dat", READ_ASCII).read
     puts ""
     r_et  = elapsed_time("ruby eval parse. ", TIMES) { eval(r) }
     jb_et = elapsed_time("javabin parse.   ", TIMES) { @parser.parse(jb) }
@@ -87,8 +88,8 @@ class TestJavaBinParser < Test::Unit::TestCase
   end
 
   def test_javabin2_parse_and_ruby2_eval
-    r  = open("fixtures/ruby2.dat", READ_FLAG).read
-    jb = open("fixtures/javabin2.dat", READ_FLAG).read
+    r  = open("fixtures/ruby2.dat", READ_UTF8).read
+    jb = open("fixtures/javabin2.dat", READ_ASCII).read
     puts ""
     r_et  = elapsed_time("ruby2 eval parse. ", TIMES) { eval(r) }
     jb_et = elapsed_time("javabin2 parse.   ", TIMES) { @parser.parse(jb) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: java_bin
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - kennyj
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-22 00:00:00 +09:00
+date: 2010-01-26 00:00:00 +09:00
 default_executable: 
 dependencies: []