diff --git a/client/ruby/solr-ruby/Rakefile b/client/ruby/solr-ruby/Rakefile
index a521991dc5f..be6773bb49e 100644
--- a/client/ruby/solr-ruby/Rakefile
+++ b/client/ruby/solr-ruby/Rakefile
@@ -29,7 +29,7 @@
#
# rake SOLR_CONSOLE=true
-SOLR_RUBY_VERSION = '0.0.1'
+SOLR_RUBY_VERSION = '0.0.2'
require 'rubygems'
require 'rake'
diff --git a/client/ruby/solr-ruby/lib/solr/connection.rb b/client/ruby/solr-ruby/lib/solr/connection.rb
index 1c2d7744312..43c906e6a6b 100755
--- a/client/ruby/solr-ruby/lib/solr/connection.rb
+++ b/client/ruby/solr-ruby/lib/solr/connection.rb
@@ -89,8 +89,8 @@ class Solr::Connection
end
# sends a commit message to the server
- def commit
- response = send(Solr::Request::Commit.new)
+ def commit(options={})
+ response = send(Solr::Request::Commit.new(options))
return response.ok?
end
diff --git a/client/ruby/solr-ruby/lib/solr/request/commit.rb b/client/ruby/solr-ruby/lib/solr/request/commit.rb
index 1d5307605ec..bcf1308d8b1 100644
--- a/client/ruby/solr-ruby/lib/solr/request/commit.rb
+++ b/client/ruby/solr-ruby/lib/solr/request/commit.rb
@@ -14,8 +14,18 @@ require 'solr/xml'
class Solr::Request::Commit < Solr::Request::Update
+ def initialize(options={})
+ @wait_searcher = options[:wait_searcher] || true
+ @wait_flush = options[:wait_flush] || true
+ end
+
+
def to_s
- Solr::XML::Element.new('commit').to_s
+ e = Solr::XML::Element.new('commit')
+ e.attributes['waitSearcher'] = @wait_searcher ? 'true' : 'false'
+ e.attributes['waitFlush'] = @wait_flush ? 'true' : 'false'
+
+ e.to_s
end
end
diff --git a/client/ruby/solr-ruby/test/unit/request_test.rb b/client/ruby/solr-ruby/test/unit/request_test.rb
index e99fa6d4385..dd4ef903398 100755
--- a/client/ruby/solr-ruby/test/unit/request_test.rb
+++ b/client/ruby/solr-ruby/test/unit/request_test.rb
@@ -22,7 +22,7 @@ class RequestTest < Test::Unit::TestCase
request = Solr::Request::Commit.new
assert_equal :xml, request.response_format
assert_equal 'update', request.handler
- assert_equal '', request.to_s
+ assert_equal '', request.to_s
end
def test_add_doc_request