redlics 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 724a34a6d432d7dced851a903f0af979f157c7cd
-  data.tar.gz: 94ec00b7a62ee7a1d6a87d934fb604b84388b93b
+  metadata.gz: 5c952b2aaef0c600c43759b347f42cf121f84359
+  data.tar.gz: 1f1122c2deeb9bcca5f77dbd2f577e81acc15a1f
 SHA512:
-  metadata.gz: e67674ebcd341d698a475a3a04730f1d00a0f911a7108e6e268074927676ec2d869b8f9ec5998204f3e060e07c510afb7e876d8a81f4018f2adeaf9d629330cf
-  data.tar.gz: b105b0e91e2459388d1c21ace343f95b34ac61e15712d32fae33455733029b29bf60496994a13827a812045379b11f97c10ab3ee12922c13427ee22cfa80605c
+  metadata.gz: 7f5f5f504154cf0e53cff914c6dbd4ea33c29ecaf0519a38630fa20a649c39270823ead3b5c6c6e693957f34bcbe7f22180433953aa11d0f1345841ab05e39de
+  data.tar.gz: 7c66a67307b5873d43ada08c4cf8c3b43a4b1db9b75fb7322b8990425c742ea851864d9b472302651e4b20b40f1058fe648fefaf5b8c885c53cc0e606142f772

data/README.md

