pubsubstub 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13fa1f1bf8d271516e2ed2389138bf55184d8b13
-  data.tar.gz: dd1bfc72703d76dc3f6a826bd8b69121efaf1a42
+  metadata.gz: 47ff717bde3d2e41574d94a5f95e7a01a086c425
+  data.tar.gz: d14af107a0b1be58b2afa83f2a221def5d2a436c
 SHA512:
-  metadata.gz: d3948cd0bbbc474de69185969dd120135941a16ecc4eb8c24fe508f80f83130a3b3f6faf4d0a7c6845f1050580222b059bb0581630d4bb4f09916593c0c9dd82
-  data.tar.gz: 03fe2195a09f6c5bf6cb275399e0f2a447a609c4241e355f3ca7b732edb7d0307157bcb17aee95d89bba99126b4a3c6aa914811d80a6dbc7f436cb5a9a466154
+  metadata.gz: 38de78410010ea79af53323418bc7804b47b3b07a3900de2199f7692209b3e16b5e4e317ad48b275dce723c68ebf780bc95e605fae2eda6e7b9a36e5ae5d8ab6
+  data.tar.gz: 0911311b184fce34bf5d3845ebccb9a59e05a8a4ae878fd741b4f656db0bf665c4bd5130446b01257a56fecc1520cab9eb2ecd2ce355165cec899db43d2f5645

data/lib/pubsubstub/redis_pub_sub.rb

@@ -1,5 +1,8 @@
 module Pubsubstub
   class RedisPubSub
+    EVENT_SCORE_THRESHOLD = 1000
+    EXPIRE_THRESHOLD = 24 * 60 * 60
+
     def initialize(channel_name)
       @channel_name = channel_name
     end
@@ -38,8 +41,13 @@ module Pubsubstub
 
     class << self
       def publish(channel_name, event)
-        blocking_redis.publish("#{channel_name}.pubsub", event.to_json)
-        blocking_redis.zadd("#{channel_name}.scrollback", event.id, event.to_json)
+        scrollback = "#{channel_name}.scrollback"
+        blocking_redis.pipelined do
+          blocking_redis.publish("#{channel_name}.pubsub", event.to_json)
+          blocking_redis.zadd(scrollback, event.id, event.to_json)
+          blocking_redis.zremrangebyrank(scrollback, 0, -EVENT_SCORE_THRESHOLD)
+          blocking_redis.expire(scrollback, EXPIRE_THRESHOLD)
+        end
       end
 
       def sub

data/lib/pubsubstub/version.rb

@@ -1,3 +1,3 @@
 module Pubsubstub
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/redis_pub_sub_spec.rb

@@ -9,14 +9,30 @@ describe Pubsubstub::RedisPubSub do
       let(:redis) { double('redis') }
       let(:event) { double('Event', to_json: "event_data", id: 1234) }
       before {
-        allow(subject).to receive(:blocking_redis) { redis }
+        allow(redis).to receive(:pipelined).and_yield
       }
 
       it "publishes the event to a redis channel and adds it to the scrollback" do
+        allow(subject).to receive(:blocking_redis) { redis }
         expect(redis).to receive(:publish).with("test.pubsub", event.to_json)
         expect(redis).to receive(:zadd).with("test.scrollback", event.id, event.to_json)
+        expect(redis).to receive(:zremrangebyrank).with("test.scrollback", 0, -1000)
+        expect(redis).to receive(:expire).with("test.scrollback", Pubsubstub::RedisPubSub::EXPIRE_THRESHOLD)
         subject.publish("test", event)
       end
+
+      it "truncates the scrollback" do
+        count = Pubsubstub::RedisPubSub::EVENT_SCORE_THRESHOLD
+        (1...count).each do |id|
+          event = double(to_json: "event_data #{id}", id: id)
+          subject.publish('test', event)
+        end
+        expect(subject.blocking_redis.zcard("test.scrollback")).to eq(count - 1)
+
+        event = double(to_json: "event_data N", id: count)
+        subject.publish('test', event)
+        expect(subject.blocking_redis.zcard("test.scrollback")).to eq(count - 1)
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubsubstub
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Guillaume Malette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-24 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra