redis-prescription 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 617a2c55e0d763f97983c56f3e7c7fbea30b4c999736a0eb8eaa4f38dab3a684
-  data.tar.gz: 16ab341290e6ee88abe15d0c0ee5523b1aaa1ab7b0228e05c9650ff4b861cf52
+  metadata.gz: fd1b8f036fcc8230f39b8df81688c9026fd2e65d3e5a825d6d1233a9ba7b9093
+  data.tar.gz: f60221b43f1ddbaa96d57212f8a1e849a94daa9c4d018c90aee7e68d6b9c7df4
 SHA512:
-  metadata.gz: 654c70a9fda3e076291c0c5339cde768c430c4d960d434fedf9e3bf7e8aaab5d4ea280a1be3a8d554015b09fd8adec26a4f2349ee169cd43e3139ce2b9b6badd
-  data.tar.gz: ce8112a9aa153b41e05e4e327dbcb6b6bf62abd120a96dad1eacbf818e747899abd7615bf975484850cad540cd4669764e320ce7a07e07d447a371397fe33c55
+  metadata.gz: 11d25b6dc569ed64cab7d439b7688102549a20e714c8a6ff2abfe7a2ccdb91a0fce7097089fd08c196b36b53ca7bcaae149edb0fb3272ec210f95efbcc5134e8
+  data.tar.gz: 386d2fbc0b0104e183c3c58ca871dd0120efe313ea7ece14904137c67139d97d82accc8b8537a0a9887e875596b2b08ec128ce52b73aca534387f873e73e4db9

data/README.adoc

@@ -31,20 +31,30 @@ script.call(redis, keys: [:xxx]) # => 123
 ----
 
 
-== Supported Ruby Versions
+== Compatibility
 
 This library aims to support and is tested against:
 
 * https://www.ruby-lang.org[Ruby]
+** MRI 2.7.x
 ** MRI 3.0.x
 ** MRI 3.1.x
+** MRI 3.2.x
 * https://redis.io[Redis Server]
 ** 6.2.x
 ** 7.0.x
 * https://github.com/redis/redis-rb[redis-rb]
+** 4.1.x
+** 4.2.x
+** 4.3.x
+** 4.4.x
+** 4.5.x
+** 4.6.x
 ** 4.7.x
 ** 4.8.x
 ** 5.0.x
+* https://github.com/resque/redis-namespace[redis-namespace]
+** 1.10.x
 * https://github.com/redis-rb/redis-client[redis-client]
 ** 0.12.x
 ** 0.13.x
@@ -63,7 +73,8 @@ patches in a timely fashion. If critical issues for a particular implementation
 exist at the time of a major release, support for that Ruby version may be
 dropped.
 
-Same rules apply to *Redis Server*, *redis-rb*, and *redis-client* support.
+The same applies to *Redis Server*, *redis-rb*, *redis-namespace*,
+and *redis-client* support.
 
 
 == Similar Projects

data/lib/redis_prescription/adapters/redis.rb

@@ -14,6 +14,10 @@ class RedisPrescription
         @redis = redis
       end
 
+      def adapter_name
+        "redis"
+      end
+
       def eval(script, keys, argv)
         @redis.eval(script, keys, argv)
       rescue ::Redis::CommandError => e

data/lib/redis_prescription/adapters/redis_client.rb

@@ -17,6 +17,10 @@ class RedisPrescription
         @redis = redis
       end
 
+      def adapter_name
+        "redis-client"
+      end
+
       def eval(script, keys, argv)
         @redis.call("EVAL", script, keys.size, *keys, *argv)
       rescue ::RedisClient::CommandError => e

data/lib/redis_prescription/adapters/redis_namespace.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require_relative "../errors"
+
+class RedisPrescription
+  module Adapters
+    # redis-namespace adapter
+    class RedisNamespace
+      def self.adapts?(redis)
+        defined?(::Redis::Namespace) && redis.is_a?(::Redis::Namespace)
+      end
+
+      def initialize(redis)
+        @redis = redis
+      end
+
+      def adapter_name
+        "redis-namespace"
+      end
+
+      def eval(script, keys, argv)
+        @redis.eval(script, keys, argv)
+      rescue ::Redis::CommandError => e
+        raise CommandError, e.message
+      end
+
+      def evalsha(digest, keys, argv)
+        @redis.evalsha(digest, keys, argv)
+      rescue ::Redis::CommandError => e
+        raise CommandError, e.message
+      end
+
+      def purge!
+        @redis.redis.script("flush")
+        @redis.redis.flushdb
+      end
+    end
+  end
+end

data/lib/redis_prescription/adapters.rb

@@ -2,6 +2,7 @@
 
 require_relative "./adapters/redis"
 require_relative "./adapters/redis_client"
+require_relative "./adapters/redis_namespace"
 
 class RedisPrescription
   # @api internal
@@ -10,6 +11,7 @@ class RedisPrescription
       def [](redis)
         return Adapters::Redis.new(redis) if Adapters::Redis.adapts?(redis)
         return Adapters::RedisClient.new(redis) if Adapters::RedisClient.adapts?(redis)
+        return Adapters::RedisNamespace.new(redis) if Adapters::RedisNamespace.adapts?(redis)
 
         raise TypeError, "Unsupported redis client: #{redis.class}"
       end

data/lib/redis_prescription/errors.rb

@@ -33,7 +33,7 @@ class RedisPrescription
         (?::\s\h+,\son\s@[^:]+:\d+\.)?                  # Redis 7.0
       )
       \z
-    }x
+    }x.freeze
     private_constant :LUA_ERROR_MESSAGE
     # rubocop:enable Layout/LineLength
 

data/lib/redis_prescription/version.rb

@@ -2,5 +2,5 @@
 
 class RedisPrescription
   # Gem version.
-  VERSION = "2.1.0"
+  VERSION = "2.3.0"
 end

data/lib/redis_prescription.rb

@@ -44,21 +44,13 @@ class RedisPrescription
   # @raise [ScriptError] if script execution failed
   # @return depends on the script
   def call(redis, keys: EMPTY_LIST, argv: EMPTY_LIST)
-    unpool(redis) { |r| evalsha_with_fallback(r, keys, argv) }
+    evalsha_with_fallback(Adapters[redis], keys, argv)
   rescue CommandError => e
     raise ScriptError.new(e.message, @source)
   end
 
   private
 
-  def unpool(redis)
-    if redis.respond_to?(:with)
-      redis.with { |r| yield Adapters[r] }
-    else
-      yield Adapters[redis]
-    end
-  end
-
   def evalsha_with_fallback(redis, keys, argv)
     redis.evalsha(@digest, keys, argv)
   rescue CommandError => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-prescription
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Alexey Zapparov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-04-07 00:00:00.000000000 Z
 dependencies: []
 description: |
   Preloads (and reloads when needed, e.g. when scripts were flushed away)
@@ -26,6 +26,7 @@ files:
 - lib/redis_prescription/adapters.rb
 - lib/redis_prescription/adapters/redis.rb
 - lib/redis_prescription/adapters/redis_client.rb
+- lib/redis_prescription/adapters/redis_namespace.rb
 - lib/redis_prescription/errors.rb
 - lib/redis_prescription/version.rb
 homepage: https://gitlab.com/ixti/redis-prescription
@@ -35,7 +36,7 @@ metadata:
   homepage_uri: https://gitlab.com/ixti/redis-prescription
   source_code_uri: https://gitlab.com/ixti/redis-prescription
   bug_tracker_uri: https://gitlab.com/ixti/redis-prescription/issues
-  changelog_uri: https://gitlab.com/ixti/redis-prescription/blob/v2.1.0/CHANGES.md
+  changelog_uri: https://gitlab.com/ixti/redis-prescription/blob/v2.3.0/CHANGES.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -45,7 +46,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="