activesupport_cache_database 0.1.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 973852575f17d5bc8f4faf071724c054068e5ab070782dce02844a72d418dd2a
-  data.tar.gz: 7551068640fe8e9c00f0e7e4474909d21bcd05b8881723fe6907f9b152e278c4
+  metadata.gz: c3b2183683fc6cb4ec9bb735da8fed61f9e057b894bfef685416dfb019d924ee
+  data.tar.gz: b493bb3f1a7aa74a27e87030fbefb98a3bf95cf98955bfbcf817382039776442
 SHA512:
-  metadata.gz: 6420375b2577ed8f62df452e71d7d280d343d193666d52c36fa5a3aea4d57eac1e3ca81e902ad5ef141ce5190d829f488a8ec0686ee0d6b18481cdb55deadbd2
-  data.tar.gz: d79407e5d25930e3b5fe96785b9e953c293a3eb7825c288525b1a73252b151b09ab7976fd1360adf4c43fb3ad55eba2e237071720c6f9473f2efbcab512a59a1
+  metadata.gz: 1ce1549296de2188bbfa524c8745844bb150d0df44e0d1472a617d716279deafe758b13b7c577dba84c00697b4aeca8fe8048bc96936fd2e17021accdc03777a
+  data.tar.gz: ae967fdb27b3597c4c1bc7ed58e57c6f4a59795a63dfc1df44caaae3b60ac3b53698df40131e8c17a0520202187e43e606a4f1cdb0471aaed0c1a7e4a1af6aab

data/.github/workflows/test.yml

@@ -0,0 +1,24 @@
+name: Test
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ["2.7", "3.0", "3.1"]
+        gemfiles: ["Gemfile", "Gemfile.rails6"]
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+    steps:
+      - uses: actions/checkout@v3
+      - 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.7"
+
 Security/MarshalLoad:
   Enabled: false
+RSpec/SubjectStub:
+  Enabled: false
+RSpec/MessageSpies:
+  Enabled: false

data/Gemfile.lock

@@ -1,68 +1,81 @@
 PATH
   remote: .
   specs:
-    activesupport_cache_database (0.1.2)
-      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.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 (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 (>= 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)
+    ast (2.4.2)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    i18n (1.11.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.1)
-    mysql2 (0.5.3)
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
-    pg (1.2.3)
-    rainbow (3.0.0)
-    rake (13.0.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)
+    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.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.84.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.31.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      rexml
-      rubocop-ast (>= 0.0.3)
+      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, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
-    ruby-progressbar (1.10.1)
-    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)
+      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)
 
 PLATFORMS
   ruby
@@ -74,8 +87,8 @@ DEPENDENCIES
   pg
   rake
   rspec
-  rubocop
+  rubocop-bsm
   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/LICENSE

@@ -1,13 +1,201 @@
-Copyright 2019 Black Square Media Ltd
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-  http://www.apache.org/licenses/LICENSE-2.0
+   1. Definitions.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2021 Black Square Media Ltd
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -1,6 +1,6 @@
 # ActiveSupport::Cache::DatabaseStore
 
-[![Build Status](https://travis-ci.org/bsm/activesupport-cache-database.png?branch=master)](https://travis-ci.org/bsm/activesupport-cache-database)
+[![Test](https://github.com/bsm/activesupport-cache-database/actions/workflows/test.yml/badge.svg)](https://github.com/bsm/activesupport-cache-database/actions/workflows/test.yml)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 ActiveSupport::Cache::Store implementation backed by a database via ActiveRecord.
@@ -37,7 +37,9 @@ cache = ActiveSupport::Cache::DatabaseStore.new namespace: 'my-scope'
 value = cache.fetch('some-key') { 'default' }
 ```
 
-To use as a Rails cache store (not recommended!), simply use a new instance.
+To use as a Rails cache store, simply use a new instance. Please keep in mind
+that, for performance reasons, your database may not be the most suitable
+general purpose cache backend.
 
 ```ruby
 config.cache_store = ActiveSupport::Cache::DatabaseStore.new

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.3.0'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(ActiveSupport::Cache::Store implementation backed by ActiveRecord.)
@@ -9,18 +9,18 @@ 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.5'
+  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'
   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'
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/active_support/cache/database_store.rb

@@ -13,6 +13,11 @@ module ActiveSupport
       autoload :Model, 'active_support/cache/database_store/model'
       autoload :Migration, 'active_support/cache/database_store/migration'
 
+      # Advertise cache versioning support.
+      def self.supports_cache_versioning?
+        true
+      end
+
       # param [Hash] options options
       # option options [Class] :model model class. Default: ActiveSupport::Cache::DatabaseStore::Model
       def initialize(options = nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport_cache_database
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-27 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
@@ -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,11 +144,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.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.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+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/.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

data/spec/active_support/cache/database_store_spec.rb

@@ -1,328 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe ActiveSupport::Cache::DatabaseStore do
-  subject do
-    described_class.new expires_in: 60
-  end
-
-  it 'should read 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
-    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
-    expect(subject.write('foo', 1)).to be_truthy
-    expect(subject.read('foo')).to eq(1)
-  end
-
-  it 'should read 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
-    expect(subject.write('foo', false)).to be_truthy
-    expect(subject.read('foo')).to eq(false)
-  end
-
-  it 'should overwrite' 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
-    subject.write('foo', 'bar')
-    expect(subject.exist?('foo')).to be_truthy
-    expect(subject.exist?('bar')).to be_falsey
-  end
-
-  it 'should support nil exist?' do
-    subject.write('foo', nil)
-    expect(subject.exist?('foo')).to be_truthy
-  end
-
-  it 'should support delete' do
-    subject.write('foo', 'bar')
-    expect(subject.exist?('foo')).to be_truthy
-    expect(subject.delete('foo')).to be_truthy
-    expect(subject.exist?('foo')).to be_falsey
-  end
-
-  it 'should support 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 'should support 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 'should delete 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 'should support 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 'should remove 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 'should support 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 'should support 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
-      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
-      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 'should support 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
-      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
-      expect(subject).not_to receive(:write)
-      expect(subject.fetch('foo', skip_nil: true) { nil }).to be_nil
-      expect(subject.exist?('foo')).to be_falsey
-    end
-
-    it 'should support 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
-      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 'should support 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
-      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 'should support 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 'should support 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 'should support 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 'should support 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
-      expect { subject.fetch_multi('foo') }.to raise_error(ArgumentError)
-    end
-  end
-
-  describe 'cache key' do
-    it 'should support 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 'should support to_param keys' do
-      obj = Object.new
-      def obj.to_param
-        :foo
-      end
-      subject.write(obj, 'bar')
-      expect(subject.read('foo')).to eq('bar')
-    end
-
-    it 'should support 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 'should support array keys' do
-      subject.write([:fu, 'foo'], 'bar')
-      expect(subject.read('fu/foo')).to eq('bar')
-    end
-
-    it 'should support 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
-      subject.write('foo', 'bar')
-      expect(subject.read('FOO')).to be_nil
-    end
-  end
-
-  describe 'with version' do
-    it 'should support 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
-      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
-      subject.write('foo', 'bar', version: 1)
-      expect(subject.exist?('foo', version: 1)).to be_truthy
-      expect(subject.exist?('foo', version: 2)).to be_falsey
-    end
-
-    it 'should cache/version 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 'should normalise' 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 :each do
-    ActiveSupport::Cache::DatabaseStore::Model.truncate!
-  end
-end
-
-ModelWithKeyAndVersion = Struct.new(:cache_key, :cache_version)