activesupport_cache_database 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0c184beea3e358d5a6b2a23d082b0dea1d17a0ed8ab5ca91aeda9984a439b99
-  data.tar.gz: 055a6e394e11e576b8a64c7ab6bdd75f687648f76bb6148283e6a9ef788ade1f
+  metadata.gz: c3b2183683fc6cb4ec9bb735da8fed61f9e057b894bfef685416dfb019d924ee
+  data.tar.gz: b493bb3f1a7aa74a27e87030fbefb98a3bf95cf98955bfbcf817382039776442
 SHA512:
-  metadata.gz: 48746c696baa9602f5eede7df9f6b345702c85f15c4423ee5f5423f798cc9b453ddbd1e4c5eeeb86271cde9b208f2dc44515beb4fca7c10f608cead14243468a
-  data.tar.gz: 2428c1fc89ff9b5a98f6a379a5f2e4af86e3bf8d9e4ce8a766123bd9d2acf2c99899c4c47011f30449eb4f17be4214b2b646db54e45193bf623e315028c2a74f
+  metadata.gz: 1ce1549296de2188bbfa524c8745844bb150d0df44e0d1472a617d716279deafe758b13b7c577dba84c00697b4aeca8fe8048bc96936fd2e17021accdc03777a
+  data.tar.gz: ae967fdb27b3597c4c1bc7ed58e57c6f4a59795a63dfc1df44caaae3b60ac3b53698df40131e8c17a0520202187e43e606a4f1cdb0471aaed0c1a7e4a1af6aab

data/.github/workflows/test.yml

@@ -7,13 +7,16 @@ on:
     branches: [main]
 
 jobs:
-  ruby:
+  test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ["2.6", "2.7", "3.0"]
+        ruby-version: ["2.7", "3.0", "3.1"]
+        gemfiles: ["Gemfile", "Gemfile.rails6"]
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}

data/.rubocop.yml

@@ -5,7 +5,7 @@ inherit_mode:
   merge:
     - Exclude
 AllCops:
-  TargetRubyVersion: "2.6"
+  TargetRubyVersion: "2.7"
 
 Security/MarshalLoad:
   Enabled: false

data/Gemfile.lock

@@ -1,82 +1,81 @@
 PATH
   remote: .
   specs:
-    activesupport_cache_database (0.2.1)
-      activerecord (>= 5.0)
-      activesupport (>= 5.0)
+    activesupport_cache_database (0.3.0)
+      activerecord (>= 6.0)
+      activesupport (>= 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activerecord (6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activesupport (6.1.3.2)
+    activemodel (7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activerecord (7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.4.4)
-    i18n (1.8.10)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    i18n (1.11.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
-    mysql2 (0.5.3)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    json (2.6.2)
+    minitest (5.16.2)
+    mysql2 (0.5.4)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    pg (1.2.3)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
+    pg (1.4.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.16.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.31.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.19.1)
+      parser (>= 3.1.1.0)
     rubocop-bsm (0.6.0)
       rubocop (~> 1.0)
       rubocop-performance
       rubocop-rake
       rubocop-rspec
-    rubocop-performance (1.11.3)
+    rubocop-performance (1.14.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rake (0.5.1)
-      rubocop
-    rubocop-rspec (2.3.0)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.12.1)
+      rubocop (~> 1.31)
     ruby-progressbar (1.11.0)
-    sqlite3 (1.4.2)
+    sqlite3 (1.4.4)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.2.0)
 
 PLATFORMS
   ruby
@@ -92,4 +91,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.1.4
+   2.3.16

data/Gemfile.rails6

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'activesupport', '~> 6.1'
+gem 'activerecord', '~> 6.1'

data/Gemfile.rails6.lock

@@ -0,0 +1,98 @@
+PATH
+  remote: .
+  specs:
+    activesupport_cache_database (0.3.0)
+      activerecord (>= 5.0)
+      activesupport (>= 5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.1.6.1)
+      activesupport (= 6.1.6.1)
+    activerecord (6.1.6.1)
+      activemodel (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+    activesupport (6.1.6.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    i18n (1.11.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.2)
+    minitest (5.16.2)
+    mysql2 (0.5.4)
+    parallel (1.22.1)
+    parser (3.1.2.0)
+      ast (~> 2.4.1)
+    pg (1.4.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.31.2)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.19.1)
+      parser (>= 3.1.1.0)
+    rubocop-bsm (0.6.0)
+      rubocop (~> 1.0)
+      rubocop-performance
+      rubocop-rake
+      rubocop-rspec
+    rubocop-performance (1.14.2)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.12.1)
+      rubocop (~> 1.31)
+    ruby-progressbar (1.11.0)
+    sqlite3 (1.4.4)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.2.0)
+    zeitwerk (2.6.0)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 6.1)
+  activesupport (~> 6.1)
+  activesupport_cache_database!
+  bundler
+  mysql2
+  pg
+  rake
+  rspec
+  rubocop-bsm
+  sqlite3
+
+BUNDLED WITH
+   2.3.16

data/activesupport_cache_database.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'activesupport_cache_database'
-  s.version       = '0.2.1'
+  s.version       = '0.3.0'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(ActiveSupport::Cache::Store implementation backed by ActiveRecord.)
@@ -9,12 +9,11 @@ Gem::Specification.new do |s|
   s.license       = 'Apache-2.0'
 
   s.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^spec/}) }
-  s.test_files    = `git ls-files -z -- spec/*`.split("\x0")
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.6'
+  s.required_ruby_version = '>= 2.7'
 
-  s.add_dependency 'activerecord', '>= 5.0'
-  s.add_dependency 'activesupport', '>= 5.0'
+  s.add_dependency 'activerecord', '>= 6.0'
+  s.add_dependency 'activesupport', '>= 6.0'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'mysql2'
@@ -23,4 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rubocop-bsm'
   s.add_development_dependency 'sqlite3'
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport_cache_database
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2022-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +149,8 @@ files:
 - ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
+- Gemfile.rails6
+- Gemfile.rails6.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -157,12 +159,11 @@ files:
 - lib/active_support/cache/database_store/migration.rb
 - lib/active_support/cache/database_store/model.rb
 - lib/activesupport_cache_database.rb
-- spec/active_support/cache/database_store_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/bsm/activesupport-cache-database
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -171,17 +172,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: ActiveSupport::Cache::Store implementation backed by ActiveRecord.
-test_files:
-- spec/active_support/cache/database_store_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/spec/active_support/cache/database_store_spec.rb

@@ -1,329 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe ActiveSupport::Cache::DatabaseStore do
-  subject do
-    described_class.new expires_in: 60
-  end
-
-  it 'reads and write strings' do
-    expect(subject.write('foo', 'bar')).to be_truthy
-    expect(subject.read('foo')).to eq('bar')
-  end
-
-  it 'reads and write hash' do
-    expect(subject.write('foo', a: 'b')).to be_truthy
-    expect(subject.read('foo')).to eq(a: 'b')
-  end
-
-  it 'reads and write integer' do
-    expect(subject.write('foo', 1)).to be_truthy
-    expect(subject.read('foo')).to eq(1)
-  end
-
-  it 'reads and write nil' do
-    expect(subject.write('foo', nil)).to be_truthy
-    expect(subject.read('foo')).to eq(nil)
-  end
-
-  it 'reads and write false' do
-    expect(subject.write('foo', false)).to be_truthy
-    expect(subject.read('foo')).to eq(false)
-  end
-
-  it 'overwrites' do
-    expect(subject.write('foo', 'bar')).to be_truthy
-    expect(subject.write('foo', 'baz')).to be_truthy
-    expect(subject.read('foo')).to eq('baz')
-  end
-
-  it 'supports exist?' do
-    subject.write('foo', 'bar')
-    expect(subject).to exist('foo')
-    expect(subject).not_to exist('bar')
-  end
-
-  it 'supports nil exist?' do
-    subject.write('foo', nil)
-    expect(subject).to exist('foo')
-  end
-
-  it 'supports delete' do
-    subject.write('foo', 'bar')
-    expect(subject).to exist('foo')
-    expect(subject.delete('foo')).to be_truthy
-    expect(subject).not_to exist('foo')
-  end
-
-  it 'supports expires_in' do
-    time = Time.local(2008, 4, 24)
-    allow(Time).to receive(:now).and_return(time)
-
-    subject.write('foo', 'bar')
-    expect(subject.read('foo')).to eq('bar')
-
-    allow(Time).to receive(:now).and_return(time + 30)
-    expect(subject.read('foo')).to eq('bar')
-
-    allow(Time).to receive(:now).and_return(time + 61)
-    expect(subject.read('foo')).to be_nil
-  end
-
-  it 'supports long keys' do
-    key = 'x' * 255
-    expect(subject.write(key, 'bar')).to be_truthy
-    expect(subject.read(key)).to eq('bar')
-    expect(subject.fetch(key)).to eq('bar')
-    expect(subject.read(key[0..-2])).to be_nil
-    expect(subject.read_multi(key)).to eq(key => 'bar')
-    expect(subject.delete(key)).to be_truthy
-
-    expect { subject.write("#{key}x", 'bar') }.to raise_error(ArgumentError, /exceeds the length limit/)
-    expect { subject.read("#{key}x") }.to raise_error(ArgumentError, /exceeds the length limit/)
-  end
-
-  describe '#cleanup' do
-    it 'deletes expired' do
-      time = Time.now
-      subject.write('foo', 'bar', expires_in: 10)
-      subject.write('fud', 'biz', expires_in: 20)
-
-      allow(Time).to receive(:now).and_return(time + 9)
-      expect(subject.cleanup).to eq(0)
-
-      allow(Time).to receive(:now).and_return(time + 19)
-      expect(subject.cleanup).to eq(1)
-      expect(subject.read('foo')).to be_nil
-      expect(subject.read('fud')).to eq('biz')
-    end
-
-    it 'supports namespace' do
-      time = Time.now
-      subject.write('foo', 'bar', expires_in: 10, namespace: 'x')
-      subject.write('foo', 'biz', expires_in: 10, namespace: 'y')
-
-      allow(Time).to receive(:now).and_return(time + 11)
-      expect(subject.count).to eq(0)
-      expect(subject.count(all: true)).to eq(2)
-
-      expect(subject.cleanup(namespace: 'x')).to eq(1)
-      expect(subject.count).to eq(0)
-      expect(subject.count(all: true)).to eq(1)
-    end
-  end
-
-  describe '#clear' do
-    it 'removes all entries' do
-      subject.write('foo', 'bar')
-      subject.write('fud', 'biz')
-      expect(subject.clear).to be_truthy
-      expect(subject.read('foo')).to be_nil
-      expect(subject.read('fud')).to be_nil
-    end
-
-    it 'supports namespace' do
-      subject.write('foo', 'bar', namespace: 'x')
-      subject.write('foo', 'biz', namespace: 'y')
-      expect(subject.count).to eq(2)
-
-      expect(subject.clear(namespace: 'x')).to be_truthy
-      expect(subject.count).to eq(1)
-    end
-  end
-
-  describe '#fetch' do
-    it 'supports cache hit' do
-      subject.write('foo', 'bar')
-      expect(subject).not_to receive(:write)
-
-      expect(subject.fetch('foo') { 'baz' }).to eq('bar')
-    end
-
-    it 'supports cache miss' do
-      expect(subject).to receive(:write).with('foo', 'baz', instance_of(Hash))
-      expect(subject.fetch('foo') { 'baz' }).to eq('baz')
-    end
-
-    it 'passes key to block on cache miss' do
-      cache_miss = false
-      expect(subject.fetch('foo') {|key| cache_miss = true; key.length }).to eq(3)
-      expect(cache_miss).to be_truthy
-
-      cache_miss = false
-      expect(subject.fetch('foo') {|key| cache_miss = true; key.length }).to eq(3)
-      expect(cache_miss).to be_falsey
-    end
-
-    it 'supports forced cache miss' do
-      subject.write('foo', 'bar')
-      expect(subject).not_to receive(:read)
-
-      expect(subject.fetch('foo', force: true) { 'baz' }).to eq('baz')
-    end
-
-    it 'supports nil values' do
-      subject.write('foo', nil)
-      expect(subject).not_to receive(:write)
-
-      expect(subject.fetch('foo') { 'baz' }).to be_nil
-    end
-
-    it 'supports skip_nil option' do
-      expect(subject).not_to receive(:write)
-      expect(subject.fetch('foo', skip_nil: true) { nil }).to be_nil
-      expect(subject).not_to exist('foo')
-    end
-
-    it 'supports forced cache miss with block' do
-      subject.write('foo', 'bar')
-      expect(subject.fetch('foo', force: true) { 'baz' }).to eq('baz')
-    end
-
-    it 'supports forced cache miss without block' do
-      subject.write('foo', 'bar')
-      expect { subject.fetch('foo', force: true) }.to raise_error(ArgumentError)
-      expect(subject.read('foo')).to eq('bar')
-    end
-  end
-
-  describe '#read_multi' do
-    it 'supports read_multi' do
-      subject.write('foo', 'bar')
-      subject.write('fu', 'baz')
-      subject.write('fud', 'biz')
-      expect(subject.read_multi('foo', 'fu')).to eq('foo' => 'bar', 'fu' => 'baz')
-    end
-
-    it 'supports expires' do
-      time = Time.now
-      subject.write('foo', 'bar', expires_in: 10)
-      subject.write('fu', 'baz')
-      subject.write('fud', 'biz')
-
-      allow(Time).to receive(:now).and_return(time + 11)
-      expect(subject.read_multi('foo', 'fu')).to eq('fu' => 'baz')
-    end
-  end
-
-  describe '#fetch_multi' do
-    it 'supports fetch_multi' do
-      subject.write('foo', 'bar')
-      subject.write('fud', 'biz')
-      values = subject.fetch_multi('foo', 'fu', 'fud') {|v| v * 2 }
-
-      expect(values).to eq('foo' => 'bar', 'fu' => 'fufu', 'fud' => 'biz')
-      expect(subject.read('fu')).to eq('fufu')
-    end
-
-    it 'supports without expires_in' do
-      subject.write('foo', 'bar')
-      subject.write('fud', 'biz')
-      values = subject.fetch_multi('foo', 'fu', 'fud', expires_in: nil) {|v| v * 2 }
-
-      expect(values).to eq('foo' => 'bar', 'fu' => 'fufu', 'fud' => 'biz')
-      expect(subject.read('fu')).to eq('fufu')
-    end
-
-    it 'supports with objects' do
-      cache_struct = Struct.new(:cache_key, :title)
-      foo = cache_struct.new('foo', 'FOO!')
-      bar = cache_struct.new('bar')
-
-      subject.write('bar', 'BAM!')
-      values = subject.fetch_multi(foo, bar, &:title)
-      expect(values).to eq(foo => 'FOO!', bar => 'BAM!')
-    end
-
-    it 'supports ordered names' do
-      subject.write('bam', 'BAM')
-      values = subject.fetch_multi('foo', 'bar', 'bam', &:upcase)
-      expect(values.keys).to eq(%w[foo bar bam])
-    end
-
-    it 'raises without block' do
-      expect { subject.fetch_multi('foo') }.to raise_error(ArgumentError)
-    end
-  end
-
-  describe 'cache key' do
-    it 'supports cache keys' do
-      obj = Object.new
-      def obj.cache_key
-        :foo
-      end
-      subject.write(obj, 'bar')
-      expect(subject.read('foo')).to eq('bar')
-    end
-
-    it 'supports to_param keys' do
-      obj = Class.new do
-        def to_param
-          'foo'
-        end
-      end.new
-      subject.write(obj, 'bar')
-      expect(subject.read('foo')).to eq('bar')
-    end
-
-    it 'supports unversioned keys' do
-      obj = Object.new
-      def obj.cache_key
-        :foo
-      end
-
-      def obj.cache_key_with_version
-        'foo-v1'
-      end
-      subject.write(obj, 'bar')
-      expect(subject.read('foo')).to eq('bar')
-    end
-
-    it 'supports array keys' do
-      subject.write([:fu, 'foo'], 'bar')
-      expect(subject.read('fu/foo')).to eq('bar')
-    end
-
-    it 'supports hash keys' do
-      subject.write({ foo: 1, fu: 2 }, 'bar')
-      expect(subject.read('foo=1/fu=2')).to eq('bar')
-    end
-
-    it 'is case sensitive' do
-      subject.write('foo', 'bar')
-      expect(subject.read('FOO')).to be_nil
-    end
-  end
-
-  describe 'with version' do
-    it 'supports fetch/read' do
-      subject.fetch('foo', version: 1) { 'bar' }
-      expect(subject.read('foo', version: 1)).to eq('bar')
-      expect(subject.read('foo', version: 2)).to be_nil
-    end
-
-    it 'supports write/read' do
-      subject.write('foo', 'bar', version: 1)
-      expect(subject.read('foo', version: 1)).to eq('bar')
-      expect(subject.read('foo', version: 2)).to be_nil
-    end
-
-    it 'supports exists' do
-      subject.write('foo', 'bar', version: 1)
-      expect(subject).to exist('foo', version: 1)
-      expect(subject).not_to exist('foo', version: 2)
-    end
-
-    it 'cache/versions keys' do
-      m1v1 = ModelWithKeyAndVersion.new('model/1', 1)
-      m1v2 = ModelWithKeyAndVersion.new('model/1', 2)
-
-      subject.write(m1v1, 'bar')
-      expect(subject.read(m1v1)).to eq('bar')
-      expect(subject.read(m1v2)).to be_nil
-    end
-
-    it 'normalises' do
-      subject.write('foo', 'bar', version: 1)
-      expect(subject.read('foo', version: '1')).to eq('bar')
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,30 +0,0 @@
-ENV['RACK_ENV'] ||= 'test'
-
-require 'rspec'
-require 'fileutils'
-require 'activesupport_cache_database'
-
-Time.zone_default = Time.find_zone!('UTC')
-
-database_url = ENV.fetch('DATABASE_URL') do
-  path = File.expand_path('./test.sqlite3', __dir__)
-  FileUtils.rm_f(path)
-  "sqlite3://#{path}"
-end
-ActiveRecord::Base.configurations = { 'test' => { 'url' => database_url, 'pool' => 20 } }
-
-ActiveRecord::Base.establish_connection :test
-ActiveRecord::Base.connection.instance_eval do
-  drop_table 'activesupport_cache_entries', if_exists: true
-end
-ActiveRecord::Migration.suppress_messages do
-  ActiveSupport::Cache::DatabaseStore::Migration.migrate(:up)
-end
-
-RSpec.configure do |c|
-  c.after do
-    ActiveSupport::Cache::DatabaseStore::Model.truncate!
-  end
-end
-
-ModelWithKeyAndVersion = Struct.new(:cache_key, :cache_version)