rsolr 0.9.6

data/test/connection/direct_test.rb

@@ -0,0 +1,37 @@
+if defined?(JRUBY_VERSION)
+  
+  require 'helper'
+  require 'connection/test_methods'
+  
+  class ConnectionDirectTest < RSolrBaseTest
+    
+    include ConnectionTestMethods
+    
+    attr :dist
+    attr :home
+    
+    def setup
+      base = File.expand_path( File.dirname(__FILE__) )
+      @dist = File.join(base, '..', '..', 'apache-solr')
+      @home = File.join(dist, 'example', 'solr')
+      @solr = RSolr.connect(:direct, :home_dir=>@home, :dist_dir=>@dist)
+      @solr.delete_by_query('*:*')
+      @solr.commit
+    end
+    
+    def teardown
+      @solr.adapter.close
+    end
+    
+    def test_new_connection_with_existing_core
+      Dir["#{@dist}/dist/*.jar"].each { |p| require p }
+      dc = org.apache.solr.servlet.DirectSolrConnection.new(@home, "#{@home}/data", nil)
+      adapter = RSolr::Connection::Adapter::Direct.new dc
+      s = RSolr::Connection::Base.new(adapter)
+      assert_equal Hash, s.request('/admin/ping').class
+      adapter.close
+    end
+    
+  end
+  
+end

data/test/connection/http_test.rb

@@ -0,0 +1,29 @@
+unless defined?(JRUBY_VERSION)
+  
+  require 'helper'
+  require 'connection/test_methods'
+  
+  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

data/test/connection/test_methods.rb

@@ -0,0 +1,97 @@
+# These are all of the test methods used by the various connection + adapter tests
+# Currently: Direct and HTTP
+# By sharing these tests, we can make sure the adapters are doing what they're suppossed to
+# while staying "dry"
+
+module ConnectionTestMethods
+  
+  
+  def teardown
+    @solr.delete_by_query('id:[* TO *]')
+    @solr.commit
+    assert_equal 0, @solr.select(:q=>'*:*')['response']['docs'].size
+  end
+  
+  # If :wt is NOT :ruby, the format doesn't get converted into a Mash (special Hash; see lib/mash.rb)
+  # Raw ruby can be returned by using :wt=>'ruby', not :ruby
+  def test_raw_response_formats
+    ruby_response = @solr.select(:q=>'*:*', :wt=>'ruby')
+    assert ruby_response.is_a?(String)
+    assert ruby_response =~ %r('wt'=>'ruby')
+    # xml?
+    xml_response = @solr.select(:q=>'*:*', :wt=>'xml')
+    assert xml_response.is_a?(String)
+    assert xml_response =~ %r(<str name="wt">xml</str>)
+    # json?
+    json_response = @solr.select(:q=>'*:*', :wt=>'json')
+    assert json_response.is_a?(String)
+    assert json_response =~ %r("wt":"json")
+  end
+  
+  def test_raise_on_invalid_query
+    assert_raise RSolr::RequestError do
+      @solr.select(:q=>'!')
+    end
+  end
+  
+  def test_select_response_docs
+    @solr.add(:id=>1, :price=>1.00, :cat=>['electronics', 'something else'])
+    @solr.commit
+    r = @solr.select(:q=>'*:*')
+    assert r.is_a?(Hash)
+    
+    docs = r['response']['docs']
+    assert_equal Array, docs.class
+    first = docs.first
+    
+    # test the has? method
+    assert_equal 1.00, first['price']
+    
+    assert_equal Array, first['cat'].class
+    assert first['cat'].include?('electronics')
+    assert first['cat'].include?('something else')
+    assert first['cat'].include?('something else')
+    
+  end
+  
+  def test_add
+    assert_equal 0, @solr.select(:q=>'*:*')['response']['numFound']
+    update_response = @solr.add({:id=>100})
+    assert update_response.is_a?(Hash)
+    #
+    @solr.commit
+    assert_equal 1, @solr.select(:q=>'*:*')['response']['numFound']
+  end
+  
+  def test_delete_by_id
+    @solr.add(:id=>100)
+    @solr.commit
+    total = @solr.select(:q=>'*:*')['response']['numFound']
+    assert_equal 1, total
+    delete_response = @solr.delete_by_id(100)
+    @solr.commit
+    assert delete_response.is_a?(Hash)
+    total = @solr.select(:q=>'*:*')['response']['numFound']
+    assert_equal 0, total
+  end
+  
+  def test_delete_by_query
+    @solr.add(:id=>1, :name=>'BLAH BLAH BLAH')
+    @solr.commit
+    assert_equal 1, @solr.select(:q=>'*:*')['response']['numFound']
+    response = @solr.delete_by_query('name:"BLAH BLAH BLAH"')
+    @solr.commit
+    assert response.is_a?(Hash)
+    assert_equal 0, @solr.select(:q=>'*:*')['response']['numFound']
+  end
+  
+  def test_admin_luke_index_info
+    response = @solr.request('/admin/luke', :numTerms=>0)
+    assert response.is_a?(Hash)
+    # make sure the ? methods are true/false
+    assert [true, false].include?(response['index']['current'])
+    assert [true, false].include?(response['index']['optimized'])
+    assert [true, false].include?(response['index']['hasDeletions'])
+  end
+  
+end

data/test/helper.rb

@@ -0,0 +1,61 @@
+
+require File.join(File.dirname(__FILE__), '..', 'lib', 'rsolr')
+require 'test/unit'
+
+# 
+class Test::Unit::TestCase
+  
+  def self.test(name, &block)
+    test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
+    defined = instance_method(test_name) rescue false
+    raise "#{test_name} is already defined in #{self}" if defined
+    if block_given?
+      define_method(test_name, &block)
+    else
+      define_method(test_name) do
+        flunk "No implementation provided for #{name}"
+      end
+    end
+  end
+  
+end
+
+class RSolrBaseTest < Test::Unit::TestCase
+  
+  def assert_class(expected, instance)
+    assert_equal expected, instance.class
+  end
+  
+  def default_test
+    
+  end
+  
+end
+
+begin
+  require 'rubygems'
+  require 'redgreen'
+rescue LoadError
+end
+
+def mock_query_response
+  %({'responseHeader'=>{
+    'status'=>0,'QTime'=>43,'params'=>{
+      'q'=>'*:*','wt'=>'ruby','echoParams'=>'EXPLICIT'
+    }
+  },
+  'response'=>{
+    'numFound'=>26,'start'=>0,'docs'=>[
+      {'id'=>'SP2514N','inStock'=>true,'manu'=>'Samsung Electronics Co. Ltd.','name'=>'Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133','popularity'=>6,'price'=>92.0,'sku'=>'SP2514N','timestamp'=>'2008-11-21T17:21:55.601Z','cat'=>['electronics','hard drive'],'spell'=>['Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133'],'features'=>['7200RPM, 8MB cache, IDE Ultra ATA-133','NoiseGuard, SilentSeek technology, Fluid Dynamic Bearing (FDB) motor']},
+      {'id'=>'6H500F0','inStock'=>true,'manu'=>'Maxtor Corp.','name'=>'Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300','popularity'=>6,'price'=>350.0,'sku'=>'6H500F0','timestamp'=>'2008-11-21T17:21:55.617Z','cat'=>['electronics','hard drive'],'spell'=>['Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300'],'features'=>['SATA 3.0Gb/s, NCQ','8.5ms seek','16MB cache']},
+      {'id'=>'F8V7067-APL-KIT','inStock'=>false,'manu'=>'Belkin','name'=>'Belkin Mobile Power Cord for iPod w/ Dock','popularity'=>1,'price'=>19.95,'sku'=>'F8V7067-APL-KIT','timestamp'=>'2008-11-21T17:21:55.652Z','weight'=>4.0,'cat'=>['electronics','connector'],'spell'=>['Belkin Mobile Power Cord for iPod w/ Dock'],'features'=>['car power adapter, white']},
+      {'id'=>'IW-02','inStock'=>false,'manu'=>'Belkin','name'=>'iPod & iPod Mini USB 2.0 Cable','popularity'=>1,'price'=>11.5,'sku'=>'IW-02','timestamp'=>'2008-11-21T17:21:55.657Z','weight'=>2.0,'cat'=>['electronics','connector'],'spell'=>['iPod & iPod Mini USB 2.0 Cable'],'features'=>['car power adapter for iPod, white']},
+      {'id'=>'MA147LL/A','inStock'=>true,'includes'=>'earbud headphones, USB cable','manu'=>'Apple Computer Inc.','name'=>'Apple 60 GB iPod with Video Playback Black','popularity'=>10,'price'=>399.0,'sku'=>'MA147LL/A','timestamp'=>'2008-11-21T17:21:55.681Z','weight'=>5.5,'cat'=>['electronics','music'],'spell'=>['Apple 60 GB iPod with Video Playback Black'],'features'=>['iTunes, Podcasts, Audiobooks','Stores up to 15,000 songs, 25,000 photos, or 150 hours of video','2.5-inch, 320x240 color TFT LCD display with LED backlight','Up to 20 hours of battery life','Plays AAC, MP3, WAV, AIFF, Audible, Apple Lossless, H.264 video','Notes, Calendar, Phone book, Hold button, Date display, Photo wallet, Built-in games, JPEG photo playback, Upgradeable firmware, USB 2.0 compatibility, Playback speed control, Rechargeable capability, Battery level indication']},
+      {'id'=>'TWINX2048-3200PRO','inStock'=>true,'manu'=>'Corsair Microsystems Inc.','name'=>'CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail','popularity'=>5,'price'=>185.0,'sku'=>'TWINX2048-3200PRO','timestamp'=>'2008-11-21T17:21:55.706Z','cat'=>['electronics','memory'],'spell'=>['CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail'],'features'=>['CAS latency 2,	2-3-3-6 timing, 2.75v, unbuffered, heat-spreader']},
+      {'id'=>'VS1GB400C3','inStock'=>true,'manu'=>'Corsair Microsystems Inc.','name'=>'CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail','popularity'=>7,'price'=>74.99,'sku'=>'VS1GB400C3','timestamp'=>'2008-11-21T17:21:55.71Z','cat'=>['electronics','memory'],'spell'=>['CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail']},
+      {'id'=>'VDBDB1A16','inStock'=>true,'manu'=>'A-DATA Technology Inc.','name'=>'A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM','popularity'=>5,'sku'=>'VDBDB1A16','timestamp'=>'2008-11-21T17:21:55.712Z','cat'=>['electronics','memory'],'spell'=>['A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM'],'features'=>['CAS latency 3,	 2.7v']},
+      {'id'=>'3007WFP','inStock'=>true,'includes'=>'USB cable','manu'=>'Dell, Inc.','name'=>'Dell Widescreen UltraSharp 3007WFP','popularity'=>6,'price'=>2199.0,'sku'=>'3007WFP','timestamp'=>'2008-11-21T17:21:55.724Z','weight'=>401.6,'cat'=>['electronics','monitor'],'spell'=>['Dell Widescreen UltraSharp 3007WFP'],'features'=>['30" TFT active matrix LCD, 2560 x 1600, .25mm dot pitch, 700:1 contrast']},
+      {'id'=>'VA902B','inStock'=>true,'manu'=>'ViewSonic Corp.','name'=>'ViewSonic VA902B - flat panel display - TFT - 19"','popularity'=>6,'price'=>279.95,'sku'=>'VA902B','timestamp'=>'2008-11-21T17:21:55.734Z','weight'=>190.4,'cat'=>['electronics','monitor'],'spell'=>['ViewSonic VA902B - flat panel display - TFT - 19"'],'features'=>['19" TFT active matrix LCD, 8ms response time, 1280 x 1024 native resolution']}]
+    }
+  })
+end

