Merge pull request #4636 from consul/dependabot/bundler/master/dalli-2.7.11

Bump dalli from 2.7.10 to 2.7.11

Gemfile

@@ -15,7 +15,7 @@ gem "caxlsx_rails", "~> 0.6.2"
 gem "ckeditor", "~> 4.3.0"
 gem "cocoon", "~> 1.2.15"
 gem "daemons", "~> 1.4.0"
-gem "dalli", "~> 2.7.10"
+gem "dalli", "~> 2.7.11"
 gem "delayed_job_active_record", "~> 4.1.6"
 gem "devise", "~> 4.8.0"
 gem "devise-async", "~> 1.0.0"

Gemfile.lock

@@ -153,7 +153,7 @@ GEM
       tins (~> 1.6)
     crass (1.0.6)
     daemons (1.4.0)
-    dalli (2.7.10)
+    dalli (2.7.11)
     database_cleaner (2.0.1)
       database_cleaner-active_record (~> 2.0.0)
     database_cleaner-active_record (2.0.1)
@@ -713,7 +713,7 @@ DEPENDENCIES
   cocoon (~> 1.2.15)
   coveralls (~> 0.8.23)
   daemons (~> 1.4.0)
-  dalli (~> 2.7.10)
+  dalli (~> 2.7.11)
   database_cleaner (~> 2.0.1)
   delayed_job_active_record (~> 4.1.6)
   devise (~> 4.8.0)

config/application.rb

@@ -28,10 +28,6 @@ module Consul
     # Use local forms with `form_with`, so it works like `form_for`
     config.action_view.form_with_generates_remote_forms = false
 
-    # Keep disabling cache versioning until we verify it's compatible
-    # with `:dalli_store` and with the way we cache stats
-    config.active_record.cache_versioning = false
-
     # Keep using AES-256-CBC for message encryption in case it's used
     # in any CONSUL installations
     config.active_support.use_authenticated_message_encryption = false

config/environments/preproduction.rb

@@ -57,7 +57,7 @@ Rails.application.configure do
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # Use a different cache store in production.
-  config.cache_store = :dalli_store, { value_max_bytes: 2000000 }
+  config.cache_store = :mem_cache_store
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = "http://assets.example.com"

config/environments/production.rb

@@ -56,7 +56,7 @@ Rails.application.configure do
   config.log_tags = [:request_id]
 
   # Use a different cache store in production.
-  config.cache_store = :dalli_store, { value_max_bytes: 2000000 }
+  config.cache_store = :mem_cache_store
 
   # Use a real queuing backend for Active Job (and separate queues per environment)
   # config.active_job.queue_adapter     = :resque

config/environments/staging.rb

@@ -57,7 +57,7 @@ Rails.application.configure do
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # Use a different cache store in production.
-  config.cache_store = :dalli_store
+  config.cache_store = :mem_cache_store
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = "http://assets.example.com"

spec/lib/cache_spec.rb

@@ -6,7 +6,7 @@ describe "Cache flow" do
       debate = create(:debate, tag_list: "Good, Bad")
       tag = Tag.find_by(name: "Bad")
 
-      expect { tag.destroy }.to change { debate.reload.cache_key }
+      expect { tag.destroy }.to change { debate.reload.cache_version }
     end
   end
 end

spec/models/comment_spec.rb

@@ -86,33 +86,33 @@ describe Comment do
 
     it "expires cache when it has a new vote" do
       expect { create(:vote, votable: comment) }
-      .to change { comment.updated_at }
+      .to change { comment.cache_version }
     end
 
     it "expires cache when hidden" do
       expect { comment.hide }
-      .to change { comment.updated_at }
+      .to change { comment.cache_version }
     end
 
     it "expires cache when the author is hidden" do
       expect { comment.user.hide }
-      .to change { [comment.reload.updated_at, comment.author.updated_at] }
+      .to change { [comment.reload.cache_version, comment.author.cache_version] }
     end
 
     it "expires cache when the author is erased" do
       expect { comment.user.erase }
-      .to change { [comment.reload.updated_at, comment.author.updated_at] }
+      .to change { [comment.reload.cache_version, comment.author.cache_version] }
     end
 
     it "expires cache when the author changes" do
       expect { comment.user.update(username: "Isabel") }
-      .to change { [comment.reload.updated_at, comment.author.updated_at] }
+      .to change { [comment.reload.cache_version, comment.author.cache_version] }
     end
 
     it "expires cache when the author's organization get verified" do
       create(:organization, user: comment.user)
       expect { comment.user.organization.verify }
-      .to change { [comment.reload.updated_at, comment.author.updated_at] }
+      .to change { [comment.reload.cache_version, comment.author.cache_version] }
     end
   end
 

spec/models/debate_spec.rb

@@ -351,48 +351,48 @@ describe Debate do
 
     it "expires cache when it has a new comment" do
       expect { create(:comment, commentable: debate) }
-      .to change { debate.updated_at }
+      .to change { debate.cache_version }
     end
 
     it "expires cache when it has a new vote" do
       expect { create(:vote, votable: debate) }
-      .to change { debate.updated_at }
+      .to change { debate.cache_version }
     end
 
     it "expires cache when it has a new flag" do
       expect { create(:flag, flaggable: debate) }
-      .to change { debate.reload.updated_at }
+      .to change { debate.reload.cache_version }
     end
 
     it "expires cache when it has a new tag" do
       expect { debate.update(tag_list: "new tag") }
-      .to change { debate.updated_at }
+      .to change { debate.cache_version }
     end
 
     it "expires cache when hidden" do
       expect { debate.hide }
-      .to change { debate.updated_at }
+      .to change { debate.cache_version }
     end
 
     it "expires cache when the author is hidden" do
       expect { debate.author.hide }
-      .to change { [debate.reload.updated_at, debate.author.updated_at] }
+      .to change { [debate.reload.cache_version, debate.author.cache_version] }
     end
 
     it "expires cache when the author is erased" do
       expect { debate.author.erase }
-      .to change { [debate.reload.updated_at, debate.author.updated_at] }
+      .to change { [debate.reload.cache_version, debate.author.cache_version] }
     end
 
     it "expires cache when its author changes" do
       expect { debate.author.update(username: "Eva") }
-      .to change { [debate.reload.updated_at, debate.author.updated_at] }
+      .to change { [debate.reload.cache_version, debate.author.cache_version] }
     end
 
     it "expires cache when the author's organization get verified" do
       create(:organization, user: debate.author)
       expect { debate.author.organization.verify }
-      .to change { [debate.reload.updated_at, debate.author.updated_at] }
+      .to change { [debate.reload.cache_version, debate.author.cache_version] }
     end
   end
 

spec/models/proposal_spec.rb

@@ -386,48 +386,48 @@ describe Proposal do
 
     it "expires cache when it has a new comment" do
       expect { create(:comment, commentable: proposal) }
-      .to change { proposal.updated_at }
+      .to change { proposal.cache_version }
     end
 
     it "expires cache when it has a new vote" do
       expect { create(:vote, votable: proposal) }
-      .to change { proposal.updated_at }
+      .to change { proposal.cache_version }
     end
 
     it "expires cache when it has a new flag" do
       expect { create(:flag, flaggable: proposal) }
-      .to change { proposal.reload.updated_at }
+      .to change { proposal.reload.cache_version }
     end
 
     it "expires cache when it has a new tag" do
       expect { proposal.update(tag_list: "new tag") }
-      .to change { proposal.updated_at }
+      .to change { proposal.cache_version }
     end
 
     it "expires cache when hidden" do
       expect { proposal.hide }
-      .to change { proposal.updated_at }
+      .to change { proposal.cache_version }
     end
 
     it "expires cache when the author is hidden" do
       expect { proposal.author.hide }
-      .to change { [proposal.reload.updated_at, proposal.author.updated_at] }
+      .to change { [proposal.reload.cache_version, proposal.author.cache_version] }
     end
 
     it "expires cache when the author is erased" do
       expect { proposal.author.erase }
-      .to change { [proposal.reload.updated_at, proposal.author.updated_at] }
+      .to change { [proposal.reload.cache_version, proposal.author.cache_version] }
     end
 
     it "expires cache when its author changes" do
       expect { proposal.author.update(username: "Eva") }
-      .to change { [proposal.reload.updated_at, proposal.author.updated_at] }
+      .to change { [proposal.reload.cache_version, proposal.author.cache_version] }
     end
 
     it "expires cache when the author's organization get verified" do
       create(:organization, user: proposal.author)
       expect { proposal.author.organization.verify }
-      .to change { [proposal.reload.updated_at, proposal.author.updated_at] }
+      .to change { [proposal.reload.cache_version, proposal.author.cache_version] }
     end
   end
 

spec/models/user_spec.rb

@@ -484,18 +484,18 @@ describe User do
 
     it "expires cache with becoming a moderator" do
       expect { create(:moderator, user: user) }
-      .to change { user.updated_at }
+      .to change { user.cache_version }
     end
 
     it "expires cache with becoming an admin" do
       expect { create(:administrator, user: user) }
-      .to change { user.updated_at }
+      .to change { user.cache_version }
     end
 
     it "expires cache with becoming a veridied organization" do
       create(:organization, user: user)
       expect { user.organization.verify }
-      .to change { user.reload.updated_at }
+      .to change { user.reload.cache_version }
     end
   end
 

spec/shared/models/map_validations.rb

@@ -34,7 +34,7 @@ shared_examples "map validations" do
       mappable.save!
 
       expect { map_location.update(latitude: 12.34) }
-        .to change { mappable.reload.updated_at }
+        .to change { mappable.reload.cache_version }
     end
   end
 end