RubyGems - java_bin - Versions diffs - 0.3.5 → 0.4.0 - Mend

java_bin 0.3.5 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

data/CHANGELOG +5 -0
data/README.rdoc +2 -0
data/VERSION +1 -1
data/ext/java_bin/ext/parser.c +22 -5
data/ext/java_bin/ext/parser.h +8 -1
data/fixtures/fixtures_for_solr3.1/javabin_all.dat +0 -0
data/fixtures/fixtures_for_solr3.1/javabin_software.dat +0 -0
data/fixtures/fixtures_for_solr3.1/json_all.dat +279 -0
data/fixtures/fixtures_for_solr3.1/json_software.dat +51 -0
data/fixtures/fixtures_for_solr3.1/ruby_all.dat +279 -0
data/fixtures/fixtures_for_solr3.1/ruby_software.dat +51 -0
data/how_to_release.txt +2 -2
data/java_bin.gemspec +39 -41
data/lib/java_bin/pure/parser.rb +25 -20
data/lib/java_bin/version.rb +1 -1
data/test/test_java_bin_parser.rb +17 -1
metadata +29 -44
data/.gitignore +0 -32

data/CHANGELOG CHANGED Viewed

@@ -1,6 +1,11 @@
+0.4.0 (2011/6/21)
+  * solr 3.1 support
+  * RailsInstaller support
 0.3.5 (2010/05/22)
   * fix issue 3
   * fix issue 4 (strict aliasing rule problem)
+  * 64 bit support (tested with cent os 5.x)
 0.3.4 (2010/02/06)
   * remove dependence on glibc byteswap.h

data/README.rdoc CHANGED Viewed

@@ -26,6 +26,7 @@ This is an Apache Solr JavaBin format (binary format) implementation for Ruby.
 * rsolr/solr-ruby support.
 * pure and c extension code.
 * ruby 1.8/1.9 support.
+* solr 1.4/3.1 support.
 == Requirements
@@ -74,6 +75,7 @@ This is an Apache Solr JavaBin format (binary format) implementation for Ruby.
 == TODO
+* Solr 3.1 support
 * max os x supoort
 * more parse speed
 * license

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.3.5
1	+ 0.4.0

data/ext/java_bin/ext/parser.c CHANGED Viewed

@@ -87,7 +87,7 @@ static inline VALUE JavaBinParser_read_small_long(JAVA_BIN_PARSER* ptr) {
   return LL2NUM(result);
 }
-static inline VALUE JavaBinParser_read_string(JAVA_BIN_PARSER* ptr) {
+static VALUE JavaBinParser_read_string_for_javabin_format_1(JAVA_BIN_PARSER* ptr) {
   int size, i;
   int start;
   unsigned char b;
@@ -106,6 +106,15 @@ static inline VALUE JavaBinParser_read_string(JAVA_BIN_PARSER* ptr) {
   return _utf8_string((const char*) &ptr->data[start], ptr->current - start);
 }
+static VALUE JavaBinParser_read_string_for_javabin_format_2(JAVA_BIN_PARSER* ptr) {
+  int size;
+  int start;
+  size = JavaBinParser_read_size(ptr);
+  start = ptr->current;
+  ptr->current += size;
+  return _utf8_string((const char*) &ptr->data[start], size);
+}
 static inline VALUE JavaBinParser_read_array(JAVA_BIN_PARSER* ptr) {
   int size, i;
   VALUE array;
@@ -253,7 +262,7 @@ static VALUE JavaBinParser_read_val(JAVA_BIN_PARSER* ptr) {
   ptr->tag_byte = _getbyte(ptr);
   switch (ptr->tag_byte >> 5) { /* unsignedなので論理シフト */
     case SHIFTED_STR:
-      return JavaBinParser_read_string(ptr);
+      return ptr->read_string(ptr);
     case SHIFTED_ARR:
       return JavaBinParser_read_array(ptr);
     case SHIFTED_EXTERN_STRING:
@@ -333,11 +342,19 @@ static VALUE rb_cParser_parse(VALUE self, VALUE data) {
   ptr->data_len = dataLen;
   /* version check */
-  if (ptr->data[0] != 0x01) {
-    rb_raise(rb_eRuntimeError, "rb_cParser_parse - not supported version");
+  if (!(ptr->data[0] == 0x01 || ptr->data[0] == 0x02)) {
+    rb_raise(rb_eRuntimeError, "rb_cParser_parse - not supported version [%d]", ptr->data[0]);
+  }
+  ptr->version = ptr->data[0];
+  /* 文字列読込用の関数ポインタを設定する */
+  if (ptr->version == 0x01) {
+    ptr->read_string = (void*) JavaBinParser_read_string_for_javabin_format_1;
+  } else if (ptr->version == 0x02) {
+    ptr->read_string = (void*) JavaBinParser_read_string_for_javabin_format_2;
   }
-  ptr->current  = 1;   /* VERSIONをとばした */
+  ptr->current  = 1;   /* skip format version */
   ptr->tag_byte = 0;
   /*

data/ext/java_bin/ext/parser.h CHANGED Viewed

@@ -52,6 +52,11 @@
 #define  SHIFTED_SINT            (SINT >> 5)
 #define  SHIFTED_SLONG           (SLONG >> 5)
+/*
+ * 文字列読み込み用関数の関数ポインタ
+ */
+typedef VALUE (*PTR_READ_STRING)(void*);
 /*
  * 読込処理データ保持構造体
  */
@@ -59,7 +64,9 @@ typedef struct java_bin_parser {
   unsigned char* data;
   int            data_len;
   int            current;
+  int            version;
   unsigned char  tag_byte;
+  PTR_READ_STRING read_string;
   /* 外部文字列用 */
   VALUE*               cache;
@@ -83,7 +90,7 @@ typedef struct java_bin_parser {
   }
 #ifndef WORDS_BIGENDIAN
-  #ifdef _WIN32
+  #if defined _WIN32 && !defined __MINGW32__
     #define _swap_16(o) _byteswap_ushort(o)
     #define _swap_32(o) _byteswap_ulong(o)
     #define _swap_64(o) _byteswap_uint64(o)

data/fixtures/fixtures_for_solr3.1/javabin_all.dat ADDED Viewed

Binary file

data/fixtures/fixtures_for_solr3.1/javabin_software.dat ADDED Viewed

Binary file

data/fixtures/fixtures_for_solr3.1/json_all.dat ADDED Viewed

@@ -0,0 +1,279 @@
+{
+  "responseHeader":{
+    "status":0,
+    "QTime":1,
+    "params":{
+      "explainOther":"",
+      "fl":"*,score",
+      "indent":"on",
+      "start":"0",
+      "q":"*:*",
+      "hl.fl":"",
+      "qt":"",
+      "wt":"json",
+      "fq":"",
+      "version":"2.2",
+      "rows":"100"}},
+  "response":{"numFound":17,"start":0,"maxScore":1.0,"docs":[
+      {
+        "id":"GB18030TEST",
+        "name":"Test with some GB18030 encoded characters",
+        "price":0.0,
+        "inStock":true,
+        "features":[
+          "No accents here",
+          "这是一个功能",
+          "This is a feature (translated)",
+          "这份文件是很有光泽",
+          "This document is very shiny (translated)"],
+        "score":1.0},
+      {
+        "id":"SP2514N",
+        "name":"Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133",
+        "manu":"Samsung Electronics Co. Ltd.",
+        "price":92.0,
+        "popularity":6,
+        "inStock":true,
+        "manufacturedate_dt":"2006-02-13T15:26:37Z",
+        "store":"35.0752,-97.032",
+        "cat":["electronics","hard drive"],
+        "features":[
+          "7200RPM, 8MB cache, IDE Ultra ATA-133",
+          "NoiseGuard, SilentSeek technology, Fluid Dynamic Bearing (FDB) motor"],
+        "score":1.0},
+      {
+        "id":"6H500F0",
+        "name":"Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300",
+        "manu":"Maxtor Corp.",
+        "price":350.0,
+        "popularity":6,
+        "inStock":true,
+        "store":"45.17614,-93.87341",
+        "manufacturedate_dt":"2006-02-13T15:26:37Z",
+        "cat":["electronics","hard drive"],
+        "features":[
+          "SATA 3.0Gb/s, NCQ",
+          "8.5ms seek",
+          "16MB cache"],
+        "score":1.0},
+      {
+        "id":"F8V7067-APL-KIT",
+        "name":"Belkin Mobile Power Cord for iPod w/ Dock",
+        "manu":"Belkin",
+        "weight":4.0,
+        "price":19.95,
+        "popularity":1,
+        "inStock":false,
+        "store":"45.17614,-93.87341",
+        "manufacturedate_dt":"2005-08-01T16:30:25Z",
+        "cat":["electronics","connector"],
+        "features":[
+          "car power adapter, white"],
+        "score":1.0},
+      {
+        "id":"IW-02",
+        "name":"iPod & iPod Mini USB 2.0 Cable",
+        "manu":"Belkin",
+        "weight":2.0,
+        "price":11.5,
+        "popularity":1,
+        "inStock":false,
+        "store":"37.7752,-122.4232",
+        "manufacturedate_dt":"2006-02-14T23:55:59Z",
+        "cat":["electronics","connector"],
+        "features":[
+          "car power adapter for iPod, white"],
+        "score":1.0},
+      {
+        "id":"MA147LL/A",
+        "name":"Apple 60 GB iPod with Video Playback Black",
+        "manu":"Apple Computer Inc.",
+        "includes":"earbud headphones, USB cable",
+        "weight":5.5,
+        "price":399.0,
+        "popularity":10,
+        "inStock":true,
+        "store":"37.7752,-100.0232",
+        "manufacturedate_dt":"2005-10-12T08:00:00Z",
+        "cat":["electronics","music"],
+        "features":[
+          "iTunes, Podcasts, Audiobooks",
+          "Stores up to 15,000 songs, 25,000 photos, or 150 hours of video",
+          "2.5-inch, 320x240 color TFT LCD display with LED backlight",
+          "Up to 20 hours of battery life",
+          "Plays AAC, MP3, WAV, AIFF, Audible, Apple Lossless, H.264 video",
+          "Notes, Calendar, Phone book, Hold button, Date display, Photo wallet, Built-in games, JPEG photo playback, Upgradeable firmware, USB 2.0 compatibility, Playback speed control, Rechargeable capability, Battery level indication"],
+        "score":1.0},
+      {
+        "id":"TWINX2048-3200PRO",
+        "name":"CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail",
+        "manu":"Corsair Microsystems Inc.",
+        "price":185.0,
+        "popularity":5,
+        "inStock":true,
+        "store":"37.7752,-122.4232",
+        "manufacturedate_dt":"2006-02-13T15:26:37Z",
+        "payloads":"electronics|6.0 memory|3.0",
+        "cat":["electronics","memory"],
+        "features":[
+          "CAS latency 2,\t2-3-3-6 timing, 2.75v, unbuffered, heat-spreader"],
+        "score":1.0},
+      {
+        "id":"VS1GB400C3",
+        "name":"CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail",
+        "manu":"Corsair Microsystems Inc.",
+        "price":74.99,
+        "popularity":7,
+        "inStock":true,
+        "store":"37.7752,-100.0232",
+        "manufacturedate_dt":"2006-02-13T15:26:37Z",
+        "payloads":"electronics|4.0 memory|2.0",
+        "cat":["electronics","memory"],
+        "score":1.0},
+      {
+        "id":"VDBDB1A16",
+        "name":"A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM",
+        "manu":"A-DATA Technology Inc.",
+        "popularity":0,
+        "inStock":true,
+        "store":"45.17614,-93.87341",
+        "manufacturedate_dt":"2006-02-13T15:26:37Z",
+        "payloads":"electronics|0.9 memory|0.1",
+        "cat":["electronics","memory"],
+        "features":[
+          "CAS latency 3,\t 2.7v"],
+        "score":1.0},
+      {
+        "id":"3007WFP",
+        "name":"Dell Widescreen UltraSharp 3007WFP",
+        "manu":"Dell, Inc.",
+        "includes":"USB cable",
+        "weight":401.6,
+        "price":2199.0,
+        "popularity":6,
+        "inStock":true,
+        "store":"43.17614,-90.57341",
+        "cat":["electronics","monitor"],
+        "features":[
+          "30\" TFT active matrix LCD, 2560 x 1600, .25mm dot pitch, 700:1 contrast"],
+        "score":1.0},
+      {
+        "id":"VA902B",
+        "name":"ViewSonic VA902B - flat panel display - TFT - 19\"",
+        "manu":"ViewSonic Corp.",
+        "weight":190.4,
+        "price":279.95,
+        "popularity":6,
+        "inStock":true,
+        "store":"45.17614,-93.87341",
+        "cat":["electronics","monitor"],
+        "features":[
+          "19\" TFT active matrix LCD, 8ms response time, 1280 x 1024 native resolution"],
+        "score":1.0},
+      {
+        "id":"0579B002",
+        "name":"Canon PIXMA MP500 All-In-One Photo Printer",
+        "manu":"Canon Inc.",
+        "weight":352.0,
+        "price":179.99,
+        "popularity":6,
+        "inStock":true,
+        "store":"45.17614,-93.87341",
+        "cat":["electronics","multifunction printer","printer","scanner","copier"],
+        "features":[
+          "Multifunction ink-jet color photo printer",
+          "Flatbed scanner, optical scan resolution of 1,200 x 2,400 dpi",
+          "2.5\" color LCD preview screen",
+          "Duplex Copying",
+          "Printing speed up to 29ppm black, 19ppm color",
+          "Hi-Speed USB",
+          "memory card: CompactFlash, Micro Drive, SmartMedia, Memory Stick, Memory Stick Pro, SD Card, and MultiMediaCard"],
+        "score":1.0},
+      {
+        "id":"9885A004",
+        "name":"Canon PowerShot SD500",
+        "manu":"Canon Inc.",
+        "includes":"32MB SD card, USB cable, AV cable, battery",
+        "weight":6.4,
+        "price":329.95,
+        "popularity":7,
+        "inStock":true,
+        "manufacturedate_dt":"2006-02-13T15:26:37Z",
+        "store":"45.17614,-93.87341",
+        "cat":["electronics","camera"],
+        "features":[
+          "3x zoop, 7.1 megapixel Digital ELPH",
+          "movie clips up to 640x480 @30 fps",
+          "2.0\" TFT LCD, 118,000 pixels",
+          "built in flash, red-eye reduction"],
+        "score":1.0},
+      {
+        "id":"SOLR1000",
+        "name":"Solr, the Enterprise Search Server",
+        "manu":"Apache Software Foundation",
+        "price":0.0,
+        "popularity":10,
+        "inStock":true,
+        "incubationdate_dt":"2006-01-17T00:00:00Z",
+        "cat":["software","search"],
+        "features":[
+          "Advanced Full-Text Search Capabilities using Lucene",
+          "Optimized for High Volume Web Traffic",
+          "Standards Based Open Interfaces - XML and HTTP",
+          "Comprehensive HTML Administration Interfaces",
+          "Scalability - Efficient Replication to other Solr Search Servers",
+          "Flexible and Adaptable with XML configuration and Schema",
+          "Good unicode support: héllo (hello with an accent over the e)"],
+        "score":1.0},
+      {
+        "id":"UTF8TEST",
+        "name":"Test with some UTF-8 encoded characters",
+        "manu":"Apache Software Foundation",
+        "price":0.0,
+        "inStock":true,
+        "cat":["software","search"],
+        "features":[
+          "No accents here",
+          "This is an e acute: é",
+          "eaiou with circumflexes: êâîôû",
+          "eaiou with umlauts: ëäïöü",
+          "tag with escaped chars: <nicetag/>",
+          "escaped ampersand: Bonnie & Clyde"],
+        "score":1.0},
+      {
+        "id":"EN7800GTX/2DHTV/256M",
+        "name":"ASUS Extreme N7800GTX/2DHTV (256 MB)",
+        "manu":"ASUS Computer Inc.",
+        "weight":16.0,
+        "price":479.95,
+        "popularity":7,
+        "store":"40.7143,-74.006",
+        "inStock":false,
+        "manufacturedate_dt":"2006-02-13T00:00:00Z",
+        "cat":["electronics","graphics card"],
+        "features":[
+          "NVIDIA GeForce 7800 GTX GPU/VPU clocked at 486MHz",
+          "256MB GDDR3 Memory clocked at 1.35GHz",
+          "PCI Express x16",
+          "Dual DVI connectors, HDTV out, video input",
+          "OpenGL 2.0, DirectX 9.0"],
+        "score":1.0},
+      {
+        "id":"100-435805",
+        "name":"ATI Radeon X1900 XTX 512 MB PCIE Video Card",
+        "manu":"ATI Technologies",
+        "weight":48.0,
+        "price":649.99,
+        "popularity":7,
+        "inStock":false,
+        "manufacturedate_dt":"2006-02-13T00:00:00Z",
+        "store":"40.7143,-74.006",
+        "cat":["electronics","graphics card"],
+        "features":[
+          "ATI RADEON X1900 GPU/VPU clocked at 650MHz",
+          "512MB GDDR3 SDRAM clocked at 1.55GHz",
+          "PCI Express x16",
+          "dual DVI, HDTV, svideo, composite out",
+          "OpenGL 2.0, DirectX 9.0"],
+        "score":1.0}]
+  }}

data/fixtures/fixtures_for_solr3.1/json_software.dat ADDED Viewed

@@ -0,0 +1,51 @@
+{
+  "responseHeader":{
+    "status":0,
+    "QTime":2,
+    "params":{
+      "explainOther":"",
+      "fl":"*,score",
+      "indent":"on",
+      "start":"0",
+      "q":"software",
+      "hl.fl":"",
+      "qt":"",
+      "wt":"json",
+      "fq":"",
+      "version":"2.2",
+      "rows":"100"}},
+  "response":{"numFound":2,"start":0,"maxScore":0.6042672,"docs":[
+      {
+        "id":"UTF8TEST",
+        "name":"Test with some UTF-8 encoded characters",
+        "manu":"Apache Software Foundation",
+        "price":0.0,
+        "inStock":true,
+        "cat":["software","search"],
+        "features":[
+          "No accents here",
+          "This is an e acute: é",
+          "eaiou with circumflexes: êâîôû",
+          "eaiou with umlauts: ëäïöü",
+          "tag with escaped chars: <nicetag/>",
+          "escaped ampersand: Bonnie & Clyde"],
+        "score":0.6042672},
+      {
+        "id":"SOLR1000",
+        "name":"Solr, the Enterprise Search Server",
+        "manu":"Apache Software Foundation",
+        "price":0.0,
+        "popularity":10,
+        "inStock":true,
+        "incubationdate_dt":"2006-01-17T00:00:00Z",
+        "cat":["software","search"],
+        "features":[
+          "Advanced Full-Text Search Capabilities using Lucene",
+          "Optimized for High Volume Web Traffic",
+          "Standards Based Open Interfaces - XML and HTTP",
+          "Comprehensive HTML Administration Interfaces",
+          "Scalability - Efficient Replication to other Solr Search Servers",
+          "Flexible and Adaptable with XML configuration and Schema",
+          "Good unicode support: héllo (hello with an accent over the e)"],
+        "score":0.48341373}]
+  }}

data/fixtures/fixtures_for_solr3.1/ruby_all.dat ADDED Viewed

@@ -0,0 +1,279 @@
+{
+  'responseHeader'=>{
+    'status'=>0,
+    'QTime'=>1,
+    'params'=>{
+      'explainOther'=>'',
+      'fl'=>'*,score',
+      'indent'=>'on',
+      'start'=>'0',
+      'q'=>'*:*',
+      'hl.fl'=>'',
+      'qt'=>'',
+      'wt'=>'ruby',
+      'fq'=>'',
+      'version'=>'2.2',
+      'rows'=>'100'}},
+  'response'=>{'numFound'=>17,'start'=>0,'maxScore'=>1.0,'docs'=>[
+      {
+        'id'=>'GB18030TEST',
+        'name'=>'Test with some GB18030 encoded characters',
+        'price'=>0.0,
+        'inStock'=>true,
+        'features'=>[
+          'No accents here',
+          '这是一个功能',
+          'This is a feature (translated)',
+          '这份文件是很有光泽',
+          'This document is very shiny (translated)'],
+        'score'=>1.0},
+      {
+        'id'=>'SP2514N',
+        'name'=>'Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133',
+        'manu'=>'Samsung Electronics Co. Ltd.',
+        'price'=>92.0,
+        'popularity'=>6,
+        'inStock'=>true,
+        'manufacturedate_dt'=>'2006-02-13T15:26:37Z',
+        'store'=>'35.0752,-97.032',
+        'cat'=>['electronics','hard drive'],
+        'features'=>[
+          '7200RPM, 8MB cache, IDE Ultra ATA-133',
+          'NoiseGuard, SilentSeek technology, Fluid Dynamic Bearing (FDB) motor'],
+        'score'=>1.0},
+      {
+        'id'=>'6H500F0',
+        'name'=>'Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300',
+        'manu'=>'Maxtor Corp.',
+        'price'=>350.0,
+        'popularity'=>6,
+        'inStock'=>true,
+        'store'=>'45.17614,-93.87341',
+        'manufacturedate_dt'=>'2006-02-13T15:26:37Z',
+        'cat'=>['electronics','hard drive'],
+        'features'=>[
+          'SATA 3.0Gb/s, NCQ',
+          '8.5ms seek',
+          '16MB cache'],
+        'score'=>1.0},
+      {
+        'id'=>'F8V7067-APL-KIT',
+        'name'=>'Belkin Mobile Power Cord for iPod w/ Dock',
+        'manu'=>'Belkin',
+        'weight'=>4.0,
+        'price'=>19.95,
+        'popularity'=>1,
+        'inStock'=>false,
+        'store'=>'45.17614,-93.87341',
+        'manufacturedate_dt'=>'2005-08-01T16:30:25Z',
+        'cat'=>['electronics','connector'],
+        'features'=>[
+          'car power adapter, white'],
+        'score'=>1.0},
+      {
+        'id'=>'IW-02',
+        'name'=>'iPod & iPod Mini USB 2.0 Cable',
+        'manu'=>'Belkin',
+        'weight'=>2.0,
+        'price'=>11.5,
+        'popularity'=>1,
+        'inStock'=>false,
+        'store'=>'37.7752,-122.4232',
+        'manufacturedate_dt'=>'2006-02-14T23:55:59Z',
+        'cat'=>['electronics','connector'],
+        'features'=>[
+          'car power adapter for iPod, white'],
+        'score'=>1.0},
+      {
+        'id'=>'MA147LL/A',
+        'name'=>'Apple 60 GB iPod with Video Playback Black',
+        'manu'=>'Apple Computer Inc.',
+        'includes'=>'earbud headphones, USB cable',
+        'weight'=>5.5,
+        'price'=>399.0,
+        'popularity'=>10,
+        'inStock'=>true,
+        'store'=>'37.7752,-100.0232',
+        'manufacturedate_dt'=>'2005-10-12T08:00:00Z',
+        'cat'=>['electronics','music'],
+        'features'=>[
+          'iTunes, Podcasts, Audiobooks',
+          'Stores up to 15,000 songs, 25,000 photos, or 150 hours of video',
+          '2.5-inch, 320x240 color TFT LCD display with LED backlight',
+          'Up to 20 hours of battery life',
+          'Plays AAC, MP3, WAV, AIFF, Audible, Apple Lossless, H.264 video',
+          'Notes, Calendar, Phone book, Hold button, Date display, Photo wallet, Built-in games, JPEG photo playback, Upgradeable firmware, USB 2.0 compatibility, Playback speed control, Rechargeable capability, Battery level indication'],
+        'score'=>1.0},
+      {
+        'id'=>'TWINX2048-3200PRO',
+        'name'=>'CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail',
+        'manu'=>'Corsair Microsystems Inc.',
+        'price'=>185.0,
+        'popularity'=>5,
+        'inStock'=>true,
+        'store'=>'37.7752,-122.4232',
+        'manufacturedate_dt'=>'2006-02-13T15:26:37Z',
+        'payloads'=>'electronics|6.0 memory|3.0',
+        'cat'=>['electronics','memory'],
+        'features'=>[
+          'CAS latency 2,	2-3-3-6 timing, 2.75v, unbuffered, heat-spreader'],
+        'score'=>1.0},
+      {
+        'id'=>'VS1GB400C3',
+        'name'=>'CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail',
+        'manu'=>'Corsair Microsystems Inc.',
+        'price'=>74.99,
+        'popularity'=>7,
+        'inStock'=>true,
+        'store'=>'37.7752,-100.0232',
+        'manufacturedate_dt'=>'2006-02-13T15:26:37Z',
+        'payloads'=>'electronics|4.0 memory|2.0',
+        'cat'=>['electronics','memory'],
+        'score'=>1.0},
+      {
+        'id'=>'VDBDB1A16',
+        'name'=>'A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM',
+        'manu'=>'A-DATA Technology Inc.',
+        'popularity'=>0,
+        'inStock'=>true,
+        'store'=>'45.17614,-93.87341',
+        'manufacturedate_dt'=>'2006-02-13T15:26:37Z',
+        'payloads'=>'electronics|0.9 memory|0.1',
+        'cat'=>['electronics','memory'],
+        'features'=>[
+          'CAS latency 3,	 2.7v'],
+        'score'=>1.0},
+      {
+        'id'=>'3007WFP',
+        'name'=>'Dell Widescreen UltraSharp 3007WFP',
+        'manu'=>'Dell, Inc.',
+        'includes'=>'USB cable',
+        'weight'=>401.6,
+        'price'=>2199.0,
+        'popularity'=>6,
+        'inStock'=>true,
+        'store'=>'43.17614,-90.57341',
+        'cat'=>['electronics','monitor'],
+        'features'=>[
+          '30" TFT active matrix LCD, 2560 x 1600, .25mm dot pitch, 700:1 contrast'],
+        'score'=>1.0},
+      {
+        'id'=>'VA902B',
+        'name'=>'ViewSonic VA902B - flat panel display - TFT - 19"',
+        'manu'=>'ViewSonic Corp.',
+        'weight'=>190.4,
+        'price'=>279.95,
+        'popularity'=>6,
+        'inStock'=>true,
+        'store'=>'45.17614,-93.87341',
+        'cat'=>['electronics','monitor'],
+        'features'=>[
+          '19" TFT active matrix LCD, 8ms response time, 1280 x 1024 native resolution'],
+        'score'=>1.0},
+      {
+        'id'=>'0579B002',
+        'name'=>'Canon PIXMA MP500 All-In-One Photo Printer',
+        'manu'=>'Canon Inc.',
+        'weight'=>352.0,
+        'price'=>179.99,
+        'popularity'=>6,
+        'inStock'=>true,
+        'store'=>'45.17614,-93.87341',
+        'cat'=>['electronics','multifunction printer','printer','scanner','copier'],
+        'features'=>[
+          'Multifunction ink-jet color photo printer',
+          'Flatbed scanner, optical scan resolution of 1,200 x 2,400 dpi',
+          '2.5" color LCD preview screen',
+          'Duplex Copying',
+          'Printing speed up to 29ppm black, 19ppm color',
+          'Hi-Speed USB',
+          'memory card: CompactFlash, Micro Drive, SmartMedia, Memory Stick, Memory Stick Pro, SD Card, and MultiMediaCard'],
+        'score'=>1.0},
+      {
+        'id'=>'9885A004',
+        'name'=>'Canon PowerShot SD500',
+        'manu'=>'Canon Inc.',
+        'includes'=>'32MB SD card, USB cable, AV cable, battery',
+        'weight'=>6.4,
+        'price'=>329.95,
+        'popularity'=>7,
+        'inStock'=>true,
+        'manufacturedate_dt'=>'2006-02-13T15:26:37Z',
+        'store'=>'45.17614,-93.87341',
+        'cat'=>['electronics','camera'],
+        'features'=>[
+          '3x zoop, 7.1 megapixel Digital ELPH',
+          'movie clips up to 640x480 @30 fps',
+          '2.0" TFT LCD, 118,000 pixels',
+          'built in flash, red-eye reduction'],
+        'score'=>1.0},
+      {
+        'id'=>'SOLR1000',
+        'name'=>'Solr, the Enterprise Search Server',
+        'manu'=>'Apache Software Foundation',
+        'price'=>0.0,
+        'popularity'=>10,
+        'inStock'=>true,
+        'incubationdate_dt'=>'2006-01-17T00:00:00Z',
+        'cat'=>['software','search'],
+        'features'=>[
+          'Advanced Full-Text Search Capabilities using Lucene',
+          'Optimized for High Volume Web Traffic',
+          'Standards Based Open Interfaces - XML and HTTP',
+          'Comprehensive HTML Administration Interfaces',
+          'Scalability - Efficient Replication to other Solr Search Servers',
+          'Flexible and Adaptable with XML configuration and Schema',
+          'Good unicode support: héllo (hello with an accent over the e)'],
+        'score'=>1.0},
+      {
+        'id'=>'UTF8TEST',
+        'name'=>'Test with some UTF-8 encoded characters',
+        'manu'=>'Apache Software Foundation',
+        'price'=>0.0,
+        'inStock'=>true,
+        'cat'=>['software','search'],
+        'features'=>[
+          'No accents here',
+          'This is an e acute: é',
+          'eaiou with circumflexes: êâîôû',
+          'eaiou with umlauts: ëäïöü',
+          'tag with escaped chars: <nicetag/>',
+          'escaped ampersand: Bonnie & Clyde'],
+        'score'=>1.0},
+      {
+        'id'=>'EN7800GTX/2DHTV/256M',
+        'name'=>'ASUS Extreme N7800GTX/2DHTV (256 MB)',
+        'manu'=>'ASUS Computer Inc.',
+        'weight'=>16.0,
+        'price'=>479.95,
+        'popularity'=>7,
+        'store'=>'40.7143,-74.006',
+        'inStock'=>false,
+        'manufacturedate_dt'=>'2006-02-13T00:00:00Z',
+        'cat'=>['electronics','graphics card'],
+        'features'=>[
+          'NVIDIA GeForce 7800 GTX GPU/VPU clocked at 486MHz',
+          '256MB GDDR3 Memory clocked at 1.35GHz',
+          'PCI Express x16',
+          'Dual DVI connectors, HDTV out, video input',
+          'OpenGL 2.0, DirectX 9.0'],
+        'score'=>1.0},
+      {
+        'id'=>'100-435805',
+        'name'=>'ATI Radeon X1900 XTX 512 MB PCIE Video Card',
+        'manu'=>'ATI Technologies',
+        'weight'=>48.0,
+        'price'=>649.99,
+        'popularity'=>7,
+        'inStock'=>false,
+        'manufacturedate_dt'=>'2006-02-13T00:00:00Z',
+        'store'=>'40.7143,-74.006',
+        'cat'=>['electronics','graphics card'],
+        'features'=>[
+          'ATI RADEON X1900 GPU/VPU clocked at 650MHz',
+          '512MB GDDR3 SDRAM clocked at 1.55GHz',
+          'PCI Express x16',
+          'dual DVI, HDTV, svideo, composite out',
+          'OpenGL 2.0, DirectX 9.0'],
+        'score'=>1.0}]
+  }}

data/fixtures/fixtures_for_solr3.1/ruby_software.dat ADDED Viewed

@@ -0,0 +1,51 @@
+{
+  'responseHeader'=>{
+    'status'=>0,
+    'QTime'=>0,
+    'params'=>{
+      'explainOther'=>'',
+      'fl'=>'*,score',
+      'indent'=>'on',
+      'start'=>'0',
+      'q'=>'software',
+      'hl.fl'=>'',
+      'qt'=>'',
+      'wt'=>'ruby',
+      'fq'=>'',
+      'version'=>'2.2',
+      'rows'=>'100'}},
+  'response'=>{'numFound'=>2,'start'=>0,'maxScore'=>0.6042672,'docs'=>[
+      {
+        'id'=>'UTF8TEST',
+        'name'=>'Test with some UTF-8 encoded characters',
+        'manu'=>'Apache Software Foundation',
+        'price'=>0.0,
+        'inStock'=>true,
+        'cat'=>['software','search'],
+        'features'=>[
+          'No accents here',
+          'This is an e acute: é',
+          'eaiou with circumflexes: êâîôû',
+          'eaiou with umlauts: ëäïöü',
+          'tag with escaped chars: <nicetag/>',
+          'escaped ampersand: Bonnie & Clyde'],
+        'score'=>0.6042672},
+      {
+        'id'=>'SOLR1000',
+        'name'=>'Solr, the Enterprise Search Server',
+        'manu'=>'Apache Software Foundation',
+        'price'=>0.0,
+        'popularity'=>10,
+        'inStock'=>true,
+        'incubationdate_dt'=>'2006-01-17T00:00:00Z',
+        'cat'=>['software','search'],
+        'features'=>[
+          'Advanced Full-Text Search Capabilities using Lucene',
+          'Optimized for High Volume Web Traffic',
+          'Standards Based Open Interfaces - XML and HTTP',
+          'Comprehensive HTML Administration Interfaces',
+          'Scalability - Efficient Replication to other Solr Search Servers',
+          'Flexible and Adaptable with XML configuration and Schema',
+          'Good unicode support: héllo (hello with an accent over the e)'],
+        'score'=>0.48341373}]
+  }}

data/how_to_release.txt CHANGED Viewed

@@ -3,12 +3,12 @@
 * vim CHANGELOG
 * vim README.rdoc
 * vim lib/java_bin/version.rb
-* rake version:bump:patch
+* rake version:bump:patch (major / minor)
 * rake gemspec
 * git commit -a -m "release x.x.x"
 * git tag vx.x.x
 * git push
 * git push --tags
-* rake gemcutter:release
+* rake rubygems:release

data/java_bin.gemspec CHANGED Viewed

@@ -1,67 +1,65 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name = %q{java_bin}
-  s.version = "0.3.5"
+  s.version = "0.4.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kennyj"]
-  s.date = %q{2010-05-22}
+  s.date = %q{2011-06-21}
   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"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "CHANGELOG",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "ext/java_bin/ext/byteswap.h",
-     "ext/java_bin/ext/extconf.rb",
-     "ext/java_bin/ext/parser.c",
-     "ext/java_bin/ext/parser.h",
-     "fixtures/javabin.dat",
-     "fixtures/javabin2.dat",
-     "fixtures/json.dat",
-     "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",
-     "lib/java_bin/ext/.keep",
-     "lib/java_bin/pure.rb",
-     "lib/java_bin/pure/parser.rb",
-     "lib/java_bin/version.rb",
-     "lib/rsolr_support.rb",
-     "lib/solr_ruby_support.rb",
-     "test/helper.rb",
-     "test/test_java_bin_parser.rb",
-     "test/xxx_performance.rb"
+    "CHANGELOG",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "ext/java_bin/ext/byteswap.h",
+    "ext/java_bin/ext/extconf.rb",
+    "ext/java_bin/ext/parser.c",
+    "ext/java_bin/ext/parser.h",
+    "fixtures/fixtures_for_solr3.1/javabin_all.dat",
+    "fixtures/fixtures_for_solr3.1/javabin_software.dat",
+    "fixtures/fixtures_for_solr3.1/json_all.dat",
+    "fixtures/fixtures_for_solr3.1/json_software.dat",
+    "fixtures/fixtures_for_solr3.1/ruby_all.dat",
+    "fixtures/fixtures_for_solr3.1/ruby_software.dat",
+    "fixtures/javabin.dat",
+    "fixtures/javabin2.dat",
+    "fixtures/json.dat",
+    "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",
+    "lib/java_bin/ext/.keep",
+    "lib/java_bin/pure.rb",
+    "lib/java_bin/pure/parser.rb",
+    "lib/java_bin/version.rb",
+    "lib/rsolr_support.rb",
+    "lib/solr_ruby_support.rb",
+    "test/helper.rb",
+    "test/test_java_bin_parser.rb",
+    "test/xxx_performance.rb"
   ]
   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.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Apache Solr JavaBin format implementation for Ruby.}
-  s.test_files = [
-    "test/helper.rb",
-     "test/xxx_performance.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::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/java_bin/pure/parser.rb CHANGED Viewed

@@ -36,12 +36,12 @@ module JavaBin
   SHIFTED_SINT          = SINT >> 5
   SHIFTED_SLONG         = SLONG >> 5
-  VERSION  = 1
+  VERSIONS  = [1, 2]
   TERM_OBJ = :term_obj
     class Parser
-      attr_reader :tag_byte, :input, :current
+      attr_reader :tag_byte, :input, :current, :version
       def initialize
       end
@@ -49,15 +49,16 @@ module JavaBin
       def parse(input)
         array = input.unpack("C*")
         check_version(array[0])
+        @current = 0
         @input = array
-        @current = 1 # HINT VERSIONをとばす
+        @version = getbyte
         @tag_byte = nil
         read_val
       end
       private
       def check_version(byte)
-        return true if VERSION == byte
+        return true if VERSIONS.include?(byte)
         raise "unsupported version #{byte}"
       end
@@ -192,22 +193,26 @@ module JavaBin
       def read_chars
         size = read_size
         str = []
-        size.times {
-          # HINT. read utf-8 char
-          b = getbyte
-          if ((b & 0x80) == 0)
-            str << b
-          elsif ((b & 0xE0) == 0xC0)
-            #str << (((b & 0x1F) << 6) | (getbyte & 0x3F))
-            str << b
-            str << getbyte
-          else
-            #str << (((b & 0x0F) << 12) | ((getbyte & 0x3F) << 6) | (getbyte & 0x3F))
-            str << b
-            str << getbyte
-            str << getbyte
-          end
-        }
+        if @version == 1
+          size.times {
+            # HINT. read utf-8 char
+            b = getbyte
+            if ((b & 0x80) == 0)
+              str << b
+            elsif ((b & 0xE0) == 0xC0)
+              #str << (((b & 0x1F) << 6) | (getbyte & 0x3F))
+              str << b
+              str << getbyte
+            else
+              #str << (((b & 0x0F) << 12) | ((getbyte & 0x3F) << 6) | (getbyte & 0x3F))
+              str << b
+              str << getbyte
+              str << getbyte
+            end
+          }
+        else
+          size.times { str << getbyte }
+        end
 	str = str.pack("C*")
         str.force_encoding('utf-8') if str.respond_to? :force_encoding
         str

data/lib/java_bin/version.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 # vim:fileencoding=utf-8
 module JavaBin
   # JavaBin version
-  VERSION = '0.3.5'
+  VERSION = '0.4.0'
   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 CHANGED Viewed

@@ -61,7 +61,7 @@ class TestJavaBinParser < Test::Unit::TestCase
     assert @parser.parse([1, 1].pack("C*"))
   end
   def test_invalid_version
-    assert_raise(RuntimeError) { @parser.parse([2].pack("C*")) }
+    assert_raise(RuntimeError) { @parser.parse([3].pack("C*")) }
   end
   def test_javabin_dat
@@ -78,6 +78,22 @@ class TestJavaBinParser < Test::Unit::TestCase
     assert_equal 19, result['response']['docs'].size
   end
+  def test_solr3_1_javabin_software_dat
+    result = @parser.parse(open("fixtures/fixtures_for_solr3.1/javabin_software.dat", READ_ASCII).read)
+    assert result['response']['docs'][0]['features'].include?('eaiou with circumflexes: êâîôû')
+    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_in_delta result['response']['maxScore'], 0.6042672, 0.0001
+    assert_in_delta result['response']['docs'][0]['score'], 0.6042672, 0.0001
+    assert_in_delta result['response']['docs'][1]['score'], 0.48341373, 0.0001
+  end
+  def test_solr3_1_javabin_all_dat
+    result = @parser.parse(open("fixtures/fixtures_for_solr3.1/javabin_all.dat", READ_ASCII).read)
+    assert_equal 17, result['response']['docs'].size
+    assert result['response']['docs'][0]['features'].include?('这是一个功能')
+  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)

metadata CHANGED Viewed

@@ -1,36 +1,27 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: java_bin
-version: !ruby/object:Gem::Version
-  hash: 25
-  prerelease: false
-  segments:
-  - 0
-  - 3
-  - 5
-  version: 0.3.5
+version: !ruby/object:Gem::Version
+  version: 0.4.0
+  prerelease:
 platform: ruby
-authors:
+authors:
 - kennyj
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-05-22 00:00:00 +09:00
+date: 2011-06-21 00:00:00.000000000 +09:00
 default_executable:
 dependencies: []
 description: Apache Solr JavaBin format (binary format) implementation for Ruby.
 email: kennyj@gmail.com
 executables: []
-extensions:
+extensions:
 - ext/java_bin/ext/extconf.rb
-extra_rdoc_files:
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files:
+files:
 - .document
-- .gitignore
 - CHANGELOG
 - LICENSE
 - README.rdoc
@@ -40,6 +31,12 @@ files:
 - ext/java_bin/ext/extconf.rb
 - ext/java_bin/ext/parser.c
 - ext/java_bin/ext/parser.h
+- fixtures/fixtures_for_solr3.1/javabin_all.dat
+- fixtures/fixtures_for_solr3.1/javabin_software.dat
+- fixtures/fixtures_for_solr3.1/json_all.dat
+- fixtures/fixtures_for_solr3.1/json_software.dat
+- fixtures/fixtures_for_solr3.1/ruby_all.dat
+- fixtures/fixtures_for_solr3.1/ruby_software.dat
 - fixtures/javabin.dat
 - fixtures/javabin2.dat
 - fixtures/json.dat
@@ -62,39 +59,27 @@ files:
 has_rdoc: true
 homepage: http://github.com/kennyj/java_bin
 licenses: []
 post_install_message:
-rdoc_options:
-- --charset=UTF-8
-require_paths:
+rdoc_options: []
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key:
 specification_version: 3
 summary: Apache Solr JavaBin format implementation for Ruby.
-test_files:
-- test/helper.rb
-- test/xxx_performance.rb
-- test/test_java_bin_parser.rb
+test_files: []

data/.gitignore DELETED Viewed

@@ -1,32 +0,0 @@
-## MAC OS
-.DS_Store
-## TEXTMATE
-*.tmproj
-tmtags
-## EMACS
-*~
-\#*
-.\#*
-## VIM
-*.swp
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-## PROJECT::SPECIFIC
-Makefile
-*.o
-*.so
-*.log
-*.orig
-*.def
-*.exp
-*.lib
-*.pdb
-*.obj
-*.s