mwmitchell-solr 0.5.3 → 0.5.4

data/test/{direct_test.rb → connection/direct_test.rb}

@@ -1,16 +1,16 @@
 if defined?(JRUBY_VERSION)
 
-require File.join(File.dirname(__FILE__), 'test_helpers')
+require File.join(File.dirname(__FILE__), '..', 'test_helpers')
 
-require 'connection_test_methods'
+require File.join(File.dirname(__FILE__), 'test_methods')
 
-class DirectTest < Test::Unit::TestCase
+class ConnectionDirectTest < Test::Unit::TestCase
   
   include ConnectionTestMethods
   
   def setup
     base = File.expand_path( File.dirname(__FILE__) )
-    dist = File.join(base, '..', 'apache-solr')
+    dist = File.join(base, '..', '..', 'apache-solr')
     home = File.join(dist, 'example', 'solr')
     @solr = Solr.connect(:direct, :home_dir=>home, :dist_dir=>dist)
     @solr.delete_by_query('*:*')

data/test/connection/http_test.rb

@@ -0,0 +1,19 @@
+unless defined?(JRUBY_VERSION)
+
+  require File.join(File.dirname(__FILE__), '..', 'test_helpers')
+  
+  require File.join(File.dirname(__FILE__), 'test_methods')
+
+  class AdapterHTTPTest < Test::Unit::TestCase
+  
+    include ConnectionTestMethods
+  
+    def setup
+      @solr = Solr.connect :http
+      @solr.delete_by_query('*:*')
+      @solr.commit
+    end
+  
+  end
+  
+end

data/test/{connection_test_methods.rb → connection/test_methods.rb}

@@ -11,6 +11,16 @@ module ConnectionTestMethods
   #  assert_equal 0, @solr.query(:q=>'*:*').docs.size
   #end
   
+  
+  def test_default_options
+    target = {
+      :select_path => '/select',
+      :update_path => '/update',
+      :luke_path => '/admin/luke'
+    }
+    assert_equal target, @solr.adapter.default_options
+  end
+  
   # setting adapter options in Solr.connect method should set them in the adapter
   def test_set_adapter_options
     solr = Solr.connect(:http, :select_path=>'/select2')
@@ -27,14 +37,14 @@ module ConnectionTestMethods
   # Raw ruby can be returned by using :wt=>'ruby', not :ruby
   def test_raw_response_formats
     ruby_response = @solr.query(:q=>'*:*', :wt=>'ruby')
-    assert ruby_response.is_a?(String)
-    assert ruby_response=~%r('wt'=>'ruby')
+    assert ruby_response[:body].is_a?(String)
+    assert ruby_response[:body]=~%r('wt'=>'ruby')
     # xml?
     xml_response = @solr.query(:q=>'*:*', :wt=>'xml')
-    assert xml_response=~%r(<str name="wt">xml</str>)
+    assert xml_response[:body]=~%r(<str name="wt">xml</str>)
     # json?
     json_response = @solr.query(:q=>'*:*', :wt=>'json')
-    assert json_response=~%r("wt":"json")
+    assert json_response[:body]=~%r("wt":"json")
   end
   
   def test_query_responses

data/test/http_client/curb_test.rb

@@ -0,0 +1,19 @@
+# don't run this test in jruby,
+# the curb gem is a c extension based gem, jruby has no support for this
+unless defined?(JRUBY_VERSION)
+
+  require File.join(File.dirname(__FILE__), '..', 'test_helpers')
+  
+  require File.join(File.dirname(__FILE__), 'test_methods')
+
+  class CurbTest < Test::Unit::TestCase
+  
+    def setup
+      @c ||= Solr::HTTPClient.connect(URL, :curb)
+    end
+  
+    include HTTPClientTestMethods
+  
+  end
+  
+end

data/test/http_client/net_http_test.rb

@@ -0,0 +1,13 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helpers')
+
+require File.join(File.dirname(__FILE__), 'test_methods')
+
+class NetHTTPTest < Test::Unit::TestCase
+  
+  def setup
+    @c ||= Solr::HTTPClient.connect(URL, :net_http)
+  end
+  
+  include HTTPClientTestMethods
+  
+end

data/test/http_client/test_methods.rb

@@ -0,0 +1,40 @@
+module HTTPClientTestMethods
+  
+  URL = 'http://localhost:8983/solr/'
+  
+  def test_raise_unknown_adapter
+    assert_raise Solr::HTTPClient::UnkownAdapterError do
+      c = Solr::HTTPClient.connect(URL, :blah)
+    end
+  end
+  
+  # the responses from the HTTPClient adapter should return the same hash structure
+  def test_get_response
+    headers = {}
+    data = nil
+    response = @c.get('select', :q=>'*:*')
+    assert_equal data, response[:data]
+    assert_equal 200, response[:status_code]
+    expected_params = {:q=>'*:*'}
+    assert_equal expected_params, response[:params]
+    assert_equal 'select', response[:path]
+    assert response[:body] =~ /name="responseHeader"/
+    assert_equal 'http://localhost:8983/solr/select?q=%2A%3A%2A', response[:url]
+    assert_equal headers, response[:headers]
+  end
+  
+  def test_post_response
+    headers = {"Content-Type" => 'text/xml; charset=utf-8'}
+    data = '<add><doc><field name="id">1</field></doc></add>'
+    response = @c.post('update', data, {}, headers)
+    assert_equal data, response[:data]
+    assert_equal 200, response[:status_code]
+    expected_params = {}
+    assert_equal expected_params, response[:params]
+    assert_equal 'update', response[:path]
+    assert response[:body] =~ /name="responseHeader"/
+    assert_equal 'http://localhost:8983/solr/update', response[:url]
+    assert_equal headers, response[:headers]
+  end
+  
+end

data/test/{adapter_common_methods_test.rb → http_client/util_test.rb}

@@ -1,24 +1,15 @@
-require File.join(File.dirname(__FILE__), 'test_helpers')
+require File.join(File.dirname(__FILE__), '..', 'test_helpers')
 
-class AdapterCommonMethodsTest < Test::Unit::TestCase
+class HTTPUtilTest < Test::Unit::TestCase
   
   class DummyClass
-    include Solr::Adapter::CommonMethods
+    include Solr::HTTPClient::Util
   end
   
   def setup
     @c = DummyClass.new
   end
   
-  def test_default_options
-    target = {
-      :select_path => '/select',
-      :update_path => '/update',
-      :luke_path => '/admin/luke'
-    }
-    assert_equal target, @c.default_options
-  end
-  
   def test_build_url
     m = @c.method(:build_url)
     assert_equal '/something', m.call('/something')

data/test/message_test.rb

@@ -67,4 +67,14 @@ class MessageTest < Test::Unit::TestCase
     assert_equal expected, message.to_s
   end
   
+  # multiValue field support test, thanks to Fouad Mardini!
+  def test_add_multi_valued_field
+    data = {
+      :id   => 1,
+      :name => ['matt1', 'matt2']
+    }
+    expected = '<add><doc><field name="id">1</field><field name="name">matt1</field><field name="name">matt2</field></doc></add>'
+    assert_equal expected, Solr::Message.add(data).to_s
+  end
+  
 end

data/test/{ext_pagination_test.rb → pagination_test.rb}

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'test_helpers')
 
-class ExtPaginationTest < Test::Unit::TestCase
+class PaginationTest < Test::Unit::TestCase
   
   def create_response(params={})
     response = Solr::Response::Query::Base.new(mock_query_response)
@@ -10,19 +10,19 @@ class ExtPaginationTest < Test::Unit::TestCase
   
   # test the Solr::Connection pagination methods
   def test_connection_calculate_start
-    dp = Solr::Connection::Base.new(nil)
-    assert_equal 15, dp.send(:calculate_start, 2, 15)
-    assert_equal 450, dp.send(:calculate_start, 10, 50)
-    assert_equal 0, dp.send(:calculate_start, 0, 50)
+    dummy_connection = Solr::Connection::Base.new(nil)
+    assert_equal 15, dummy_connection.send(:calculate_start, 2, 15)
+    assert_equal 450, dummy_connection.send(:calculate_start, 10, 50)
+    assert_equal 0, dummy_connection.send(:calculate_start, 0, 50)
   end
   
   def test_connection_modify_params_for_pagination
-    dp = Solr::Connection::Base.new(nil)
-    p = dp.send(:modify_params_for_pagination, {:page=>1})
+    dummy_connection = Solr::Connection::Base.new(nil)
+    p = dummy_connection.send(:modify_params_for_pagination, {:page=>1})
     assert_equal 0, p[:start]
     assert_equal 10, p[:rows]
     #
-    p = dp.send(:modify_params_for_pagination, {:page=>10, :per_page=>100})
+    p = dummy_connection.send(:modify_params_for_pagination, {:page=>10, :per_page=>100})
     assert_equal 900, p[:start]
     assert_equal 100, p[:rows]
   end

data/test/test_helpers.rb

@@ -2,6 +2,14 @@ $: << File.dirname(__FILE__)
 require File.join(File.dirname(__FILE__), '..', 'lib', 'solr')
 require 'test/unit'
 
+class SolrBaseTest < Test::Unit::TestCase
+  
+  def default_test
+    
+  end
+  
+end
+
 #begin
 #  require 'rubygems'
 #  require 'redgreen'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mwmitchell-solr
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-16 00:00:00 -08:00
+date: 2008-12-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,24 +32,33 @@ extra_rdoc_files: []
 files: 
 - examples/http.rb
 - examples/direct.rb
-- lib/solr.rb
 - lib/core_ext.rb
-- lib/solr/adapter.rb
-- lib/solr/adapter/common_methods.rb
-- lib/solr/adapter/direct.rb
-- lib/solr/adapter/http.rb
-- lib/solr/connection.rb
+- lib/solr.rb
+- lib/solr/connection/adapter/common_methods.rb
+- lib/solr/connection/adapter/direct.rb
+- lib/solr/connection/adapter/http.rb
+- lib/solr/connection/adapter.rb
 - lib/solr/connection/base.rb
 - lib/solr/connection/search_ext.rb
+- lib/solr/connection.rb
+- lib/solr/http_client/adapter/curb.rb
+- lib/solr/http_client/adapter/net_http.rb
+- lib/solr/http_client/adapter.rb
+- lib/solr/http_client.rb
 - lib/solr/indexer.rb
-- lib/solr/mapper.rb
 - lib/solr/mapper/rss.rb
+- lib/solr/mapper.rb
 - lib/solr/message.rb
+- lib/solr/response/base.rb
+- lib/solr/response/index_info.rb
+- lib/solr/response/query.rb
+- lib/solr/response/update.rb
 - lib/solr/response.rb
 - LICENSE
 - Rakefile
 - README.rdoc
 - solr-ruby.gemspec
+- CHANGES.txt
 has_rdoc: true
 homepage: http://github.com/mwmitchell/solr
 post_install_message: 
@@ -77,15 +86,18 @@ signing_key:
 specification_version: 2
 summary: Ruby client for Apache Solr
 test_files: 
-- test/adapter_common_methods_test.rb
-- test/connection_test_methods.rb
-- test/direct_test.rb
-- test/ext_pagination_test.rb
-- test/ext_params_test.rb
-- test/ext_search_test.rb
-- test/http_test.rb
-- test/indexer_test.rb
+- test/connection/direct_test.rb
+- test/connection/http_test.rb
+- test/connection/test_methods.rb
+- test/core_ext_test
+- test/http_client/curb_test.rb
+- test/http_client/net_http_test.rb
+- test/http_client/test_methods.rb
+- test/http_client/util_test.rb
+- test/indexer.rb
 - test/mapper_test.rb
 - test/message_test.rb
+- test/pagination_test.rb
 - test/ruby-lang.org.rss.xml
+- test/solr_test
 - test/test_helpers.rb

data/lib/solr/adapter/http.rb

@@ -1,55 +0,0 @@
-require 'net/http'
-
-#
-# Connection for standard HTTP Solr server
-#
-class Solr::Adapter::HTTP
-  
-  include Solr::Adapter::CommonMethods
-  
-  attr_accessor :opts, :connection, :url
-  
-  # opts can have:
-  #   :url => 'http://localhost:8080/solr'
-  #   :select_path => '/the/url/path/to/the/select/handler'
-  #   :update_path => '/the/url/path/to/the/update/handler'
-  #   :luke_path => '/admin/luke'
-  #
-  # If a block is given, the @connection (Net::HTTP) instance is yielded
-  def initialize(opts={}, &block)
-    opts[:url]||='http://127.0.0.1:8983/solr'
-    @url = URI.parse(opts[:url])
-    @connection = Net::HTTP.new(@url.host, @url.port)
-    yield @connection if block_given?
-    @opts = default_options.merge(opts)
-  end
-  
-  # send a request to the connection
-  # request '/update', :wt=>:xml, '</commit>'
-  def send_request(request_url_path, params={}, data=nil)
-    data = data.to_xml if data.respond_to?(:to_xml)
-    full_path = build_url(@url.path + request_url_path, params)
-    if data
-      response = @connection.post(full_path, data, post_headers)
-    else
-      response = @connection.get(full_path)
-    end
-    unless response.code=='200'
-      raise Solr::RequestError.new(parse_solr_html_error(response.body))
-    end
-    response.body
-  end
-  
-  protected
-  
-  # The standard post headers
-  def post_headers
-    {"Content-Type" => 'text/xml', 'charset'=>'utf-8'}
-  end
-  
-  # extracts the message from the solr error response
-  def parse_solr_html_error(html)
-    html.scan(/<pre>(.*)<\/pre>/mi).first.first.gsub(/&lt;/, '<').gsub(/&gt;/, '>') rescue html
-  end
-  
-end

data/lib/solr/adapter.rb

@@ -1,7 +0,0 @@
-module Solr::Adapter
-  
-  autoload :Direct, 'solr/adapter/direct'
-  autoload :HTTP, 'solr/adapter/http'
-  autoload :CommonMethods, 'solr/adapter/common_methods'
-  
-end

data/test/ext_search_test.rb

@@ -1,9 +0,0 @@
-require File.join(File.dirname(__FILE__), 'test_helpers')
-
-class ExtSearchTest < Test::Unit::TestCase
-  
-  def test_mapping_methods
-    
-  end
-  
-end

data/test/http_test.rb

@@ -1,15 +0,0 @@
-require File.join(File.dirname(__FILE__), 'test_helpers')
-
-require 'connection_test_methods'
-
-class HTTPTest < Test::Unit::TestCase
-  
-  include ConnectionTestMethods
-  
-  def setup
-    @solr = Solr.connect :http
-    @solr.delete_by_query('*:*')
-    @solr.commit
-  end
-  
-end

data/test/indexer_test.rb

@@ -1,14 +0,0 @@
-require File.join(File.dirname(__FILE__), 'test_helpers')
-
-class IndexerTest < Test::Unit::TestCase
-  
-  def test_something
-    data = nil
-    mapping = {
-      
-    }
-    i = Solr::Indexer.new(Solr.connect(:http), mapping)
-    i.index([])
-  end
-  
-end