stretcher 1.5.0 → 1.6.0

data/lib/stretcher/index.rb

@@ -73,11 +73,12 @@ module Stretcher
       # Unless the exception is hit we know its a 2xx response
       request(:head)
       true
-    rescue Stretcher::RequestError => e
-      raise e if e.http_response.status != 404
+    rescue Stretcher::RequestError::NotFound
       false
     end
-
+    
+    # Delete documents by a given query.
+    # Per: http://www.elasticsearch.org/guide/reference/api/delete-by-query.html
     def delete_query(query)
       do_delete_query(query)
     end

data/lib/stretcher/search_results.rb

@@ -21,7 +21,10 @@ module Stretcher
       self.results = raw.hits.hits.collect do |r|
         k = ['_source', 'fields'].detect { |k| r.key?(k) }
         doc = k.nil? ? Hashie::Mash.new : r[k]
-        doc.merge({"_id" => r['_id']})
+        if r.key?('highlight')
+          doc.merge!({"_highlight" => r['highlight']})
+        end
+        doc.merge!({"_id" => r['_id']})
       end
     end
   end

data/lib/stretcher/version.rb

@@ -1,3 +1,3 @@
 module Stretcher
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

data/spec/lib/stretcher_index_spec.rb

@@ -6,7 +6,10 @@ describe Stretcher::Index do
   }
   let(:index) {
     i = server.index('foo')
-    i.delete
+    begin
+      i.delete
+    rescue Stretcher::RequestError::NotFound
+    end
     server.refresh
     i.create
     # Why do both? Doesn't hurt, and it fixes some races

data/spec/lib/stretcher_index_type_spec.rb

@@ -32,19 +32,25 @@ describe Stretcher::IndexType do
     end
 
     it "should search and find the right doc" do
-      res = type.search({}, {:query => {:match => {:message => @doc[:message]}}})
+      res = type.search(:query => {:match => {:message => @doc[:message]}})
       res.results.first.message.should == @doc[:message]
     end
 
     it "should build results when _source is not included in loaded fields" do
-      res = type.search({}, {query: {match_all: {}}, fields: ['message']})
+      res = type.search(query: {match_all: {}}, fields: ['message'])
       res.results.first.message.should == @doc[:message]
     end
 
     it "should build results when no document fields are selected" do
-      res = type.search({}, {query: {match_all: {}}, fields: ['_id']})
+      res = type.search(query: {match_all: {}}, fields: ['_id'])
       res.results.first.should have_key '_id'
     end
+
+    it "should add _highlight field to resulting documents when present" do
+      res = type.search(:query => {:match => {:message => 'hello'}}, :highlight => {:fields => {:message => {}}})
+      res.results.first.message.should == @doc[:message]
+      res.results.first.should have_key '_highlight'
+    end
   end
 
   describe "put/get/delete" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stretcher
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday