elasticsearch-rails 2.0.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a012795b9d598653b45138e1689bfd1b726c5242
-  data.tar.gz: dc1ec2ce53ba7d0e2161e3693c3cbfa7c890c3ce
+  metadata.gz: ea114ac0dd56a8531dc05565db0638efe2e6d74c
+  data.tar.gz: d1f820554717d039b37d88274cf9f2a7bb1271c4
 SHA512:
-  metadata.gz: db2bb8a725121d5f8228bc9268efb16a074af10015f17debefd0f9c8ec94aef7f72d2535f6b6f7d613a403f3e9dd80273605dd5eb9c10053a9087fde62c849d8
-  data.tar.gz: 89fc7efb60a4532f5df4cf5d52af61b50e3e75895c4d13378486194dd81ffe7654b8921ab1050bc559170149e58c2a7e2f12d99a83be51c6b5e4b23b09b9026e
+  metadata.gz: 5866628fe6b02c7e1c58dd72e334ddd1efb2f5fc1d12d4df245e4081c974cf449545b2e3ae418da449ea40ba12f33dfd4dfd7f3f102db06fbdaf7f65d6eacf35
+  data.tar.gz: 841670e97ba0da3f8f3f63906b90420177bb146793b83effa176476715320ad44c55984c467c35feed23de43096fb8a97a0253b0c92d00c428d94277d9d8198f

data/lib/elasticsearch/rails/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Rails
-    VERSION = "2.0.1"
+    VERSION = "5.0.0"
   end
 end

data/lib/rails/templates/01-basic.rb

@@ -10,8 +10,8 @@
 #
 # * Git
 # * Ruby  >= 1.9.3
-# * Rails >= 4
-# * Java  >= 7 (for Elasticsearch)
+# * Rails >= 5
+# * Java  >= 8 (for Elasticsearch)
 #
 # Usage:
 # ------
@@ -31,29 +31,32 @@ at_exit do
   end
 end
 
-run "touch tmp/.gitignore"
+$elasticsearch_url = ENV.fetch('ELASTICSEARCH_URL', 'http://localhost:9200')
 
-append_to_file ".gitignore", "vendor/elasticsearch-1.0.1/\n"
+# ----- Check & download Elasticsearch ------------------------------------------------------------
 
-git :init
-git add:    "."
-git commit: "-m 'Initial commit: Clean application'"
+cluster_info = Net::HTTP.get(URI.parse($elasticsearch_url)) rescue nil
+cluster_info = JSON.parse(cluster_info) if cluster_info
 
-# ----- Download Elasticsearch --------------------------------------------------------------------
+if cluster_info.nil? || cluster_info['version']['number'] < '5'
+  # Change the port when incompatible Elasticsearch version is running on localhost:9200
+  if $elasticsearch_url == 'http://localhost:9200' && cluster_info && cluster_info['version']['number'] < '5'
+    $change_port = '9280'
+    $elasticsearch_url = "http://localhost:#{$change_port}"
+  end
 
-unless (Net::HTTP.get(URI.parse('http://localhost:9200')) rescue false)
   COMMAND = <<-COMMAND.gsub(/^    /, '')
-    curl -# -O "http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.0.1.tar.gz"
-    tar -zxf elasticsearch-1.0.1.tar.gz
-    rm  -f   elasticsearch-1.0.1.tar.gz
-    ./elasticsearch-1.0.1/bin/elasticsearch -d -p #{destination_root}/tmp/pids/elasticsearch.pid
+    curl -# -O "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.2.1.tar.gz"
+    tar -zxf elasticsearch-5.2.1.tar.gz
+    rm  -f   elasticsearch-5.2.1.tar.gz
+    ./elasticsearch-5.2.1/bin/elasticsearch -d -p #{destination_root}/tmp/pids/elasticsearch.pid #{$change_port.nil? ? '' : "-E http.port=#{$change_port}" }
   COMMAND
 
   puts        "\n"
   say_status  "ERROR", "Elasticsearch not running!\n", :red
   puts        '-'*80
-  say_status  '',      "It appears that Elasticsearch is not running on this machine."
-  say_status  '',      "Is it installed? Do you want me to install it for you with this command?\n\n"
+  say_status  '',      "It appears that Elasticsearch 5 is not running on this machine."
+  say_status  '',      "Is it installed? Do you want me to install and run it for you with this command?\n\n"
   COMMAND.each_line { |l| say_status '', "$ #{l}" }
   puts
   say_status  '',      "(To uninstall, just remove the generated application directory.)"
@@ -63,25 +66,51 @@ unless (Net::HTTP.get(URI.parse('http://localhost:9200')) rescue false)
     puts
     say_status  "Install", "Elasticsearch", :yellow
 
+    java_info = `java -version 2>&1`
+
+    unless java_info.match /1\.[8-9]/
+      puts
+      say_status "ERROR", "Required Java version (1.8) not found, exiting...", :red
+      exit(1)
+    end
+
     commands = COMMAND.split("\n")
     exec     = commands.pop
     inside("vendor") do
       commands.each { |command| run command }
       run "(#{exec})"  # Launch Elasticsearch in subshell
     end
+
+    # Wait for Elasticsearch to be up...
+    #
+    system <<-COMMAND
+      until $(curl --silent --head --fail #{$elasticsearch_url} > /dev/null 2>&1); do
+          printf '.'; sleep 1
+      done
+    COMMAND
   end
 end unless ENV['RAILS_NO_ES_INSTALL']
 
+# ----- Application skeleton ----------------------------------------------------------------------
+
+run "touch tmp/.gitignore"
+
+append_to_file ".gitignore", "vendor/elasticsearch-5.2.1/\n"
+
+git :init
+git add:    "."
+git commit: "-m 'Initial commit: Clean application'"
+
 # ----- Add README --------------------------------------------------------------------------------
 
 puts
 say_status  "README", "Adding Readme...\n", :yellow
 puts        '-'*80, ''; sleep 0.25
 
-remove_file 'README.rdoc'
+remove_file 'README.md'
 
-create_file 'README.rdoc', <<-README
-= Ruby on Rails and Elasticsearch: Example application
+create_file 'README.md', <<-README
+# Ruby on Rails and Elasticsearch: Example application
 
 This application is an example of integrating the {Elasticsearch}[http://www.elasticsearch.org]
 search engine with the {Ruby On Rails}[http://rubyonrails.org] web framework.
@@ -89,7 +118,7 @@ search engine with the {Ruby On Rails}[http://rubyonrails.org] web framework.
 It has been generated by application templates available at
 https://github.com/elasticsearch/elasticsearch-rails/tree/master/elasticsearch-rails/lib/rails/templates.
 
-== [1] Basic
+## [1] Basic
 
 The `basic` version provides a simple integration for a simple Rails model, `Article`, showing how
 to include the search engine support in your model, automatically index changes to records,
@@ -116,6 +145,7 @@ end
 # ----- Auxiliary gems ----------------------------------------------------------------------------
 
 gem 'mocha', group: 'test', require: 'mocha/api'
+gem 'rails-controller-testing', group: 'test'
 
 # ----- Remove CoffeeScript, Sass and "all that jazz" ---------------------------------------------
 
@@ -145,9 +175,8 @@ say_status  "Application", "Disabling asset logging in development...\n", :yello
 puts        '-'*80, ''; sleep 0.25
 
 environment 'config.assets.logger = false', env: 'development'
-gem 'quiet_assets',  group: "development"
+environment 'config.assets.quiet  = true',  env: 'development'
 
-git add:    "Gemfile*"
 git add:    "config/"
 git commit: "-m 'Disabled asset logging in development'"
 
@@ -208,7 +237,7 @@ inject_into_file 'app/controllers/articles_controller.rb', before: %r|^\s*# GET
   CODE
 end
 
-inject_into_file 'app/views/articles/index.html.erb', after: %r{<h1>Listing articles</h1>}i do
+inject_into_file 'app/views/articles/index.html.erb', after: %r{<h1>.*Articles</h1>}i do
   <<-CODE
 
 
@@ -236,21 +265,21 @@ resources :articles do
   end
 CODE
 
-gsub_file "#{Rails::VERSION::STRING > '4' ? 'test/controllers' : 'test/functional'}/articles_controller_test.rb", %r{setup do.*?end}m, <<-CODE
+gsub_file "test/controllers/articles_controller_test.rb", %r{setup do.*?end}m, <<-CODE
 setup do
     @article = articles(:one)
 
-    Article.__elasticsearch__.import
+    Article.__elasticsearch__.import force: true
     Article.__elasticsearch__.refresh_index!
   end
 CODE
 
-inject_into_file "#{Rails::VERSION::STRING > '4' ? 'test/controllers' : 'test/functional'}/articles_controller_test.rb", after: %r{test "should get index" do.*?end}m do
+inject_into_file "test/controllers/articles_controller_test.rb", after: %r{test "should get index" do.*?end}m do
   <<-CODE
 
 
   test "should get search results" do
-    get :search, q: 'mystring'
+    #{ Rails::VERSION::STRING > '5' ? 'get search_articles_url(q: "mystring")' : 'get :search, q: "mystring"' }
     assert_response :success
     assert_not_nil assigns(:articles)
     assert_equal 2, assigns(:articles).size

data/lib/rails/templates/02-pretty.rb

@@ -1,6 +1,6 @@
 # $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/02-pretty.rb
 
-unless File.read('README.rdoc').include? '== [1] Basic'
+unless File.read('README.md').include? '## [1] Basic'
   say_status  "ERROR", "You have to run the 01-basic.rb template first.", :red
   exit(1)
 end
@@ -9,9 +9,9 @@ puts
 say_status  "README", "Updating Readme...\n", :yellow
 puts        '-'*80, ''; sleep 0.25
 
-append_to_file 'README.rdoc', <<-README
+append_to_file 'README.md', <<-README
 
-== [2] Pretty
+## [2] Pretty
 
 The `pretty` template builds on the `basic` version and brings couple of improvements:
 
@@ -22,7 +22,7 @@ The `pretty` template builds on the `basic` version and brings couple of improve
 
 README
 
-git add:    "README.rdoc"
+git add:    "README.md"
 git commit: "-m '[02] Updated the application README'"
 
 # ----- Update application.rb ---------------------------------------------------------------------
@@ -154,8 +154,8 @@ end
 
 # ----- Customize the header -----------------------------------------------------------------
 
-gsub_file 'app/views/articles/index.html.erb', %r{<h1>Listing articles</h1>} do |match|
-  "<h1><%= controller.action_name == 'search' ? 'Searching articles' : 'Listing articles' %></h1>"
+gsub_file 'app/views/articles/index.html.erb', %r{<h1>.*Articles</h1>} do |match|
+  "<h1><%= controller.action_name == 'search' ? 'Search results' : 'Articles' %></h1>"
 end
 
 # ----- Customize the results listing -------------------------------------------------------------

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

@@ -1,6 +1,6 @@
 #     $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/03-expert.rb
 
-unless File.read('README.rdoc').include? '== [2] Pretty'
+unless File.read('README.md').include? '## [2] Pretty'
   say_status  "ERROR", "You have to run the 01-basic.rb and 02-pretty.rb templates first.", :red
   exit(1)
 end
@@ -21,9 +21,9 @@ rescue Redis::CannotConnectError
   exit(1)
 end
 
-append_to_file 'README.rdoc', <<-README
+append_to_file 'README.md', <<-README
 
-== [3] Expert
+## [3] Expert
 
 The `expert` template changes to a complex database schema with model relationships: article belongs
 to a category, has many authors and comments.
@@ -39,7 +39,7 @@ to a category, has many authors and comments.
 
 README
 
-git add:    "README.rdoc"
+git add:    "README.md"
 git commit: "-m '[03] Updated the application README'"
 
 # ----- Add gems into Gemfile ---------------------------------------------------------------------
@@ -77,19 +77,6 @@ git add:    "Gemfile*"
 git add:    "config/"
 git commit: "-m 'Added Pry as the console for development'"
 
-# ----- Disable asset logging in development ------------------------------------------------------
-
-puts
-say_status  "Application", "Disabling asset logging in development...\n", :yellow
-puts        '-'*80, ''; sleep 0.25
-
-environment 'config.assets.logger = false', env: 'development'
-gem 'quiet_assets',  group: "development"
-
-git add:    "Gemfile*"
-git add:    "config/"
-git commit: "-m 'Disabled asset logging in development'"
-
 # ----- Run bundle install ------------------------------------------------------------------------
 
 run "bundle install"
@@ -173,11 +160,10 @@ class Article < ActiveRecord::Base
 end
 CODE
 
-gsub_file "#{Rails::VERSION::STRING > '4' ? 'test/models' : 'test/unit' }/article_test.rb", %r{assert_equal 'foo', definition\[:query\]\[:multi_match\]\[:query\]}, "assert_equal 'foo', definition.to_hash[:query][:bool][:should][0][:multi_match][:query]"
+gsub_file "test/models/article_test.rb", %r{assert_equal 'foo', definition\[:query\]\[:multi_match\]\[:query\]}, "assert_equal 'foo', definition.to_hash[:query][:bool][:should][0][:multi_match][:query]"
 
 # copy_file File.expand_path('../searchable.rb', __FILE__), 'app/models/concerns/searchable.rb'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/searchable.rb',
-    'app/models/concerns/searchable.rb'
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/searchable.rb', 'app/models/concerns/searchable.rb'
 
 insert_into_file "app/models/article.rb", after: "ActiveRecord::Base" do
   <<-CODE
@@ -205,8 +191,7 @@ gem "sidekiq"
 run "bundle install"
 
 # copy_file File.expand_path('../indexer.rb', __FILE__), 'app/workers/indexer.rb'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/indexer.rb',
-    'app/workers/indexer.rb'
+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",
@@ -241,19 +226,16 @@ create_file 'app/controllers/search_controller.rb' do
 end
 
 # copy_file File.expand_path('../search_controller_test.rb', __FILE__), 'test/controllers/search_controller_test.rb'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/search_controller_test.rb',
-    'test/controllers/search_controller_test.rb'
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/search_controller_test.rb', 'test/controllers/search_controller_test.rb'
 
 route "get '/search', to: 'search#index', as: 'search'"
 gsub_file 'config/routes.rb', %r{root to: 'articles#index'$}, "root to: 'search#index'"
 
 # copy_file File.expand_path('../index.html.erb', __FILE__), 'app/views/search/index.html.erb'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/index.html.erb',
-    'app/views/search/index.html.erb'
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/index.html.erb', 'app/views/search/index.html.erb'
 
 # copy_file File.expand_path('../search.css', __FILE__), 'app/assets/stylesheets/search.css'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/search.css',
-    'app/assets/stylesheets/search.css'
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/search.css', 'app/assets/stylesheets/search.css'
 
 git add:    "app/controllers/ test/controllers/ config/routes.rb"
 git add:    "app/views/search/ app/assets/stylesheets/search.css"
@@ -304,13 +286,11 @@ say_status  "Database", "Re-creating the database with data and importing into E
 puts        '-'*80, ''; sleep 0.25
 
 # copy_file File.expand_path('../articles.yml.gz', __FILE__), 'db/articles.yml.gz'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/articles.yml.gz',
-    'db/articles.yml.gz'
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/articles.yml.gz', 'db/articles.yml.gz'
 
 remove_file 'db/seeds.rb'
 # copy_file File.expand_path('../seeds.rb', __FILE__), 'db/seeds.rb'
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/seeds.rb',
-    'db/seeds.rb'
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/seeds.rb', 'db/seeds.rb'
 
 rake "db:reset"
 rake "environment elasticsearch:import:model CLASS='Article' BATCH=100 FORCE=y"

data/lib/rails/templates/04-dsl.rb

@@ -1,13 +1,13 @@
 #     $ rails new searchapp --skip --skip-bundle --template https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/04-dsl.rb
 
-unless File.read('README.rdoc').include? '== [3] Expert'
+unless File.read('README.md').include? '## [3] Expert'
   say_status  "ERROR", "You have to run the 01-basic.rb, 02-pretty.rb and 03-expert.rb templates first.", :red
   exit(1)
 end
 
-append_to_file 'README.rdoc', <<-README
+append_to_file 'README.md', <<-README
 
-== [4] DSL
+## [4] DSL
 
 The `dsl` template refactors the search definition in SearchController#index
 to use the [`elasticsearch-dsl`](https://github.com/elastic/elasticsearch-ruby/tree/dsl/elasticsearch-dsl)
@@ -15,7 +15,7 @@ Rubygem for better expresivity and readability of the code.
 
 README
 
-git add:    "README.rdoc"
+git add:    "README.md"
 git commit: "-m '[03] Updated the application README'"
 
 run 'rm -f app/assets/stylesheets/*.scss'
@@ -39,16 +39,14 @@ run "bundle install"
 # ----- Change the search definition implementation and associated views and tests ----------------
 
 # copy_file File.expand_path('../searchable.dsl.rb', __FILE__), 'app/models/concerns/searchable.rb', force: true
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/searchable.dsl.rb',
-    'app/models/concerns/searchable.rb', force: true
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/searchable.dsl.rb', 'app/models/concerns/searchable.rb', force: true
 
 # copy_file File.expand_path('../index.html.dsl.erb', __FILE__), 'app/views/search/index.html.erb', force: true
-get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/index.html.dsl.erb',
-    'app/views/search/index.html.erb', force: true
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/index.html.dsl.erb', 'app/views/search/index.html.erb', force: true
 
 gsub_file "test/controllers/search_controller_test.rb", %r{test "should return facets" do.*?end}m, <<-CODE
 test "should return aggregations" do
-    get :index, q: 'one'
+    get :index, params: { q: 'one' }
     assert_response :success
 
     aggregations = assigns(:articles).response.response['aggregations']
@@ -65,7 +63,7 @@ CODE
 
 gsub_file "test/controllers/search_controller_test.rb", %r{test "should filter search results and the author and published date facets when user selects a category" do.*?end}m, <<-CODE
 test "should filter search results and the author and published date facets when user selects a category" do
-    get :index, q: 'one', c: 'One'
+    get :index, params: { q: 'one', c: 'One' }
     assert_response :success
 
     assert_equal 2, assigns(:articles).size
@@ -82,7 +80,7 @@ CODE
 
 gsub_file "test/controllers/search_controller_test.rb", %r{test "should filter search results and the category and published date facets when user selects a category" do.*?end}m, <<-CODE
 test "should filter search results and the category and published date facets when user selects a category" do
-    get :index, q: 'one', a: 'Mary Smith'
+    get :index, params: { q: 'one', a: 'Mary Smith' }
     assert_response :success
 
     assert_equal 1, assigns(:articles).size

data/lib/rails/templates/05-settings-files.rb

@@ -2,16 +2,16 @@
 
 # (See: 01-basic.rb, 02-pretty.rb, 03-expert.rb, 04-dsl.rb)
 
-append_to_file 'README.rdoc', <<-README
+append_to_file 'README.md', <<-README
 
-== [5] Settings Files
+## [5] Settings Files
 
 The `settings-files` template refactors the `Searchable` module to load the index settings
 from an external file.
 
 README
 
-git add:    "README.rdoc"
+git add:    "README.md"
 git commit: "-m '[05] Updated the application README'"
 
 # ----- Setup the Searchable module to load settings from config/elasticsearch/articles_settings.json
@@ -32,12 +32,6 @@ get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasti
 git add:    "config/elasticsearch/articles_settings.json"
 git commit: "-m 'Create the articles settings file'"
 
-# ----- Temporarily set local repo for testing ----------------------------------------------------
-
-gsub_file "Gemfile",
-    %r{gem 'elasticsearch-model', git: 'git://github.com/elasticsearch/elasticsearch-rails.git'},
-    "gem 'elasticsearch-model', path: File.expand_path('../../../../../../elasticsearch-model', __FILE__)"
-
 # ----- Run bundle install ------------------------------------------------------------------------
 
 run "bundle install"

data/lib/rails/templates/index.html.dsl.erb

@@ -37,8 +37,8 @@
           sorted by <%= sort.humanize.downcase %> <span class="caret"></span>
         </button>
         <ul class="dropdown-menu" role="menu">
-          <li><%= link_to "Sort by published on", search_path(params.except(:controller, :action).merge(s: 'published_on')), class: 'btn-xs' %></li>
-          <li><%= link_to "Sort by relevancy",    search_path(params.except(:controller, :action).merge(s: nil)), class: 'btn-xs' %></li>
+          <li><%= link_to "Sort by published on", search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(s: 'published_on')), class: 'btn-xs' %></li>
+          <li><%= link_to "Sort by relevancy",    search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(s: nil)), class: 'btn-xs' %></li>
         </ul>
       </div>
     </div>
@@ -54,7 +54,7 @@
     <% if @articles.response.suggestions.terms.present? %>
       Maybe you mean
       <%= @articles.response.suggestions.terms.map do |term|
-        link_to term, search_path(params.except(:controller, :action).merge q: term)
+        link_to term, search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge q: term)
       end.to_sentence(last_word_connector: ' or ').html_safe %>?
     <% end %>
   </p>
@@ -65,12 +65,12 @@
   <% unless @articles.size < 1 %>
 
     <div class="categories panel panel-default">
-      <p class="panel-heading"><%= link_to 'All Sections &rarr;'.html_safe, search_path(params.except(:controller, :action).merge(c: nil))%></p>
+      <p class="panel-heading"><%= link_to 'All Sections &rarr;'.html_safe, search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(c: nil))%></p>
 
       <div class="list-group">
         <% @articles.response.response['aggregations']['categories']['categories']['buckets'].each do |c| %>
         <%=
-          link_to search_path(params.except(:controller, :action).merge(c: c['key'])),
+          link_to search_path(params.permit(:q, :a, :c, :s, :w, :comments).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
@@ -80,12 +80,12 @@
     </div>
 
     <div class="authors panel panel-default">
-      <p class="panel-heading"><%= link_to 'All Authors &rarr;'.html_safe, search_path(params.except(:controller, :action).merge(a: nil))%></p>
+      <p class="panel-heading"><%= link_to 'All Authors &rarr;'.html_safe, search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(a: nil))%></p>
 
       <div class="list-group">
         <% @articles.response.response['aggregations']['authors']['authors']['buckets'].each do |a| %>
         <%=
-          link_to search_path(params.except(:controller, :action).merge(a: a['key'])),
+          link_to search_path(params.permit(:q, :a, :c, :s, :w, :comments).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
@@ -95,7 +95,7 @@
     </div>
 
     <div class="authors panel panel-default">
-      <p class="panel-heading"><%= link_to 'Any Date &rarr;'.html_safe, search_path(params.except(:controller, :action).merge(w: nil))%></p>
+      <p class="panel-heading"><%= link_to 'Any Date &rarr;'.html_safe, search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(w: nil))%></p>
 
       <div class="list-group">
         <% @articles.response.response['aggregations']['published']['published']['buckets'].each do |w| %>
@@ -104,7 +104,7 @@
           __end   = __start.end_of_week
           __date  = __start.to_date.to_s(:iso)
 
-          link_to search_path(params.except(:controller, :action).merge(w: __date)),
+          link_to search_path(params.permit(:q, :a, :c, :s, :w, :comments).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['doc_count'], class: 'badge').html_safe

data/lib/rails/templates/index.html.erb

@@ -37,8 +37,8 @@
           sorted by <%= sort.humanize.downcase %> <span class="caret"></span>
         </button>
         <ul class="dropdown-menu" role="menu">
-          <li><%= link_to "Sort by published on", search_path(params.except(:controller, :action).merge(s: 'published_on')), class: 'btn-xs' %></li>
-          <li><%= link_to "Sort by relevancy",    search_path(params.except(:controller, :action).merge(s: nil)), class: 'btn-xs' %></li>
+          <li><%= link_to "Sort by published on", search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(s: 'published_on')), class: 'btn-xs' %></li>
+          <li><%= link_to "Sort by relevancy",    search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(s: nil)), class: 'btn-xs' %></li>
         </ul>
       </div>
     </div>
@@ -47,14 +47,14 @@
   <hr>
 </div>
 
-<% if @articles.size < 1 && @articles.response.suggest.present? %>
+<% if @articles.size < 1 && @articles.response.suggestions.present? %>
 <div class="col-md-12">
   <p class="alert alert-warning">
     No documents have been found.
-    <% if @articles.response.suggest['suggest_title'].present? || @articles.response.suggest['suggest_body'].present? %>
+    <% if @articles.response.suggestions['suggest_title'].present? || @articles.response.suggestions['suggest_body'].present? %>
       Maybe you mean
-      <%= @articles.response.suggest.map { |k,v| v.first['options'] }.flatten.map {|v| v['text']}.uniq.map do |term|
-        link_to term, search_path(params.except(:controller, :action).merge q: term)
+      <%= @articles.response.suggestions.map { |k,v| v.first['options'] }.flatten.map {|v| v['text']}.uniq.map do |term|
+        link_to term, search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge q: term)
       end.to_sentence(last_word_connector: ' or ').html_safe %>?
     <% end %>
   </p>
@@ -65,12 +65,12 @@
   <% unless @articles.size < 1 %>
 
     <div class="categories panel panel-default">
-      <p class="panel-heading"><%= link_to 'All Sections &rarr;'.html_safe, search_path(params.except(:controller, :action).merge(c: nil))%></p>
+      <p class="panel-heading"><%= link_to 'All Sections &rarr;'.html_safe, search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(c: nil))%></p>
 
       <div class="list-group">
         <% @articles.response.response['aggregations']['categories']['categories']['buckets'].each do |c| %>
         <%=
-          link_to search_path(params.except(:controller, :action).merge(c: c['key'])),
+          link_to search_path(params.permit(:q, :a, :c, :s, :w, :comments).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
@@ -80,12 +80,12 @@
     </div>
 
     <div class="authors panel panel-default">
-      <p class="panel-heading"><%= link_to 'All Authors &rarr;'.html_safe, search_path(params.except(:controller, :action).merge(a: nil))%></p>
+      <p class="panel-heading"><%= link_to 'All Authors &rarr;'.html_safe, search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(a: nil))%></p>
 
       <div class="list-group">
         <% @articles.response.response['aggregations']['authors']['authors']['buckets'].each do |a| %>
         <%=
-          link_to search_path(params.except(:controller, :action).merge(a: a['key'])),
+          link_to search_path(params.permit(:q, :a, :c, :s, :w, :comments).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
@@ -95,7 +95,7 @@
     </div>
 
     <div class="authors panel panel-default">
-      <p class="panel-heading"><%= link_to 'Any Date &rarr;'.html_safe, search_path(params.except(:controller, :action).merge(w: nil))%></p>
+      <p class="panel-heading"><%= link_to 'Any Date &rarr;'.html_safe, search_path(params.permit(:q, :a, :c, :s, :w, :comments).merge(w: nil))%></p>
 
       <div class="list-group">
         <% @articles.response.response['aggregations']['published']['published']['buckets'].each do |w| %>
@@ -104,7 +104,7 @@
           __end   = __start.end_of_week
           __date  = __start.to_date.to_s(:iso)
 
-          link_to search_path(params.except(:controller, :action).merge(w: __date)),
+          link_to search_path(params.permit(:q, :a, :c, :s, :w, :comments).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['doc_count'], class: 'badge').html_safe

data/lib/rails/templates/search_controller_test.dsl.rb

@@ -1,8 +1,9 @@
 require 'test_helper'
+require 'sidekiq/api'
 
 class SearchControllerTest < ActionController::TestCase
   setup do
-    Time.stubs(:now).returns(Time.parse('2015-03-16 10:00:00 UTC'))
+    Time.stubs(:now).returns(Time.new(2015, 03, 16, 10, 00, 00, 0))
 
     Article.delete_all
 
@@ -37,34 +38,34 @@ class SearchControllerTest < ActionController::TestCase
   end
 
   test "should return search results" do
-    get :index, q: 'one'
+    get :index, params: { q: 'one' }
     assert_response :success
     assert_equal 3, assigns(:articles).size
   end
 
   test "should return search results in comments" do
-    get :index, q: 'one', comments: 'y'
+    get :index, params: { q: 'one', comments: 'y' }
     assert_response :success
     assert_equal 4, assigns(:articles).size
   end
 
   test "should return highlighted snippets" do
-    get :index, q: 'one'
+    get :index, params: { q: 'one' }
     assert_response :success
     assert_match %r{<em class="label label-highlight">One</em>}, assigns(:articles).first.highlight.title.first
   end
 
   test "should return suggestions" do
-    get :index, q: 'one'
+    get :index, params: { q: 'one' }
     assert_response :success
 
-    suggestions = assigns(:articles).response.suggest
+    suggestions = assigns(:articles).response.suggestions
 
     assert_equal 'one', suggestions['suggest_title'][0]['text']
   end
 
   test "should return aggregations" do
-    get :index, q: 'one'
+    get :index, params: { q: 'one' }
     assert_response :success
 
     aggregations = assigns(:articles).response.response['aggregations']
@@ -79,7 +80,7 @@ class SearchControllerTest < ActionController::TestCase
   end
 
   test "should sort on the published date" do
-    get :index, q: 'one', s: 'published_on'
+    get :index, params: { q: 'one', s: 'published_on' }
     assert_response :success
 
     assert_equal 3, assigns(:articles).size
@@ -89,7 +90,7 @@ class SearchControllerTest < ActionController::TestCase
   end
 
   test "should sort on the published date when no query is provided" do
-    get :index, q: ''
+    get :index, params: { q: '' }
     assert_response :success
 
     assert_equal 5, assigns(:articles).size
@@ -99,7 +100,7 @@ class SearchControllerTest < ActionController::TestCase
   end
 
   test "should filter search results and the author and published date facets when user selects a category" do
-    get :index, q: 'one', c: 'One'
+    get :index, params: { q: 'one', c: 'One' }
     assert_response :success
 
     assert_equal 2, assigns(:articles).size
@@ -114,7 +115,7 @@ class SearchControllerTest < ActionController::TestCase
   end
 
   test "should filter search results and the category and published date facets when user selects a category" do
-    get :index, q: 'one', a: 'Mary Smith'
+    get :index, params: { q: 'one', a: 'Mary Smith' }
     assert_response :success
 
     assert_equal 1, assigns(:articles).size

data/lib/rails/templates/search_controller_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class SearchControllerTest < ActionController::TestCase
   setup do
-    Time.stubs(:now).returns(Time.parse('2015-03-16 10:00:00 UTC'))
+    Time.stubs(:now).returns(Time.new(2015, 03, 16, 10, 00, 00, 0))
 
     Article.delete_all
 
@@ -37,35 +37,35 @@ class SearchControllerTest < ActionController::TestCase
   end
 
   test "should return search results" do
-    get :index, q: 'one'
+    get :index, params: { q: 'one' }
     assert_response :success
     assert_equal 3, assigns(:articles).size
   end
 
   test "should return search results in comments" do
-    get :index, q: 'one', comments: 'y'
+    get :index, params: { q: 'one', comments: 'y' }
     assert_response :success
 
     assert_equal 4, assigns(:articles).size
   end
 
   test "should return highlighted snippets" do
-    get :index, q: 'one'
+    get :index, params: { q: 'one' }
     assert_response :success
     assert_match %r{<em class="label label-highlight">One</em>}, assigns(:articles).first.highlight.title.first
   end
 
   test "should return suggestions" do
-    get :index, q: 'one'
+    get :index, params: { q: 'one' }
     assert_response :success
 
-    suggestions = assigns(:articles).response.suggest
+    suggestions = assigns(:articles).response.suggestions
 
     assert_equal 'one', suggestions['suggest_title'][0]['text']
   end
 
   test "should return facets" do
-    get :index, q: 'one'
+    get :index, params: { q: 'one' }
     assert_response :success
 
     aggregations = assigns(:articles).response.response['aggregations']
@@ -80,7 +80,7 @@ class SearchControllerTest < ActionController::TestCase
   end
 
   test "should sort on the published date" do
-    get :index, q: 'one', s: 'published_on'
+    get :index, params: { q: 'one', s: 'published_on' }
     assert_response :success
 
     assert_equal 3, assigns(:articles).size
@@ -90,7 +90,7 @@ class SearchControllerTest < ActionController::TestCase
   end
 
   test "should sort on the published date when no query is provided" do
-    get :index, q: ''
+    get :index, params: { q: '' }
     assert_response :success
 
     assert_equal 5, assigns(:articles).size
@@ -100,7 +100,7 @@ class SearchControllerTest < ActionController::TestCase
   end
 
   test "should filter search results and the author and published date facets when user selects a category" do
-    get :index, q: 'one', c: 'One'
+    get :index, params: { q: 'one', c: 'One' }
     assert_response :success
 
     assert_equal 2, assigns(:articles).size
@@ -115,7 +115,7 @@ class SearchControllerTest < ActionController::TestCase
   end
 
   test "should filter search results and the category and published date facets when user selects a category" do
-    get :index, q: 'one', a: 'Mary Smith'
+    get :index, params: { q: 'one', a: 'Mary Smith' }
     assert_response :success
 
     assert_equal 1, assigns(:articles).size

data/lib/rails/templates/searchable.dsl.rb

@@ -12,12 +12,12 @@ module Searchable
     #
     settings index: { number_of_shards: 1, number_of_replicas: 0 } do
       mapping do
-        indexes :title, type: 'multi_field' do
+        indexes :title, type: 'text' do
           indexes :title,     analyzer: 'snowball'
           indexes :tokenized, analyzer: 'simple'
         end
 
-        indexes :content, type: 'multi_field' do
+        indexes :content, type: 'text'  do
           indexes :content,   analyzer: 'snowball'
           indexes :tokenized, analyzer: 'simple'
         end
@@ -25,22 +25,22 @@ module Searchable
         indexes :published_on, type: 'date'
 
         indexes :authors do
-          indexes :full_name, type: 'multi_field' do
+          indexes :full_name, type: 'text' do
             indexes :full_name
-            indexes :raw, analyzer: 'keyword'
+            indexes :raw, type: 'keyword'
           end
         end
 
-        indexes :categories, analyzer: 'keyword'
+        indexes :categories, type: 'keyword'
 
         indexes :comments, type: 'nested' do
           indexes :body, analyzer: 'snowball'
           indexes :stars
           indexes :pick
-          indexes :user, analyzer: 'keyword'
-          indexes :user_location, type: 'multi_field' do
+          indexes :user, type: 'keyword'
+          indexes :user_location, type: 'text' do
             indexes :user_location
-            indexes :raw, analyzer: 'keyword'
+            indexes :raw, type: 'keyword'
           end
         end
       end
@@ -98,7 +98,7 @@ module Searchable
                     query do
                       multi_match do
                         query q
-                        fields   'body'
+                        fields   'comments.body'
                         operator 'and'
                       end
                     end

data/lib/rails/templates/searchable.rb

@@ -12,12 +12,12 @@ module Searchable
     #
     settings index: { number_of_shards: 1, number_of_replicas: 0 } do
       mapping do
-        indexes :title, type: 'multi_field' do
+        indexes :title, type: 'text' do
           indexes :title,     analyzer: 'snowball'
           indexes :tokenized, analyzer: 'simple'
         end
 
-        indexes :content, type: 'multi_field' do
+        indexes :content, type: 'text'  do
           indexes :content,   analyzer: 'snowball'
           indexes :tokenized, analyzer: 'simple'
         end
@@ -25,22 +25,22 @@ module Searchable
         indexes :published_on, type: 'date'
 
         indexes :authors do
-          indexes :full_name, type: 'multi_field' do
+          indexes :full_name, type: 'text' do
             indexes :full_name
-            indexes :raw, analyzer: 'keyword'
+            indexes :raw, type: 'keyword'
           end
         end
 
-        indexes :categories, analyzer: 'keyword'
+        indexes :categories, type: 'keyword'
 
         indexes :comments, type: 'nested' do
           indexes :body, analyzer: 'snowball'
           indexes :stars
           indexes :pick
-          indexes :user, analyzer: 'keyword'
-          indexes :user_location, type: 'multi_field' do
+          indexes :user, type: 'keyword'
+          indexes :user_location, type: 'text' do
             indexes :user_location
-            indexes :raw, analyzer: 'keyword'
+            indexes :raw, type: 'keyword'
           end
         end
       end
@@ -74,8 +74,9 @@ module Searchable
       # 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[:post_filter][:bool] ||= {}
+        @search_definition[:post_filter][:bool][:must] ||= []
+        @search_definition[:post_filter][:bool][:must]  |= [f]
 
         @search_definition[:aggregations][key.to_sym][:filter][:bool][:must] ||= []
         @search_definition[:aggregations][key.to_sym][:filter][:bool][:must]  |= [f]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler