mwmitchell-solr 0.5.1 → 0.5.2

data/lib/solr/connection/base.rb

@@ -12,7 +12,6 @@ class Solr::Connection::Base
   #   Solr::Adapter::Direct (jRuby only)
   def initialize(adapter, opts={})
     @adapter=adapter
-    opts[:auto_commit]||=false
     opts[:global_params]||={}
     default_global_params = {
       :wt=>:ruby,
@@ -57,10 +56,9 @@ class Solr::Connection::Base
   # if :ruby is the :wt, then Solr::Response::Base is returned
   # -- there's not really a way to figure out what kind of handler request this is.
   
-  def update(data, params={}, auto_commit=nil)
+  def update(data, params={})
     params = map_params(params)
     response = @adapter.update(data, params)
-    self.commit if auto_commit.nil? ? @opts[:auto_commit]==true : auto_commit
     params[:wt]==:ruby ? Solr::Response::Update.new(response) : response
   end
   
@@ -70,7 +68,7 @@ class Solr::Connection::Base
   
   # send </commit>
   def commit(opts={})
-    update message.commit, opts, false
+    update message.commit, opts
   end
   
   # send </optimize>

data/lib/solr.rb

@@ -7,7 +7,7 @@ proc {|base, files|
 
 module Solr
   
-  VERSION = '0.5.0'
+  VERSION = '0.5.2'
   
   autoload :Adapter, 'solr/adapter'
   autoload :Message, 'solr/message'
@@ -19,16 +19,16 @@ module Solr
   
   # factory for creating connections
   # adapter name is either :http or :direct
-  # adapter_opts are sent to the adapter instance (:url for http, :dist_dir for :direct etc.)
-  # connection_opts are sent to the connection instance (:auto_commit etc.)
-  def self.connect(adapter_name, adapter_opts={}, wrapper_opts={})
+  # opts are sent to the adapter instance (:url for http, :dist_dir for :direct etc.)
+  # and to the connection instance
+  def self.connect(adapter_name, opts={})
     types = {
       :http=>'HTTP',
       :direct=>'Direct'
     }
     adapter_class_name = "Solr::Adapter::#{types[adapter_name]}"
     adapter_class = Kernel.eval adapter_class_name
-    Solr::Connection::Base.new(adapter_class.new(adapter_opts), wrapper_opts)
+    Solr::Connection::Base.new(adapter_class.new(opts), opts)
   end
   
   class RequestError < RuntimeError; end

data/test/connection_test_methods.rb

@@ -5,10 +5,11 @@
 
 module ConnectionTestMethods
   
-  def teardown
-    response = @solr.delete_by_query('id:[* TO *]')
-    assert_equal 0, @solr.query(:q=>'*:*').docs.size
-  end
+  #def teardown
+  #  @solr.delete_by_query('id:[* TO *]')
+  #  @solr.commit
+  #  assert_equal 0, @solr.query(:q=>'*:*').docs.size
+  #end
   
   # setting adapter options in Solr.connect method should set them in the adapter
   def test_set_adapter_options
@@ -18,7 +19,7 @@ module ConnectionTestMethods
   
   # setting connection options in Solr.connect method should set them in the connection
   def test_set_connection_options
-    solr = Solr.connect(:http, {}, :default_wt=>:json)
+    solr = Solr.connect(:http, :default_wt=>:json)
     assert_equal :json, solr.opts[:default_wt]
   end
   
@@ -48,15 +49,18 @@ module ConnectionTestMethods
   def test_add
     assert_equal 0, @solr.query(:q=>'*:*').total
     response = @solr.add(:id=>100)
+    @solr.commit
     assert_equal 1, @solr.query(:q=>'*:*').total
     assert response.is_a?(Solr::Response::Update)
   end
   
   def test_delete_by_id
     @solr.add(:id=>100)
+    @solr.commit
     total = @solr.query(:q=>'*:*').total
     assert_equal 1, total
     delete_response = @solr.delete_by_id(100)
+    @solr.commit
     assert delete_response.is_a?(Solr::Response::Update)
     total = @solr.query(:q=>'*:*').total
     assert_equal 0, total
@@ -64,8 +68,10 @@ module ConnectionTestMethods
   
   def test_delete_by_query
     @solr.add(:id=>1, :name=>'BLAH BLAH BLAH')
+    @solr.commit
     assert_equal 1, @solr.query(:q=>'*:*').total
     response = @solr.delete_by_query('name:BLAH BLAH BLAH')
+    @solr.commit
     assert response.is_a?(Solr::Response::Update)
     assert_equal 0, @solr.query(:q=>'*:*').total
   end

data/test/direct_test.rb

@@ -12,7 +12,9 @@ class DirectTest < Test::Unit::TestCase
     base = File.expand_path( File.dirname(__FILE__) )
     dist = File.join(base, '..', 'apache-solr')
     home = File.join(dist, 'example', 'solr')
-    @solr = Solr.connect(:direct, {:home_dir=>home, :dist_dir=>dist}, :auto_commit=>true)
+    @solr = Solr.connect(:direct, :home_dir=>home, :dist_dir=>dist)
+    @solr.delete_by_query('*:*')
+    @solr.commit
   end
   
 end

data/test/http_test.rb

@@ -7,7 +7,9 @@ class HTTPTest < Test::Unit::TestCase
   include ConnectionTestMethods
   
   def setup
-    @solr = Solr.connect(:http, {}, :auto_commit=>true)
+    @solr = Solr.connect :http
+    @solr.delete_by_query('*:*')
+    @solr.commit
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mwmitchell-solr
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Matt Mitchell