delsolr 0.0.3 → 0.0.4

data/README.txt

@@ -7,6 +7,17 @@ http://delsolr.rubyforge.org
 DelSolr is a light weight ruby wrapper for solr.  It's intention is to expose the full power of solr queries 
 while keeping the interface as ruby-esque as possible.
 
+== Installation
+
+Can be installed as a gem which is hosted on http://gemcutter.org
+
+    gem install delsolr
+
+or as a plugin...
+
+    ruby script/plugin install git://github.com/avvo/delsolr.git
+
+
 == PROBLEMS:
 
 * Not threadsafe yet

data/lib/delsolr/configuration.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

data/lib/delsolr/query_builder.rb

@@ -109,7 +109,7 @@ module DelSolr
           end
         end
         
-        "/solr/select?#{param_strings.join('&')}"
+        "/select?#{param_strings.join('&')}"
       end
       
       # returns the query param

data/lib/delsolr.rb

@@ -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)

data/test/test_client.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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: delsolr
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Ben VandenBos
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: DelSolr is a light weight ruby wrapper for solr.  It's intention is to expose the full power of solr queries while keeping the interface as ruby-esque as possible.