Bugfixes and bump to version 0.1.6.

phlegx · May 17, 2016 · 0571b30 · 0571b30
1 parent 6503beb
commit 0571b30
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/lib/redlics/counter.rb b/lib/redlics/counter.rb
@@ -55,10 +55,7 @@ def count_with_block
       # @return [Array] list of counted granularities
       def count_with_args(*args)
         options = args.last.instance_of?(Hash) ? args.pop : {}
-        options.merge!({
-          event: args[0],
-          id: args[1]
-        })
+        options.merge!(event: args[0])
         count_with_hash(options)
       end
 
@@ -72,7 +69,7 @@ def count_by_hash(options)
         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])
+          redis.expire(key[0], (options[:expiration_for] && options[:expiration_for][granularity] || Redlics.config.counter_expirations[granularity]).to_i)
         end
       end
 
@@ -86,7 +83,7 @@ def count_by_key(options)
         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])
+          redis.expire(key, (options[:expiration_for] && options[:expiration_for][granularity] || Redlics.config.counter_expirations[granularity]).to_i)
         end
       end
 

diff --git a/lib/redlics/tracker.rb b/lib/redlics/tracker.rb
@@ -31,7 +31,7 @@ def track_with_hash(options)
           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])
+            redis.expire(key, (options[:expiration_for] && options[:expiration_for][granularity] || Redlics.config.tracker_expirations[granularity]).to_i)
           end
         end
       end

diff --git a/lib/redlics/version.rb b/lib/redlics/version.rb
@@ -1,4 +1,4 @@
 # Redlics version.
 module Redlics
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end