ruby_rate_limiter 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c941d7875c4fabbe2df0861b89e8b7d18af0e001ac3f3e1425e51f59590a300c
-  data.tar.gz: a1a1f7431b4797271fb5db464e771257505ec5b403adc5813aa38b477b223228
+  metadata.gz: fac1847e631354a2a9afe2bf545b46799580d0eb5504afe0a487acb34fb7e9cd
+  data.tar.gz: e1759f509fd0bd3ae66f4f40cdd1380816ae874ff96ac9988e97cf0a55cd74ce
 SHA512:
-  metadata.gz: ef02828da1412884377e4eac4687672be0757ec13409e6bdb31df93b3dfdd3bcab0ffd3786180ddbb172f7c006d99aa0ab14ac933b03730904ee107140f65626
-  data.tar.gz: 652883cc2da93a8eb07b10958f8120d3f57d900338d3d5b43a4fdba8e2d4c8ea5b0a613db0fbba9681997866b30c825f521737b1fa576dff8eaf7b021942ed5e
+  metadata.gz: f4d956f68015d77952ace49a10cf4268775d4152d3a7710fba49b9b7e4c715941548a0d8c5a4e097abd7871ab8239f865ca2ad30afbad3f475e65fdeb0914616
+  data.tar.gz: 71c1ea5ab146f05962b467a159c6fb317482dc75b4c583d4f3fab2cbdb2bc757db2b2270fe1797a0c339d4c5f48015ce53b782710adde9d4fd9e8568a169c695

data/README.md

@@ -44,57 +44,63 @@ require 'ruby_rate_limiter'
 require 'redis'
 
 module RateLimiter
-  def self.bucket
-    @bucket ||= RubyRateLimiter::TokenBucket.new(
-      'user123',
+  DEFAULT_BUCKET_SIZE = 10
+  DEFAULT_REFILL_RATE = 1
+  DEFAULT_TIME_UNIT = :minute
+
+  def self.for(user_identifier:, bucket_size: DEFAULT_BUCKET_SIZE, refill_rate: DEFAULT_REFILL_RATE, time_unit: DEFAULT_TIME_UNIT)
+    RubyRateLimiter::TokenBucket.new(
+      user_identifier: user_identifier,
       storage: RubyRateLimiter::Storage::RedisStorage.new(redis_client),
-      bucket_size: 10,   # Optional: specify bucket size
-      refill_rate: 2     # Optional: specify refill rate (tokens per second)
+      bucket_size: bucket_size,
+      refill_rate: refill_rate,
+      time_unit: time_unit
     )
   end
 
   private
 
   def self.redis_client
-    @redis_client ||= Redis.new(url: 'redis://localhost:6379/1')
+    @redis_client ||= Redis.new(url: ENV['REDIS_URL'])
   end
 end
 
+
+
 ```
 
 ### Usage somewhere, in the controller or better still in a service
 
+Maybe have some service
+
 ```ruby
-class SomeController < ApplicationController
-  def some_action
-    if RateLimiter.bucket.allow_request?
-      # Process the request
-      render json: { message: 'Request processed' }
-    else
-      # Rate limit exceeded
-      render status: 429, json: { error: 'Too many requests' }
-    end
+class RateLimiterService
+  def self.rate_limit_exceeded?(user_identifier)
+    rate_limiter = RateLimiter.for(user_identifier: user_identifier)
+    !rate_limiter.allow_request?
   end
 end
+
 ```
 
+Usage in the controller
+
 ```ruby
-class SomeService
-  def perform
-    if RateLimiter.bucket.allow_request?
-      # Process the request
-      # Perform the service logic here
+class SomeController < ApplicationController
+  def some_action
+    user_identifier = current_user ? "user:#{current_user.id}" : "ip:#{request.remote_ip}"
+    if RateLimiterService.rate_limit_exceeded?(user_identifier)
+      render status: 429, json: { error: 'Too many requests' }
     else
-      # Rate limit exceeded
-      raise 'Too many requests'
+      # Process the request
+      render json: { message: 'Request processed' }
     end
   end
 end
 
-```
-
 Contributing
 Bug reports and pull requests are welcome on GitHub at https://github.com/Mutuba/ruby-rate-limiter.
 
 License
 The gem is available as open source under the terms of the MIT License.
+```

data/lib/ruby_rate_limiter/token_bucket.rb

@@ -1,8 +1,3 @@
-# lib/ruby_rate_limiter/token_bucket.rb
-require 'forwardable'
-require_relative 'storage/abstract_storage'
-require_relative 'storage/redis_storage'
-
 module RubyRateLimiter
   class TokenBucket
     extend Forwardable
@@ -34,20 +29,27 @@ module RubyRateLimiter
     def allow_request?
       refill_tokens
       tokens = get_bucket_size
+      puts "Allow request: tokens before = #{tokens}" # Debugging line
+
       return false if tokens < 1
 
       update_bucket_size(tokens - 1)
+      puts "Allow request: tokens after = #{get_bucket_size}" # Debugging line
       true
     end
 
     private
 
     def get_bucket_size
-      (@storage.get("#{@user_id}_tokens") || @bucket_size).to_i
+      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
-      (@storage.get("#{@user_id}_last_refill") || Time.now.to_f).to_f
+      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
 
     def update_bucket_size(tokens)
@@ -62,13 +64,15 @@ module RubyRateLimiter
       current_time = Time.now.to_f
       last_refill_time = get_last_refill_time
       elapsed_time = current_time - last_refill_time
-
       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
+
       return 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.2"
+  VERSION = "2.0.4"
 end

data/lib/ruby_rate_limiter.rb

@@ -5,7 +5,6 @@ require 'ruby_rate_limiter/token_bucket'
 require 'ruby_rate_limiter/storage/abstract_storage'
 require 'ruby_rate_limiter/storage/redis_storage'
 
-
 module RubyRateLimiter
   class Error < StandardError; end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rate_limiter
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - Mutuba
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis