solrsan 0.0.24 → 0.0.25

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    solrsan (0.0.23)
+    solrsan (0.0.24)
       activemodel (~> 3.0.5)
       activesupport (~> 3.0.5)
       rsolr (~> 1.0.0)

data/config/solr/conf/solrconfig.xml

@@ -410,8 +410,8 @@
    <!-- Configure the standard formatter -->
    <formatter name="html" class="org.apache.solr.highlight.HtmlFormatter" default="true">
     <lst name="defaults">
-     <str name="hl.simple.pre"><![CDATA[<em>]]></str>
-     <str name="hl.simple.post"><![CDATA[</em>]]></str>
+     <str name="hl.simple.pre"><![CDATA[<mark>]]></str>
+     <str name="hl.simple.post"><![CDATA[</mark>]]></str>
     </lst>
    </formatter>
   </highlighting>

data/lib/solrsan/search.rb

@@ -2,6 +2,10 @@ module Solrsan
   module Search
     extend ActiveSupport::Concern
     module ClassMethods
+
+      HL_START_TAG = "<mark>"
+      HL_END_TAG = "</mark>"
+
       def class_name
         to_s.underscore
       end
@@ -143,7 +147,16 @@ module Solrsan
 
         highlighted_docs = search_response[:docs].map do |doc|
           hl_metadata = search_response[:highlighting][doc['id']]
-          hl_metadata.each{ |k,v| doc[k] = v unless excluded_highlighting_fields.include?(k)} if hl_metadata
+
+          hl_metadata.drop_while{|k,v| excluded_highlighting_fields.include?(k) }.each do |k,v|
+            new_value = if v.is_a?(Array)
+              matched = v.map{|t| t.gsub(HL_START_TAG,"").gsub(HL_END_TAG,"") }
+              doc[k].drop_while{|text| matched.include?(text) }.concat(v)
+            else
+              v
+            end
+            doc[k] = new_value
+          end if hl_metadata
 
           doc
         end

data/lib/solrsan/version.rb

@@ -1,3 +1,3 @@
 module Solrsan
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

data/test/unit/search_test.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solrsan
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-24 00:00:00.000000000 -07:00
+date: 2011-03-25 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &2153746600 !ruby/object:Gem::Requirement
+  requirement: &2160641540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153746600
+  version_requirements: *2160641540
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2153746100 !ruby/object:Gem::Requirement
+  requirement: &2160641040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153746100
+  version_requirements: *2160641040
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153745640 !ruby/object:Gem::Requirement
+  requirement: &2160640580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 3.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153745640
+  version_requirements: *2160640580
 description: solrsan is a lightweight wrapper for using Apache Solr within a Ruby
   application including Rails and Sinatra.
 email: