sunspot 0.10.4 → 0.10.5

data/History.txt

@@ -1,3 +1,6 @@
+== 0.10.5 2009-10-22
+* Fix highlighting for multiple-model search
+
 == 0.10.4 2009-10-20
 * Add adjust_params method, allowing experts to manually edit Solr params
 * Track adds and deletes separately in session, and expose delete_dirty? method

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 10
-:patch: 4
+:patch: 5
 :major: 0

data/lib/sunspot.rb

@@ -323,7 +323,7 @@ module Sunspot
     #
     # objects...<Object>:: Objects to remove from the index
     #
-    def remove!
+    def remove!(*objects)
       session.remove!(*objects)
     end
 

data/lib/sunspot/composite_setup.rb

@@ -49,10 +49,14 @@ module Sunspot
     #   If no field with that name is configured for any of the enclosed types.
     #
     def text_fields(field_name)
-      text_fields_hash[field_name.to_sym] || raise(
-        UnrecognizedFieldError,
-        "No text field configured for #{@types * ', '} with name '#{field_name}'"
-      )
+      if text_fields = text_fields_hash[field_name.to_sym]
+        text_fields.to_a
+      else
+        raise(
+          UnrecognizedFieldError,
+          "No text field configured for #{@types * ', '} with name '#{field_name}'"
+        )
+      end
     end
 
     # 

data/spec/api/query/highlighting_spec.rb

@@ -48,6 +48,15 @@ describe 'highlighted fulltext queries', :type => :query do
     connection.should have_last_search_with(:hl => 'on', :'hl.fl' => %w(title_text body_texts))
   end
 
+  it 'should enable highlighting on multiple fields for multiple search types' do
+    session.search(Post, Namespaced::Comment) do
+      keywords 'test' do
+        highlight :body
+      end
+    end
+    connection.searches.last[:'hl.fl'].to_set.should == Set['body_text', 'body_texts']
+  end
+
   it 'should raise UnrecognizedFieldError if try to highlight unexisting field via block call' do
     lambda {
       session.search(Post) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot
 version: !ruby/object:Gem::Version 
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors: 
 - Mat Brown
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-20 00:00:00 -04:00
+date: 2009-10-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency