stretcher 1.7.3 → 1.8.0

data/lib/stretcher/index_type.rb

@@ -14,8 +14,12 @@ module Stretcher
     # Retrieves the document by ID
     # Normally this returns the contents of _source, however, the 'raw' flag is passed in, it will return the full response hash
     # Returns nil if the document does not exist
-    def get(id, raw=false)
-      res = request(:get, id)
+    def get(id, options={}, raw=false)
+      if options == true || options == false # Support raw as second argument, legacy API
+        raw = true
+        options = {}
+      end
+      res = request(:get, id, options)
       raw ? res : res["_source"]
     end
 

data/lib/stretcher/search_results.rb

@@ -24,7 +24,7 @@ module Stretcher
         if r.key?('highlight')
           doc.merge!({"_highlight" => r['highlight']})
         end
-        doc.merge!({"_id" => r['_id']})
+        doc.merge!({"_id" => r['_id'], "_index" => r['_index'], "_type" => r['_type']})
       end
     end
   end

data/lib/stretcher/version.rb

@@ -1,3 +1,3 @@
 module Stretcher
-  VERSION = "1.7.3"
+  VERSION = "1.8.0"
 end

data/spec/lib/stretcher_index_type_spec.rb

@@ -55,7 +55,7 @@ describe Stretcher::IndexType do
 
   describe "put/get/delete/explain" do
     before do
-      @doc = {:message => "hello!"}
+      @doc = {:message => "hello!", :_timestamp => 1366420401}
       @put_res = type.put(987, @doc)
     end
 
@@ -77,7 +77,19 @@ describe Stretcher::IndexType do
       }.should raise_exception(Stretcher::RequestError::NotFound)
     end
 
+    it "should get individual, passing through additional options" do
+      res = type.get(987, {:fields => ['_timestamp']})
+      res._timestamp.should == @doc[:_timestamp]
+      res.message == nil
+    end
+
     it "should get individual raw documents correctly" do
+      res = type.get(987, {}, true)
+      res["_id"].should == "987"
+      res["_source"].message.should == @doc[:message]
+    end
+
+    it "should get individual raw documents correctly with legacy API" do
       res = type.get(987, true)
       res["_id"].should == "987"
       res["_source"].message.should == @doc[:message]

metadata

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