Merge pull request #60 from theablefew/esmarkowski/Highlighting

Fix highlighting and add support for storing and retrieving highlights

lib/stretchy/common.rb

@@ -10,6 +10,10 @@ def [](attribute)
             self.send(attribute)
         end
 
+        def highlights_for(attribute)
+            highlights[attribute.to_s]
+        end
+
         class_methods do
 
             # Set the default sort key to be used in sort operations

lib/stretchy/model/serialization.rb

@@ -9,6 +9,7 @@ def serialize(document)
 
             def deserialize(document)
                 attribs = ActiveSupport::HashWithIndifferentAccess.new(document['_source']).deep_symbolize_keys
+                attribs[:_highlights] = document["highlight"] if document["highlight"]
                 _id = __get_id_from_document(document)
                 attribs[:id] = _id if _id
                 klass.new attribs

lib/stretchy/record.rb

@@ -45,6 +45,13 @@ def self.inherited(base)
                 # overriden by #size
                 default_size 10000
 
+                attr_accessor :highlights
+
+                def initialize(attributes = {})
+                    @highlights = attributes.delete(:_highlights) 
+                    super(attributes)
+                end
+
             end
 
             def initialize(attributes = {})

lib/stretchy/relations/query_builder.rb

@@ -174,7 +174,13 @@ def build_highlights
         structure.highlight do
           structure.fields do
             highlights.each do |highlight|
-              structure.set! highlight, extract_highlighter(highlight)
+              if highlight.is_a?(String) || highlight.is_a?(Symbol)
+                structure.set! highlight, {}
+              elsif highlight.is_a?(Hash)
+                highlight.each_pair do |k,v|
+                  structure.set! k, v
+                end
+              end
             end
           end
         end

spec/stretchy/querying_spec.rb

@@ -278,10 +278,26 @@
 
             context 'highlight' do
                 it 'returns highlighted fields' do
-                    result = described_class.highlight(:body)
+                    result = described_class.highlight(body: {})
                     expected = {:highlight=>{:fields=>{body: {}}}}
                     expect(result.to_elastic).to eq(expected.with_indifferent_access)
                 end
+
+                it 'stores highlights' do
+                    result = described_class.query_string("name: Soph*").highlight(name: {pre_tags: "__", post_tags: "__"}).first
+                    expect(result.highlights).to eq({"name"=>["__Sophia__ Anderson"]})
+                end
+
+                it 'allows single symbol argument' do
+                    result = described_class.highlight(:body) 
+                    expected = {:highlight=>{:fields=>{body: {}}}}
+                    expect(result.to_elastic).to eq(expected.with_indifferent_access) 
+                end
+
+                it 'highlights_for ' do
+                    result = described_class.query_string("name: Soph*").highlight(name: {pre_tags: "__", post_tags: "__"}).first
+                    expect(result.highlights_for(:name)).to eq(["__Sophia__ Anderson"])
+                end
             end
 
             it 'adds exists with has_field' do