redis-prescription 2.4.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 354a94422396fda6136797808b779601e496bd65820569745c5394e6ae3da356
-  data.tar.gz: 19991740730012d7667f792e9c4324ae115fbe3e616d4295616b579cf2f8b7b5
+  metadata.gz: b40f45880782f9837583276b82f9d8c7469ea9ecb43975c3c0f39ba443ef5ee9
+  data.tar.gz: 4b30c8e0542b78426afb3cc6eedeae0b62f621043f32c39e3d58e438a34f7c59
 SHA512:
-  metadata.gz: 3c10f0ee851f6e1b026d3d64b9903f140093b236e1964155bcef5e7c72417e5b68ae79cfc9b647a03c1ebd425d16772022ad2bb8175292e0a83c5231dd2a54e7
-  data.tar.gz: a605ed2d14492a8e638c16a38bafab2afc37d5cc731c59df65ed3cae067cfeb75d9848115d434a302d7852df78678faccd5646a82568c91d04d8c7be9c19b533
+  metadata.gz: 23541e2d295d44ebb114fe031c84a1219a996c8b7566f6ad1f4b67ccf3b851ee5d5ece5aac8cb12549c6ac292b32b20471f0949f41b9b91014bec945290bd1c0
+  data.tar.gz: ea5b760e8c10d489a566da3a4a9135b2cb0b0e8c02da87c89e9169ee3d92490d87b8eb979393695133d0731b63ed7d048278596af100c703817102a7cb34bcbe

data/README.adoc

@@ -41,6 +41,7 @@ This library aims to support and is tested against:
 ** MRI 3.1.x
 ** MRI 3.2.x
 * https://redis.io[Redis Server]
+** 6.0.x
 ** 6.2.x
 ** 7.0.x
 * https://github.com/redis/redis-rb[redis-rb]

data/lib/redis/prescription.rb

@@ -3,10 +3,13 @@
 require_relative "../redis_prescription"
 
 class Redis
-  # @deprecated
-  # @see RedisPrescription
+  # @deprecated Use ::RedisPrescription
   class Prescription < RedisPrescription
     class << self
+      # Controls if deprecation warnings should be silenced or not.
+      # Defaults to `false`.
+      #
+      # @return [Boolean]
       attr_accessor :silence_deprecation_warning
     end
 

data/lib/redis_prescription/adapters/redis.rb

@@ -5,34 +5,23 @@ require_relative "../errors"
 class RedisPrescription
   module Adapters
     # redis-rb adapter
-    class Redis
-      def self.adapts?(redis)
-        defined?(::Redis) && redis.is_a?(::Redis)
-      end
-
-      def initialize(redis)
-        @redis = redis
-      end
-
-      def adapter_name
-        "redis"
-      end
-
-      def eval(script, keys, argv)
-        @redis.eval(script, keys, argv)
-      rescue ::Redis::CommandError => e
-        raise CommandError, e.message
-      end
+    module Redis
+      class << self
+        def adapts?(redis)
+          defined?(::Redis) && redis.is_a?(::Redis)
+        end
 
-      def evalsha(digest, keys, argv)
-        @redis.evalsha(digest, keys, argv)
-      rescue ::Redis::CommandError => e
-        raise CommandError, e.message
-      end
+        def eval(redis, script, keys, argv)
+          redis.eval(script, keys, argv)
+        rescue ::Redis::CommandError => e
+          raise CommandError, e.message
+        end
 
-      def purge!
-        @redis.script("flush")
-        @redis.flushdb
+        def evalsha(redis, digest, keys, argv)
+          redis.evalsha(digest, keys, argv)
+        rescue ::Redis::CommandError => e
+          raise CommandError, e.message
+        end
       end
     end
   end

data/lib/redis_prescription/adapters/redis_client.rb

@@ -5,37 +5,26 @@ require_relative "../errors"
 class RedisPrescription
   module Adapters
     # redis-client adapter
-    class RedisClient
-      def self.adapts?(redis)
-        return true if defined?(::RedisClient) && redis.is_a?(::RedisClient)
-        return true if defined?(::RedisClient::Decorator::Client) && redis.is_a?(::RedisClient::Decorator::Client)
-
-        false
-      end
-
-      def initialize(redis)
-        @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
-        raise CommandError, e.message
-      end
-
-      def evalsha(digest, keys, argv)
-        @redis.call("EVALSHA", digest, keys.size, *keys, *argv)
-      rescue ::RedisClient::CommandError => e
-        raise CommandError, e.message
-      end
-
-      def purge!
-        @redis.call("SCRIPT", "FLUSH")
-        @redis.call("FLUSHDB")
+    module RedisClient
+      class << self
+        def adapts?(redis)
+          return true if defined?(::RedisClient) && redis.is_a?(::RedisClient)
+          return true if defined?(::RedisClient::Decorator::Client) && redis.is_a?(::RedisClient::Decorator::Client)
+
+          false
+        end
+
+        def eval(redis, script, keys, argv)
+          redis.call("EVAL", script, keys.size, *keys, *argv)
+        rescue ::RedisClient::CommandError => e
+          raise CommandError, e.message
+        end
+
+        def evalsha(redis, digest, keys, argv)
+          redis.call("EVALSHA", digest, keys.size, *keys, *argv)
+        rescue ::RedisClient::CommandError => e
+          raise CommandError, e.message
+        end
       end
     end
   end

data/lib/redis_prescription/adapters/redis_namespace.rb

@@ -5,34 +5,23 @@ 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
+    module RedisNamespace
+      class << self
+        def adapts?(redis)
+          defined?(::Redis::Namespace) && redis.is_a?(::Redis::Namespace)
+        end
 
-      def evalsha(digest, keys, argv)
-        @redis.evalsha(digest, keys, argv)
-      rescue ::Redis::CommandError => e
-        raise CommandError, e.message
-      end
+        def eval(redis, script, keys, argv)
+          redis.eval(script, keys, argv)
+        rescue ::Redis::CommandError => e
+          raise CommandError, e.message
+        end
 
-      def purge!
-        @redis.redis.script("flush")
-        @redis.redis.flushdb
+        def evalsha(redis, digest, keys, argv)
+          redis.evalsha(digest, keys, argv)
+        rescue ::Redis::CommandError => e
+          raise CommandError, e.message
+        end
       end
     end
   end

data/lib/redis_prescription/adapters.rb

@@ -9,9 +9,9 @@ class RedisPrescription
   module Adapters
     class << self
       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)
+        return Adapters::Redis if Adapters::Redis.adapts?(redis)
+        return Adapters::RedisClient if Adapters::RedisClient.adapts?(redis)
+        return Adapters::RedisNamespace if Adapters::RedisNamespace.adapts?(redis)
 
         raise TypeError, "Unsupported redis client: #{redis.class}"
       end

data/lib/redis_prescription/version.rb

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

data/lib/redis_prescription.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "digest/sha1"
+
 require_relative "./redis_prescription/adapters"
 require_relative "./redis_prescription/errors"
 require_relative "./redis_prescription/version"
@@ -44,18 +46,18 @@ class RedisPrescription
   # @raise [ScriptError] if script execution failed
   # @return depends on the script
   def call(redis, keys: EMPTY_LIST, argv: EMPTY_LIST)
-    evalsha_with_fallback(Adapters[redis], keys, argv)
+    evalsha_with_fallback(Adapters[redis], redis, keys, argv)
   rescue CommandError => e
     raise ScriptError.new(e.message, @source)
   end
 
   private
 
-  def evalsha_with_fallback(redis, keys, argv)
-    redis.evalsha(@digest, keys, argv)
+  def evalsha_with_fallback(adapter, redis, keys, argv)
+    adapter.evalsha(redis, @digest, keys, argv)
   rescue CommandError => e
     raise unless e.message.include?(NOSCRIPT)
 
-    redis.eval(@source, keys, argv)
+    adapter.eval(redis, @source, keys, argv)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-prescription
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Alexey Zapparov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-07 00:00:00.000000000 Z
+date: 2023-04-30 00:00:00.000000000 Z
 dependencies: []
 description: |
   Preloads (and reloads when needed, e.g. when scripts were flushed away)
@@ -35,9 +35,9 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://gitlab.com/ixti/redis-prescription
-  source_code_uri: https://gitlab.com/ixti/redis-prescription
+  source_code_uri: https://gitlab.com/ixti/redis-prescription/tree/v2.6.0
   bug_tracker_uri: https://gitlab.com/ixti/redis-prescription/issues
-  changelog_uri: https://gitlab.com/ixti/redis-prescription/blob/v2.4.0/CHANGES.md
+  changelog_uri: https://gitlab.com/ixti/redis-prescription/blob/v2.6.0/CHANGES.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []