Merge pull request #557 from zarqman/dalli3

Test against dalli 3.0

.github/workflows/build.yml

@@ -28,6 +28,7 @@ jobs:
           - rails_6_0
           - rails_5_2
           - rails_4_2
+          - dalli3
           - dalli2
           - redis_4
           - redis_3
@@ -45,8 +46,6 @@ jobs:
             ruby: 3.0.2
           - gemfile: dalli2
             ruby: 3.0.2
-          - gemfile: connection_pool_dalli
-            ruby: 3.0.2
           - gemfile: rack_1
             ruby: 2.7.4
           - gemfile: rails_4_2

Appraisals

@@ -41,6 +41,10 @@ appraise 'dalli2' do
   gem 'dalli', '~> 2.0'
 end
 
+appraise 'dalli3' do
+  gem 'dalli', '~> 3.0'
+end
+
 appraise 'redis_4' do
   gem 'redis', '~> 4.0'
 end
@@ -51,7 +55,7 @@ end
 
 appraise "connection_pool_dalli" do
   gem "connection_pool", "~> 2.2"
-  gem "dalli", "~> 2.7"
+  gem "dalli", "~> 3.0"
 end
 
 appraise "active_support_redis_cache_store" do

gemfiles/connection_pool_dalli.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "connection_pool", "~> 2.2"
-gem "dalli", "~> 2.7"
+gem "dalli", "~> 3.0"
 
 gemspec path: "../"

gemfiles/dalli3.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "dalli", "~> 3.0"
+
+gemspec path: "../"

spec/acceptance/stores/active_support_dalli_store_spec.rb

@@ -2,7 +2,11 @@
 
 require_relative "../../spec_helper"
 
-if defined?(::Dalli)
+should_run =
+  defined?(::Dalli) &&
+  Gem::Version.new(::Dalli::VERSION) < Gem::Version.new("3")
+
+if should_run
   require_relative "../../support/cache_store_helper"
   require "active_support/cache/dalli_store"
   require "timecop"