@@ -64,7 +64,7 @@ Redlics.configure do |config|
     ids: true
   }
   config.granularities = {
-    minutely: { step: 1.minute, pattern: '%Y%m%d%H%m' },
+    minutely: { step: 1.minute, pattern: '%Y%m%d%H%M' },
     hourly:   { step: 1.hour,   pattern: '%Y%m%d%H' },
     daily:    { step: 1.day,    pattern: '%Y%m%d' },
     weekly:   { step: 1.week,   pattern: '%GW%V' },

data/lib/redlics.rb

@@ -27,10 +27,11 @@ module Redlics
   # Get or initialize the Redis connection.
   # @return [Object] redis connection
   def redis
+    raise ArgumentError, 'requires a block' unless block_given?
     redis_pool.with do |conn|
       retryable = true
       begin
-        conn
+        yield conn
       rescue Redis::BaseError => e
         raise e unless config.silent
       rescue Redis::CommandError => ex
@@ -48,19 +49,19 @@ module Redlics
   # @return [String] Lua script result
   def script(file, *args)
     begin
-      cache = LUA_CACHE[redis.client.options[:url]]
+      cache = LUA_CACHE[redis { |r| r.client.options[:url] }]
       if cache.key?(file)
         sha = cache[file]
       else
         src = File.read(file)
-        sha = redis.script(:load, src)
+        sha = redis { |r| r.script(:load, src) }
         cache[file] = sha
       end
-      redis.evalsha(sha, *args)
+      redis { |r| r.evalsha(sha, *args) }
     rescue RuntimeError
       case $!.message
       when Exception::ErrorPatterns::NOSCRIPT
-        LUA_CACHE[redis.client.options[:url]].clear
+        LUA_CACHE[redis { |r| r.client.options[:url] }].clear
         retry
       else
         raise $! unless config.silent

data/lib/redlics/config.rb

@@ -33,7 +33,7 @@ module Redlics
           ids: true
         },
         granularities: {
-          minutely: { step: 1.minute, pattern: '%Y%m%d%H%m' },
+          minutely: { step: 1.minute, pattern: '%Y%m%d%H%M' },
           hourly:   { step: 1.hour,   pattern: '%Y%m%d%H' },
           daily:    { step: 1.day,    pattern: '%Y%m%d' },
           weekly:   { step: 1.week,   pattern: '%GW%V' },

data/lib/redlics/counter.rb

@@ -67,9 +67,11 @@ module Redlics
       def count_by_hash(options)
         granularity = options[:granularity]
         key = Key.name(CONTEXT, options[:event], granularity, options[:past], { id: options[:id], bucketized: true })
-        Redlics.redis.pipelined do |redis|
-          redis.hincrby(key[0], key[1], 1)
-          redis.expire(key[0], (options[:expiration_for] && options[:expiration_for][granularity] || Redlics.config.counter_expirations[granularity]).to_i)
+        Redlics.redis do |conn|
+          conn.pipelined do |redis|
+            redis.hincrby(key[0], key[1], 1)
+            redis.expire(key[0], (options[:expiration_for] && options[:expiration_for][granularity] || Redlics.config.counter_expirations[granularity]).to_i)
+          end
         end
       end
 
@@ -81,9 +83,11 @@ module Redlics
       def count_by_key(options)
         granularity = options[:granularity]
         key = Key.name(CONTEXT, options[:event], granularity, options[:past], { id: options[:id], bucketized: false })
-        Redlics.redis.pipelined do |redis|
-          redis.incr(key)
-          redis.expire(key, (options[:expiration_for] && options[:expiration_for][granularity] || Redlics.config.counter_expirations[granularity]).to_i)
+        Redlics.redis do |conn|
+          conn.pipelined do |redis|
+            redis.incr(key)
+            redis.expire(key, (options[:expiration_for] && options[:expiration_for][granularity] || Redlics.config.counter_expirations[granularity]).to_i)
+          end
         end
       end
 

data/lib/redlics/key.rb

@@ -97,7 +97,7 @@ module Redlics
     # @param string [String] the key name to check
     # @return [Boolean] true id key exists, false if not
     def exists?(key)
-      Redlics.redis.exists(key)
+      Redlics.redis { |r| r.exists(key) }
     end
 
 
@@ -117,9 +117,11 @@ module Redlics
       loop do
         ns = operation
         unless exists?(ns)
-          Redlics.redis.pipelined do |redis|
-            redis.set(ns, 0)
-            redis.expire(ns, Redlics.config.operation_expiration)
+          Redlics.redis do |conn|
+            conn.pipelined do |redis|
+              redis.set(ns, 0)
+              redis.expire(ns, Redlics.config.operation_expiration)
+            end
           end
           break ns
         end

data/lib/redlics/query.rb

@@ -44,7 +44,7 @@ module Redlics
     # Get or process tracks on Redis.
     # @return [Integer] tracks result of given query
     def tracks
-      @tracks ||= Redlics.redis.bitcount(track_bits)
+      @tracks ||= Redlics.redis { |r| r.bitcount(track_bits) }
     end
 
 
@@ -65,7 +65,7 @@ module Redlics
     # @return [Boolean] true if exists, false if not
     # @return [NilClass] nil if no object id is given
     def exists?
-      @exists ||= @options[:id] ? Redlics.redis.getbit(track_bits, @options[:id]) == 1 : nil
+      @exists ||= @options[:id] ? Redlics.redis { |r| r.getbit(track_bits, @options[:id]) } == 1 : nil
     end
 
 
@@ -197,7 +197,7 @@ module Redlics
       # @return [Integer] result of Redis delete keys
       # @return [NilClass] nil if namespaces are empty
       def reset_redis_namespaces(namespaces)
-        Redlics.redis.del(namespaces) if namespaces.any?
+        Redlics.redis { |r| r.del(namespaces) } if namespaces.any?
       end
 
     end

data/lib/redlics/query/operation.rb

@@ -30,7 +30,7 @@ module Redlics
       # @return [Integer] tracks result of given query operation
       def tracks
         @tracks ||= (
-          Redlics.redis.bitcount(@track_bits || traverse)
+          Redlics.redis { |r| r.bitcount(@track_bits || traverse) }
         )
       end
 
@@ -59,7 +59,7 @@ module Redlics
       # @param [Integer] the object id to check
       # @return [Boolean] true if exists, false if not
       def exists?(id)
-        Redlics.redis.getbit(@track_bits || traverse, id.to_i) == 1
+        Redlics.redis { |r| r.getbit(@track_bits || traverse, id.to_i) } == 1
       end
 
 
@@ -109,7 +109,7 @@ module Redlics
         # @return [Integer] result of Redis delete keys
         # @return [NilClass] nil if namespaces are empty
         def reset_redis_namespaces(namespaces)
-          Redlics.redis.del(namespaces) if namespaces.any?
+          Redlics.redis { |r| r.del(namespaces) } if namespaces.any?
         end
 
       end

data/lib/redlics/tracker.rb

@@ -29,9 +29,11 @@ module Redlics
       def track_with_hash(options)
         Granularity.validate(CONTEXT, options[:granularity]).each do |granularity|
           key = Key.name(CONTEXT, options[:event], granularity, options[:past])
-          Redlics.redis.pipelined do |redis|
-            redis.setbit(key, options[:id].to_i, 1)
-            redis.expire(key, (options[:expiration_for] && options[:expiration_for][granularity] || Redlics.config.tracker_expirations[granularity]).to_i)
+          Redlics.redis do |conn|
+            conn.pipelined do |redis|
+              redis.setbit(key, options[:id].to_i, 1)
+              redis.expire(key, (options[:expiration_for] && options[:expiration_for][granularity] || Redlics.config.tracker_expirations[granularity]).to_i)
+            end
           end
         end
       end

data/lib/redlics/version.rb

@@ -1,4 +1,4 @@
 # Redlics version.
 module Redlics
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/test/redlics_test.rb

@@ -7,7 +7,7 @@ describe Redlics do
 
 
   it 'must respond positively' do
-    subject.redis.namespace.must_equal Redlics.config.namespace
+    subject.redis { |r| r.namespace }.must_equal Redlics.config.namespace
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redlics
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Egon Zemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool