activesupport_cache_database 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 973852575f17d5bc8f4faf071724c054068e5ab070782dce02844a72d418dd2a
-  data.tar.gz: 7551068640fe8e9c00f0e7e4474909d21bcd05b8881723fe6907f9b152e278c4
+  metadata.gz: d60d7d422c325c71a260bc33eb80fa7b402cd467afbed925778820c1d27d51bb
+  data.tar.gz: cef45b1c8e48c971737b52ebe318b2e76f5ef0f846ac997155c4b5e0a3fdc533
 SHA512:
-  metadata.gz: 6420375b2577ed8f62df452e71d7d280d343d193666d52c36fa5a3aea4d57eac1e3ca81e902ad5ef141ce5190d829f488a8ec0686ee0d6b18481cdb55deadbd2
-  data.tar.gz: d79407e5d25930e3b5fe96785b9e953c293a3eb7825c288525b1a73252b151b09ab7976fd1360adf4c43fb3ad55eba2e237071720c6f9473f2efbcab512a59a1
+  metadata.gz: 1637788764095dff7192fa782f2dcb62d14155d7a739bf00af1c60ea58798221f550e034f2035dbf827a0695545a6f1467b3bbfa0a7e85fcae0142e4e24b644f
+  data.tar.gz: 20429c7f45dc8fc0d3383c20992b5e0185522d106916a32225c5411ba6edab3b49ac4df78dc2e8b4f024e3c588156aa37b3e51cfce03c2a6ff01268f1d90ad3b

data/.github/workflows/ruby.yml

@@ -0,0 +1,21 @@
+name: Ruby
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ["2.6", "2.7", "3.0"]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - run: bundle exec rake

data/.rubocop.yml

@@ -1,7 +1,15 @@
-inherit_from:
-  - https://gitlab.com/bsm/misc/raw/master/rubocop/default.yml
-
+inherit_gem:
+  rubocop-bsm:
+    - default.yml
+inherit_mode:
+  merge:
+    - Exclude
 AllCops:
-  TargetRubyVersion: "2.5"
+  TargetRubyVersion: "2.6"
+
 Security/MarshalLoad:
   Enabled: false
+RSpec/SubjectStub:
+  Enabled: false
+RSpec/MessageSpies:
+  Enabled: false

data/Gemfile.lock

@@ -1,68 +1,88 @@
 PATH
   remote: .
   specs:
-    activesupport_cache_database (0.1.2)
+    activesupport_cache_database (0.2.0)
       activerecord (>= 5.0)
       activesupport (>= 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activerecord (6.0.3.1)
-      activemodel (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activesupport (6.0.3.1)
+    activemodel (6.1.3)
+      activesupport (= 6.1.3)
+    activerecord (6.1.3)
+      activemodel (= 6.1.3)
+      activesupport (= 6.1.3)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.0)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    i18n (1.8.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.9)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.1)
+    minitest (5.14.4)
     mysql2 (0.5.3)
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
     pg (1.2.3)
+    rack (2.2.3)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
     rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.84.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.11.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.0.3)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-bsm (0.5.4)
+      rubocop (~> 1.0)
+      rubocop-performance
+      rubocop-rails
+      rubocop-rake
+      rubocop-rspec
+    rubocop-performance (1.10.1)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.90.0, < 2.0)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.2.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
     sqlite3 (1.4.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -74,7 +94,7 @@ DEPENDENCIES
   pg
   rake
   rspec
-  rubocop
+  rubocop-bsm
   sqlite3
 
 BUNDLED WITH

data/activesupport_cache_database.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'activesupport_cache_database'
-  s.version       = '0.1.2'
+  s.version       = '0.2.0'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(ActiveSupport::Cache::Store implementation backed by ActiveRecord.)
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   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.5'
+  s.required_ruby_version = '>= 2.6'
 
   s.add_dependency 'activerecord', '>= 5.0'
   s.add_dependency 'activesupport', '>= 5.0'
@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pg'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop-bsm'
   s.add_development_dependency 'sqlite3'
 end

data/spec/active_support/cache/database_store_spec.rb

@@ -5,56 +5,56 @@ RSpec.describe ActiveSupport::Cache::DatabaseStore do
     described_class.new expires_in: 60
   end
 
-  it 'should read and write strings' do
+  it 'reads and write strings' do
     expect(subject.write('foo', 'bar')).to be_truthy
     expect(subject.read('foo')).to eq('bar')
   end
 
-  it 'should read and write hash' do
+  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 'should read and write integer' do
+  it 'reads and write integer' do
     expect(subject.write('foo', 1)).to be_truthy
     expect(subject.read('foo')).to eq(1)
   end
 
-  it 'should read and write nil' do
+  it 'reads and write nil' do
     expect(subject.write('foo', nil)).to be_truthy
     expect(subject.read('foo')).to eq(nil)
   end
 
-  it 'should read and write false' do
+  it 'reads and write false' do
     expect(subject.write('foo', false)).to be_truthy
     expect(subject.read('foo')).to eq(false)
   end
 
-  it 'should overwrite' do
+  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 'should support exist?' do
+  it 'supports exist?' do
     subject.write('foo', 'bar')
-    expect(subject.exist?('foo')).to be_truthy
-    expect(subject.exist?('bar')).to be_falsey
+    expect(subject).to exist('foo')
+    expect(subject).not_to exist('bar')
   end
 
-  it 'should support nil exist?' do
+  it 'supports nil exist?' do
     subject.write('foo', nil)
-    expect(subject.exist?('foo')).to be_truthy
+    expect(subject).to exist('foo')
   end
 
-  it 'should support delete' do
+  it 'supports delete' do
     subject.write('foo', 'bar')
-    expect(subject.exist?('foo')).to be_truthy
+    expect(subject).to exist('foo')
     expect(subject.delete('foo')).to be_truthy
-    expect(subject.exist?('foo')).to be_falsey
+    expect(subject).not_to exist('foo')
   end
 
-  it 'should support expires_in' do
+  it 'supports expires_in' do
     time = Time.local(2008, 4, 24)
     allow(Time).to receive(:now).and_return(time)
 
@@ -68,7 +68,7 @@ RSpec.describe ActiveSupport::Cache::DatabaseStore do
     expect(subject.read('foo')).to be_nil
   end
 
-  it 'should support long keys' do
+  it 'supports long keys' do
     key = 'x' * 255
     expect(subject.write(key, 'bar')).to be_truthy
     expect(subject.read(key)).to eq('bar')
@@ -82,7 +82,7 @@ RSpec.describe ActiveSupport::Cache::DatabaseStore do
   end
 
   describe '#cleanup' do
-    it 'should delete expired' do
+    it 'deletes expired' do
       time = Time.now
       subject.write('foo', 'bar', expires_in: 10)
       subject.write('fud', 'biz', expires_in: 20)
@@ -96,7 +96,7 @@ RSpec.describe ActiveSupport::Cache::DatabaseStore do
       expect(subject.read('fud')).to eq('biz')
     end
 
-    it 'should support namespace' do
+    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')
@@ -112,7 +112,7 @@ RSpec.describe ActiveSupport::Cache::DatabaseStore do
   end
 
   describe '#clear' do
-    it 'should remove all entries' do
+    it 'removes all entries' do
       subject.write('foo', 'bar')
       subject.write('fud', 'biz')
       expect(subject.clear).to be_truthy
@@ -120,7 +120,7 @@ RSpec.describe ActiveSupport::Cache::DatabaseStore do
       expect(subject.read('fud')).to be_nil
     end
 
-    it 'should support namespace' do
+    it 'supports namespace' do
       subject.write('foo', 'bar', namespace: 'x')
       subject.write('foo', 'biz', namespace: 'y')
       expect(subject.count).to eq(2)
@@ -131,19 +131,19 @@ RSpec.describe ActiveSupport::Cache::DatabaseStore do
   end
 
   describe '#fetch' do
-    it 'should support cache hit' 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 'should support cache miss' do
+    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 'should pass key to block on cache miss' do
+    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
@@ -153,32 +153,32 @@ RSpec.describe ActiveSupport::Cache::DatabaseStore do
       expect(cache_miss).to be_falsey
     end
 
-    it 'should support forced cache miss' do
+    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 'should support nil values' do
+    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 'should support skip_nil option' do
+    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.exist?('foo')).to be_falsey
+      expect(subject).not_to exist('foo')
     end
 
-    it 'should support forced cache miss with block' do
+    it 'supports forced cache miss with block' do
       subject.write('foo', 'bar')
       expect(subject.fetch('foo', force: true) { 'baz' }).to eq('baz')
     end
 
-    it 'should support forced cache miss without block' do
+    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')
@@ -186,14 +186,14 @@ RSpec.describe ActiveSupport::Cache::DatabaseStore do
   end
 
   describe '#read_multi' do
-    it 'should support 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 'should support expires' do
+    it 'supports expires' do
       time = Time.now
       subject.write('foo', 'bar', expires_in: 10)
       subject.write('fu', 'baz')
@@ -205,7 +205,7 @@ RSpec.describe ActiveSupport::Cache::DatabaseStore do
   end
 
   describe '#fetch_multi' do
-    it 'should support 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 }
@@ -214,7 +214,7 @@ RSpec.describe ActiveSupport::Cache::DatabaseStore do
       expect(subject.read('fu')).to eq('fufu')
     end
 
-    it 'should support without expires_in' do
+    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 }
@@ -223,7 +223,7 @@ RSpec.describe ActiveSupport::Cache::DatabaseStore do
       expect(subject.read('fu')).to eq('fufu')
     end
 
-    it 'should support with objects' do
+    it 'supports with objects' do
       cache_struct = Struct.new(:cache_key, :title)
       foo = cache_struct.new('foo', 'FOO!')
       bar = cache_struct.new('bar')
@@ -233,19 +233,19 @@ RSpec.describe ActiveSupport::Cache::DatabaseStore do
       expect(values).to eq(foo => 'FOO!', bar => 'BAM!')
     end
 
-    it 'should support ordered names' do
+    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 'should raise without block' do
+    it 'raises without block' do
       expect { subject.fetch_multi('foo') }.to raise_error(ArgumentError)
     end
   end
 
   describe 'cache key' do
-    it 'should support cache keys' do
+    it 'supports cache keys' do
       obj = Object.new
       def obj.cache_key
         :foo
@@ -254,16 +254,17 @@ RSpec.describe ActiveSupport::Cache::DatabaseStore do
       expect(subject.read('foo')).to eq('bar')
     end
 
-    it 'should support to_param keys' do
-      obj = Object.new
-      def obj.to_param
-        :foo
-      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 'should support unversioned keys' do
+    it 'supports unversioned keys' do
       obj = Object.new
       def obj.cache_key
         :foo
@@ -276,42 +277,42 @@ RSpec.describe ActiveSupport::Cache::DatabaseStore do
       expect(subject.read('foo')).to eq('bar')
     end
 
-    it 'should support array keys' do
+    it 'supports array keys' do
       subject.write([:fu, 'foo'], 'bar')
       expect(subject.read('fu/foo')).to eq('bar')
     end
 
-    it 'should support hash keys' do
+    it 'supports hash keys' do
       subject.write({ foo: 1, fu: 2 }, 'bar')
       expect(subject.read('foo=1/fu=2')).to eq('bar')
     end
 
-    it 'should be case sensitive' do
+    it 'is case sensitive' do
       subject.write('foo', 'bar')
       expect(subject.read('FOO')).to be_nil
     end
   end
 
   describe 'with version' do
-    it 'should support fetch/read' 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 'should support write/read' do
+    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 'should support exists' do
+    it 'supports exists' do
       subject.write('foo', 'bar', version: 1)
-      expect(subject.exist?('foo', version: 1)).to be_truthy
-      expect(subject.exist?('foo', version: 2)).to be_falsey
+      expect(subject).to exist('foo', version: 1)
+      expect(subject).not_to exist('foo', version: 2)
     end
 
-    it 'should cache/version keys' do
+    it 'cache/versions keys' do
       m1v1 = ModelWithKeyAndVersion.new('model/1', 1)
       m1v2 = ModelWithKeyAndVersion.new('model/1', 2)
 
@@ -320,7 +321,7 @@ RSpec.describe ActiveSupport::Cache::DatabaseStore do
       expect(subject.read(m1v2)).to be_nil
     end
 
-    it 'should normalise' do
+    it 'normalises' do
       subject.write('foo', 'bar', version: 1)
       expect(subject.read('foo', version: '1')).to eq('bar')
     end

data/spec/spec_helper.rb

@@ -22,7 +22,7 @@ ActiveRecord::Migration.suppress_messages do
 end
 
 RSpec.configure do |c|
-  c.after :each do
+  c.after do
     ActiveSupport::Cache::DatabaseStore::Model.truncate!
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport_cache_database
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-bsm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -144,9 +144,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -171,14 +171,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ActiveSupport::Cache::Store implementation backed by ActiveRecord.

data/.travis.yml

@@ -1,15 +0,0 @@
-language: ruby
-rvm:
-  - 2.6
-  - 2.5
-before_install:
-  - gem install bundler
-  - mysql -e 'CREATE DATABASE ci_test;'
-  - psql -c 'CREATE DATABASE ci_test;' -U postgres
-services:
-  - postgresql
-  - mysql
-env:
-  - DATABASE_URL=sqlite3:///tmp/ci_test.sqlite3
-  - DATABASE_URL=mysql2://travis@127.0.0.1/ci_test
-  - DATABASE_URL=postgresql://127.0.0.1/ci_test