@@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "delsolr" - s.version = "0.0.3" + s.version = "0.0.4" s.authors = ["Ben VandenBos"] s.date = %q{2009-11-02} s.description = "Ruby wrapper for Lucene Solr" delsolr.gemspec @@ -37,7 +37,7 @@ module DelSolr # [<b><tt>:shortcuts</tt></b>] # (options) a list of values in the doc fields to generate short cuts for (ie: [:scores, :id], you will be able to call <tt>rsp.scores</tt> and have it return an array of scores, likewise for <tt>ids</tt>.) Defaults to [:id, :unique_id, :score] def initialize(options = {}) - @configuration = DelSolr::Client::Configuration.new(options[:server], options[:port], options[:timeout]) + @configuration = DelSolr::Client::Configuration.new(options[:server], options[:port], options[:timeout], options[:path]) @cache = options[:cache] @shortcuts = options[:shortcuts] end @@ -157,7 +157,7 @@ module DelSolr end if body.blank? # cache miss (or wasn't enabled) - header, body = connection.get(query_builder.request_string) + header, body = connection.get(configuration.path + query_builder.request_string) # add to the cache if caching if enable_caching @@ -253,7 +253,7 @@ module DelSolr # helper for posting data to solr def post(buffer) - connection.post('/solr/update', buffer, {'Content-type' => 'text/xml;charset=utf-8'}) + connection.post("#{configuration.path}/update", buffer, {'Content-type' => 'text/xml;charset=utf-8'}) end def success?(response_body) lib/delsolr.rb @@ -1,12 +1,13 @@ module DelSolr class Client class Configuration - attr_accessor :server, :port, :timeout + attr_accessor :server, :port, :timeout, :path - def initialize(server, port, timeout = 120) + def initialize(server, port, timeout = nil, path = nil) @server = server @port = port.to_i @timeout = timeout || 120 + @path = path || '/solr' end end lib/delsolr/configuration.rb @@ -109,7 +109,7 @@ module DelSolr end end - "/solr/select?#{param_strings.join('&')}" + "/select?#{param_strings.join('&')}" end # returns the query param lib/delsolr/query_builder.rb @@ -177,26 +177,40 @@ class ClientTest < Test::Unit::TestCase assert_equal(0, c.pending_documents.length) end - def test_query - c = setup_client + def test_query_with_path + c = setup_client(:path => '/abcsolr') mock_query_builder = DelSolr::Client::QueryBuilder - mock_query_builder.stubs(:request_string).returns('/solr/select?some_query') # mock the query builder + mock_query_builder.stubs(:request_string).returns('/select?some_query') # mock the query builder + DelSolr::Client::QueryBuilder.stubs(:new).returns(mock_query_builder) + c.connection.expects(:get).with("/abcsolr" + mock_query_builder.request_string).returns([nil, @@response_buffer]) # mock the connection + r = c.query('standard', :query => '123') + assert(r) + assert_equal([1,3,4,5,7,8,9,10,11,12], r.ids.sort) + assert(!r.from_cache?, 'should not be from cache') + end + + def test_query_with_default_path + c = setup_client + + mock_query_builder = DelSolr::Client::QueryBuilder + mock_query_builder.stubs(:request_string).returns('/select?some_query') # mock the query builder DelSolr::Client::QueryBuilder.stubs(:new).returns(mock_query_builder) - c.connection.expects(:get).with(mock_query_builder.request_string).returns([nil, @@response_buffer]) # mock the connection + c.connection.expects(:get).with("/solr" + mock_query_builder.request_string).returns([nil, @@response_buffer]) # mock the connection r = c.query('standard', :query => '123') assert(r) assert_equal([1,3,4,5,7,8,9,10,11,12], r.ids.sort) assert(!r.from_cache?, 'should not be from cache') end + def test_query_from_cache c = setup_client(:cache => TestCache.new) mock_query_builder = DelSolr::Client::QueryBuilder - mock_query_builder.stubs(:request_string).returns('/solr/select?some_query') # mock the query builder + mock_query_builder.stubs(:request_string).returns('/select?some_query') # mock the query builder DelSolr::Client::QueryBuilder.stubs(:new).returns(mock_query_builder) - c.connection.expects(:get).with(mock_query_builder.request_string).returns([nil, @@response_buffer]) # mock the connection + c.connection.expects(:get).with("/solr" + mock_query_builder.request_string).returns([nil, @@response_buffer]) # mock the connection r = c.query('standard', :query => '123', :enable_caching => true) assert(r) assert_equal([1,3,4,5,7,8,9,10,11,12], r.ids.sort) test/test_client.rb 5f4aeef5ad60e6c0f7f51a788f34e46dcb8610df Ben VandenBos ben@ben-01.local http://github.com/avvo/delsolr/commit/2648cbc415c0d2293a2c623cc903f40639632e99 2648cbc415c0d2293a2c623cc903f40639632e99 2009-11-03T09:16:20-08:00 2009-11-03T09:16:20-08:00 Adding an option :path option to DelSolr::Client for non-standard solr installs 9af6b603c5d6366ece7527c5969467b67e5456eb Ben VandenBos ben@ben-01.local