data/test/http_client/curb_test.rb

@@ -0,0 +1,18 @@
+# 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 'helper'
+  require 'http_client/test_methods'
+
+  class CurbTest < RSolrBaseTest
+  
+    def setup
+      @c ||= RSolr::HTTPClient::connect(:curb, :url=>URL)
+    end
+  
+    include HTTPClientTestMethods
+  
+  end
+  
+end

data/test/http_client/net_http_test.rb

@@ -0,0 +1,12 @@
+require 'helper'
+require 'http_client/test_methods'
+
+class NetHTTPTest < RSolrBaseTest
+  
+  def setup
+    @c ||= RSolr::HTTPClient::connect(:url=>URL)
+  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 RSolr::HTTPClient::UnkownAdapterError do
+      c = RSolr::HTTPClient.connect(:blah, URL)
+    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/http_client/util_test.rb

@@ -0,0 +1,83 @@
+require 'helper'
+
+class HTTPUtilTest < RSolrBaseTest
+  
+  class DummyClass
+    include RSolr::HTTPClient::Util
+  end
+  
+  def setup
+    @c = DummyClass.new
+  end
+  
+  def test_build_url
+    assert_equal '/something', @c.build_url('/something')
+    assert_equal '/something?q=Testing', @c.build_url('/something', :q=>'Testing')
+    assert_equal '/something?array=1&array=2&array=3', @c.build_url('/something', :array=>[1, 2, 3])
+    result = @c.build_url('/something', :q=>'A', :array=>[1, 2, 3])
+    assert result=~/^\/something\?/
+    assert result=~/q=A/
+    assert result=~/array=1/
+    assert result=~/array=2/
+    assert result=~/array=3/
+  end
+  
+  def test_escape
+    assert_equal '%2B', @c.escape('+')
+    assert_equal 'This+is+a+test', @c.escape('This is a test')
+    assert_equal '%3C%3E%2F%5C', @c.escape('<>/\\')
+    assert_equal '%22', @c.escape('"')
+    assert_equal '%3A', @c.escape(':')
+  end
+  
+  def test_hash_to_query
+    my_params = {
+      :z=>'should be whatever',
+      :q=>'test',
+      :d=>[1, 2, 3, 4],
+      :b=>:zxcv,
+      :x=>['!', '*', nil]
+    }
+    result = @c.hash_to_query(my_params)
+    assert result=~/z=should\+be\+whatever/
+    assert result=~/q=test/
+    assert result=~/d=1/
+    assert result=~/d=2/
+    assert result=~/d=3/
+    assert result=~/d=4/
+    assert result=~/b=zxcv/
+    assert result=~/x=%21/
+    assert result=~/x=*/
+    assert result=~/x=&?/
+  end
+  
+  def test_ampersand_within_query_value
+    my_params = {
+      "fq" => "building_facet:\"Green (Humanities & Social Sciences)\""
+    }
+    expected = 'fq=building_facet%3A%22Green+%28Humanities+%26+Social+Sciences%29%22'
+    assert_equal expected, @c.hash_to_query(my_params)
+  end
+  
+  def test_brackets
+    assert_equal '%7B', @c.escape('{')
+    assert_equal '%7D', @c.escape('}')
+  end
+  
+  def test_exclamation
+    assert_equal '%21', @c.escape('!')
+  end
+  
+  def test_complex_solr_query1
+    my_params = {'fq' => '{!raw f=field_name}crazy+\"field+value'}
+    expected = 'fq=%7B%21raw+f%3Dfield_name%7Dcrazy%2B%5C%22field%2Bvalue'
+    assert_equal expected, @c.hash_to_query(my_params)
+  end
+  
+  def test_complex_solr_query2
+    my_params = {'q' => '+popularity:[10 TO *] +section:0'}
+    expected = 'q=%2Bpopularity%3A%5B10+TO+%2A%5D+%2Bsection%3A0'
+    assert_equal expected, @c.hash_to_query(my_params)
+  end
+  
+end

data/test/message_test.rb

@@ -0,0 +1,167 @@
+
+require 'helper'
+
+module MessageTestMethods
+  
+  def builder
+    @builder ||= RSolr::Message::Builder.new
+  end
+  
+  # call all of the simple methods...
+  # make sure the xml string is valid
+  # ensure the class is actually Solr::XML
+  def test_simple_methods
+    [:optimize, :rollback, :commit].each do |meth|
+      result = self.builder.send(meth)
+      assert_equal "<#{meth}/>", result.to_s
+      assert_equal String, result.class
+    end
+  end
+
+  def test_add_yields_doc_objects_if_block_given
+    documents = [{:id=>1, :name=>'sam', :cat=>['cat 1', 'cat 2']}]
+    add_attrs = {:boost=>200.00}
+    result = self.builder.add(documents, add_attrs) do |doc|
+      doc.field_by_name(:name).attrs[:boost] = 10
+      assert_equal 4, doc.fields.size
+      assert_equal 2, doc.fields_by_name(:cat).size
+    end
+    #<add boost="200.0">
+      #<doc>
+        #<field name="cat">cat 1</field>
+        #<field name="cat">cat 2</field>
+        #<field name="name" boost="10">sam</field>
+        #<field name="id">1</field>
+      #</doc>
+    #</add>
+    assert result =~ %r(name="cat">cat 1</field>)
+    assert result =~ %r(name="cat">cat 2</field>)
+    assert result =~ %r(<add boost="200.0">)
+    assert result =~ %r(boost="10")
+    assert result =~ %r(<field name="id">1</field>)
+  end
+
+  def test_delete_by_id
+    result = self.builder.delete_by_id(10)
+    assert_equal String, result.class
+    assert_equal '<delete><id>10</id></delete>', result.to_s
+  end
+
+  def test_delete_by_multiple_ids
+    result = self.builder.delete_by_id([1, 2, 3])
+    assert_equal String, result.class
+    assert_equal '<delete><id>1</id><id>2</id><id>3</id></delete>', result.to_s
+  end
+
+  def test_delete_by_query
+    result = self.builder.delete_by_query('status:"LOST"')
+    assert_equal String, result.class
+    assert_equal '<delete><query>status:"LOST"</query></delete>', result.to_s
+  end
+
+  def test_delete_by_multiple_queries
+    result = self.builder.delete_by_query(['status:"LOST"', 'quantity:0'])
+    assert_equal String, result.class
+    assert_equal '<delete><query>status:"LOST"</query><query>quantity:0</query></delete>', result.to_s
+  end
+
+  # add a single hash ("doc")
+  def test_add_hash
+    data = {
+      :id=>1,
+      :name=>'matt'
+    }
+    assert self.builder.add(data).to_s =~ /<field name="name">matt<\/field>/
+    assert self.builder.add(data).to_s =~ /<field name="id">1<\/field>/
+  end
+
+  # add an array of hashes
+  def test_add_array
+    data = [
+      {
+        :id=>1,
+        :name=>'matt'
+      },
+      {
+        :id=>2,
+        :name=>'sam'
+      }
+    ]
+  
+    message = self.builder.add(data)
+    expected = '<add><doc><field name="id">1</field><field name="name">matt</field></doc><doc><field name="id">2</field><field name="name">sam</field></doc></add>'
+  
+    assert message.to_s=~/<field name="name">matt<\/field>/
+    assert message.to_s=~/<field name="name">sam<\/field>/
+  end
+
+  # multiValue field support test, thanks to Fouad Mardini!
+  def test_add_multi_valued_field
+    data = {
+      :id   => 1,
+      :name => ['matt1', 'matt2']
+    }
+  
+    result = self.builder.add(data)
+  
+    assert result.to_s =~ /<field name="name">matt1<\/field>/
+    assert result.to_s =~ /<field name="name">matt2<\/field>/
+  end
+
+  def test_add_single_document
+    document = RSolr::Message::Document.new
+    document.add_field('id', 1)
+    document.add_field('name', 'matt', :boost => 2.0)
+    result = self.builder.add(document)
+  
+    assert result.to_s =~ /<field name="id">1<\/field>/
+  
+    # depending on which ruby version, the attributes can be out of place
+    # so we need to test both... there's gotta be a better way to do this?
+    assert(
+      result.to_s =~ /<field name="name" boost="2.0">matt<\/field>/ || 
+      result.to_s =~ /<field boost="2.0" name="name">matt<\/field>/
+    )
+  end
+
+  def test_add_multiple_documents
+    documents = (1..2).map do |i|
+      doc = RSolr::Message::Document.new
+      doc.add_field('id', i)
+      doc.add_field('name', "matt#{i}")
+      doc
+    end
+    result = self.builder.add(documents)
+
+    assert result.to_s =~ /<field name="name">matt1<\/field>/
+    assert result.to_s =~ /<field name="name">matt2<\/field>/
+  end
+  
+end
+
+#####
+
+unless defined?(JRUBY_VERSION)
+  class LibxmlMessageTest < RSolrBaseTest
+  
+    include MessageTestMethods
+  
+    def setup
+      self.builder.adapter = RSolr::Message::Adapter::Libxml.new
+    end
+  
+  end
+end
+
+
+#####
+
+class BuilderMessageTest < RSolrBaseTest
+  
+  include MessageTestMethods
+  
+  def setup
+    self.builder.adapter = RSolr::Message::Adapter::Builder.new
+  end
+  
+end