stretcher 1.20.0.beta2 → 1.20.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81f2f9ec0ad54ee0611402adab9de910c69c7add
-  data.tar.gz: dd0776a032dc17bce10cb15d44a66435f19f6ee1
+  metadata.gz: 6fe7e6ae86720732abdf939c6632e6c025244ae0
+  data.tar.gz: 715e7729054c64b798914cb05a3d1364af9dfc23
 SHA512:
-  metadata.gz: 2173de91fa8f0e1322aa6a0e5b7718b6cbd6005dd237250967773f567ba2cb841626fb8b5251dc1d25034ee7163e22fc309ea07762455673b5625d7e9110a322
-  data.tar.gz: 2c69f1f1f583985b4b7bb1c7c36664ceb5937c2ea5656bbaf6a5a34c22f2aa0c3e9e786f84c992f98bc77364beee865effa24452f65d1ac3700599d760335870
+  metadata.gz: a89263f5d9a591a5b798b04333726b5c8af8174ff3a5f68ea155fe4c881d3b1f01a8fddc91ec0dfa8eac295e1461b6a41cb0b1a4d80a60f1a3969761a6aaf992
+  data.tar.gz: 0a40d4f3f45ab830efe603fd50145ad4439222fe91452060b93eee3fe222fced761df86a5f2743e09540c8091ce65f2c4ec4ca71ee59c4e4e791079ea870b10e

data/lib/stretcher/index_type.rb

@@ -73,9 +73,20 @@ module Stretcher
       false
     end
 
+    # Takes a document and percolates it
     def percolate(document = {})
       request :get, '_percolate', nil, {:doc => document}
     end
+    
+    # Runs an MLT query based on the document's content.
+    # This is actually a search, so a Stretcher::SearchResults object is returned
+    #
+    # Equivalent to hitting /index/type/id/_mlt
+    # See http://www.elasticsearch.org/guide/reference/api/more-like-this/ for more
+    # Takens an options hash as a second argument, for things like fields=
+    def mlt(id, options={})
+      SearchResults.new(request(:get, "#{id}/_mlt", options))
+    end
 
     # Retrieve the mapping for this type
     def get_mapping

data/lib/stretcher/search_results.rb

@@ -13,6 +13,8 @@ module Stretcher
     end
     
     # Returns a plain (string keyed) hash of the raw response
+    # Normally stretcher deals in Hashie::Mash-ified versions of data
+    # If you have truly gigantic result sets this may matter.
     def raw_plain
       @raw_plain
     end
@@ -27,17 +29,14 @@ module Stretcher
       @total ||= raw_plain['hits']['total']
     end
 
+    # Returns the facet data from elasticsearch
+    # Equivalent to raw[:facets]
     def facets
       @facets ||= raw[:facets]
     end    
-
-    # DEPRECATED!
-    # Call #documents instead!
-    def results
-      documents
-    end
   
     # Returns a 'prettier' version of elasticsearch results
+    # Also aliased as +docs+
     # This will:
     # 
     # 1. Return either '_source' or 'fields' as the base of the result
@@ -53,6 +52,13 @@ module Stretcher
         doc
       end
     end
+    alias_method :docs, :documents
+
+    # DEPRECATED!
+    # Call #documents instead!
+    def results
+      documents
+    end
     
     private
     
@@ -72,16 +78,15 @@ module Stretcher
     def copy_underscores(hit, doc)
       # Copy underscore keys into the document
       hit.each do |k,v|
-        if k && k[0] == "_"
-          doc[k] = v
-        end
+        doc[k] = v if k && k[0] == "_"
       end
+      
       doc
     end
 
     def copy_highlight(hit, doc)
       if highlight = hit.key?("highlight")
-        doc[:_highlight] = highlight
+        doc[:_highlight] = highlight 
       end
       doc
     end

data/lib/stretcher/version.rb

@@ -1,3 +1,3 @@
 module Stretcher
-  VERSION = "1.20.0.beta2"
+  VERSION = "1.20.0.beta3"
 end

data/spec/lib/stretcher_index_type_spec.rb

@@ -17,7 +17,11 @@ describe Stretcher::IndexType do
   before do
     type.delete_query(:match_all => {})
     index.refresh
-    type.put_mapping({"bar" => {"properties" => {"message" => {"type" => "string"}}}})
+    type.put_mapping({"bar" => {
+                         "properties" => {
+                           "message" => {"type" => "string", analyzer: "snowball"},
+                           "username" => {"type" => "string"}
+                         }}})
   end
 
   describe "searching" do
@@ -50,6 +54,31 @@ describe Stretcher::IndexType do
     end
   end
 
+  describe "document based mlt_searches" do
+    let(:doc_one) {{message: "I just saw Death Wish I with charles bronson!", :_timestamp => 1366420402}}
+    let(:doc_two) {{message: "Death Wish II was even better!", :_timestamp => 1366420403}}
+    let(:doc_three) {{message: "Death Wish III was even better, making it the best!", :_timestamp => 1366420403}}
+
+    before do
+      type.put(1, doc_one)
+      type.put(2, doc_two)
+      type.put(3, doc_three)
+      type.index.refresh
+    end
+
+    let (:results) {
+      type.mlt(1, min_term_freq: 1, min_doc_freq: 1, fields: [:message])
+    }
+    
+    it "should return results as SearchResults" do
+      results.should be_a(Stretcher::SearchResults)
+    end
+    
+    it "should return expected mlt results" do
+      Set.new(results.docs.map(&:_id)).should == Set.new(["2", "3"])
+    end
+  end
+
   describe 'mget' do
     let(:doc_one) {{:message => "message one!", :_timestamp => 1366420402}}
     let(:doc_two) {{:message => "message two!", :_timestamp => 1366420403}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretcher
 version: !ruby/object:Gem::Version
-  version: 1.20.0.beta2
+  version: 1.20.0.beta3
 platform: ruby
 authors:
 - Andrew Cholakian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday