java_bin 0.1.0 → 0.1.1

data/README.rdoc

@@ -12,12 +12,16 @@ This is a Solr JavaBin format implementation for Ruby.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-=== References
+== Install
+
+gem install java_bin
+ 
+== References
 
 * http://wiki.apache.org/solr/javabin
 * http://svn.apache.org/viewvc/lucene/solr/trunk/src/common/org/apache/solr/common/util/JavaBinCodec.java?view=markup
  
-=== Author
+== Author
 
 Toshinori Kajihara <mailto:kennyj@gmail.com>
 

data/Rakefile

@@ -20,7 +20,7 @@ end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+  test.libs << 'lib' << 'test' << 'ext'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end

data/TODO

@@ -1,4 +1,3 @@
-* gem化
 * 他のgemの依存関係
 ** rsolr/solr-rubyのmonkey-patch
 * hashのキーをsymbolにする

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/ext/java_bin/ext/parser.c

@@ -260,8 +260,10 @@ static VALUE JavaBinParser_read_val(JAVA_BIN_PARSER* ptr) {
 
 static void JavaBinParser_free(JAVA_BIN_PARSER* ptr) {
   if (ptr) {
-    // free(ptr->data);
-    free(ptr->cache);
+    //free(ptr->data);
+    if (ptr->cache) {
+      free(ptr->cache);
+    }
     free(ptr);
   }
 }
@@ -311,11 +313,11 @@ static VALUE rb_cParser_parse(VALUE self, VALUE data) {
     rb_raise(rb_eRuntimeError, "rb_cParser_parse - data is empty.");
   }
 
-  //  ptr->data = (unsigned char*) malloc(dataLen);
-  //  if (!ptr->data) {
-  //    rb_raise(rb_eRuntimeError, "rb_cParser_parse - allocate error");
-  //  }
-  //  memcpy(ptr->data, ptrData, dataLen);
+  //ptr->data = (unsigned char*) malloc(dataLen);
+  //if (!ptr->data) {
+  //  rb_raise(rb_eRuntimeError, "rb_cParser_parse - allocate error");
+  //}
+  //memcpy(ptr->data, ptrData, dataLen);
   ptr->data = (unsigned char*)ptrData;
   ptr->data_len = dataLen;
 
@@ -344,6 +346,10 @@ static VALUE rb_cParser_initialize(VALUE self) {
     rb_raise(rb_eRuntimeError, "rb_cParser_initialize - allocate error");
   }
   DATA_PTR(self) = ptr;
+
+  /* 参照文字列の準備(ここでも初期化しておかないと、たまにsegしちゃいますruby 1.8.7) */
+  ptr->cache = NULL;
+  ptr->cache_index = 0;
  
   return self;
 }
@@ -361,7 +367,7 @@ void Init_parser(void) {
   rb_mJavaBin = rb_define_module("JavaBin");
   rb_mExt     = rb_define_module_under(rb_mJavaBin, "Ext");
   rb_cParser  = rb_define_class_under(rb_mExt, "Parser", rb_cObject);
-
+  
   /* メモリーアロケーター設定 */
   rb_define_alloc_func(rb_cParser, JavaBinParser_alloc);
   /* コンストラクタ */

data/java_bin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{java_bin}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kennyj"]
-  s.date = %q{2010-01-11}
+  s.date = %q{2010-01-12}
   s.description = %q{Solr JavaBin format implementation for Ruby.}
   s.email = %q{kennyj@gmail.com}
   s.extensions = ["ext/java_bin/ext/extconf.rb"]
@@ -49,8 +49,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Solr JavaBin format implementation for Ruby.}
   s.test_files = [
-    "test/xxx_performance.rb",
-     "test/test_java_bin_parser.rb",
+    "test/test_java_bin_parser.rb",
+     "test/xxx_performance.rb",
      "test/helper.rb"
   ]
 

data/test/test_java_bin_parser.rb

@@ -1,4 +1,5 @@
 # vim:fileencoding=utf-8
+require 'stringio'
 require 'helper'
 
 case ENV['JavaBin']
@@ -9,7 +10,7 @@ else
   require 'java_bin/ext'
 end
 
-class TestJavaBin < Test::Unit::TestCase
+class TestJavaBinParser < Test::Unit::TestCase
 
   private
   def write_v_int(i, output)
@@ -72,7 +73,7 @@ class TestJavaBin < Test::Unit::TestCase
     puts ""
     r_et  = elapsed_time("ruby eval parse. ", TIMES) { eval(r) }
     jb_et = elapsed_time("javabin parse.   ", TIMES) { @parser.parse(jb) }
-    assert (jb_et * 3) < r_et if @parser.is_a? JavaBin::Ext::Parser
+    assert (jb_et * 2) < r_et if @parser.is_a? JavaBin::Ext::Parser
   end
 
   def test_null

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: java_bin
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - kennyj
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 +09:00
+date: 2010-01-12 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -77,6 +77,6 @@ signing_key:
 specification_version: 3
 summary: Solr JavaBin format implementation for Ruby.
 test_files: 
-- test/xxx_performance.rb
 - test/test_java_bin_parser.rb
+- test/xxx_performance.rb
 - test/helper.rb