cymometer 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b6b049e6e1eb9a3e85d76744dbe9b01644b5458d8ab4f865bb8e8eb9e63090f
-  data.tar.gz: 9e4aa50e9cd945d3f59b67dda14dd5b74f7efdd07236d251fde2279a07957770
+  metadata.gz: 20fd5ba47d84bc46e3a7addbea10c7a7703d72203b29b7a72a98298412f926f9
+  data.tar.gz: 84c7c887ddd5db7d15fb4eef9572a021d1184fb53eb2fa516e8ca529a8a05414
 SHA512:
-  metadata.gz: 01df592e5d19b1c9190b36c53934f00dde718e651cd8fa9abcfe9bef164f39aa4ee79b69b4e94bf293714bce0d94d05a7e27e23e901dc3fd541b500e2185aa45
-  data.tar.gz: 675e54015097691ea021beffe114a81ca72bdc3d5d9282d0e78852edd4af7eee3270349bc558c621f58773f2edfd152dceb6ede2ffac96bfbc68ba6226435b7e
+  metadata.gz: be285678db56e5ef239b75c1f375a82c080ab79a65080c3147945187c61a469a967aafe270149bf1bfd8bd8095e1b94b36015d475564b7948448ae55bb404cbf
+  data.tar.gz: 10caff6237da7ddd93cba8db278e96d339598b4a1276d2092321b682299c29b7e73974fecb10b4738578fba1015beedec29c5efbd78e1f3b2b0526458ea6c955

data/lib/cymometer/counter.rb

@@ -1,4 +1,5 @@
 require "securerandom"
+require "digest/sha1"
 
 module Cymometer
   class Counter
@@ -8,7 +9,7 @@ module Cymometer
 
     attr_reader :window, :limit, :key
 
-    INCREMENT_LUA_SCRIPT = <<-LUA
+    INCREMENT_LUA_SCRIPT = <<-LUA.freeze
       local key = KEYS[1]
       local current_time = tonumber(ARGV[1])
       local window = tonumber(ARGV[2])
@@ -31,7 +32,7 @@ module Cymometer
       end
     LUA
 
-    DECREMENT_LUA_SCRIPT = <<-LUA
+    DECREMENT_LUA_SCRIPT = <<-LUA.freeze
       local key = KEYS[1]
       local current_time = tonumber(ARGV[1])
       local window = tonumber(ARGV[2])
@@ -54,13 +55,18 @@ module Cymometer
       end
     LUA
 
+    @increment_sha = Digest::SHA1.hexdigest(INCREMENT_LUA_SCRIPT).freeze
+    @decrement_sha = Digest::SHA1.hexdigest(DECREMENT_LUA_SCRIPT).freeze
+
+    class << self
+      attr_reader :increment_sha, :decrement_sha
+    end
+
     def initialize(key_namespace: nil, key: nil, limit: nil, window: nil, redis: nil)
       @redis = redis || Cymometer.redis
       @key = "#{key_namespace || "cymometer"}:#{key || generate_key}"
       @window = window || DEFAULT_WINDOW
       @limit = limit || 1
-      @increment_sha = nil
-      @decrement_sha = nil
     end
 
     # Atomically increments the counter and checks the limit
@@ -70,7 +76,6 @@ module Cymometer
 
       result = evalsha_with_fallback(
         :increment,
-        INCREMENT_LUA_SCRIPT,
         keys: [@key],
         argv: [current_time, window, @limit]
       )
@@ -90,7 +95,6 @@ module Cymometer
 
       result = evalsha_with_fallback(
         :decrement,
-        DECREMENT_LUA_SCRIPT,
         keys: [@key],
         argv: [current_time, window]
       )
@@ -126,23 +130,16 @@ module Cymometer
       SecureRandom.uuid
     end
 
-    def evalsha_with_fallback(type, script, keys:, argv:)
-      sha_var = (type == :increment) ? :@increment_sha : :@decrement_sha
+    def evalsha_with_fallback(type, keys:, argv:)
+      script = (type == :increment) ? INCREMENT_LUA_SCRIPT : DECREMENT_LUA_SCRIPT
+      sha = (type == :increment) ? self.class.increment_sha : self.class.decrement_sha
 
-      sha = instance_variable_get(sha_var)
-      begin
-        # Try EVALSHA first
-        sha ||= @redis.script(:load, script)
-        instance_variable_set(sha_var, sha)
-        @redis.evalsha(sha, keys: keys, argv: argv)
-      rescue Redis::CommandError => e
-        raise unless e.message.include?("NOSCRIPT")
-
-        # If the script wasn't loaded, reload and try again
-        sha = @redis.script(:load, script)
-        instance_variable_set(sha_var, sha)
-        @redis.evalsha(sha, keys: keys, argv: argv)
-      end
+      @redis.evalsha(sha, keys: keys, argv: argv)
+    rescue Redis::CommandError => e
+      raise unless e.message.include?("NOSCRIPT")
+
+      @redis.script(:load, script)
+      @redis.evalsha(sha, keys: keys, argv: argv)
     end
   end
 end

data/lib/cymometer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cymometer
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cymometer
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Charlton Trezevant
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-11 00:00:00.000000000 Z
+date: 2025-06-12 00:00:00.000000000 Z
 dependencies: []
 description: A simple, atomic, memory-efficient frequency counter backed by Redis
   Sorted Sets.