stretcher 1.1.3 → 1.2.0

data/lib/stretcher/index.rb

@@ -48,11 +48,16 @@ module Stretcher
       @server.request :delete, path_uri
     end
 
-    # Retrieves stats from the server
+    # Retrieves stats for this index
     def stats
       @server.request :get, path_uri("/_stats")
     end
     
+    # Retrieves status for this index
+    def status
+      @server.request :get, path_uri("/_status")      
+    end
+    
     # Retrieve the mapping for this index
     def get_mapping
       @server.request :get, path_uri("/_mapping")

data/lib/stretcher/index_type.rb

@@ -70,6 +70,11 @@ module Stretcher
       server.http.head(path_uri("/#{id}")).status != 404
     end
 
+    # Issues an Index#search scoped to this type
+    def search(query_opts={}, body=nil)
+      @index.search(query_opts.merge(type: name), body)
+    end
+
     # Full path to this index type
     def path_uri(path="/")
       index.path_uri("/#{name}") + path.to_s

data/lib/stretcher/server.rb

@@ -58,6 +58,16 @@ module Stretcher
         req.body = data
       end
     end
+
+    # Retrieves stats for this server
+    def stats
+      request :get, path_uri("/_stats")
+    end
+
+    # Retrieves status for this server
+    def status
+      request :get, path_uri("/_status")
+    end
     
     # Returns true if the server is currently reachable, raises an error otherwise
     def up?

data/lib/stretcher/version.rb

@@ -1,3 +1,3 @@
 module Stretcher
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

data/spec/lib/stretcher_index_spec.rb

@@ -42,6 +42,10 @@ describe Stretcher::Index do
     index.stats['_all'].should_not be_nil
   end
 
+  it "should return the status without error" do
+    index.status['ok'].should be_true
+  end
+
   it "should put mappings for new types correctly" do
     create_tweet_mapping
   end
@@ -57,6 +61,14 @@ describe Stretcher::Index do
     }
   end
 
+  it "should search without error" do
+    seed_corpus
+    match_text = corpus.first[:text]
+    sleep 1 # ES needs time to update!
+    res = index.search({}, {query: {match: {text: match_text}}})
+    res.results.first.text.should == match_text
+  end
+
   # TODO: Actually use two indexes
   it "should msearch across the index returning all docs" do
     seed_corpus

data/spec/lib/stretcher_index_type_spec.rb

@@ -14,6 +14,20 @@ describe Stretcher::Index do
     type.get_mapping.should == mapping
   end
 
+  describe "searching" do
+    before do
+      @doc = {message: "hello"}
+    end
+
+    it "should search and find the right doc" do
+      match_text = 'hello'
+      type.put(123123, @doc)
+      sleep 1
+      res = type.search({}, {query: {match: {message: match_text}}})
+      res.results.first.message.should == @doc[:message]
+    end
+  end
+
   describe "put/get" do
     before do
       @doc = {message: "hello!"}

data/spec/lib/stretcher_server_spec.rb

@@ -20,6 +20,14 @@ describe Stretcher::Server do
   it "should properly return that our server is up" do
     server.up?.should be_true
   end
+
+  it "should check the stats w/o error" do
+    server.stats
+  end
+
+  it "should check the status w/o error" do
+    server.status.ok.should be_true
+  end
   
   it "should beget an index object cleanly" do
     server.index('foo').class.should == Stretcher::Index

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stretcher
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday