java_bin 0.4.0 → 0.4.1

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - 1.8.7

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.4.1 (2012/09/3)
+  * Adds travis ci support.
+  * Adds bundler support.
+  * First working version with rsolr 1.0.8.
+
 0.4.0 (2011/6/21)
   * solr 3.1 support
   * RailsInstaller support

data/Gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gem 'jeweler'
+gem 'rake-compiler'
+gem 'json'
+
+group :test do
+  gem 'rsolr'
+  gem 'mocha'
+end

data/Gemfile.lock

@@ -0,0 +1,31 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (3.0.0)
+    git (1.2.5)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.7.5)
+    metaclass (0.0.1)
+    mocha (0.12.3)
+      metaclass (~> 0.0.1)
+    rake (0.9.2.2)
+    rake-compiler (0.8.1)
+      rake
+    rdoc (3.12)
+      json (~> 1.4)
+    rsolr (1.0.8)
+      builder (>= 2.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler
+  json
+  mocha
+  rake-compiler
+  rsolr

data/README.rdoc

@@ -32,7 +32,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, YARV 1.9.1 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, YARV 1.9.3 on Ubuntu Linux 9.10 (32bit) and MRI 1.8.6, YARV 1.9.1 on Windows Vista (32bit), and Apache Solr 1.4, 3.1  
 
 == Install
 
@@ -75,12 +75,10 @@ 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
 * shared string over parsing
-* builder(writer)作成
+* builder(writer)
 * JRuby support
 
 == References
@@ -106,4 +104,4 @@ Toshinori Kajihara <mailto:kennyj@gmail.com>
 
 == Copyright
 
-Copyright (c) 2010 kennyj. See LICENSE for details.
+Copyright (c) 2010 - 2012 kennyj. See LICENSE for details.

data/Rakefile

@@ -1,5 +1,13 @@
 require 'rubygems'
 require 'rake'
+require 'rake/extensiontask'
+
+Rake::ExtensionTask.new do |ext|
+  ext.name = 'parser'                # indicate the name of the extension.
+  ext.ext_dir = 'ext/java_bin/ext'         # search for 'hello_world' inside it.
+  ext.lib_dir = 'lib/java_bin/ext'              # put binaries into this folder.
+  ext.tmp_dir = 'tmp'                     # temporary folder used during compilation.
+end
 
 begin
   require 'jeweler'
@@ -38,11 +46,11 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
+task :test => :compile
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/how_to_release.txt

@@ -1,3 +1,13 @@
+* rvm use 1.9.3
+* bundle update
+* rake
+* JavaBin=pure rake
+* rvm use 1.9.2
+* bundle update
+* rake
+* JavaBin=pure rake
+* rvm use ree
+* bundle update
 * rake
 * JavaBin=pure rake
 * vim CHANGELOG

data/java_bin.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{java_bin}
-  s.version = "0.4.0"
+  s.name = "java_bin"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kennyj"]
-  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.date = "2012-09-03"
+  s.description = "Apache Solr JavaBin format (binary format) implementation for Ruby."
+  s.email = "kennyj@gmail.com"
   s.extensions = ["ext/java_bin/ext/extconf.rb"]
   s.extra_rdoc_files = [
     "LICENSE",
@@ -19,7 +19,10 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".travis.yml",
     "CHANGELOG",
+    "Gemfile",
+    "Gemfile.lock",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
@@ -52,20 +55,30 @@ Gem::Specification.new do |s|
     "lib/solr_ruby_support.rb",
     "test/helper.rb",
     "test/test_java_bin_parser.rb",
+    "test/test_rsolr_support.rb",
     "test/xxx_performance.rb"
   ]
-  s.homepage = %q{http://github.com/kennyj/java_bin}
+  s.homepage = "http://github.com/kennyj/java_bin"
   s.require_paths = ["lib", "ext"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Apache Solr JavaBin format implementation for Ruby.}
+  s.rubygems_version = "1.8.24"
+  s.summary = "Apache Solr JavaBin format implementation for Ruby."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<rake-compiler>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
     else
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rake-compiler>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
     end
   else
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rake-compiler>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
   end
 end
 

data/lib/java_bin/version.rb

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

data/lib/rsolr_support.rb

@@ -4,15 +4,22 @@ if defined? RSolr::Client
 
   class RSolr::Client
     protected
-  
-    def map_params(params)
-      params ||= {}
-      {:wt=>:javabin}.merge(params)
+
+    def send_and_receive_with_java_bin(path, opts={})
+      if opts[:params].nil?
+        opts[:params]={}
+      end
+      opts[:params][:wt] = :javabin
+
+      send_and_receive_without_java_bin(path, opts)
     end
-  
-    def adapt_response_with_java_bin(connection_response)
-      data = adapt_response_without_java_bin(connection_response)
-      data = JavaBin.parser.new.parse(data) if data.raw[:params][:wt] == :javabin
+
+    alias_method :send_and_receive_without_java_bin, :send_and_receive
+    alias_method :send_and_receive, :send_and_receive_with_java_bin
+
+    def adapt_response_with_java_bin(request, response)
+      data = adapt_response_without_java_bin(request, response)
+      data = JavaBin.parser.new.parse(data) if request[:params][:wt] == :javabin
       data
     end
 

data/test/helper.rb

@@ -1,10 +1,17 @@
 # vim:fileencoding=utf-8
 require 'rubygems'
+require 'bundler'
 require 'test/unit'
 
+ENV['TZ']='JST-9'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+Bundler.require(:test)
+
 require 'java_bin'
 
 class Test::Unit::TestCase
+  READ_UTF8 = (RUBY_VERSION >= '1.9' ? 'rb:utf-8' : 'rb')
+  READ_ASCII = (RUBY_VERSION >= '1.9' ? 'rb:ascii' : 'rb')
 end

data/test/test_java_bin_parser.rb

@@ -14,9 +14,6 @@ end
 
 class TestJavaBinParser < Test::Unit::TestCase
 
-  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)
     while ((i & ~0x7F) != 0)

data/test/test_rsolr_support.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestRSolrSupportTest < Test::Unit::TestCase
+  def test_queries_are_performed_with_javabin
+
+    rsolr_connection=mock()
+    rsolr_connection.expects(:execute).
+            with { |rsolr_client, params|
+              assert_equal({:wt => :javabin}, params[:params])
+              true
+            }.
+            returns(:status => 200,
+                    :headers => '',
+                    :body => open(File.join(File.dirname(__FILE__), '..', 'fixtures', 'javabin2.dat'), READ_ASCII).read)
+
+    RSolr::Connection.expects(:new).returns(rsolr_connection)
+
+    rsolr = RSolr.connect
+
+    assert_equal({"status" => 0,
+                  "QTime" => 0,
+                  "params" =>
+                      {"indent" => "on",
+                       "start" => "0",
+                       "q" => "*:*\r\n",
+                       "wt" => "javabin",
+                       "version" => "2.2",
+                       "rows" => "100"}}, rsolr.select(:q => 'whatever')['responseHeader'])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: java_bin
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-21 00:00:00.000000000 +09:00
-default_executable: 
-dependencies: []
+date: 2012-09-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Apache Solr JavaBin format (binary format) implementation for Ruby.
 email: kennyj@gmail.com
 executables: []
@@ -22,7 +69,10 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- .travis.yml
 - CHANGELOG
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -55,8 +105,8 @@ files:
 - lib/solr_ruby_support.rb
 - test/helper.rb
 - test/test_java_bin_parser.rb
+- test/test_rsolr_support.rb
 - test/xxx_performance.rb
-has_rdoc: true
 homepage: http://github.com/kennyj/java_bin
 licenses: []
 post_install_message: 
@@ -78,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Apache Solr JavaBin format implementation for Ruby.