bearcat 1.5.0.beta2 → 1.5.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eebb8dddf4346967e2667d229aaeb7f6f8e952d179374fd031409ceaf454f162
-  data.tar.gz: fd7aa76b7318d0d884efc2e33551c3cee467ccbf81c4a8497e6c83dd4d2e3664
+  metadata.gz: 830e59c042dbbc2af216f866ac9256836fddd0162a8fd007d3688251a640cfd9
+  data.tar.gz: f7bb5edaae3618574f53e31c648e284e9b20259ab213bea0418a9b02fd91244c
 SHA512:
-  metadata.gz: b22779cb1c4ded1d20efb675c0d554ddbc4ad773d5708b5ef3729bdc49fc5bbff9b82f4cb004fcef28a31d9648024e9fbf5a98295ba9ab7630c9c7daa28b0c80
-  data.tar.gz: 4b135c91ed60ba46adbcb4035940afc33b862f1bb1b623c2bda7a0adfc4d907f63298be9419b7af23f79b69127d3f94a100dd931360cdf533b6bf8de4a70407a
+  metadata.gz: 3a8d5b6ccf14fbd6300f1779ea86910421ac0d9b3df38598327cd2b6a4fa3ac1e160f1f1324a7583f37e24de8a75deb74d14d480f1a8f89759ed6b2ce7c5dac7
+  data.tar.gz: e8e7aecf6176f92745c32d5e2722176654298fd67593030245da304beb605eb3165d50b7d930e5983d226e8f4ddda93a8471919a768c32613fa3cd9e66c95b89

data/bearcat.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.summary =       %q{Canvas API}
 
   gem.files = %w[Rakefile bearcat.gemspec]
-  gem.files += Dir.glob("lib/**/*.rb")
+  gem.files += Dir.glob("lib/**/*")
   gem.files += Dir.glob("spec/**/*")
   gem.test_files    = Dir.glob("spec/**/*")
   gem.name          = "bearcat"

data/lib/bearcat/rate_limiting/functions.lua

@@ -0,0 +1,11 @@
+#!lua name=bearcat_rate_limiting
+
+local function checkin_time(keys, args)
+    local return_time = args[1]
+    local true_remaining = args[2]
+
+    local hash = keys[1]
+    return redis.call('HGET', hash, '_last_modified_')
+end
+
+redis.register_function('my_hset', my_hset)

data/lib/bearcat/rate_limiting/increment_bucket.lua

@@ -0,0 +1,33 @@
+local cache_key = KEYS[1]
+
+local amount = tonumber(ARGV[1])
+local current_time = tonumber(ARGV[2])
+local outflow = tonumber(ARGV[3])
+local maximum = tonumber(ARGV[4])
+
+local leak = function(count, last_touched, current_time, outflow)
+  if count > 0 then
+    local timespan = current_time - last_touched
+    local loss = outflow * timespan
+    if loss > 0 then
+      count = count - loss
+    end
+  end
+  return count, last_touched
+end
+
+local count, last_touched = unpack(redis.call('HMGET', cache_key, 'count', 'timestamp'))
+count = tonumber(count or 0)
+last_touched = tonumber(last_touched or current_time)
+
+count, last_touched = leak(count, last_touched, current_time, outflow)
+if count < 0 then count = 0 end
+
+count = count + amount
+if count < 0 then count = 0 end
+if count > maximum then count = maximum end
+
+redis.call('HMSET', cache_key, 'count', count, 'timestamp', current_time)
+redis.call('EXPIRE', cache_key, 600)
+
+return { tostring(count), tostring(current_time) }

data/lib/bearcat/version.rb

@@ -1,3 +1,3 @@
 module Bearcat
-  VERSION = '1.5.0.beta2' unless defined?(Bearcat::VERSION)
+  VERSION = '1.5.0.beta3' unless defined?(Bearcat::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bearcat
 version: !ruby/object:Gem::Version
-  version: 1.5.0.beta2
+  version: 1.5.0.beta3
 platform: ruby
 authors:
 - Nathan Mills, Jake Sorce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-24 00:00:00.000000000 Z
+date: 2023-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -180,6 +180,8 @@ files:
 - lib/bearcat/client/users.rb
 - lib/bearcat/client_module.rb
 - lib/bearcat/rate_limiting.rb
+- lib/bearcat/rate_limiting/functions.lua
+- lib/bearcat/rate_limiting/increment_bucket.lua
 - lib/bearcat/rate_limiting/redis_script.rb
 - lib/bearcat/spec_helpers.rb
 - lib/bearcat/version.rb