From ae4ad3a62a373c030749ee3e90bdfd1ef407327d Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Mon, 1 Apr 2019 19:24:51 +1300
Subject: [PATCH] Change to use searchkick

---
 Gemfile      | 15 +++++----------
 Gemfile.lock | 27 ++++++++++-----------------
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/Gemfile b/Gemfile
index ea339ba7c..f9f9ba59d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -78,17 +78,13 @@ gem 'omniauth-facebook'
 gem 'omniauth-flickr', '>= 0.0.15'
 gem 'omniauth-twitter'
 
+# Pretty charts
 gem "chartkick"
 
-# client for Elasticsearch. Elasticsearch is a flexible
-# and powerful, distributed, real-time search and analytics engine.
-# An example of the use in the project is fuzzy crop search.
-# Project does not use semver, so we want to be in sync with the version of
-# elasticsearch we use
-# See https://github.com/elastic/elasticsearch-ruby#compatibility
-gem "elasticsearch-api", "~> 6.0.0"
-gem "elasticsearch-model", "~> 6.0.0"
-gem "elasticsearch-rails", "~> 6.0.0"
+# clever elastic searh
+gem 'searchkick'
+
+
 gem "hashie", ">= 3.5.3"
 
 gem 'rake', '>= 10.0.0'
@@ -104,7 +100,6 @@ gem 'xmlrpc' # fixes rake error - can be removed if not needed later
 gem 'puma'
 
 group :production, :staging do
-  gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
   gem 'dalli'
   gem 'memcachier'
   gem 'newrelic_rpm'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7730545f3..ae33aae4d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -63,9 +63,6 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bluecloth (2.2.0)
-    bonsai-elasticsearch-rails (7.0.1)
-      elasticsearch-model (< 8)
-      elasticsearch-rails (< 8)
     bootstrap-datepicker-rails (1.8.0.1)
       railties (>= 3.0)
     bootstrap-kaminari-views (0.0.5)
@@ -142,17 +139,12 @@ GEM
       warden (~> 1.2.3)
     diff-lcs (1.3)
     docile (1.1.5)
-    elasticsearch (6.0.3)
-      elasticsearch-api (= 6.0.3)
-      elasticsearch-transport (= 6.0.3)
-    elasticsearch-api (6.0.3)
+    elasticsearch (6.2.0)
+      elasticsearch-api (= 6.2.0)
+      elasticsearch-transport (= 6.2.0)
+    elasticsearch-api (6.2.0)
       multi_json
-    elasticsearch-model (6.0.0)
-      activesupport (> 3)
-      elasticsearch (> 1)
-      hashie
-    elasticsearch-rails (6.0.0)
-    elasticsearch-transport (6.0.3)
+    elasticsearch-transport (6.2.0)
       faraday
       multi_json
     erubi (1.8.0)
@@ -452,6 +444,10 @@ GEM
       sprockets-rails
       tilt
     scout_apm (2.4.24)
+    searchkick (3.1.2)
+      activemodel (>= 4.2)
+      elasticsearch (>= 5)
+      hashie
     selenium-webdriver (3.141.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2, >= 1.2.2)
@@ -516,7 +512,6 @@ DEPENDENCIES
   active_utils
   better_errors
   bluecloth
-  bonsai-elasticsearch-rails
   bootstrap-datepicker-rails
   bootstrap-kaminari-views
   bootstrap-sass
@@ -536,9 +531,6 @@ DEPENDENCIES
   dalli
   database_cleaner
   devise
-  elasticsearch-api (~> 6.0.0)
-  elasticsearch-model (~> 6.0.0)
-  elasticsearch-rails (~> 6.0.0)
   factory_bot_rails
   faker
   figaro
@@ -588,6 +580,7 @@ DEPENDENCIES
   ruby-units
   sass-rails
   scout_apm
+  searchkick
   selenium-webdriver
   sidekiq
   timecop