solr-ruby 0.0.2 → 0.0.3

data/lib/solr/importer/hpricot_mapper.rb

@@ -10,11 +10,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'hpricot'
+begin
+  require 'hpricot'
 
-# For files with the first line containing field names
-class Solr::Importer::HpricotMapper < Solr::Importer::Mapper
-  def field_data(doc, path)
-    doc.search(path.to_s).collect { |e| e.inner_html }
+  class Solr::Importer::HpricotMapper < Solr::Importer::Mapper
+    def field_data(doc, path)
+      doc.search(path.to_s).collect { |e| e.inner_html }
+    end
   end
-end
+rescue LoadError => e # If we can't load hpricot
+  class Solr::Importer::HpricotMapper
+    def initialize(mapping, options={})
+      raise "Hpricot not installed."
+    end
+  end
+end

data/lib/solr/importer/xpath_mapper.rb

@@ -10,18 +10,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'xml/libxml'
+begin
+  require 'xml/libxml'
 
-# For files with the first line containing field names
-class Solr::Importer::XPathMapper < Solr::Importer::Mapper
-  def field_data(doc, xpath)
-    doc.find(xpath.to_s).collect do |node|
-      case node
-        when XML::Attr
-          node.value
-        when XML::Node
-          node.content
+  # For files with the first line containing field names
+  class Solr::Importer::XPathMapper < Solr::Importer::Mapper
+    def field_data(doc, xpath)
+      doc.find(xpath.to_s).collect do |node|
+        case node
+          when XML::Attr
+            node.value
+          when XML::Node
+            node.content
+        end
       end
     end
   end
+rescue LoadError => e # If we can't load libxml
+  class Solr::Importer::XPathMapper
+    def initialize(mapping, options={})
+      raise "libxml not installed"
+    end
+  end
 end

data/lib/solr/indexer.rb

@@ -11,12 +11,9 @@
 # limitations under the License.
 
 class Solr::Indexer
-  # deprecated, use Indexer.new(ds,mapping).index instead
-  def self.index(data_source, mapper_or_mapping, options={})
-    indexer = Solr::Indexer.new(data_source, mapper_or_mapping, options)
-    indexer.index
-  end
+  attr_reader :solr
   
+  # TODO: document options!
   def initialize(data_source, mapper_or_mapping, options={})
     solr_url = options[:solr_url] || ENV["SOLR_URL"] || "http://localhost:8983/solr"
     @solr = Solr::Connection.new(solr_url, options) #TODO - these options contain the solr_url and debug keys also, so tidy up what gets passed
@@ -33,7 +30,8 @@ class Solr::Indexer
     @data_source.each do |record|
       document = @mapper.map(record)
       
-      yield(record, document) if block_given? # TODO check return of block, if not true then don't index
+      # TODO: check arrity of block, if 3, pass counter as 3rd argument
+      yield(record, document) if block_given? # TODO check return of block, if not true then don't index, or perhaps if document.empty?
       
       buffer << document
       

data/test/unit/document_test.rb

@@ -59,7 +59,7 @@ class DocumentTest < Test::Unit::TestCase
   def test_boost
     doc = Solr::Document.new :name => "McGrump"
     doc.boost = 300.28
