@@ -1,5 +1,7 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'rsolr') +solr = RSolr.connect + Dir['../apache-solr/example/exampledocs/*.xml'].each do |xml_file| puts "Updating with #{xml_file}" solr.update File.read(xml_file) @@ -11,7 +13,7 @@ puts response = solr.select(:q=>'ipod', :fq=>['price:[0 TO 50]'], :rows=>2, :start=>0) -puts "URL : #{response.adapter_response[:url]} -> #{response.adapter_response[:status_code]}" +puts "URL : #{response.raw[:url]} -> #{response.raw[:status_code]}" puts examples/http.rb @@ -20,7 +20,7 @@ module RSolr::Connection # "params" is an optional hash of GET style query params # "string_query" is an extra query string that will be appended to the # result of "url" and "params". - def build_url(url='', params={}, string_query='') + def build_url url='', params={}, string_query='' queries = [string_query, hash_to_query(params)] queries.delete_if{|i| i.to_s.empty?} url += "?#{queries.join('&')}" unless queries.empty? lib/rsolr/connection.rb @@ -45,13 +45,13 @@ class RSolr::Connection::NetHttp end def get path, params={} - url = build_url path, params + url = self.build_url path, params net_http_response = self.connection.get url create_http_context net_http_response, url, path, params end def post path, data, params={}, headers={} - url = build_url path, params + url = self.build_url path, params net_http_response = self.connection.post url, data, headers create_http_context net_http_response, url, path, params, data, headers end @@ -72,7 +72,8 @@ class RSolr::Connection::NetHttp end def build_url path, params={} - super @uri.path + path, params, @uri.query + full_path = @uri.path + path + super full_path, params, @uri.query end end \ No newline at end of file lib/rsolr/connection/net_http.rb @@ -51,12 +51,12 @@ describe RSolr::Connection::NetHttp do net_http_response.should_receive(:body). and_return('The Response') http = new_net_http - http.should_receive(:build_url). - with('/select', :q=>1). - and_return('/select?q=1') + #http.should_receive(:build_url). + # with('/select', :q=>1). + # and_return('/select?q=1') c = http.send(:connection) c.should_receive(:get). - with('/select?q=1'). + with('/solr/select?q=1'). and_return(net_http_response) context = http.send(:get, '/select', :q=>1) context.should be_a(Hash) @@ -64,7 +64,7 @@ describe RSolr::Connection::NetHttp do context[:body].should == 'The Response' context[:status_code].should == 200 context[:path].should == '/select' - context[:url].should == 'http://127.0.0.1:8983/select?q=1' + context[:url].should == 'http://127.0.0.1:8983/solr/select?q=1' context[:headers].should == {} context[:params].should == {:q=>1} end @@ -76,12 +76,12 @@ describe RSolr::Connection::NetHttp do net_http_response.should_receive(:body). and_return('The Response') http = new_net_http - http.should_receive(:build_url). - with('/update', {}). - and_return('/update') + #http.should_receive(:build_url). + # with('/update', {}). + # and_return('/update') c = http.send(:connection) c.should_receive(:post). - with('/update', '<rollback/>', {}). + with('/solr/update', '<rollback/>', {}). and_return(net_http_response) context = http.send(:post, '/update', '<rollback/>') context.should be_a(Hash) @@ -89,11 +89,21 @@ describe RSolr::Connection::NetHttp do context[:body].should == 'The Response' context[:status_code].should == 200 context[:path].should == '/update' - context[:url].should == 'http://127.0.0.1:8983/update' + context[:url].should == 'http://127.0.0.1:8983/solr/update' context[:headers].should == {} context[:params].should == {} end end + context 'build_url' do + + it 'should incude the base path to solr' do + http = new_net_http + result = http.send(:build_url, '/select', :q=>'*:*', :check=>'{!}') + result.should == '/solr/select?check=%7B%21%7D&q=%2A%3A%2A' + end + + end + end \ No newline at end of file spec/api/connection/net_http_spec.rb d317d9c9523ac2d22978037f7a4b37013c49bcbc Matt Mitchell goodieboy@gmail.com http://github.com/mwmitchell/rsolr/commit/1c3a46ee08d4e56163c29a94c4c7aab89e8a749f 1c3a46ee08d4e56163c29a94c4c7aab89e8a749f 2009-10-27T18:02:37-07:00 2009-10-27T18:02:37-07:00 fixed example, added specs for build_url, fixed bad specs related to build_url 6461b6780aa5be441a61cac4811b8b9a5356c03d Matt Mitchell goodieboy@gmail.com