java_bin 0.3.4 → 0.3.5

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.3.5 (2010/05/22)
+  * fix issue 3
+  * fix issue 4 (strict aliasing rule problem)
+
 0.3.4 (2010/02/06)
   * remove dependence on glibc byteswap.h
   * a little performance improve

data/README.rdoc

@@ -78,7 +78,6 @@ This is an Apache Solr JavaBin format (binary format) implementation for Ruby.
 * more parse speed
 * license
 * shared string over parsing
-* 64bit build
 * builder(writer)作成
 * JRuby support
 

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/ext/java_bin/ext/parser.c

@@ -8,6 +8,7 @@ static VALUE rb_mExt;
 static VALUE rb_cParser;
 
 static ID    i_At; // Time#at用
+static ID    i_Utc; // Time#utc用
 #ifdef HAVE_RUBY_ENCODING_H
   static rb_encoding* rb_encUtf8;
 #endif
@@ -183,21 +184,21 @@ static inline VALUE JavaBinParser_read_date(JAVA_BIN_PARSER* ptr) {
   u_int64_t c;
   _readnumeric(ptr, c);
   c = _swap_64(c);
-  return rb_funcall(rb_cTime, i_At, 1, ULL2NUM(c / 1000));
+  return rb_funcall(rb_funcall(rb_cTime, i_At, 1, ULL2NUM(c / 1000)), i_Utc, 0);
 }
 
 static inline VALUE JavaBinParser_read_float(JAVA_BIN_PARSER* ptr) {
-  u_int32_t c;
-  _readnumeric(ptr, c);
-  c = _swap_32(c);
-  return rb_float_new((double)*((float*)&c));
+  JAVA_BIN_FLOAT c;
+  _readnumeric(ptr, c.i_value);
+  c.i_value = _swap_32(c.i_value);
+  return rb_float_new((double)c.f_value);
 }
 
 static inline VALUE JavaBinParser_read_double(JAVA_BIN_PARSER* ptr) {
-  u_int64_t c;
-  _readnumeric(ptr, c);
-  c = _swap_64(c);
-  return rb_float_new(*((double*)&c));
+  JAVA_BIN_DOUBLE c;
+  _readnumeric(ptr, c.i_value);
+  c.i_value = _swap_64(c.i_value);
+  return rb_float_new(c.d_value);
 }
 
 static inline VALUE JavaBinParser_read_byte_array(JAVA_BIN_PARSER* ptr) {
@@ -396,6 +397,7 @@ static VALUE JavaBinParser_alloc(VALUE klass) {
  */
 void Init_parser(void) {
   i_At = rb_intern("at");
+  i_Utc = rb_intern("utc");
 #ifdef HAVE_RUBY_ENCODING_H
   rb_encUtf8 = rb_utf8_encoding();
 #endif

data/ext/java_bin/ext/parser.h

@@ -111,6 +111,16 @@ typedef struct java_bin_parser {
   typedef unsigned __int64 u_int64_t;
 #endif
 
+typedef union java_bin_float {
+  float     f_value;
+  u_int32_t i_value;
+} JAVA_BIN_FLOAT;
+
+typedef union java_bin_double {
+  double    d_value;
+  u_int64_t i_value;
+} JAVA_BIN_DOUBLE;
+
 static VALUE JavaBinParser_read_val(JAVA_BIN_PARSER* ptr);
 
 static void JavaBinParser_free(JAVA_BIN_PARSER* ptr);

data/how_to_release.txt

@@ -0,0 +1,14 @@
+* rake
+* JavaBin=pure rake
+* vim CHANGELOG
+* vim README.rdoc
+* vim lib/java_bin/version.rb
+* rake version:bump:patch
+* rake gemspec
+* git commit -a -m "release x.x.x"
+* git tag vx.x.x
+* git push
+* git push --tags
+* rake gemcutter:release
+
+

data/java_bin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{java_bin}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kennyj"]
-  s.date = %q{2010-02-06}
+  s.date = %q{2010-05-22}
   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"]
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "fixtures/json2.dat",
      "fixtures/ruby.dat",
      "fixtures/ruby2.dat",
+     "how_to_release.txt",
      "java_bin.gemspec",
      "lib/java_bin.rb",
      "lib/java_bin/ext.rb",
@@ -51,19 +52,19 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/kennyj/java_bin}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib", "ext"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Apache Solr JavaBin format implementation for Ruby.}
   s.test_files = [
-    "test/test_java_bin_parser.rb",
+    "test/helper.rb",
      "test/xxx_performance.rb",
-     "test/helper.rb"
+     "test/test_java_bin_parser.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/java_bin/version.rb

@@ -1,7 +1,7 @@
 # vim:fileencoding=utf-8
 module JavaBin
   # JavaBin version
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
   VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:

data/test/test_java_bin_parser.rb

@@ -2,6 +2,7 @@
 
 require 'stringio'
 require 'helper'
+require 'time'
 
 case ENV['JavaBin']
 when 'pure'
@@ -67,7 +68,9 @@ class TestJavaBinParser < Test::Unit::TestCase
     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
+    assert_in_delta result['response']['maxScore'], 0.6288448, 0.0001
+    assert_in_delta result['response']['docs'][0]['score'], 0.628844797611237, 0.0001
+    assert_in_delta result['response']['docs'][1]['score'], 0.5030758380889893, 0.0001
   end
 
   def test_javabin2_dat
@@ -75,7 +78,12 @@ class TestJavaBinParser < Test::Unit::TestCase
     assert_equal 19, result['response']['docs'].size
   end
 
-
+  def test_javabin_parse_and_ruby_eval_with_time
+    r = eval(open("fixtures/ruby.dat", READ_UTF8).read)
+    jb = @parser.parse(open("fixtures/javabin.dat", READ_ASCII).read)
+    assert_equal Time.xmlschema(r['response']['docs'][1]['incubationdate_dt']), jb['response']['docs'][1]['incubationdate_dt']
+  end
+ 
   TIMES = 5000
   def test_javabin_parse_and_ruby_eval
     r  = open("fixtures/ruby.dat", READ_UTF8).read
@@ -135,6 +143,8 @@ class TestJavaBinParser < Test::Unit::TestCase
 
   def test_double
     assert_equal -1.0, @parser.parse([1, 5, -1.0].pack("C2G"))
+    assert_equal  1.0, @parser.parse([1, 5,  1.0].pack("C2G"))
+    assert_equal  0.0, @parser.parse([1, 5,  0.0].pack("C2G"))
   end
 
   def test_int
@@ -152,8 +162,10 @@ class TestJavaBinParser < Test::Unit::TestCase
   end
 
   def test_float
+    assert_equal  0.0, @parser.parse([1, 8,  0.0].pack("C2g"))
+    assert_equal  1.0, @parser.parse([1, 8,  1.0].pack("C2g"))
     assert_equal -1.0, @parser.parse([1, 8, -1.0].pack("C2g"))
-  end
+ end
 
   def test_date
     t = Time.now

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: java_bin
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  hash: 25
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - kennyj
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-06 00:00:00 +09:00
+date: 2010-05-22 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -40,6 +46,7 @@ files:
 - fixtures/json2.dat
 - fixtures/ruby.dat
 - fixtures/ruby2.dat
+- how_to_release.txt
 - java_bin.gemspec
 - lib/java_bin.rb
 - lib/java_bin/ext.rb
@@ -63,25 +70,31 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Apache Solr JavaBin format implementation for Ruby.
 test_files: 
-- test/test_java_bin_parser.rb
-- test/xxx_performance.rb
 - test/helper.rb
+- test/xxx_performance.rb
+- test/test_java_bin_parser.rb