solr-ruby 0.0.3 → 0.0.4

data/lib/solr/document.rb

@@ -37,7 +37,7 @@ class Solr::Document
     case fields
     when Hash
       fields.each_pair do |name,value|
-        if value.respond_to?(:each)
+        if value.respond_to?(:each) && !value.is_a?(String)
           value.each {|v| @fields << Solr::Field.new(name => v)}
         else
           @fields << Solr::Field.new(name => value)

data/lib/solr/importer/mapper.rb

@@ -25,7 +25,7 @@ class Solr::Importer::Mapper
       when String
         field_mapping
       when Proc
-        field_mapping.call(orig_data)
+        field_mapping.call(orig_data)  # TODO pass in more context, like self or a function for field_data, etc
       when Symbol
         field_data(orig_data, @options[:stringify_symbols] ? field_mapping.to_s : field_mapping)
       when Enumerable

data/lib/solr/request/dismax.rb

@@ -19,7 +19,7 @@ class Solr::Request::Dismax < Solr::Request::Standard
     @alternate_query = params.delete(:alternate_query)
     @sort_values = params.delete(:sort)
     
-    super(params)
+    super
     
     @query_type = "dismax"
   end

data/lib/solr/request/index_info.rb

@@ -16,4 +16,7 @@ class Solr::Request::IndexInfo < Solr::Request::Select
     'admin/luke'
   end
   
+  def to_hash
+    {:numTerms => 0}.merge(super.to_hash)
+  end
 end

data/lib/solr/response/add_document.rb

@@ -12,6 +12,6 @@
 
 class Solr::Response::AddDocument < Solr::Response::Xml
   def initialize(xml)
-    super(xml)
+    super
   end
 end

data/lib/solr/response/index_info.rb

@@ -12,7 +12,7 @@
 
 class Solr::Response::IndexInfo < Solr::Response::Ruby
   def initialize(ruby_code)
-    super(ruby_code)
+    super
   end
 
   def num_docs

data/lib/solr/response/ping.rb

@@ -15,7 +15,7 @@ require 'rexml/xpath'
 class Solr::Response::Ping < Solr::Response::Xml
 
   def initialize(xml)
-    super(xml)
+    super
     @ok = REXML::XPath.first(@doc, './solr/ping') ? true : false
   end
 

data/lib/solr/response/ruby.rb

@@ -14,7 +14,7 @@ class Solr::Response::Ruby < Solr::Response::Base
   attr_reader :data
 
   def initialize(ruby_code)
-    super(ruby_code)
+    super
     begin
       #TODO: what about pulling up data/header/response to ResponseBase,
       #      or maybe a new middle class like SelectResponseBase since

data/lib/solr/response/standard.rb

@@ -15,7 +15,7 @@ class Solr::Response::Standard < Solr::Response::Ruby
   include Enumerable
   
   def initialize(ruby_code)
-    super(ruby_code)
+    super
     @response = @data['response']
     raise "response section missing" unless @response.kind_of? Hash
   end

data/lib/solr/response/xml.rb

@@ -17,7 +17,7 @@ class Solr::Response::Xml < Solr::Response::Base
   attr_reader :doc, :status_code, :status_message
 
   def initialize(xml)
-    super(xml)
+    super
     # parse the xml
     @doc = REXML::Document.new(xml)
 

data/lib/solr/util.rb

@@ -22,13 +22,7 @@ class Solr::Util
 
   # paired_array_to_hash([key1,value1,key2,value2]) => {key1 => value1, key2, value2}
   def self.paired_array_to_hash(a)
-    h = {}
-    
-    paired_array_each(a) do |key,value|
-      h[key] = value
-    end
-    
-    h
+    Hash[*a]
   end
   
 end

data/test/unit/document_test.rb

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

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: solr-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2007-05-22 00:00:00 -04:00
+  version: 0.0.4
+date: 2007-08-16 00:00:00 -04:00
 summary: Ruby library for working with Apache Solr
 require_paths: 
 - lib