From 4e41f40863a9d317720323af4a716a281fb84be1 Mon Sep 17 00:00:00 2001
From: Eric Schultz <eric+this+is+ridiculous@commitchange.com>
Date: Wed, 6 Nov 2019 14:48:14 -0600
Subject: [PATCH] Remove memcached from development version

---
 Gemfile                         | 2 --
 Gemfile.lock                    | 4 ----
 config/commitchange.yml         | 3 ---
 config/environment.rb           | 4 ----
 config/settings.yml             | 3 ---
 docker/build/docker-compose.yml | 3 ---
 docker/debug/docker-compose.yml | 5 -----
 7 files changed, 24 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7c12cd15..404723f7 100755
--- a/Gemfile
+++ b/Gemfile
@@ -46,8 +46,6 @@ gem 'table_print', '~> 1.5', '>= 1.5.6' # Nice table printing of data for the co
 
 # Database and Events
 gem 'bunny', '~> 2.14', '>= 2.14.2' # RabittMQ
-gem 'dalli', '~> 2.7'
-gem 'memcachier', '~> 0.0.2'
 gem 'pg', '~> 0.11'
 
 gem 'param_validation', path: 'gems/ruby-param-validation'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3decfabe..91d1da54 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -146,7 +146,6 @@ GEM
     crass (1.0.4)
     css_parser (1.7.0)
       addressable
-    dalli (2.7.10)
     dante (0.2.0)
     database_cleaner (1.7.0)
     debase (0.2.4)
@@ -291,7 +290,6 @@ GEM
       tilt
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    memcachier (0.0.2)
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
@@ -519,7 +517,6 @@ DEPENDENCIES
   colorize (~> 0.8.1)
   config (> 1.5)
   countries (~> 3.0)
-  dalli (~> 2.7)
   database_cleaner (~> 1.7)
   debase (~> 0.2.3)
   delayed_job_active_record (~> 4.1)
@@ -548,7 +545,6 @@ DEPENDENCIES
   i18n-js (~> 3.3)
   lograge (~> 0.11.2)
   mail_view (~> 2.0)
-  memcachier (~> 0.0.2)
   mini_magick (~> 4.9)
   nearest_time_zone (~> 0.0.4)
   parallel (~> 1.17)
diff --git a/config/commitchange.yml b/config/commitchange.yml
index 8c9803d9..15a12606 100644
--- a/config/commitchange.yml
+++ b/config/commitchange.yml
@@ -10,9 +10,6 @@ default:
     nonprofit: "/images/fallback/default-nonprofit.png"
     campaign: "/fallback/default-campaign-background.jpg"
 
-
-cache_store: dalli_store
-
 aws:
   access_key_id: <%= ENV['AWS_ACCESS_KEY'] %>
   secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
diff --git a/config/environment.rb b/config/environment.rb
index 9dd7a2ec..e636496e 100755
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -55,10 +55,6 @@ Config.schema do
       # the path on your image.host to your default campaign background image
       required(:campaign).filled(:str?)
     end
-
-    # the cache stor you're using. Must be the name of caching store for rails
-    # Default is dalli_store
-    required(:cache_store).filled(:str?)
   end
 
   required(:aws).schema do
diff --git a/config/settings.yml b/config/settings.yml
index 9dfbfa19..31d42063 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -14,9 +14,6 @@ default:
     nonprofit: "/images/fallback/default-nonprofit.png"
     campaign: "/fallback/default-campaign-background.jpg"
 
-
-  cache_store: dalli_store
-
 aws:
   access_key_id: <%= ENV['AWS_ACCESS_KEY'] %>
   secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
diff --git a/docker/build/docker-compose.yml b/docker/build/docker-compose.yml
index 2bebe9b1..e87b8881 100644
--- a/docker/build/docker-compose.yml
+++ b/docker/build/docker-compose.yml
@@ -10,7 +10,6 @@ services:
       - memcached
     environment:
     - DATABASE_HOST=db
-    - MEMCACHE_SERVERS=memcached
     volumes:
     - ../../:/myapp
   db:
@@ -18,6 +17,4 @@ services:
     environment:
       POSTGRES_USER: "admin"
       POSTGRES_PASSWORD: "password"
-  memcached:
-    image: memcached
 
diff --git a/docker/debug/docker-compose.yml b/docker/debug/docker-compose.yml
index 4f4378ee..757cba31 100644
--- a/docker/debug/docker-compose.yml
+++ b/docker/debug/docker-compose.yml
@@ -11,7 +11,6 @@ services:
 
     environment:
     - DATABASE_HOST=db
-    - MEMCACHE_SERVERS=memcached
     - USER=${USER}
 
     volumes:
@@ -21,15 +20,11 @@ services:
     - "5000:5000"
     depends_on:
     - db
-    - memcached
   db:
     image: postgres:9.6
     environment:
       POSTGRES_USER: "admin"
       POSTGRES_PASSWORD: "password"
-  memcached:
-    image: memcached
-