mwmitchell-rsolr 0.9.5 → 0.9.6

data/CHANGES.txt

@@ -1,3 +1,8 @@
+0.9.6 - September 9, 2009
+  Added ability to create direct connections from existing Java::OrgApacheSolrCore::SolrCore
+  Added ability to send queries using POST
+  - solr.request '/select', :q=>'*:*', :method=>:post
+
 0.9.5 - September 4, 2009
   Removed Array #extract_options!
   Removed the Connection #send_request method (now #request)

data/lib/rsolr/connection.rb

@@ -18,17 +18,16 @@ module RSolr::Connection
     end
   
     # Send a request to a request handler using the method name.
-    # This does not handle data/POSTs, only GET requests.
-    def method_missing(method_name, params, &blk)
-      request("/#{method_name}", map_params(params))
+    def method_missing(method_name, *args, &blk)
+      request("/#{method_name}", *args, &blk)
     end
-  
+    
     # sends data to the update handler
     # data can be a string of xml, or an object that returns xml from its #to_xml method
     def update(data, params={})
-      request('/update', map_params(params), data)
+      request '/update', params, data
     end
-  
+    
     # send request solr
     # params is hash with valid solr request params (:q, :fl, :qf etc..)
     #   if params[:wt] is not set, the default is :ruby
@@ -37,11 +36,11 @@ module RSolr::Connection
     #   NOTE: to get raw ruby, use :wt=>'ruby' <- a string, not a symbol like :ruby  
     #
     #
-    def request(path, params={}, data=nil)
-      response = @adapter.request(path, map_params(params), data)
+    def request(path, params={}, *extra)
+      response = @adapter.request(path, map_params(params), *extra)
       adapt_response(response)
     end
-  
+    
     # 
     # single record:
     # solr.update(:id=>1, :name=>'one')

data/lib/rsolr/connection/adapter/direct.rb

@@ -23,7 +23,9 @@ class RSolr::Connection::Adapter::Direct
   #   :select_path => 'the/select/handler'
   #   :update_path => 'the/update/handler'
   def initialize(opts, &block)
-    if defined?(Java::OrgApacheSolrServlet::DirectSolrConnection) and opts.is_a?(Java::OrgApacheSolrServlet::DirectSolrConnection)
+    if defined?(Java::OrgApacheSolrCore::SolrCore) and opts.is_a?(Java::OrgApacheSolrCore::SolrCore)
+      @connection = org.apache.solr.servlet.DirectSolrConnection.new(opts)
+    elsif defined?(Java::OrgApacheSolrServlet::DirectSolrConnection) and opts.is_a?(Java::OrgApacheSolrServlet::DirectSolrConnection)
       @connection = opts
     else
       opts[:data_dir] ||= File.join(opts[:home_dir].to_s, 'data')
@@ -54,7 +56,7 @@ class RSolr::Connection::Adapter::Direct
   # send a request to the connection
   # request '/select', :q=>'something'
   # request '/update', :wt=>:xml, '</commit>'
-  def request(path, params={}, data=nil)
+  def request(path, params={}, data=nil, opts={})
     data = data.to_xml if data.respond_to?(:to_xml)
     url = build_url(path, params)
     begin

data/lib/rsolr/connection/adapter/http.rb

@@ -3,6 +3,8 @@
 #
 class RSolr::Connection::Adapter::HTTP
   
+  include RSolr::HTTPClient::Util
+  
   attr_reader :opts
   
   # opts can have:
@@ -18,22 +20,23 @@ class RSolr::Connection::Adapter::HTTP
   
   # send a request to the connection
   # request '/update', :wt=>:xml, '</commit>'
-  def request(path, params={}, data=nil)
-    data = data.to_xml if data.respond_to?(:to_xml)
-    if data
-      http_context = connection.post(path, data, params, post_headers)
+  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 = connection.post(path, hash_to_query(params), {}, {'Content-Type' => 'application/x-www-form-urlencoded'})
     else
-      http_context = connection.get(path, params)
+      if data
+        # standard POST, using "data" as the POST body
+        http_context = connection.post(path, data, params, {"Content-Type" => 'text/xml; charset=utf-8'})
+      else
+        # standard GET
+        http_context = connection.get(path, params)
+      end
     end
     raise RSolr::RequestError.new(http_context[:body]) unless http_context[:status_code] == 200
     http_context
   end
   
-  protected
-  
-  # The standard POST headers
-  def post_headers
-    {"Content-Type" => 'text/xml; charset=utf-8'}
-  end
-  
 end

data/rsolr.gemspec

@@ -1,8 +1,7 @@
 Gem::Specification.new do |s|
-  
   s.name = "rsolr"
-  s.version = "0.9.5"
-  s.date = "2009-09-05"
+  s.version = "0.9.6"
+  s.date = "2009-09-12"
   s.summary = "A Ruby client for Apache Solr"
   s.email = "goodieboy@gmail.com"
   s.homepage = "http://github.com/mwmitchell/rsolr"

data/test/connection/http_test.rb

@@ -6,13 +6,24 @@ unless defined?(JRUBY_VERSION)
   class AdapterHTTPTest < RSolrBaseTest
   
     include ConnectionTestMethods
-  
+    
     def setup
       @solr = RSolr.connect(:http)
       @solr.delete_by_query('*:*')
       @solr.commit
     end
-  
+    
+    # http://www.w3.org/TR/html4/interact/forms.html#submit-format
+    
+    # due to the way some servers implement their query string parsing,
+    # POST is sometimes needed for large query strings.
+    # This test simply shows that a large q value will not blow up solr.
+    def test_post_for_select
+      big_honkin_q = (['ipod']*1000).join(' OR ')
+      response = @solr.adapter.request '/select', {:q=>big_honkin_q}, :method=>:post
+      assert response
+    end
+    
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mwmitchell-rsolr
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-05 00:00:00 -07:00
+date: 2009-09-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,6 @@ files:
 - CHANGES.txt
 has_rdoc: true
 homepage: http://github.com/mwmitchell/rsolr
-licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -74,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A Ruby client for Apache Solr