bearcat 1.5.40 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3236497a9855e8e10a1f6d658ff1d0a58c5ab584807af6855ff3ec7bdecec613
-  data.tar.gz: 3ac14e60f373fb3ba5fe4c805ac7865a727859df438c52dd237ad368f1fa19e5
+  metadata.gz: ac375521a4820c6403d1ef93205828d8de6fc3456a5ede22e0c2a36f38aede93
+  data.tar.gz: f2e89a06538fd5afd4c925439a739b883224b085164cd86f516e9bc8116ca9bd
 SHA512:
-  metadata.gz: c68b1547fe4ad1d6940ea56432edae963419f28e9e2dee93ce7f3c66d7ccb809e44cbbd0be60f223d2503e5f878a9e8d4b9b506ce05b10e8c9c3dbe1af8a7389
-  data.tar.gz: 29613910bfe3a083bdc1035f6ec104b84810ed109cd3b62a62907d5010ad55cbe3edd31aa9e020cfe64cb4a843cc348b4a8b3bbecff05f05e38f7513cd3c51ac
+  metadata.gz: 39ec7c3b55d2fc07bf84b35a34a1193618f14f51d0ce21fac9e31650c2ea1b2ba5a383070f3683f6f3b6de6a4ecdff44b1887273aa3b89ed23ff9e5203f3591b
+  data.tar.gz: d3897fac75a11f98df238ac2594ffc21ec0d3a9ad31ccf5b6d9aa409b1f83f97d93e46b62f9c748315a61f7cfc9200c8bd87622489df10b3bbf507018caf4e97

data/bearcat.gemspec

@@ -34,5 +34,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "activesupport"
   gem.add_dependency "footrest", ">= 0.2.2"
-  gem.add_dependency "connection_pool", ">= 2.2.0", "< 3.0"
+  gem.add_dependency "rediconn", "~> 0.1.0"
 end

data/lib/bearcat/client/reports.rb

@@ -1,5 +1,3 @@
-require 'csv'
-
 module Bearcat
   class Client < Footrest::Client
     module Reports

data/lib/bearcat/client.rb

@@ -2,7 +2,6 @@ require 'active_support/core_ext/hash'
 require 'footrest/client'
 require_relative 'rate_limiting'
 require_relative 'client_module'
-require_relative 'redis_connection'
 
 module Bearcat
   class Client < Footrest::Client
@@ -99,7 +98,7 @@ module Bearcat
         rl = config[:rate_limiter] || Bearcat.rate_limiter
         master_rate_limit = config[:master_rate_limit].present? ? config[:master_rate_limit] : Bearcat.master_rate_limit
 
-        if rl.nil? && master_rate_limit.nil? && defined?(Rails) && Rails.env.production? && defined?(::Redis) && Bearcat::RedisConnection.configured?("BEARCAT", explicit: false)
+        if rl.nil? && master_rate_limit.nil? && defined?(Rails) && Rails.env.production? && defined?(::Redis) && RediConn::RedisConnection.configured?("BEARCAT", explicit: false)
           master_rate_limit = true
         end
 

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/version.rb

@@ -1,3 +1,3 @@
 module Bearcat
-  VERSION = '1.5.40' unless defined?(Bearcat::VERSION)
+  VERSION = '1.6.1' unless defined?(Bearcat::VERSION)
 end

data/lib/bearcat.rb

@@ -1,6 +1,5 @@
 require 'bearcat/version'
 require 'bearcat/client'
-require 'bearcat/redis_connection'
 
 module Bearcat
   class << self
@@ -37,15 +36,12 @@ module Bearcat
     end
 
     def redis_pool
-      require 'bearcat/redis_connection'
-      @redis_pool ||= Bearcat::RedisConnection.create(env_prefix: "BEARCAT")
+      require 'rediconn'
+      @redis_pool ||= RediConn::RedisConnection.create(env_prefix: "BEARCAT")
     end
 
-    def redis
-      raise ArgumentError, "requires a block" unless block_given?
-      redis_pool.with do |conn|
-        yield conn
-      end
+    def redis(&blk)
+      redis_pool.lazy_with(&blk)
     end
   end
 end