ablab 0.2.11 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b7bad6cb71ee4a023026838ebc53691b01e2ac0
-  data.tar.gz: 6eed09d871b9709293491c4ac5a2dd9502bf5825
+  metadata.gz: 12f71c1bce10f9c02b35a34690b8c5a3f9116591
+  data.tar.gz: ac5b44830c77f57d30efa75bcd95b0c33648e5f1
 SHA512:
-  metadata.gz: 3ee7a966a7a03e580585ec38db3726739d9e79c3cba7e14e62d065f763037045fb267051c096bb3cd4087084dfce45d62a31b32397fb9680df76ef453bd4118e
-  data.tar.gz: 8c9d2076cf84bf8466f771f55a401e655f622f7af0bd21fa21c09af71f464b8000b23568a70b6f3c7b64edf7019843f1de0404662f4dc41ac0a438a9099d2236
+  metadata.gz: 149c7facb01e5c55f04890ed49afb0281d49068bf319e603b35df286098829d5d9f77c06b81e087a53b7578c1ca219f5f8828ee647b082315b5865b602d74aa9
+  data.tar.gz: 3f6446406904c78461b83d40a4b343cac2a13ae4a03b84f84e425cf3c1d9e4bf6ee87601e7d52c5993f1e919bcab673b528e6765755b704c167c8bd1c79fc246

data/lib/ablab/store/redis.rb

@@ -6,8 +6,9 @@ module Ablab
       attr_reader :redis
 
       def initialize(opts = {})
-        @key_prefix = opts[:key_prefix] || 'ablab'
+        @key_prefix = opts[:key_prefix] || 'ablab:1'
         @redis = ::Redis.new(opts)
+        @session_duration = opts[:session_duration] || (60 * 30)
       end
 
       def track_view!(experiment, bucket, session_id)
@@ -23,7 +24,12 @@ module Ablab
       end
 
       def sessions(experiment, bucket)
-        (redis.pfcount(key(:sessions, experiment, bucket)) || 0).to_i
+        s, z = nil, nil
+        redis.multi do
+          s = redis.zcard(key(:sessions, experiment, bucket))
+          z = redis.get(key(:'sessions:spool', experiment, bucket))
+        end
+        (s.value || 0).to_i + (z.value || 0).to_i
       end
 
       def successes(experiment, bucket)
@@ -31,22 +37,29 @@ module Ablab
       end
 
       def conversions(experiment, bucket)
-        (redis.pfcount(key(:conversions, experiment, bucket)) || 0).to_i
+        c, z = nil, nil
+        redis.multi do
+          c = redis.zcard(key(:conversions, experiment, bucket))
+          z = redis.get(key(:'conversions:spool', experiment, bucket))
+        end
+        (c.value || 0).to_i + (z.value || 0).to_i
       end
 
       def counts(experiment, bucket)
-        v, s, x, c = nil, nil, nil, nil
+        v, s, k, x, c, z = nil, nil, nil, nil, nil, nil
         redis.multi do
           v = redis.get(key(:views, experiment, bucket))
-          s = redis.pfcount(key(:sessions, experiment, bucket))
+          s = redis.zcard(key(:sessions, experiment, bucket))
+          k = redis.get(key(:'sessions:spool', experiment, bucket))
           x = redis.get(key(:successes, experiment, bucket))
-          c = redis.pfcount(key(:conversions, experiment, bucket))
+          c = redis.zcard(key(:conversions, experiment, bucket))
+          z = redis.get(key(:'conversions:spool', experiment, bucket))
         end
         {
           views:       (v.value || 0).to_i,
-          sessions:    (s.value || 0).to_i,
+          sessions:    (s.value || 0).to_i + (k.value || 0).to_i,
           successes:   (x.value || 0).to_i,
-          conversions: (c.value || 0).to_i
+          conversions: (c.value || 0).to_i + (z.value || 0).to_i
         }
       end
 
@@ -58,10 +71,15 @@ module Ablab
         return false if bucket.nil?
         redis.pipelined do
           redis.incr(key(counter, experiment, bucket))
-          redis.pfadd(key(set, experiment, bucket), session_id)
+          redis.zadd(key(set, experiment, bucket), Time.now.to_i, session_id)
         end
+        spool_set!(experiment, bucket, set) if rand(100) < 1
+      end
+
+      private def spool_set!(experiment, bucket, set)
+        n = redis.zremrangebyscore(key(set, experiment, bucket), 0, Time.now.to_i - @session_duration)
+        redis.incrby(key("#{set}:spool", experiment, bucket), n)
       end
     end
   end
 end
-

data/lib/ablab/version.rb

@@ -1,3 +1,3 @@
 module Ablab
-  VERSION = "0.2.11"
+  VERSION = "0.3.0"
 end

data/spec/ablab/store/redis_spec.rb

@@ -21,5 +21,17 @@ describe Ablab::Store::Redis do
 
   let(:store) { Ablab::Store::Redis.new(db: 2, key_prefix: 'ablabtest') }
   include_examples 'store'
+
+  describe 'spool_set!' do
+    it 'does not change the count' do
+      5.times do |i|
+        store.track_view!('foo', 'bar', i)
+      end
+      later = Time.at(Time.now.to_i + 60 * 60)
+      allow(Time).to receive(:now).and_return(later)
+      expect { store.send(:spool_set!, 'foo', 'bar', :sessions) }
+        .not_to change { store.sessions('foo', 'bar') }
+    end
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ablab
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.3.0
 platform: ruby
 authors:
 - Luca Ongaro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails