ruby_rate_limiter 2.0.8 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f812a1ae8b8449217f489de3234d4f26a077bdc4f8bd6653dbe29457c363ab23
-  data.tar.gz: f2941667395af0a013e11c87394ab355ed5c01ec789fdc294e5eb84ef4ac4c3b
+  metadata.gz: a23283f4cf54bc34f7fa761e08c79032c9de40ccc7a4da6d5af6e3498e474017
+  data.tar.gz: f4e11f0d03ea1a2532cffc98bbfe3707d50c58ed6f033cce3b7b39f09034ad15
 SHA512:
-  metadata.gz: ebd5d104e4172e0b32856dc26b815b04d0a49b89b35e7a9c8520ad474ab00e2dfb5c2771078a579e8c9075b49ed84a75c2b98e5e5ad672ec4b750ef576ea1eaf
-  data.tar.gz: e402b83a46be87121443283dc178a8eabed68056c44a23423f2c008d0bc5f9c7d8f5a870fb1c00ef629f5ad006501c42267fbb4ae01532030f434409662b8d1c
+  metadata.gz: 3f52b1a24f3c2022fc451b1b2bfc591a89f006f7c04a5f9d33030840341c0bcc1772c0a3319f850f1b046ae9c8dead896a02fd67539fac5e713ab947ba0e1745
+  data.tar.gz: 15c4b5b4895957972139afce12a97ac3b64e53754e1b755b71e78289216c6e0f232c2ddb09c49250cb69279d96641507b686525b830691a40ec30fec7692f8ab

data/lib/ruby_rate_limiter/storage/redis_storage.rb

@@ -1,6 +1,5 @@
 # lib/ruby_rate_limiter/storage/redis_storage.rb
 require 'redis'
-require_relative 'abstract_storage'
 
 module RubyRateLimiter
   module Storage
@@ -14,7 +13,15 @@ module RubyRateLimiter
       end
 
       def set(key, value)
-        @redis.set(key, value)
+        @redis.setnx(key, value)
+      end
+
+      def watch(key, &block)
+        @redis.watch(key, &block)
+      end
+
+      def multi(&block)
+        @redis.multi(&block)
       end
     end
   end

data/lib/ruby_rate_limiter/token_bucket.rb

@@ -1,12 +1,12 @@
 # lib/ruby_rate_limiter/token_bucket.rb
 require 'forwardable'
+require 'logger'
 require_relative 'storage/abstract_storage'
 require_relative 'storage/redis_storage'
 
 module RubyRateLimiter
   class TokenBucket
     extend Forwardable
-
     DEFAULT_BUCKET_SIZE = 10
     DEFAULT_REFILL_RATE = 1
     DEFAULT_STORAGE = RubyRateLimiter::Storage::RedisStorage.new
@@ -29,40 +29,41 @@ module RubyRateLimiter
       @bucket_size = bucket_size
       @refill_rate_per_second = refill_rate.to_f / TIME_UNITS[time_unit]
       @storage = storage
+
+      @logger = Logger.new(STDOUT)
+      @logger.level = Logger::DEBUG 
       initialize_bucket
     end
 
     def allow_request?
       refill_tokens
       tokens = get_bucket_size
-      puts "Allow request: tokens before = #{tokens}" # Debugging line
+      @logger.info "Allow request: tokens before = #{tokens}" 
 
       return false if tokens < 1
 
       update_bucket_size(tokens - 1)
-      puts "Allow request: tokens after = #{get_bucket_size}" # Debugging line
+      @logger.info "Allow request: tokens after = #{get_bucket_size}" 
       true
     end
 
     private
 
     def initialize_bucket
-      if @storage.get("#{@user_id}_tokens").nil?
+      if @storage.get("#{@user_id}_tokens").empty?
         update_bucket_size(@bucket_size)
         update_last_refill_time(Time.now.to_f)
-        puts "Initialized bucket: tokens = #{@bucket_size}, time = #{Time.now.to_f}"
+        @logger.info "Initialized bucket: tokens = #{@bucket_size}, time = #{Time.now.to_f}"
       end
     end
 
     def get_bucket_size
       size = (@storage.get("#{@user_id}_tokens") || @bucket_size).to_i
-      puts "get_bucket_size: #{@user_id}_tokens = #{size}" # Debugging line
       size
     end
 
     def get_last_refill_time
       last_refill = (@storage.get("#{@user_id}_last_refill") || Time.now.to_f).to_f
-      puts "get_last_refill_time: #{@user_id}_last_refill = #{last_refill}" # Debugging line
       last_refill
     end
 
@@ -80,18 +81,15 @@ module RubyRateLimiter
       elapsed_time = current_time - last_refill_time
     
       if elapsed_time < 0
-        puts "Warning: elapsed_time is negative. Adjusting to zero."
         elapsed_time = 0
       end
     
       new_tokens = (elapsed_time * @refill_rate_per_second).to_i
-      puts "Refill tokens: current_time = #{current_time}, last_refill_time = #{last_refill_time}, elapsed_time = #{elapsed_time}, new_tokens = #{new_tokens}" # Debugging line
-    
+
       if new_tokens > 0
         tokens = [get_bucket_size + new_tokens, @bucket_size].min
         update_bucket_size(tokens)
         update_last_refill_time(current_time)
-        puts "Refill tokens: updated tokens = #{tokens}, current_time = #{current_time}" # Debugging line
       end
     end
   end

data/lib/ruby_rate_limiter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RateLimiter
-  VERSION = "2.0.8"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rate_limiter
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.1.0
 platform: ruby
 authors:
 - Mutuba