stretcher 1.4.0 → 1.5.0

data/README.md

@@ -97,6 +97,7 @@ Specs may be run with `rake spec`
 * @psynix
 * @fmardini
 * @chatgris
+* @alpinegizmo
 
 ## Contributing
 

data/lib/stretcher/es_component.rb

@@ -4,9 +4,9 @@ module Stretcher
 
     # Many of the methods marked protected are called by one line shims in subclasses. This is mostly to facilitate
     # better looking rdocs
-    
+
     private
-    
+
     def do_search(generic_opts={}, explicit_body=nil)
       query_opts = {}
       body = nil
@@ -21,7 +21,7 @@ module Stretcher
       response = request(:get, "_search", query_opts) do |req|
         req.body = body
       end
-      SearchResults.new(:raw => response)      
+      SearchResults.new(:raw => response)
     end
 
     def do_refresh
@@ -33,5 +33,11 @@ module Stretcher
       raise "Cannot issue request, no server specified!" unless @server
       @server.request(method, prefixed_path, query_opts, *args, &block)
     end
+
+    def do_delete_query(query)
+      request :delete, '_query' do |req|
+        req.body = query
+      end
+    end
   end
 end

data/lib/stretcher/index.rb

@@ -78,6 +78,10 @@ module Stretcher
       false
     end
 
+    def delete_query(query)
+      do_delete_query(query)
+    end
+
     # Issues a search with the given query opts and body, both should be hashes
     #
     #    res = server.index('foo').search(size: 12, {query: {match_all: {}}})
@@ -117,7 +121,7 @@ module Stretcher
         req.body = text
       end
     end
-    
+
     # Perform a refresh making all items in this index available instantly
     def refresh
       do_refresh

data/lib/stretcher/index_type.rb

@@ -13,6 +13,7 @@ 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)
       raw ? res : res["_source"]
@@ -23,6 +24,11 @@ module Stretcher
       request(:put, id, source)
     end
 
+    # Index an item with automatic ID generation
+    def post(source)
+      request(:post, nil, source)
+    end
+
     # Uses the update api to modify a document with a script
     # To update a doc with ID 987 for example:
     # type.update(987, script: "ctx._source.message = 'Updated!'")
@@ -63,11 +69,14 @@ module Stretcher
     def exists?(id=nil)
       request :head, id
       true
-    rescue Stretcher::RequestError => e
-      raise e if e.http_response.status != 404
+    rescue Stretcher::RequestError::NotFound => e
       false
     end
 
+    def delete_query(query)
+      do_delete_query(query)
+    end
+
     # Issues an Index#search scoped to this type
     # See Index#search for more details
     def search(generic_opts={}, explicit_body=nil)

data/lib/stretcher/request_error.rb

@@ -2,9 +2,12 @@ module Stretcher
   # Raised when the underlying http status of an operation != 200
   class RequestError < StandardError
     attr_reader :http_response
-    
+
     def initialize(http_response)
       @http_response = http_response
     end
+
+    class NotFound < RequestError
+    end
   end
 end

data/lib/stretcher/search_results.rb

@@ -18,9 +18,11 @@ module Stretcher
       super
       self.total = raw.hits.total
       self.facets = raw.facets
-      self.results = raw.hits.hits.collect {|r|
-        (r.has_key?('_source') ? r['_source'] : r['fields']).merge({"_id" => r['_id']})
-      }
+      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']})
+      end
     end
   end
 end

data/lib/stretcher/server.rb

@@ -119,7 +119,7 @@ module Stretcher
         req.body = text
       end
     end
-    
+
     # Perform a refresh, making all indexed documents available
     def refresh
       do_refresh
@@ -146,6 +146,10 @@ module Stretcher
 
       if res.status >= 200 && res.status <= 299
         res.body
+      elsif res.status == 404
+        err_str = "Error 404 processing request: (#{res.status})! #{res.env[:method]} URL: #{res.env[:url]}"
+        err_str << "\n Resp Body: #{res.body}"
+        raise RequestError::NotFound.new(res), err_str
       else
         err_str = "Error processing request (#{res.status})! #{res.env[:method]} URL: #{res.env[:url]}"
         err_str << "\n Resp Body: #{res.body}"

data/lib/stretcher/util.rb

@@ -3,7 +3,7 @@ module Stretcher
     def self.qurl(url, query_opts=nil)
       query_opts && !query_opts.empty? ? "#{url}?#{querify(query_opts)}" : url
     end
-    
+
     def self.querify(hash)
       hash.map {|k,v| "#{k}=#{v}"}.join('&')
     end

data/lib/stretcher/version.rb

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

data/spec/lib/stretcher_index_spec.rb

@@ -4,7 +4,16 @@ describe Stretcher::Index do
   let(:server) {
     Stretcher::Server.new(ES_URL, :logger => DEBUG_LOGGER)
   }
-  let(:index) { server.index('foo') }
+  let(:index) {
+    i = server.index('foo')
+    i.delete
+    server.refresh
+    i.create
+    # Why do both? Doesn't hurt, and it fixes some races
+    server.refresh
+    i.refresh
+    i
+  }
   let(:corpus) {
     [
      {:text => "Foo", "_type" => 'tweet', "_id" => 'fooid'},
@@ -21,6 +30,7 @@ describe Stretcher::Index do
   def seed_corpus
     create_tweet_mapping
     index.bulk_index(corpus)
+    index.refresh
   end
 
   it "should work on an existential level" do
@@ -63,6 +73,14 @@ describe Stretcher::Index do
     }
   end
 
+  it "should delete by query" do
+    seed_corpus
+    index.search(:query => {:match_all => {}}).total == 3
+    index.delete_query(:match_all => {})
+    index.refresh
+    index.search(:query => {:match_all => {}}).total == 0
+  end
+
   it "should search without error" do
     seed_corpus
     match_text = corpus.first[:text]
@@ -80,7 +98,7 @@ describe Stretcher::Index do
   end
 
   it "execute the analysis API and return an expected result" do
-    analyzed = index.analyze("Candles", :analyzer => :snowball)
+    analyzed = server.index(:foo).analyze("Candles", :analyzer => :snowball)
     analyzed.tokens.first.token.should == 'candl'
   end
 

data/spec/lib/stretcher_index_type_spec.rb

@@ -1,29 +1,38 @@
 require 'spec_helper'
 
-describe Stretcher::Index do
+describe Stretcher::IndexType do
   let(:server) { Stretcher::Server.new(ES_URL) }
-  let(:index) { server.index('foo') }
-  let(:type) { index.type('bar') }
+  let(:index) {
+    i = server.index(:foo)
+    i
+  }
+  let(:type) {
+    t = index.type(:bar)
+    t.delete_query(:match_all => {})
+    index.refresh
+    mapping = {"bar" => {"properties" => {"message" => {"type" => "string"}}}}
+    t.put_mapping mapping
+    t
+  }
 
   it "should be existentially aware" do
-    type.delete rescue nil
-    type.exists?.should be_false
-    mapping = {"bar" => {"properties" => {"message" => {"type" => "string"}}}}
-    type.put_mapping mapping
-    type.exists?.should be_true
-    type.get_mapping.should == mapping
+    t = index.type(:existential)
+    t.exists?.should be_false
+    mapping = {"existential" => {"properties" => {"message" => {"type" => "string"}}}}
+    t.put_mapping mapping
+    t.exists?.should be_true
+    t.get_mapping.should == mapping
   end
 
   describe "searching" do
     before do
       @doc = {:message => "hello"}
+      type.put(123123, @doc)
+      index.refresh
     end
 
     it "should search and find the right doc" do
-      match_text = 'hello'
-      type.put(123123, @doc)
-      index.refresh
-      res = type.search({}, {:query => {:match => {:message => match_text}}})
+      res = type.search({}, {:query => {:match => {:message => @doc[:message]}}})
       res.results.first.message.should == @doc[:message]
     end
 
@@ -31,21 +40,37 @@ describe Stretcher::Index do
       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.results.first.should have_key '_id'
+    end
   end
 
-  describe "put/get" do
+  describe "put/get/delete" do
     before do
       @doc = {:message => "hello!"}
+      @put_res = type.put(987, @doc)
     end
 
     it "should put correctly" do
-      type.put(987, @doc).should_not be_nil
+      @put_res.should_not be_nil
+    end
+
+    it "should post correctly" do
+      type.post(@doc).should_not be_nil
     end
 
     it "should get individual documents correctly" do
       type.get(987).message.should == @doc[:message]
     end
 
+    it "should return nil when retrieving non-extant docs" do
+      lambda {
+        type.get(898323329)
+      }.should raise_exception(Stretcher::RequestError::NotFound)
+    end
+
     it "should get individual raw documents correctly" do
       res = type.get(987, true)
       res["_id"].should == "987"
@@ -57,6 +82,12 @@ describe Stretcher::Index do
       type.get(987).message.should == 'Updated!'
     end
 
+    it "should delete by query correctly" do
+      type.delete_query("match_all" => {})
+      index.refresh
+      type.exists?(987).should be_false
+    end
+
     it "should delete individual docs correctly" do
       type.exists?(987).should be_true
       type.delete(987)

metadata

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