elastic_record 0.6.0 → 0.6.1

data/elastic_record.gemspec

@@ -2,7 +2,7 @@
  
 Gem::Specification.new do |s|
   s.name = 'elastic_record'
-  s.version = '0.6.0'
+  s.version = '0.6.1'
   s.summary = 'Use Elastic Search with your objects'
   s.description = 'Find your records with elastic search'
 

data/lib/elastic_record/index/documents.rb

@@ -39,11 +39,26 @@ module ElasticRecord
         connection.json_get url, elastic_query
       end
 
+      def explain(id, elastic_query)
+        connection.json_get "/#{alias_name}/#{type}/#{id}/_explain", elastic_query
+      end
+
       def scroll(scroll_id, scroll_keep_alive)
         options = {scroll_id: scroll_id, scroll: scroll_keep_alive}
         connection.json_get("/_search/scroll?#{options.to_query}")
       end
 
+      def bulk
+        @batch = []
+        yield
+        if @batch.any?
+          body = @batch.map { |action| "#{ActiveSupport::JSON.encode(action)}\n" }.join
+          connection.json_post "/_bulk", body
+        end
+      ensure
+        @batch = nil
+      end
+
       def bulk_add(batch, index_name = nil)
         return if disabled
 
@@ -55,17 +70,6 @@ module ElasticRecord
           end
         end
       end
-
-      def bulk
-        @batch = []
-        yield
-        if @batch.any?
-          body = @batch.map { |action| "#{ActiveSupport::JSON.encode(action)}\n" }.join
-          connection.json_post "/_bulk", body
-        end
-      ensure
-        @batch = nil
-      end
     end
   end
 end

data/lib/elastic_record/index/percolator.rb

@@ -2,6 +2,7 @@ module ElasticRecord
   class Index
     module Percolator
       def create_percolator(name, elastic_query)
+        p "creating #{elastic_query.inspect}"
         unless exists? percolator_index_name
           create percolator_index_name
         else
@@ -20,9 +21,14 @@ module ElasticRecord
       end
 
       def percolate(document)
+        # p "document = #{document}"
         connection.json_get("/#{percolator_index_name}/#{type}/_percolate", 'doc' => document)['matches']
       end
 
+      def reset_percolator
+        delete(percolator_index_name) if exists?(percolator_index_name)
+      end
+
       def percolator_index_name
         @percolator_index_name ||= "percolate_#{alias_name}"
       end

data/lib/elastic_record/relation.rb

@@ -29,8 +29,8 @@ module ElasticRecord
       klass.elastic_index.create_percolator(name, as_elastic)
     end
 
-    def reset
-      @search_results = @records = nil
+    def explain(id)
+      klass.elastic_index.explain(id, as_elastic)
     end
 
     def initialize_copy(other)
@@ -70,6 +70,10 @@ module ElasticRecord
     end
 
     private
+      def reset
+        @search_results = @records = nil
+      end
+    
       def search_hits
         search_results['hits']['hits']
       end

data/test/elastic_record/relation_test.rb

@@ -6,20 +6,20 @@ class ElasticRecord::RelationTest < MiniTest::Spec
   end
 
   def test_count
-    create_widgets
+    create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
 
     assert_equal 2, Widget.elastic_relation.count
   end
 
   def test_facets
-    create_widgets
+    create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
 
     facets = Widget.elastic_relation.facet(Widget.arelastic.facet['popular_colors'].terms('color')).facets
 
     assert_equal 2, facets['popular_colors']['total']
   end
 
-  def test_percolate
+  def test_create_percolator
     Widget.elastic_relation.filter(color: 'green').create_percolator('green')
     Widget.elastic_relation.filter(color: 'blue').create_percolator('blue')
     widget = Widget.new(color: 'green')
@@ -27,17 +27,26 @@ class ElasticRecord::RelationTest < MiniTest::Spec
     assert_equal ['green'], Widget.elastic_index.percolate(widget.as_search)
   end
 
+  def test_explain
+    create_widgets [Widget.new(id: 10, color: 'blue')]
+
+    # explain = Widget.elastic_relation.filter(color: 'blue').explain('10')
+    # p "explain = #{explain}"
+  end
+
   def test_to_hits
     # assert Widget.elastic_relation.search_results.is_a?(ElasticSearch::Api::Hits)
   end
 
   def test_to_ids
-    create_widgets
+    create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
+
     assert_equal ['5', '10'], Widget.elastic_relation.to_ids
   end
 
   def test_to_a
-    create_widgets
+    create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
+    
     array = Widget.elastic_relation.to_a
 
     assert_equal 2, array.size
@@ -45,7 +54,7 @@ class ElasticRecord::RelationTest < MiniTest::Spec
   end
 
   def test_equal
-    create_widgets
+    create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
 
     assert(Widget.elastic_relation.filter(color: 'green') == Widget.elastic_relation.filter(color: 'green'))
     assert(Widget.elastic_relation.filter(color: 'green') != Widget.elastic_relation.filter(color: 'blue'))
@@ -58,12 +67,8 @@ class ElasticRecord::RelationTest < MiniTest::Spec
   end
 
   private
-    def create_widgets
-      Widget.elastic_index.bulk_add [
-        Widget.new(id: 5, color: 'red'),
-        Widget.new(id: 10, color: 'blue')
-      ]
-
+    def create_widgets(widgets)
+      Widget.elastic_index.bulk_add(widgets)
       Widget.elastic_index.refresh
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic