collectionspace-refcache 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c38f8c09590b06bacca02630a58d0470ab97807e0da4a0004f96e1f37d24c826
-  data.tar.gz: b4453a9b856d0ac400bacf394b0455252558d3ef05e7b44586d1014711bc5cc7
+  metadata.gz: 42e8acdba0d3c8da1fcbe7ed21f28f05e6f0218c51d271bccc653eb6bae3dc9a
+  data.tar.gz: bac0cdb617a10ccac95694d39115514df8b1b0ce0c5ff3e53fc07f22974ec61d
 SHA512:
-  metadata.gz: 969957ef1d7b7641bbbe6a27ab64ce52f903628fd75be2bbc4c35e8fd3f1496bbdc73657e107b2ff4f408e6303f36c658e2efd25d7fac668e4279febeda5e13b
-  data.tar.gz: 1d8b175e29860eba192c2ce7c2bfb3ec401b21d1c2bc37e3cff89354612e8bc750531fe6f00f0c14980cccf8ef93fee48141c1152078e9c4644a0791b7c20c97
+  metadata.gz: ba1fb6fb68c059733583fce9ca8319c95e5df0d9f1aa6d1124ec83968ac09ebc0142c01de981bb2a50c5577d680fcf949763ec446a1048760e49d9abd4e91a7a
+  data.tar.gz: a6c52240d77fc9daf63115370adefe53fdefca72b8a0f16c8e7ccd60420520a8648de8f25c7133285182829537c1315644b062d07d49cb34801a491eba25d459

data/.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.2', '3.1.3', '3.0.5', '2.7.4']
+        ruby-version: ['4.0']
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

data/.github/workflows/publish.yml

@@ -18,7 +18,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
-          ruby-version: 3.2
+          ruby-version: 4.0
           rubygems: latest
 
       - name: Release Gem

data/.ruby-version

@@ -1 +1 @@
-3.2.1
+4.0.5

data/Gemfile.lock

@@ -1,77 +1,92 @@
 PATH
   remote: .
   specs:
-    collectionspace-refcache (1.0.0)
+    collectionspace-refcache (1.0.1)
       redis (~> 4.2.1)
       zache (~> 0.12.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
+    ast (2.4.3)
     coderay (1.1.3)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    json (2.6.3)
-    language_server-protocol (3.17.0.3)
-    method_source (1.0.0)
+    diff-lcs (1.6.2)
+    io-console (0.9.4)
+    json (3.1.0)
+    language_server-protocol (3.17.0.6)
+    lint_roller (1.1.0)
+    method_source (1.1.0)
     mock_redis (0.29.0)
       ruby2_keywords
-    parallel (1.22.1)
-    parser (3.2.1.1)
+    parallel (2.3.0)
+    parser (3.3.13.0)
       ast (~> 2.4.1)
-    pry (0.14.2)
+      racc
+    prism (1.9.0)
+    pry (0.16.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+      reline (>= 0.6.0)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.4.2)
     redis (4.2.5)
-    regexp_parser (2.7.0)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    regexp_parser (2.13.1)
+    reline (0.7.0)
+      io-console (~> 0.5)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.44.1)
-      json (~> 2.3)
-      parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    rubocop (1.91.0)
+      json (>= 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (>= 1.10)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.27.0)
-      parser (>= 3.2.1.0)
-    rubocop-performance (1.15.2)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.50.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    rubocop-performance (1.26.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
-    standard (1.24.3)
+    simplecov (1.3.2)
+    standard (1.57.0)
       language_server-protocol (~> 3.17.0.2)
-      rubocop (= 1.44.1)
-      rubocop-performance (= 1.15.2)
-    unicode-display_width (2.4.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.91.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.8)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.9.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.26.0)
+    unicode-display_width (3.3.0)
+      unicode-emoji (~> 4.3)
+    unicode-emoji (4.3.0)
     zache (0.12.0)
 
 PLATFORMS
+  arm64-darwin-25
   ruby
 
 DEPENDENCIES
@@ -81,8 +96,47 @@ DEPENDENCIES
   rake (~> 13.0)
   rspec
   rubocop
-  simplecov (~> 0.21)
+  simplecov
   standard
 
+CHECKSUMS
+  ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
+  coderay (1.1.3) sha256=dc530018a4684512f8f38143cd2a096c9f02a1fc2459edcfe534787a7fc77d4b
+  collectionspace-refcache (1.0.1)
+  diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
+  io-console (0.9.4) sha256=a403304f32928ee85e56d457b4612ca43f2703b561a3258844992bd24085fbb1
+  json (3.1.0) sha256=3ce7ccf8fde58960177a3a756c31f292a4c1e1dedee884547096a5b0604e3bd8
+  language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0
+  lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
+  method_source (1.1.0) sha256=181301c9c45b731b4769bc81e8860e72f9161ad7d66dd99103c9ab84f560f5c5
+  mock_redis (0.29.0) sha256=296956fff24a8bf10d771e4f1a54913161de480b879f53f7ae5030aa323c5282
+  parallel (2.3.0) sha256=f75a3e904101ce6a1ccb6b8dc800cbafd42166d83330192438dcf29395167a6f
+  parser (3.3.13.0) sha256=e02f9b63c2fe05b0c68f692ba4df89b3cb113b663964f75d988fbebfd6c3deca
+  prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
+  pry (0.16.1) sha256=d92d82c86e7f2dc34beec6d2892d5cf5ea517eea22eed3ceabb38ee62a98accc
+  racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
+  rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
+  rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
+  redis (4.2.5) sha256=88a85e4a379b8fdfdc76518dd4fd5daa34464735785ef4f6929924004dd6a297
+  regexp_parser (2.13.1) sha256=5aedb6b7c35688f51e86eef17a15374dfd287c83f4ca644b2c5f3ec50a33b44b
+  reline (0.7.0) sha256=5b012d8e55dbf9d450f12bde2cf7d15ff546ae80b3f8f3b30e570d431815583d
+  rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
+  rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
+  rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
+  rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
+  rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
+  rubocop (1.91.0) sha256=9c82b7bf391c5d7e3798c5b9996e22a1fe3bd7468e351dfdeb96140c058296d0
+  rubocop-ast (1.50.0) sha256=b9ca88300da0803ee222ad20cdb30494c0a784eed06fdc35d254b06d662788db
+  rubocop-performance (1.26.1) sha256=cd19b936ff196df85829d264b522fd4f98b6c89ad271fa52744a8c11b8f71834
+  ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
+  ruby2_keywords (0.0.5) sha256=ffd13740c573b7301cf7a2e61fc857b2a8e3d3aff32545d6f8300d8bae10e3ef
+  simplecov (1.3.2) sha256=2a22ec1759f1b8db60881a2e038758956fc69ef93ed669be0bde0678de6d0e85
+  standard (1.57.0) sha256=4a65ea92421fbaf77fb54da91e16093cf79b335b8f62c35aaa3dd714c8592858
+  standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b
+  standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2
+  unicode-display_width (3.3.0) sha256=4b7aa66a4b11db50f6f7e98411215cd0dd10eaecb665d36eec5bcacb3fa0b613
+  unicode-emoji (4.3.0) sha256=11c02fa73290378c066bb0562cd4c87d8e1b706fbbe0059ca12746a4244de8ce
+  zache (0.12.0) sha256=6a3bccae54ca88fa0b0afa9debdbcb30c3f3b470d8763844c10a9fa62b02bce7
+
 BUNDLED WITH
-   2.4.8
+  4.0.10

data/README.md

@@ -1,4 +1,4 @@
-# CollectionSpace RefCache
+# CollectionSpace Refcache
 
 A caching system for CollectionSpace refnames.
 

data/Rakefile

@@ -8,5 +8,5 @@ RSpec::Core::RakeTask.new(:spec)
 task default: :spec
 
 task :version do
-  puts CollectionSpace::RefCache::VERSION
+  puts CollectionSpace::Refcache::VERSION
 end

data/bin/console

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'bundler/setup'
-require 'collectionspace/refcache'
+require "bundler/setup"
+require "collectionspace/refcache"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -11,5 +11,5 @@ require 'collectionspace/refcache'
 # require "pry"
 # Pry.start
 
-require 'irb'
+require "irb"
 IRB.start(__FILE__)

data/bin/rspec

@@ -15,7 +15,7 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
 bundle_binstub = File.expand_path("../bundle", __FILE__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/collectionspace-refcache.gemspec

@@ -4,15 +4,15 @@ require_relative "lib/collectionspace/refcache/version"
 
 Gem::Specification.new do |spec|
   spec.name = "collectionspace-refcache"
-  spec.version = CollectionSpace::RefCache::VERSION
+  spec.version = CollectionSpace::Refcache::VERSION
   spec.authors = ["Mark Cooper"]
   spec.email = ["mark.c.cooper@outlook.com"]
 
-  spec.summary = "CollectionSpace RefCache."
+  spec.summary = "CollectionSpace Refcache."
   spec.description = "A caching system for CollectionSpace refnames."
   spec.homepage = "https://github.org/collectionspace/collectionspace-refcache"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.7.4"
+  spec.required_ruby_version = ">= 4.0.5"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
@@ -32,6 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency("rake", "~> 13.0")
   spec.add_development_dependency("rspec")
   spec.add_development_dependency("rubocop")
-  spec.add_development_dependency("simplecov", "~> 0.21")
+  spec.add_development_dependency("simplecov")
   spec.add_development_dependency("standard")
 end

data/doc/REFCACHE.md

@@ -1,15 +1,18 @@
-# RefCache
+# Refcache
 
 Setup and usage:
 
 ```ruby
+# In-memory cache (Zache) will be used as backend if neither :redis nor :store are included
+#   in config
 cache_config = {
-  # redis: 'redis://localhost:6379/1', # optional, if omitted use in memory cache (Zache)
+  # redis: 'redis://localhost:6379/1', # optional
+  # store: ActiveSupport::Cache::Store or SolidCache::Store object, # optional
   domain: 'core.collectionspace.org',
   error_if_not_found: false, # raise error if key cannot be retrieved (default false)
   lifetime: 5 * 60, # cache expiry in seconds (default is 5 minutes)
 }
-cache = CollectionSpace::RefCache.new(config: cache_config)
+cache = CollectionSpace::Refcache.new(config: cache_config)
 cache.get('placeauthorities', 'place', 'Death Valley') # $refname or error / nil if not found
 cache.exists?('placeauthorities', 'place', 'Death Valley') # check for key
 

data/lib/collectionspace/refcache/backend/activesupport_cache_store.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module CollectionSpace
+  class Refcache
+    module Backend
+      class ActivesupportCacheStore
+        # @param store [ActiveSupport::Cache::Store] or other store conforming
+        #   to its abstract interface (e.g. SolidCache::Store)
+        def initialize(store)
+          @c = store
+        end
+
+        def clean
+          return nil unless @c.respond_to?(:clean)
+
+          @c.clean
+        end
+
+        def connected?
+          "PONG" # cute, matches redis response
+        end
+
+        def exists?(key)
+          @c.exist?(key)
+        end
+
+        def flush
+          return nil unless @c.respond_to?(:clear)
+
+          @c.clear
+        end
+
+        def get(key)
+          @c.read(key)
+        end
+
+        def put(key, value, lifetime: nil)
+          if lifetime
+            @c.write(key, value, expires_in: lifetime)
+          else
+            @c.write(key, value)
+          end
+        end
+
+        def remove(key)
+          @c.delete(key)
+        end
+
+        def size
+          return nil unless @c.respond_to?(:stats)
+
+          @c.stats.dig(:connection_stats, :cache, :entries)
+        end
+      end
+    end
+  end
+end

data/lib/collectionspace/refcache/backend/redis.rb

@@ -3,7 +3,7 @@
 require "redis"
 
 module CollectionSpace
-  class RefCache
+  class Refcache
     module Backend
       class Redis
         def initialize(url)

data/lib/collectionspace/refcache/backend/zache.rb

@@ -3,7 +3,7 @@
 require "zache"
 
 module CollectionSpace
-  class RefCache
+  class Refcache
     module Backend
       class Zache
         def initialize

data/lib/collectionspace/refcache/backend.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
+require_relative "backend/activesupport_cache_store"
 require_relative "backend/redis"
 require_relative "backend/zache"
 
 module CollectionSpace
-  class RefCache
+  class Refcache
     module Backend
     end
   end

data/lib/collectionspace/refcache/refcache.rb

@@ -3,14 +3,14 @@
 require "digest"
 
 module CollectionSpace
-  class RefCache
+  class Refcache
     class NotFoundError < StandardError; end
 
     attr_reader :config, :domain
 
     def initialize(config: {})
       @config = config
-      @cache = backend(config.fetch(:redis, nil))
+      @cache = set_backend(config)
       @domain = config.fetch(:domain)
       @error_if_not_found = config.fetch(:error_if_not_found, false)
       @lifetime = config.fetch(:lifetime, 5 * 60)
@@ -43,126 +43,130 @@ module CollectionSpace
     #####
     # Default methods (assumes authority terms)
     # cache.exists?('placeauthorities', 'place', 'Death Valley')
-    def exists?(type, subtype, value)
-      generic_exists?(term_key(type, subtype, value))
+    def exists?(type, subtype, value, value_type = nil)
+      generic_exists?(term_key(type, subtype, value, value_type))
     end
 
     # cache.put('placeauthorities', 'place', 'The Moon', $refname)
     # rubocop:disable Metrics/ParameterLists
-    def put(type, subtype, value, to_cache)
-      put_generic(term_key(type, subtype, value), to_cache)
+    def put(type, subtype, value, to_cache, value_type = nil)
+      put_generic(term_key(type, subtype, value, value_type), to_cache)
     end
     # rubocop:enable Metrics/ParameterLists
 
     # cache.get('placeauthorities', 'place', 'The Moon')
     # cache.get('vocabularies', 'languages', 'English')
-    def get(type, subtype, value)
-      get_generic(term_key(type, subtype, value))
+    def get(type, subtype, value, value_type = nil)
+      get_generic(term_key(type, subtype, value, value_type))
     end
 
-    def remove(type, subtype, value)
-      remove_generic(term_key(type, subtype, value))
+    def remove(type, subtype, value, value_type = nil)
+      remove_generic(term_key(type, subtype, value, value_type))
     end
 
     #####
     # object caching
     #####
-    def put_object(id, to_cache)
-      put_generic(object_key(id), to_cache)
+    def put_object(id, to_cache, value_type = nil)
+      put_generic(object_key(id, value_type), to_cache)
     end
 
-    def get_object(id)
-      get_generic(object_key(id))
+    def get_object(id, value_type = nil)
+      get_generic(object_key(id, value_type))
     end
 
-    def remove_object(id)
-      remove_generic(object_key(id))
+    def remove_object(id, value_type = nil)
+      remove_generic(object_key(id, value_type))
     end
 
-    def object_exists?(id)
-      generic_exists?(object_key(id))
+    def object_exists?(id, value_type = nil)
+      generic_exists?(object_key(id, value_type))
     end
 
     #####
     # procedure caching
     #####
-    def put_procedure(type, id, to_cache)
-      put_generic(procedure_key(type, id), to_cache)
+    def put_procedure(type, id, to_cache, value_type = nil)
+      put_generic(procedure_key(type, id, value_type), to_cache)
     end
 
-    def get_procedure(type, id)
-      get_generic(procedure_key(type, id))
+    def get_procedure(type, id, value_type = nil)
+      get_generic(procedure_key(type, id, value_type))
     end
 
-    def remove_procedure(type, id)
-      remove_generic(procedure_key(type, id))
+    def remove_procedure(type, id, value_type = nil)
+      remove_generic(procedure_key(type, id, value_type))
     end
 
-    def procedure_exists?(type, id)
-      generic_exists?(procedure_key(type, id))
+    def procedure_exists?(type, id, value_type = nil)
+      generic_exists?(procedure_key(type, id, value_type))
     end
 
     #####
     # authority term caching
     #####
-    def auth_term_exists?(type, subtype, term)
-      generic_exists?(term_key(type, subtype, term))
+    def auth_term_exists?(type, subtype, term, value_type = nil)
+      generic_exists?(term_key(type, subtype, term, value_type))
     end
 
     # rubocop:disable Metrics/ParameterLists
-    def put_auth_term(type, subtype, term, to_cache)
-      put_generic(term_key(type, subtype, term), to_cache)
+    def put_auth_term(type, subtype, term, to_cache, value_type = nil)
+      put_generic(term_key(type, subtype, term, value_type), to_cache)
     end
     # rubocop:enable Metrics/ParameterLists
 
-    def get_auth_term(type, subtype, term)
-      get_generic(term_key(type, subtype, term))
+    def get_auth_term(type, subtype, term, value_type = nil)
+      get_generic(term_key(type, subtype, term, value_type))
     end
 
-    def remove_auth_term(type, subtype, term)
-      remove_generic(term_key(type, subtype, term))
+    def remove_auth_term(type, subtype, term, value_type = nil)
+      remove_generic(term_key(type, subtype, term, value_type))
     end
 
     #####
     # relation caching
     #####
-    def relation_exists?(reltype, subjectcsid, objectcsid)
-      generic_exists?(term_key(reltype, subjectcsid, objectcsid))
+    def relation_exists?(reltype, subjectcsid, objectcsid, value_type = nil)
+      generic_exists?(
+        relation_key(reltype, subjectcsid, objectcsid, value_type)
+      )
     end
 
     # rubocop:disable Metrics/ParameterLists
-    def put_relation(reltype, subjectcsid, objectcsid, to_cache)
-      put_generic(term_key(reltype, subjectcsid, objectcsid), to_cache)
+    def put_relation(reltype, subjectcsid, objectcsid, to_cache,
+      value_type = nil)
+      put_generic(relation_key(reltype, subjectcsid, objectcsid, value_type),
+        to_cache)
     end
     # rubocop:enable Metrics/ParameterLists
 
-    def get_relation(reltype, subjectcsid, objectcsid)
-      get_generic(term_key(reltype, subjectcsid, objectcsid))
+    def get_relation(reltype, subjectcsid, objectcsid, value_type = nil)
+      get_generic(relation_key(reltype, subjectcsid, objectcsid, value_type))
     end
 
-    def remove_relation(reltype, subjectcsid, objectcsid)
-      remove_generic(term_key(reltype, subjectcsid, objectcsid))
+    def remove_relation(reltype, subjectcsid, objectcsid, value_type = nil)
+      remove_generic(relation_key(reltype, subjectcsid, objectcsid, value_type))
     end
 
     #####
     # vocabulary term caching
     #####
-    def vocab_term_exists?(vocab, term)
-      generic_exists?(vocab_term_key(vocab, term))
+    def vocab_term_exists?(vocab, term, value_type = nil)
+      generic_exists?(vocab_term_key(vocab, term, value_type))
     end
 
     # rubocop:disable Metrics/ParameterLists
-    def put_vocab_term(vocab, term, to_cache)
-      put_generic(vocab_term_key(vocab, term), to_cache)
+    def put_vocab_term(vocab, term, to_cache, value_type = nil)
+      put_generic(vocab_term_key(vocab, term, value_type), to_cache)
     end
     # rubocop:enable Metrics/ParameterLists
 
-    def get_vocab_term(vocab, term)
-      get_generic(vocab_term_key(vocab, term))
+    def get_vocab_term(vocab, term, value_type = nil)
+      get_generic(vocab_term_key(vocab, term, value_type))
     end
 
-    def remove_vocab_term(vocab, term)
-      remove_generic(vocab_term_key(vocab, term))
+    def remove_vocab_term(vocab, term, value_type = nil)
+      remove_generic(vocab_term_key(vocab, term, value_type))
     end
 
     private
@@ -186,32 +190,38 @@ module CollectionSpace
       @cache.exists?(key)
     end
 
-    def backend(connection)
-      connection ? Backend::Redis.new(connection) : Backend::Zache.new
+    def set_backend(config)
+      if config.key?(:redis)
+        Backend::Redis.new(config[:redis])
+      elsif config.key?(:store)
+        Backend::ActivesupportCacheStore.new(config[:store])
+      else
+        Backend::Zache.new
+      end
     end
 
     def generate_key(parts = [])
       Digest::SHA2.hexdigest(parts.dup.append(domain).join).prepend("refcache::")
     end
 
-    def object_key(id)
-      generate_key(["collectionobjects", id])
+    def object_key(id, value_type = nil)
+      generate_key(["collectionobjects", id, value_type].compact)
     end
 
-    def procedure_key(type, id)
-      generate_key([type, id])
+    def procedure_key(type, id, value_type = nil)
+      generate_key([type, id, value_type].compact)
     end
 
-    def relation_key(reltype, subjectcsid, objectcsid)
-      generate_key([reltype, subjectcsid, objectcsid])
+    def relation_key(reltype, subjectcsid, objectcsid, value_type = nil)
+      generate_key([reltype, subjectcsid, objectcsid, value_type].compact)
     end
 
-    def term_key(type, subtype, term)
-      generate_key([type, subtype, term])
+    def term_key(type, subtype, term, value_type = nil)
+      generate_key([type, subtype, term, value_type].compact)
     end
 
-    def vocab_term_key(vocab, term)
-      generate_key(["vocabularies", vocab, term])
+    def vocab_term_key(vocab, term, value_type = nil)
+      generate_key(["vocabularies", vocab, term, value_type].compact)
     end
   end
 end

data/lib/collectionspace/refcache/version.rb

@@ -2,8 +2,8 @@
 
 module CollectionSpace
   # rubocop:disable Style/StaticClass
-  class RefCache
-    VERSION = "1.0.0"
+  class Refcache
+    VERSION = "1.0.1"
   end
   # rubocop:enable Style/StaticClass
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: collectionspace-refcache
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Mark Cooper
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -112,16 +111,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +161,7 @@ files:
 - doc/REFCACHE.md
 - lib/collectionspace/refcache.rb
 - lib/collectionspace/refcache/backend.rb
+- lib/collectionspace/refcache/backend/activesupport_cache_store.rb
 - lib/collectionspace/refcache/backend/redis.rb
 - lib/collectionspace/refcache/backend/zache.rb
 - lib/collectionspace/refcache/refcache.rb
@@ -172,7 +172,6 @@ licenses:
 metadata:
   homepage_uri: https://github.org/collectionspace/collectionspace-refcache
   source_code_uri: https://github.org/collectionspace/collectionspace-refcache
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -180,15 +179,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.4
+      version: 4.0.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.8
-signing_key: 
+rubygems_version: 4.0.23
 specification_version: 4
-summary: CollectionSpace RefCache.
+summary: CollectionSpace Refcache.
 test_files: []