circuitry 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9183d64596ee7f88393c7ef2a9469e493622dbd
-  data.tar.gz: fbf9569e2e8d3ee9c55693decebc6a60b2aff295
+  metadata.gz: 2c5939511fb1a459b3a6674d0adccd6138235674
+  data.tar.gz: 25c640746707e9b6a34fc016110a8b5069ad730b
 SHA512:
-  metadata.gz: 3a6fb3550295bdada1eb956aa8fc15ea46db14cf35ec19bcdbf0c5521bbfe6a9f0a87395ed000c1f5f53dec492feba389c703b0e46115af280184f096b778403
-  data.tar.gz: e84272270e33d8ca0eee876df181666b37dea65b0c361ef3379aa748d857632f6257909509d20a205f2e01d4811d8ec624cc1c0dfe254c99584b37ebede604ba
+  metadata.gz: 2119226fb89515758f04f426bf5b1d8e5576e27a7a1e12108ad35b8b0e03dc0085d42184095a2dd8a347d7c5a58cd3b6409edb55fa5d661bc29f8958ba8125e5
+  data.tar.gz: f1a5eadbfcf85445908d6c333eed171ac49e3e28d851a949460dd84f5282a67150ce244c8f3ea13c23f7ff708e479e2ee5966857cba827a4353b4fa8261c030f

data/README.md

@@ -297,14 +297,19 @@ a new `Redis` object.
 Circuitry::Locks::Redis.new(url: 'redis://localhost:6379')
 ```
 
-The second way is to pass in a `:client` option that specifies the redis client
-itself.  This is useful for more advanced usage such as sharing an existing redis
-connection, utilizing [Redis::Namespace](https://github.com/resque/redis-namespace),
-or utilizing [hiredis](https://github.com/redis/hiredis-rb).
+The second way is to pass in a `:client` option that specifies either the redis
+client itself or a [ConnectionPool](https://github.com/mperham/connection_pool)
+of redis clients.  This is useful for more advanced usage such as sharing an
+existing redis connection, connection pooling, utilizing
+[Redis::Namespace](https://github.com/resque/redis-namespace), or utilizing
+[hiredis](https://github.com/redis/hiredis-rb).
 
 ```ruby
 client = Redis.new(url: 'redis://localhost:6379')
 Circuitry::Locks::Redis.new(client: client)
+
+client = ConnectionPool.new(size: 5) { Redis.new }
+Circuitry::Locks::Redis.new(client: client)
 ```
 
 #### Memcache

data/lib/circuitry/locks/redis.rb

@@ -15,20 +15,38 @@ module Circuitry
       protected
 
       def lock(key, ttl)
-        client.set(key, (Time.now + ttl).to_i, ex: ttl, nx: true)
+        with_pool do |client|
+          client.set(key, (Time.now + ttl).to_i, ex: ttl, nx: true)
+        end
       end
 
       def lock!(key, ttl)
-        client.set(key, (Time.now + ttl).to_i, ex: ttl)
+        with_pool do |client|
+          client.set(key, (Time.now + ttl).to_i, ex: ttl)
+        end
       end
 
       def unlock!(key)
-        client.del(key)
+        with_pool do |client|
+          client.del(key)
+        end
       end
 
       private
 
       attr_accessor :client
+
+      def with_pool(&block)
+        if pool?
+          client.with(&block)
+        else
+          block.call(client)
+        end
+      end
+
+      def pool?
+        defined?(ConnectionPool) && client.is_a?(ConnectionPool)
+      end
     end
   end
 end

data/lib/circuitry/topic.rb

@@ -7,7 +7,7 @@ module Circuitry
     end
 
     def name
-      arn.split(':').last
+      @name ||= arn.split(':').last
     end
 
     def ==(obj)

data/lib/circuitry/version.rb

@@ -1,3 +1,3 @@
 module Circuitry
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: circuitry
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Matt Huggins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws