rsolr 0.12.1 → 0.13.0.pre

data/README.rdoc

@@ -9,16 +9,21 @@ A simple, extensible Ruby client for Apache Solr.
 == Example:
   require 'rubygems'
   require 'rsolr'
+  
+  # Direct connection
   solr = RSolr.connect :url=>'http://solrserver.com'
   
+  # Connecting over a proxy server
+  solr = RSolr.connect :url=>'http://solrserver.com', :proxy=>'http://user:pass@proxy.example.com:8080'
+  
   # send a request to /select
-  response = rsolr.select :q=>'*:*'
+  response = solr.select :q=>'*:*'
   
   # send a request to a custom request handler; /catalog
-  response = rsolr.request '/catalog', :q=>'*:*'
+  response = solr.request '/catalog', :q=>'*:*'
   
   # alternative to above:
-  response = rsolr.catalog :q=>'*:*'
+  response = solr.catalog :q=>'*:*'
 
 == Querying
 Use the #select method to send requests to the /select handler:
@@ -107,6 +112,7 @@ The raw is a hash that contains the generated params, url, path, post data, head
 * {RSolr Google Group}[http://groups.google.com/group/rsolr] -- The RSolr discussion group
 * {rsolr-ext}[http://github.com/mwmitchell/rsolr-ext] -- An extension kit for RSolr
 * {rsolr-direct}[http://github.com/mwmitchell/rsolr-direct] -- JRuby direct connection for RSolr
+* {rsolr-nokogiri}[http://github.com/mwmitchell/rsolr-nokogiri] -- Gives RSolr Nokogiri for XML generation.
 * {SunSpot}[http://github.com/outoftime/sunspot] -- An awesome Solr DSL, built with RSolr
 * {Blacklight}[http://blacklightopac.org] -- A "next generation" Library OPAC, built with RSolr
 * {java_bin}[http://github.com/kennyj/java_bin] -- Provides javabin/binary parsing for RSolr
@@ -122,8 +128,12 @@ The raw is a hash that contains the generated params, url, path, post data, head
 * Send me a pull request. Bonus points for topic branches.
 
 ==Contributors
-* mperham
+* Lorenzo Riccucci
+* Mike Perham
 * Mat Brown
-* shairontoledo
+* Shairon Toledo
 * Matthew Rudy
-* Fouad Mardini
+* Fouad Mardini
+* Jeremy Hinegardner
+* Nathan Witmer
+* Craig Smith

data/VERSION

@@ -1 +1 @@
-0.12.1
+0.13.0.pre

data/lib/rsolr.rb

@@ -47,4 +47,7 @@ module RSolr
   # RequestError is a common/generic exception class used by the adapters
   class RequestError < RuntimeError; end
   
+  # TODO: The connection drivers need to start raising this...
+  class ConnectionError < RuntimeError; end
+  
 end

data/lib/rsolr/client.rb

@@ -42,18 +42,38 @@ class RSolr::Client
   # update using an array
   # solr.update([{:id=>1, :name=>'one'}, {:id=>2, :name=>'two'}])
   #
-  def add(doc, &block)
-    update message.add(doc, &block)
+  def add(doc, params={}, &block)
+    update message.add(doc, params, &block)
   end
 
-  # send </commit>
-  def commit
-    update message.commit
+  # send "commit" message with options
+  #
+  # Options recognized by solr
+  #
+  #   :maxSegments    => N - optimizes down to at most N number of segments
+  #   :waitFlush      => true|false - do not return until changes are flushed to disk
+  #   :waitSearcher   => true|false - do not return until a new searcher is opened and registered
+  #   :expungeDeletes => true|false - merge segments with deletes into other segments #NOT
+  #
+  # *NOTE* :expungeDeletes is Solr 1.4 only
+  #
+  def commit( options = {} )
+    update message.commit( options )
   end
 
-  # send </optimize>
-  def optimize
-    update message.optimize
+  # send "optimize" message with options.
+  #
+  # Options recognized by solr
+  #
+  #   :maxSegments    => N - optimizes down to at most N number of segments
+  #   :waitFlush      => true|false - do not return until changes are flushed to disk
+  #   :waitSearcher   => true|false - do not return until a new searcher is opened and registered
+  #   :expungeDeletes => true|false - merge segments with deletes into other segments
+  #
+  # *NOTE* :expungeDeletes is Solr 1.4 only
+  #
+  def optimize( options = {} )
+    update message.optimize( options )
   end
 
   # send </rollback>
@@ -77,7 +97,7 @@ class RSolr::Client
   end
   
   # shortcut to RSolr::Message::Generator
-  def message *opts
+  def message
     @message ||= RSolr::Message::Generator.new
   end
   

data/lib/rsolr/connection.rb

@@ -4,6 +4,6 @@ module RSolr::Connection
   
   autoload :NetHttp, 'rsolr/connection/net_http'
   autoload :Utils, 'rsolr/connection/utils'
-  autoload :Requestable, 'rsolr/connection/requestable'
+  autoload :Httpable, 'rsolr/connection/httpable'
   
 end

data/lib/rsolr/connection/httpable.rb

@@ -0,0 +1,101 @@
+# A module that defines the interface and top-level logic for http based connection classes.
+# Httpable provides URL parsing and handles proxy logic.
+
+module RSolr::Connection::Httpable
+  
+  include RSolr::Connection::Utils
+  
+  attr_reader :opts, :uri, :proxy
+  
+  # opts can have:
+  #   :url => 'http://localhost:8080/solr'
+  def initialize opts={}
+    opts[:url] ||= 'http://127.0.0.1:8983/solr'
+    @opts = opts
+    @uri = URI.parse opts[:url]
+    @proxy = URI.parse opts[:proxy] if opts[:proxy]
+  end
+  
+  # send a request to the connection
+  # request '/select', :q=>'*:*'
+  #
+  # request '/update', {:wt=>:xml}, '</commit>'
+  # 
+  # force a post where the post body is the param query
+  # request '/update', "<optimize/>", :method=>:post
+  #
+  def request path, params={}, *extra
+    extra = extra.dup
+    opts = extra[-1].kind_of?(Hash) ? extra.pop : {}
+    data = extra[0]
+    
+    context = create_http_context path, params, data, opts
+    
+    error = nil
+    
+    begin
+      
+      # if data is being sent, this is a POST
+      if context[:data]
+        response = self.post context[:path], context[:data], context[:headers]
+      # use POST if :method => :post
+      elsif opts[:method] == :post
+        response = self.post context[:path], context[:query], context[:headers]
+      # GET
+      else
+        response = self.get context[:path]
+      end
+      
+      # spray out our response into variables...
+      body, status_code, message = response
+      
+      # merge the response into the http context
+      context.merge!(:body => body, :status_code => status_code, :message => message)
+      
+    rescue
+      # throw RequestError?
+      context[:message] = $!.to_s
+    end
+    
+    # if no :message but a non-200, throw a "SolrRequestError" ?
+    unless context[:status_code] == 200
+      error = context[:message] || "Non-200 Response Status Code" 
+      raise RSolr::RequestError.new("#{error} -> #{context.inspect}")
+    end
+    
+    context
+  end
+  
+  # -> should this stuff be in a "ReqResContext" class? ->
+  
+  # creates a Hash based "context"
+  # that contains all of the information sent to Solr
+  # The keys are:
+  #   :host, :path, :params, :query, :data, :headers
+  def create_http_context path, params, data=nil, opts={}
+    context = {:host => base_url, :path => build_url(path), :params => params, :query => hash_to_query(params), :data => data}
+    if opts[:method] == :post
+      raise "Don't send POST data when using :method => :post" unless data.to_s.empty?
+      # force a POST, use the query string as the POST body
+      context.merge! :data => hash_to_query(params), :headers => {'Content-Type' => 'application/x-www-form-urlencoded'}
+    elsif data
+      # standard POST, using "data" as the POST body
+      context.merge! :headers => {'Content-Type' => 'text/xml; charset=utf-8'}
+    else
+      context.merge! :path => build_url(path, params)
+    end
+    context
+  end
+  
+  # accepts a path/string and optional hash of query params
+  # returns a string that represents the full url
+  def build_url path, params={}
+    full_path = @uri.path + path
+    super full_path, params, @uri.query
+  end
+  
+  def base_url
+    "#{@uri.scheme}://#{@uri.host}" + (@uri.port ? ":#{@uri.port}" : "")
+  end
+
+end

data/lib/rsolr/connection/net_http.rb

@@ -5,44 +5,26 @@ require 'net/http'
 #
 class RSolr::Connection::NetHttp
   
-  include RSolr::Connection::Requestable
+  include RSolr::Connection::Httpable
   
   def connection
-    @connection ||= Net::HTTP.new(@uri.host, @uri.port)
+    if @proxy
+      proxy_user, proxy_pass = @proxy.userinfo.split(/:/) if @proxy.userinfo
+      @connection ||= Net::HTTP.Proxy(@proxy.host, @proxy.port, proxy_user, proxy_pass).new(@uri.host, @uri.port)
+    else
+      @connection ||= Net::HTTP.new(@uri.host, @uri.port)
+    end
   end
   
-  def get path, params={}
-    url = self.build_url path, params
+  # maybe follow Rack and do [status, headers, body]
+  def get url
     net_http_response = self.connection.get url
-    create_http_context net_http_response, url, path, params
+    [net_http_response.code.to_i, net_http_response.message, net_http_response.body]
   end
   
-  def post path, data, params={}, headers={}
-    url = self.build_url path, params
+  def post url, data, headers={}
     net_http_response = self.connection.post url, data, headers
-    create_http_context net_http_response, url, path, params, data, headers
-  end
-  
-  def create_http_context net_http_response, url, path, params, data=nil, headers={}
-    full_url = "#{@uri.scheme}://#{@uri.host}"
-    full_url += @uri.port ? ":#{@uri.port}" : ''
-    full_url += url
-    {
-      :status_code=>net_http_response.code.to_i,
-      :url=>full_url,
-      :body=> encode_utf8(net_http_response.body),
-      :path=>path,
-      :params=>params,
-      :data=>data,
-      :headers=>headers,
-      :message => net_http_response.message
-    }
-  end
-  
-  # accepts a path/string and optional hash of query params
-  def build_url path, params={}
-    full_path = @uri.path + path
-    super full_path, params, @uri.query
+    [net_http_response.code.to_i, net_http_response.message, net_http_response.body]
   end
   
 end

data/lib/rsolr/connection/utils.rb

@@ -1,5 +1,5 @@
 # Helpful utility methods for building queries to a Solr server
-# This includes helpers that the Direct connection can use.
+# This includes helpers that the Direct connection can use --  not specific to http, for example
 module RSolr::Connection::Utils
   
   # Performs URI escaping so that you can construct proper
@@ -19,7 +19,7 @@ module RSolr::Connection::Utils
       string.force_encoding(Encoding::UTF_8) : string
   end
   
-  # Return the bytesize of String; uses String#length under Ruby 1.8 and
+  # Return the bytesize of String; uses String#size under Ruby 1.8 and
   # String#bytesize under 1.9.
   if ''.respond_to?(:bytesize)
     def bytesize(string)
@@ -53,11 +53,12 @@ module RSolr::Connection::Utils
   #
   # converts hash into URL query string, keys get an alpha sort
   # if a value is an array, the array values get mapped to the same key:
-  #   hash_to_query(:q=>'blah', :fq=>['blah', 'blah'], :facet=>{:field=>['location_facet', 'format_facet']})
+  #   hash_to_query(:q=>'blah-query', :fq=>['f1', 'f1'], :facet=>true, 'facet.field'=>['location_facet', 'format_facet'])
   # returns:
-  #   ?q=blah&fq=blah&fq=blah&facet.field=location_facet&facet.field=format.facet
+  #   ?q=blah-query&fq=f1&fq=f2&facet=true&facet.field=location_facet&facet.field=format.facet
+  #
+  # if a value is empty/nil etc., it is tossed out
   #
-  # if a value is empty/nil etc., it is not added
   def hash_to_query(params)
     mapped = params.map do |k, v|
       next if v.to_s.empty?
@@ -69,5 +70,5 @@ module RSolr::Connection::Utils
     end
     mapped.compact.join("&")
   end
-
+  
 end

data/spec/api/client_spec.rb

@@ -26,18 +26,40 @@ describe RSolr::Client do
       }
       client.add(:id=>1)
     end
-    
+
     it 'should forward #commit calls to #update' do
       client.should_receive(:update).
         with("<?xml version=\"1.0\" encoding=\"UTF-8\"?><commit/>")
       client.commit
     end
+
+    it 'should forward #commit calls with options to #update' do
+      opts = {:waitFlush => false, :waitSearcher => false, :expungeDeletes => true}
+      # when client.commit is called, it eventually calls update
+      client.should_receive(:update).
+        with(opts)
+      # client.message is calls to create the xml
+      client.message.should_receive(:commit).
+        and_return(opts)
+      client.commit(opts)
+    end
     
     it 'should forward #optimize calls to #update' do
       client.should_receive(:update).
         with("<?xml version=\"1.0\" encoding=\"UTF-8\"?><optimize/>")
       client.optimize
     end
+
+    it 'should forward #optimize calls with options to #update' do
+      opts = {:maxSegments => 5, :waitFlush => false}
+      # when client.commit is called, it eventually calls update
+      client.should_receive(:update).
+        with(opts)
+      # client.message is calls to create the xml
+      client.message.should_receive(:optimize).
+        and_return(opts)
+      client.optimize(opts)
+    end
     
     it 'should forward #rollback calls to #update' do
       client.should_receive(:update).
@@ -69,9 +91,9 @@ describe RSolr::Client do
           and_return(:params=>{})
       client.request '/music', :q=>'Coltrane'
     end
-    
+
   end
-  
+
   context :adapt_response do
     
     it 'should not try to evaluate ruby when the :qt is not :ruby' do
@@ -90,4 +112,4 @@ describe RSolr::Client do
     
   end
   
-end
+end

data/spec/api/connection/httpable_spec.rb

@@ -0,0 +1,157 @@
+describe RSolr::Connection::Httpable do
+  
+  # calls #let to set "net_http" as method accessor
+  class R
+    include RSolr::Connection::Httpable
+  end
+  
+  module HttpableHelper
+    def self.included base
+      base.let(:httpable){R.new}
+    end
+  end
+  
+  context 'new' do
+    
+    include HttpableHelper
+    
+    it 'should define an intialize method that accepts a hash argument' do
+      lambda{R.new({})}.should_not raise_error 
+    end
+  
+    it 'should have an #opts attribute after creation' do
+      httpable.should respond_to(:opts)
+    end
+  
+    it 'should have an #uri attribute after creation' do
+      httpable.should respond_to(:uri)
+    end
+    
+  end
+  
+  context 'opts and uri' do
+    
+    it 'should allow setting the opts' do
+      opts = {:url=>'blah'}
+      r = R.new(opts)
+      r.opts.should == opts
+    end
+    
+    it 'should parser the url option into a URI object' do
+      opts = {:url => 'http://xyz:1010/solr'}
+      r = R.new(opts)
+      r.uri.should be_a(URI)
+      r.uri.host.should == 'xyz'
+    end
+    
+  end
+  
+  context :build_url do
+    
+    include HttpableHelper
+    
+    it 'should build a full path and create a query string' do
+      r = httpable
+      r.build_url("/select", :q=>1).should == '/solr/select?q=1'
+    end
+    
+    it 'should build a full path without a query string' do
+      r = httpable
+      r.build_url("/select").should == '/solr/select'
+    end
+    
+  end
+  
+  context :create_http_context do
+    
+    include HttpableHelper
+    
+    it "should build a simple GET context" do
+      r = httpable
+      result = r.create_http_context('/select', :q=>'a', :fq=>'b')
+      expected = {:path=>"/solr/select?q=a&fq=b", :params=>{:q=>"a", :fq=>"b"}, :data=>nil, :query=>"q=a&fq=b", :host=>"http://127.0.0.1:8983"}
+      
+      result.keys.all? {|v| expected.keys.include?(v) }
+      result.values.all? {|v| expected.values.include?(v) }
+    end
+    
+    it "should build a POST context" do
+      r = httpable
+      result = r.create_http_context('/select', {:wt => :xml}, '<commit/>')
+      expected = {:path=>"/solr/select", :params=>{:wt=>:xml}, :headers=>{"Content-Type"=>"text/xml; charset=utf-8"}, :data=>"<commit/>", :query=>"wt=xml", :host=>"http://127.0.0.1:8983"}
+      result.should == expected
+    end
+    
+    it "should raise an exception when trying to use POST data AND :method => :post" do
+      r = httpable
+      lambda{
+        r.create_http_context('/select', {:wt => :xml}, '<commit/>', :method => :post)
+      }.should raise_error("Don't send POST data when using :method => :post")
+    end
+    
+    it "should form-encoded POST context" do
+      r = httpable
+      result = r.create_http_context('/select', {:q => 'some gigantic query string that is too big for GET (for example)'}, nil, :method => :post)
+      result.should == {:path=>"/solr/select", :params=>{:q=>"some gigantic query string that is too big for GET (for example)"}, :headers=>{"Content-Type"=>"application/x-www-form-urlencoded"}, :data=>"q=some+gigantic+query+string+that+is+too+big+for+GET+%28for+example%29", :query=>"q=some+gigantic+query+string+that+is+too+big+for+GET+%28for+example%29", :host=>"http://127.0.0.1:8983"}
+    end
+    
+  end
+  
+  context :request do
+    
+    include HttpableHelper
+    
+    it "should be able to build a request context, pass the url to #get and return a full context" do
+      httpable.should_receive(:create_http_context).
+        with("/admin/ping", {}, nil, {}).
+          and_return({:path => '/solr/admin/ping'})
+      httpable.should_receive(:get).
+        with('/solr/admin/ping').
+          and_return(["asdfasdf", 200, "OK"])
+      response = httpable.request '/admin/ping'
+      response.should == {:status_code=>200, :message=>"OK", :path=>"/solr/admin/ping", :body=>"asdfasdf"}
+    end
+    
+    it 'should send a get to itself with params' do
+      httpable.should_receive(:get).
+        with("/solr/blahasdf?id=1").
+          and_return(["", 200, "OK"])
+      r = httpable.request('/blahasdf', :id=>1)
+      r.should == {:status_code=>200, :path=>"/solr/blahasdf?id=1", :params=>{:id=>1}, :message=>"OK", :data=>nil, :query=>"id=1", :host=>"http://127.0.0.1:8983", :body=>""}
+    end
+    
+    it 'should raise an error if the status_code is not 200' do
+      httpable.should_receive(:get).
+        with("/solr/blah?id=1").
+          and_return( ["", 404, "Not Found"] )
+      lambda{
+        httpable.request('/blah', :id=>1).should == true
+      }.should raise_error(/Not Found/)
+    end
+    
+    it 'should send a post to itself if data is supplied' do
+      httpable.should_receive(:post).
+        with("/solr/blah", "<commit/>", {"Content-Type"=>"text/xml; charset=utf-8"}).
+          and_return(["", 200, "OK"])
+      httpable.request('/blah', {:id=>1}, "<commit/>")#.should == expected_response
+    end
+    
+    it 'should send a post to itself when :method=>:post is set even if no POST data is supplied' do
+      httpable.should_receive(:post).
+        with("/solr/blah", "q=testing", {"Content-Type"=>"application/x-www-form-urlencoded"}).
+          and_return(["", 200, "OK"])
+      response = httpable.request('/blah', {:q => "testing"}, :method => :post)#.should == expected_response
+      response[:body].should == ""
+      response[:path].should == "/solr/blah"
+      response[:message].should == "OK"
+      response[:status_code].should == 200
+      response[:params].should == {:q=>"testing"}
+      response[:headers].should == {"Content-Type"=>"application/x-www-form-urlencoded"}
+      response[:data].should == "q=testing"
+      response[:query].should == "q=testing"
+      response[:host].should == "http://127.0.0.1:8983"
+    end
+    
+  end
+  
+end

data/spec/api/connection/net_http_spec.rb

@@ -12,23 +12,26 @@ describe RSolr::Connection::NetHttp do
     include NetHttpHelper
     
     it 'should forward simple, non-data calls to #get' do
+      net_http.should_receive(:create_http_context).
+        with("/select", {:q=>"a"}, nil, {}).
+          and_return(:path=>"/solr/select?q=a", :params=>{:q=>"a"}, :data=>nil, :query=>"q=a", :host=>"http://127.0.0.1:8983")
       net_http.should_receive(:get).
-        with('/select', :q=>'a').
-          and_return({:status_code=>200})
-      net_http.request('/select', :q=>'a') 
+        with("/solr/select?q=a").
+          and_return(['', 200, 'OK'])
+      net_http.request('/select', :q=>'a')
     end
     
     it 'should forward :method=>:post calls to #post with a special header' do
       net_http.should_receive(:post).
-        with('/select', 'q=a', {}, {"Content-Type"=>"application/x-www-form-urlencoded"}).
-          and_return({:status_code=>200})
+        with("/solr/select", "q=a", {"Content-Type"=>"application/x-www-form-urlencoded"}).
+          and_return(["", 200, "OK"])
       net_http.request('/select', {:q=>'a'}, :method=>:post)
     end
     
     it 'should forward data calls to #post' do
       net_http.should_receive(:post).
-        with("/update", "<optimize/>", {}, {"Content-Type"=>"text/xml; charset=utf-8"}).
-          and_return({:status_code=>200})
+        with("/solr/update", "<optimize/>", {"Content-Type"=>"text/xml; charset=utf-8"}).
+          and_return(["", 200, "OK"])
       net_http.request('/update', {}, '<optimize/>')
     end
     
@@ -61,21 +64,14 @@ describe RSolr::Connection::NetHttp do
         with('/solr/select?q=1').
           and_return(net_http_response)
       
-      context = net_http.send(:get, '/select', :q=>1)
-      context.should be_a(Hash)
+      context = net_http.send(:get, '/solr/select?q=1')
+      context.should be_a(Array)
       
-      keys = [:data, :body, :status_code, :path, :url, :headers, :params, :message]
-      context.keys.size.should == keys.size
-      context.keys.all?{|key| keys.include?(key) }.should == true
+      context.size.should == 3
       
-      context[:data].should == nil
-      context[:body].should == 'The Response'
-      context[:status_code].should == 200
-      context[:path].should == '/select'
-      context[:url].should == 'http://127.0.0.1:8983/solr/select?q=1'
-      context[:headers].should == {}
-      context[:params].should == {:q=>1}
-      context[:message].should == 'OK'
+      context[0].should == 200
+      context[1].should == 'OK'
+      context[2].should == 'The Response'
     end
     
     it 'should make a POST request as expected' do
@@ -90,21 +86,14 @@ describe RSolr::Connection::NetHttp do
       c.should_receive(:post).
         with('/solr/update', '<rollback/>', {}).
           and_return(net_http_response)
-      context = net_http.send(:post, '/update', '<rollback/>')
-      context.should be_a(Hash)
+      context = net_http.send(:post, '/solr/update', '<rollback/>')
+      context.should be_a(Array)
       
-      keys = [:data, :body, :status_code, :path, :url, :headers, :params, :message]
-      context.keys.size.should == keys.size
-      context.keys.all?{|key| keys.include?(key) }.should == true
+      context.size.should == 3
       
-      context[:data].should == '<rollback/>'
-      context[:body].should == 'The Response'
-      context[:status_code].should == 200
-      context[:path].should == '/update'
-      context[:url].should == 'http://127.0.0.1:8983/solr/update'
-      context[:headers].should == {}
-      context[:params].should == {}
-      context[:message].should == 'OK'
+      context[0].should == 200
+      context[1].should == 'OK'
+      context[2].should == 'The Response'
     end
     
   end
@@ -145,4 +134,4 @@ describe RSolr::Connection::NetHttp do
     
   end
   
-end
+end

data/spec/api/connection/utils_spec.rb

@@ -39,12 +39,12 @@ describe RSolr::Connection::Utils do
       utils.hash_to_query(my_params).should == expected
     end
     
-    it 'should escape comlex queries, part 2' do
+    it 'should escape complex queries, part 2' do
       my_params = {'q' => '+popularity:[10 TO *] +section:0'}
       expected = 'q=%2Bpopularity%3A%5B10+TO+%2A%5D+%2Bsection%3A0'
       utils.hash_to_query(my_params).should == expected
     end
-    
+        
   end
   
   context 'escape method' do
@@ -81,4 +81,4 @@ describe RSolr::Connection::Utils do
     
   end
   
-end
+end

data/spec/integration/http_errors_spec.rb

@@ -0,0 +1,12 @@
+describe "Solr servlet error handling" do
+  
+  it "should raise a RSolr::Request which contains the http request context" do
+    s = RSolr.connect
+    begin
+      s.select :qt => 'standard'
+    rescue RSolr::RequestError
+      
+    end
+  end
+  
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rsolr
 version: !ruby/object:Gem::Version 
-  version: 0.12.1
+  prerelease: true
+  segments: 
+  - 0
+  - 13
+  - 0
+  - pre
+  version: 0.13.0.pre
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,19 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -05:00
+date: 2010-04-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 2
         version: 2.1.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: RSolr aims to provide a simple and extensible library for working with Solr
 email: goodieboy@gmail.com
 executables: []
@@ -38,8 +48,8 @@ files:
 - lib/rsolr.rb
 - lib/rsolr/client.rb
 - lib/rsolr/connection.rb
+- lib/rsolr/connection/httpable.rb
 - lib/rsolr/connection/net_http.rb
-- lib/rsolr/connection/requestable.rb
 - lib/rsolr/connection/utils.rb
 - lib/rsolr/message.rb
 - lib/rsolr/message/document.rb
@@ -58,28 +68,33 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A Ruby client for Apache Solr
 test_files: 
 - spec/api/client_spec.rb
+- spec/api/connection/httpable_spec.rb
 - spec/api/connection/net_http_spec.rb
-- spec/api/connection/requestable_spec.rb
 - spec/api/connection/utils_spec.rb
 - spec/api/message_spec.rb
 - spec/api/rsolr_spec.rb
+- spec/integration/http_errors_spec.rb
 - spec/spec_helper.rb
 - Rakefile
 - tasks/spec.rake

data/lib/rsolr/connection/requestable.rb

@@ -1,43 +0,0 @@
-# A module that defines the interface and top-level logic for http based connection classes.
-module RSolr::Connection::Requestable
-  
-  include RSolr::Connection::Utils
-  
-  attr_reader :opts, :uri
-  
-  # opts can have:
-  #   :url => 'http://localhost:8080/solr'
-  def initialize opts={}
-    opts[:url] ||= 'http://127.0.0.1:8983/solr'
-    @opts = opts
-    @uri = URI.parse opts[:url]
-  end
-  
-  # send a request to the connection
-  # request '/select', :q=>'*:*'
-  #
-  # request '/update', {:wt=>:xml}, '</commit>'
-  # 
-  # force a post where the post body is the param query
-  # request '/update', "<optimize/>", :method=>:post
-  #
-  def request path, params={}, *extra
-    opts = extra[-1].kind_of?(Hash) ? extra.pop : {}
-    data = extra[0]
-    # force a POST, use the query string as the POST body
-    if opts[:method] == :post and data.to_s.empty?
-      http_context = self.post(path, hash_to_query(params), {}, {'Content-Type' => 'application/x-www-form-urlencoded'})
-    else
-      if data
-        # standard POST, using "data" as the POST body
-        http_context = self.post(path, data, params, {"Content-Type" => 'text/xml; charset=utf-8'})
-      else
-        # standard GET
-        http_context = self.get(path, params)
-      end
-    end
-    raise RSolr::RequestError.new("Solr Response: #{http_context[:message]}") unless http_context[:status_code] == 200
-    http_context
-  end
-  
-end

data/spec/api/connection/requestable_spec.rb

@@ -1,92 +0,0 @@
-describe RSolr::Connection::Requestable do
-  
-  # calls #let to set "net_http" as method accessor
-  class R
-    include RSolr::Connection::Requestable
-  end
-  
-  module RequestableHelper
-    def self.included base
-      base.let(:requestable){R.new}
-    end
-  end
-  
-  context 'new' do
-    
-    include RequestableHelper
-    
-    it 'should define an intialize method that accepts a hash argument' do
-      lambda{R.new({})}.should_not raise_error 
-    end
-  
-    it 'should have an #opts attribute after creation' do
-      requestable.should respond_to(:opts)
-    end
-  
-    it 'should have an #uri attribute after creation' do
-      requestable.should respond_to(:uri)
-    end
-    
-  end
-  
-  context 'opts and uri' do
-    
-    it 'should allow setting the opts' do
-      opts = {:url=>'blah'}
-      r = R.new(opts)
-      r.opts.should == opts
-    end
-    
-    it 'should parser the url option into a URI object' do
-      opts = {:url => 'http://xyz:1010/solr'}
-      r = R.new(opts)
-      r.uri.should be_a(URI)
-      r.uri.host.should == 'xyz'
-    end
-    
-  end
-  
-  context :request do
-    
-    include RequestableHelper
-    
-    it 'should send a get to itself' do
-      expected_response = {:status_code => 200}
-      requestable.should_receive(:get).
-        with('/blah', {:id=>1}).
-        and_return(expected_response)
-      requestable.request('/blah', :id=>1).should == expected_response
-    end
-    
-    it 'should raise an error if the status_code is not 200' do
-      expected_response = {:status_code => 503}
-      requestable.should_receive(:get).
-        with('/blah', {:id=>1}).
-        and_return(expected_response)
-      lambda{
-        requestable.request('/blah', :id=>1)
-      }.should raise_error
-    end
-    
-    it 'should send a post to itself if data is supplied' do
-      expected_response = {:status_code => 200}
-      my_data = "<commit/>"
-      post_headers = {"Content-Type"=>"text/xml; charset=utf-8"}
-      requestable.should_receive(:post).
-        with('/blah', my_data, {:id=>1}, post_headers).
-        and_return(expected_response)
-      requestable.request('/blah', {:id=>1}, my_data).should == expected_response
-    end
-    
-    it 'should send a post to itself when :method=>:post is set even if no POST data is supplied' do
-      expected_response = {:status_code => 200}
-      post_headers = {"Content-Type"=>"application/x-www-form-urlencoded"}
-      requestable.should_receive(:post).
-        with('/blah', "", {}, post_headers).
-        and_return(expected_response)
-      requestable.request('/blah', {}, :method => :post).should == expected_response
-    end
-    
-  end
-  
-end