-    assert_match(/<doc boost=['"]300.28['"]>[\s]+<field name=['"]name['"]>McGrump<\/field>[\s]+<\/doc>/, doc.to_xml.to_s)
+    assert_match(/<doc boost=['"]300.28['"]>[\s]*<field name=['"]name['"]>McGrump<\/field>[\s]*<\/doc>/, doc.to_xml.to_s)
   end
 
 end

data/test/unit/hpricot_mapper_test.rb

@@ -10,31 +10,35 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'solr'
-require 'test/unit'
-require 'hpricot'
+begin
+  require 'solr'
+  require 'test/unit'
+  require 'hpricot'
 
-class HpricotMapperTest < Test::Unit::TestCase
+  class HpricotMapperTest < Test::Unit::TestCase
   
-  def setup
-    @doc = open(File.expand_path(File.dirname(__FILE__)) + "/hpricot_test_file.xml"){|f| Hpricot.XML(f)}
-  end
+    def setup
+      @doc = open(File.expand_path(File.dirname(__FILE__)) + "/hpricot_test_file.xml"){|f| Hpricot.XML(f)}
+    end
 
-  def test_simple_hpricot_path
-    mapping = {:field1 => :'child[@attribute="attribute1"]',
-               :field2 => :'child[@attribute="attribute2"]',
-               :field3 => :'child[@attribute="attribute3"]',
-               :field4 => :'child[@attribute="attribute3"] grandchild',
-               :field5 => :'child'}    
+    def test_simple_hpricot_path
+      mapping = {:field1 => :'child[@attribute="attribute1"]',
+                 :field2 => :'child[@attribute="attribute2"]',
+                 :field3 => :'child[@attribute="attribute3"]',
+                 :field4 => :'child[@attribute="attribute3"] grandchild',
+                 :field5 => :'child'}    
     
-    mapper = Solr::Importer::HpricotMapper.new(mapping)    
-    mapped_data = mapper.map(@doc)
+      mapper = Solr::Importer::HpricotMapper.new(mapping)    
+      mapped_data = mapper.map(@doc)
         
-    assert_equal ['text1'], mapped_data[:field1]
-    assert_equal ['text2'], mapped_data[:field2]
-    assert_equal ['text3<grandchild>grandchild 3 text</grandchild>'], mapped_data[:field3]
-    assert_equal ['grandchild 3 text'], mapped_data[:field4]
-    assert_equal ['text1', 'text2', 'text3<grandchild>grandchild 3 text</grandchild>'], mapped_data[:field5]
-  end
+      assert_equal ['text1'], mapped_data[:field1]
+      assert_equal ['text2'], mapped_data[:field2]
+      assert_equal ['text3<grandchild>grandchild 3 text</grandchild>'], mapped_data[:field3]
+      assert_equal ['grandchild 3 text'], mapped_data[:field4]
+      assert_equal ['text1', 'text2', 'text3<grandchild>grandchild 3 text</grandchild>'], mapped_data[:field5]
+    end
 
-end
+  end
+rescue LoadError => e
+  puts "HpricotMapperTest not run because #{e}"
+end

data/test/unit/request_test.rb

@@ -22,7 +22,7 @@ class RequestTest < Test::Unit::TestCase
     request = Solr::Request::Commit.new
     assert_equal :xml, request.response_format
     assert_equal 'update', request.handler
-    assert_equal '<commit waitSearcher="true" waitFlush="true"/>', request.to_s
+    assert_match(/<commit waitSearcher=["']true["'] waitFlush=["'']true["'']\/>/, request.to_s)
   end
   
   def test_add_doc_request

data/test/unit/xpath_mapper_test.rb

@@ -10,24 +10,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'solr'
-require 'test/unit'
+begin
+  require 'solr'
+  require 'test/unit'
+  require 'xml/libxml'
 
-class XPathMapperTest < Test::Unit::TestCase
+  class XPathMapperTest < Test::Unit::TestCase
   
-  def setup
-    @doc = XML::Document.file(File.expand_path(File.dirname(__FILE__)) + "/xpath_test_file.xml")
-  end
+    def setup
+      @doc = XML::Document.file(File.expand_path(File.dirname(__FILE__)) + "/xpath_test_file.xml")
+    end
 
-  def test_simple_xpath
-    mapping = {:solr_field1 => :'/root/parent/child',
-               :solr_field2 => :'/root/parent/child/@attribute'}    
+    def test_simple_xpath
+      mapping = {:solr_field1 => :'/root/parent/child',
+                 :solr_field2 => :'/root/parent/child/@attribute'}    
     
-    mapper = Solr::Importer::XPathMapper.new(mapping)    
-    mapped_data = mapper.map(@doc)
+      mapper = Solr::Importer::XPathMapper.new(mapping)    
+      mapped_data = mapper.map(@doc)
         
-    assert_equal ['text1', 'text2'], mapped_data[:solr_field1]
-    assert_equal ['attribute1', 'attribute2'], mapped_data[:solr_field2]
-  end
+      assert_equal ['text1', 'text2'], mapped_data[:solr_field1]
+      assert_equal ['attribute1', 'attribute2'], mapped_data[:solr_field2]
+    end
 
-end
+  end
+rescue LoadError => e
+  puts "XPathMapperTest not run because #{e}"
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: solr-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-05-14 00:00:00 -04:00
+  version: 0.0.3
+date: 2007-05-22 00:00:00 -04:00
 summary: Ruby library for working with Apache Solr
 require_paths: 
 - lib