solrsan 0.0.20 → 0.0.21

data/lib/solrsan/search.rb

@@ -54,9 +54,11 @@ module Solrsan
           :time => solr_response['responseHeader']['QTime'],
           :status => solr_response['responseHeader']['status']
         }
-
-        {:docs => docs, :metadata =>  metadata,
+        
+        response = {:docs => docs, :metadata =>  metadata,
          :facet_counts => parsed_facet_counts, :highlighting => highlighting}
+
+        embed_highlighting(response)
       end
 
       def parse_fq(fq)
@@ -130,6 +132,20 @@ module Solrsan
         end
       end
 
+      def embed_highlighting(search_response)
+        return search_response unless search_response[:highlighting]
+
+        highlighted_docs = search_response[:docs].map do |doc|
+          hl_metadata = search_response[:highlighting][doc['id']]
+          hl_metadata.each{ |k,v| doc[k] = v } if hl_metadata
+
+          doc
+        end
+
+        search_response[:docs] = highlighted_docs
+        search_response
+      end
+
     end
   end
 end

data/lib/solrsan/version.rb

@@ -1,3 +1,3 @@
 module Solrsan
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

data/test/unit/search_test.rb

@@ -167,5 +167,14 @@ class SearchTest < Test::Unit::TestCase
     first_result = highlighting.first
     assert first_result[1]['tags'].include?("<em>solr</em>")
   end
+
+  def test_embed_highlighting
+    Document.index(Document.new(:id => 3, :author => "Bert", :title => "solr lucene",:review_count => 10, :tags => ["solr"]))
+
+    response = Document.search(:q => "solr", 
+                               :'hl.fl' => "*")
+    docs = response[:docs]
+    assert docs.first['tags'].include?("<em>solr</em>")
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solrsan
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-18 00:00:00.000000000 -07:00
+date: 2011-03-21 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &2153183880 !ruby/object:Gem::Requirement
+  requirement: &2152897700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153183880
+  version_requirements: *2152897700
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2153183260 !ruby/object:Gem::Requirement
+  requirement: &2152897120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153183260
+  version_requirements: *2152897120
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153182780 !ruby/object:Gem::Requirement
+  requirement: &2152896640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 3.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153182780
+  version_requirements: *2152896640
 description: solrsan is a lightweight wrapper for using Apache Solr within a Ruby
   application including Rails and Sinatra.
 email: