[RAILS] Updated the example application to work with Elasticsearch 2.x

Closes elastic#521

Author: karmi

elasticsearch-rails/lib/rails/templates/03-expert.rb

@@ -189,6 +189,10 @@ class Article < ActiveRecord::Base
 get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/indexer.rb',
     'app/workers/indexer.rb'
 
+insert_into_file "test/test_helper.rb",
+                 "require 'sidekiq/testing'\n\n",
+                 before: "class ActiveSupport::TestCase\n"
+
 git add:    "Gemfile* app/workers/"
 git commit: "-m 'Added a Sidekiq indexer\n\nRun:\n\n    $ bundle exec sidekiq --queue elasticsearch --verbose\n\nSee http://sidekiq.org'"
 

elasticsearch-rails/lib/rails/templates/index.html.erb

@@ -68,11 +68,11 @@
       <p class="panel-heading"><%= link_to 'All Sections &rarr;'.html_safe, search_path(params.except(:controller, :action).merge(c: nil))%></p>
 
       <div class="list-group">
-        <% @articles.response.response['facets']['categories']['terms'].each do |c| %>
+        <% @articles.response.response['aggregations']['categories']['categories']['buckets'].each do |c| %>
         <%=
-          link_to search_path(params.except(:controller, :action).merge(c: c['term'])),
-                  class: "list-group-item#{' active' if params[:c] == c['term']}" do
-                    c['term'].titleize.html_safe + content_tag(:small, c['count'], class: 'badge').html_safe
+          link_to search_path(params.except(:controller, :action).merge(c: c['key'])),
+                  class: "list-group-item#{' active' if params[:c] == c['key']}" do
+                    c['key'].titleize.html_safe + content_tag(:small, c['doc_count'], class: 'badge').html_safe
           end
         %>
         <% end %>
@@ -83,11 +83,11 @@
       <p class="panel-heading"><%= link_to 'All Authors &rarr;'.html_safe, search_path(params.except(:controller, :action).merge(a: nil))%></p>
 
       <div class="list-group">
-        <% @articles.response.response['facets']['authors']['terms'].each do |a| %>
+        <% @articles.response.response['aggregations']['authors']['authors']['buckets'].each do |a| %>
         <%=
-          link_to search_path(params.except(:controller, :action).merge(a: a['term'])),
-                  class: "list-group-item#{' active' if params[:a] == a['term']}" do
-                    a['term'].titleize.html_safe + content_tag(:small, a['count'], class: 'badge').html_safe
+          link_to search_path(params.except(:controller, :action).merge(a: a['key'])),
+                  class: "list-group-item#{' active' if params[:a] == a['key']}" do
+                    a['key'].titleize.html_safe + content_tag(:small, a['doc_count'], class: 'badge').html_safe
           end
         %>
         <% end %>
@@ -98,16 +98,16 @@
       <p class="panel-heading"><%= link_to 'Any Date &rarr;'.html_safe, search_path(params.except(:controller, :action).merge(w: nil))%></p>
 
       <div class="list-group">
-        <% @articles.response.response['facets']['published']['entries'].each do |w| %>
+        <% @articles.response.response['aggregations']['published']['published']['buckets'].each do |w| %>
         <%=
-          __start = Time.at(w['time']/1000)
+          __start = Time.at(w['key']/1000)
           __end   = __start.end_of_week
           __date  = __start.to_date.to_s(:iso)
 
           link_to search_path(params.except(:controller, :action).merge(w: __date)),
                   class: "list-group-item#{' active' if params[:w] == __date}" do
                     "#{__start.to_date.to_s(:short)} &mdash; #{__end.to_date.to_s(:short)}".html_safe + \
-                    content_tag(:small, w['count'], class: 'badge').html_safe
+                    content_tag(:small, w['doc_count'], class: 'badge').html_safe
           end
         %>
         <% end %>

elasticsearch-rails/lib/rails/templates/search_controller_test.rb

@@ -30,7 +30,7 @@ class SearchControllerTest < ActionController::TestCase
 
     Article.find_by_title('Article Three').comments.create body: 'One'
 
-    Sidekiq::Queue.new("elasticsearch").clear
+    Sidekiq::Worker.clear_all
 
     Article.__elasticsearch__.import force: true
     Article.__elasticsearch__.refresh_index!
@@ -45,6 +45,7 @@ class SearchControllerTest < ActionController::TestCase
   test "should return search results in comments" do
     get :index, q: 'one', comments: 'y'
     assert_response :success
+
     assert_equal 4, assigns(:articles).size
   end
 
@@ -67,15 +68,15 @@ class SearchControllerTest < ActionController::TestCase
     get :index, q: 'one'
     assert_response :success
 
-    facets = assigns(:articles).response.response['facets']
+    aggregations = assigns(:articles).response.response['aggregations']
 
-    assert_equal 2, facets['categories']['terms'].size
-    assert_equal 2, facets['authors']['terms'].size
-    assert_equal 2, facets['published']['entries'].size
+    assert_equal 2, aggregations['categories']['categories']['buckets'].size
+    assert_equal 2, aggregations['authors']['authors']['buckets'].size
+    assert_equal 2, aggregations['published']['published']['buckets'].size
 
-    assert_equal 'One', facets['categories']['terms'][0]['term']
-    assert_equal 'John Smith', facets['authors']['terms'][0]['term']
-    assert_equal 1425254400000, facets['published']['entries'][0]['time']
+    assert_equal 'One', aggregations['categories']['categories']['buckets'][0]['key']
+    assert_equal 'John Smith', aggregations['authors']['authors']['buckets'][0]['key']
+    assert_equal 1425254400000, aggregations['published']['published']['buckets'][0]['key']
   end
 
   test "should sort on the published date" do
@@ -104,13 +105,13 @@ class SearchControllerTest < ActionController::TestCase
 
     assert_equal 2, assigns(:articles).size
 
-    facets = assigns(:articles).response.response['facets']
+    aggregations = assigns(:articles).response.response['aggregations']
 
-    assert_equal 1, facets['authors']['terms'].size
-    assert_equal 1, facets['published']['entries'].size
+    assert_equal 1, aggregations['authors']['authors']['buckets'].size
+    assert_equal 1, aggregations['published']['published']['buckets'].size
 
     # Do NOT filter the category facet
-    assert_equal 2, facets['categories']['terms'].size
+    assert_equal 2, aggregations['categories']['categories']['buckets'].size
   end
 
   test "should filter search results and the category and published date facets when user selects a category" do
@@ -119,12 +120,12 @@ class SearchControllerTest < ActionController::TestCase
 
     assert_equal 1, assigns(:articles).size
 
-    facets = assigns(:articles).response.response['facets']
+    aggregations = assigns(:articles).response.response['aggregations']
 
-    assert_equal 1, facets['categories']['terms'].size
-    assert_equal 1, facets['published']['entries'].size
+    assert_equal 1, aggregations['categories']['categories']['buckets'].size
+    assert_equal 1, aggregations['published']['published']['buckets'].size
 
     # Do NOT filter the authors facet
-    assert_equal 2, facets['authors']['terms'].size
+    assert_equal 2, aggregations['authors']['authors']['buckets'].size
   end
 end

elasticsearch-rails/lib/rails/templates/searchable.rb

@@ -71,15 +71,14 @@ def as_indexed_json(options={})
     #
     def self.search(query, options={})
 
-      # Prefill and set the filters (top-level `filter` and `facet_filter` elements)
+      # Prefill and set the filters (top-level `post_filter` and aggregation `filter` elements)
       #
       __set_filters = lambda do |key, f|
+        @search_definition[:post_filter][:and] ||= []
+        @search_definition[:post_filter][:and]  |= [f]
 
-        @search_definition[:filter][:and] ||= []
-        @search_definition[:filter][:and]  |= [f]
-
-        @search_definition[:facets][key.to_sym][:facet_filter][:and] ||= []
-        @search_definition[:facets][key.to_sym][:facet_filter][:and]  |= [f]
+        @search_definition[:aggregations][key.to_sym][:filter][:bool][:must] ||= []
+        @search_definition[:aggregations][key.to_sym][:filter][:bool][:must]  |= [f]
       end
 
       @search_definition = {
@@ -95,27 +94,22 @@ def self.search(query, options={})
           }
         },
 
-        filter: {},
+        post_filter: {},
 
-        facets: {
+        aggregations: {
           categories: {
-            terms: {
-              field: 'categories'
-            },
-            facet_filter: {}
+            filter: { bool: { must: [ match_all: {} ] } },
+            aggregations: { categories: { terms: { field: 'categories' } } }
           },
           authors: {
-            terms: {
-              field: 'authors.full_name.raw'
-            },
-            facet_filter: {}
+            filter: { bool: { must: [ match_all: {} ] } },
+            aggregations: { authors: { terms: { field: 'authors.full_name.raw' } } }
           },
           published: {
-            date_histogram: {
-              field: 'published_on',
-              interval: 'week'
-            },
-            facet_filter: {}
+            filter: { bool: { must: [ match_all: {} ] } },
+            aggregations: {
+              published: { date_histogram: { field: 'published_on', interval: 'week' } }
+            }
           }
         }
       }
@@ -174,7 +168,7 @@ def self.search(query, options={})
             query: {
               multi_match: {
                 query: query,
-                fields: ['body'],
+                fields: ['comments.body'],
                 operator: 'and'
               }
             }