pubsubstub 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47ff717bde3d2e41574d94a5f95e7a01a086c425
-  data.tar.gz: d14af107a0b1be58b2afa83f2a221def5d2a436c
+  metadata.gz: a0ea373d5be1e2b83c65048f8d24f34c942ebabc
+  data.tar.gz: b0c58d16d5c69ccc221527e134a1ab74172c8ec3
 SHA512:
-  metadata.gz: 38de78410010ea79af53323418bc7804b47b3b07a3900de2199f7692209b3e16b5e4e317ad48b275dce723c68ebf780bc95e605fae2eda6e7b9a36e5ae5d8ab6
-  data.tar.gz: 0911311b184fce34bf5d3845ebccb9a59e05a8a4ae878fd741b4f656db0bf665c4bd5130446b01257a56fecc1520cab9eb2ecd2ce355165cec899db43d2f5645
+  metadata.gz: 2e27fd24735fbcd7ef96be80f9dcbbb925bf322c17a3902c76f5a9ad04a37039dc6dacd0c1661eec07a5cc400b9757ed938b93f45d6f61e80f8fb8f1885dd006
+  data.tar.gz: 16ad3bfc0d0fc4c73ca135715f3ce73f4bd374897d830d1f9a564a6edaa59787cd280c14f3acb77bea61813a32ebd2fdfebfb02f6b6d3cbd2a133020e2d4c667

data/lib/pubsubstub/redis_pub_sub.rb

@@ -20,21 +20,24 @@ module Pubsubstub
     end
 
     def scrollback(since_event_id)
-      redis = if EventMachine.reactor_running?
-        self.class.nonblocking_redis
-      else
-        self.class.blocking_redis
+      redis_scrollback(since_event_id) do |json|
+        yield Pubsubstub::Event.from_json(json)
       end
+    end
+
+    private
 
-      redis.zrangebyscore(key('scrollback'), "(#{since_event_id.to_i}", '+inf') do |events|
-        events.each do |json|
-          yield Pubsubstub::Event.from_json(json)
+    def redis_scrollback(since_event_id, &block)
+      args = [key('scrollback'), "(#{since_event_id.to_i}", '+inf']
+      if EventMachine.reactor_running?
+        self.class.nonblocking_redis.zrangebyscore(*args) do |events|
+          events.each(&block)
         end
+      else
+        self.class.blocking_redis.zrangebyscore(*args).each(&block)
       end
     end
 
-    private
-
     def key(purpose)
       [@channel_name, purpose].join(".")
     end

data/lib/pubsubstub/stream_action.rb

@@ -62,12 +62,11 @@ module Pubsubstub
     end
 
     def start_heartbeat
-      @heartbeat = Thread.new do
-        loop do
-          sleep Pubsubstub.heartbeat_frequency
-          event = heartbeat_frequency.to_message
-          @connections.each { |connection| connection << event }
-        end
+      return unless EventMachine.reactor_running?
+      EventMachine::PeriodicTimer.new(Pubsubstub.heartbeat_frequency) do
+        sleep Pubsubstub.heartbeat_frequency
+        event = heartbeat_event.to_message
+        @connections.each { |connection| connection << event }
       end
     end
 

data/lib/pubsubstub/version.rb

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

data/spec/redis_pub_sub_spec.rb

@@ -78,11 +78,29 @@ describe Pubsubstub::RedisPubSub do
     let(:event1) { Pubsubstub::Event.new("toto", id: 1235) }
     let(:event2) { Pubsubstub::Event.new("toto", id: 1236) }
 
-    it "yields the events in the scrollback" do
-      redis = double('redis')
-      expect(redis).to receive(:zrangebyscore).with('test.scrollback', '(1234', '+inf').and_yield([event1.to_json, event2.to_json])
-      expect(Pubsubstub::RedisPubSub).to receive(:blocking_redis).and_return(redis)
-      expect { |block| subject.scrollback(1234, &block) }.to yield_successive_args(event1, event2)
+    describe "without EventMachine" do
+      it "yields the events in the scrollback" do
+        redis = double('redis')
+        expect(redis).to receive(:zrangebyscore)
+          .with('test.scrollback', '(1234', '+inf')
+          .and_return([event1.to_json, event2.to_json])
+
+        expect(Pubsubstub::RedisPubSub).to receive(:blocking_redis).and_return(redis)
+        expect { |block| subject.scrollback(1234, &block) }.to yield_successive_args(event1, event2)
+      end
+    end
+
+    describe "with EventMachine" do
+      it "yields the events in the scrollback" do
+        allow(EventMachine).to receive(:reactor_running?).and_return(true)
+        redis = double('redis')
+        expect(redis).to receive(:zrangebyscore)
+          .with('test.scrollback', '(1234', '+inf')
+          .and_yield([event1.to_json, event2.to_json])
+
+        expect(Pubsubstub::RedisPubSub).to receive(:nonblocking_redis).and_return(redis)
+        expect { |block| subject.scrollback(1234, &block) }.to yield_successive_args(event1, event2)
+      end
     end
   end
 end

data/spec/stream_action_spec.rb

@@ -25,9 +25,10 @@ describe "Pubsubstub::StreamAction without EventMachine" do
 
   it "returns the content of the scrollback" do
     event = Pubsubstub::Event.new("test")
-    expect_any_instance_of(Pubsubstub::Channel).to receive(:scrollback).and_return([event])
+    Pubsubstub::RedisPubSub.publish(:default, event)
 
     get "/", {}, 'HTTP_LAST_EVENT_ID' => 1
+    expect(last_response.body).to eq(event.to_message)
   end
 end
 
@@ -50,10 +51,10 @@ describe "Pubsubstub::StreamAction with EventMachine" do
     end
   end
 
-  it "subscribes the connection to the channel" do
-    event = Pubsubstub::Event.new('ping')
-    channel = Pubsubstub::Channel.new(:default)
-    allow_any_instance_of(Pubsubstub::StreamAction).to receive(:with_each_channel).and_yield(channel)
+  it "returns the content of the scrollback right away" do
+    event = Pubsubstub::Event.new("test")
+    Pubsubstub::RedisPubSub.publish(:default, event)
+    expect_any_instance_of(EventMachine::Hiredis::Client).to receive(:zrangebyscore).and_yield([event.to_json])
 
     em do
       env = current_session.send(:env_for, "/", 'HTTP_LAST_EVENT_ID' => 1)
@@ -61,7 +62,6 @@ describe "Pubsubstub::StreamAction with EventMachine" do
       status, headers, body = app.call(request.env)
 
       response = Rack::MockResponse.new(status, headers, body, env["rack.errors"].flush)
-      channel.send(:broadcast, event.to_json)
 
       EM.next_tick {
         body.close
@@ -72,4 +72,48 @@ describe "Pubsubstub::StreamAction with EventMachine" do
       }
     end
   end
+
+  it "subscribes the connection to the channel" do
+    em do
+      redis = spy('Redis Pubsub')
+      allow(Pubsubstub::RedisPubSub).to receive(:sub).and_return(redis)
+      expect(redis).to receive(:subscribe).with("default.pubsub", anything)
+
+      env = current_session.send(:env_for, "/", 'HTTP_LAST_EVENT_ID' => 1)
+      request = Rack::Request.new(env)
+      status, headers, body = app.call(request.env)
+
+      response = Rack::MockResponse.new(status, headers, body, env["rack.errors"].flush)
+
+      EM.next_tick {
+        body.close
+        response.finish
+        EM.stop
+      }
+    end
+  end
+
+  it "sends heartbeat events every now and then" do
+    allow(Pubsubstub).to receive(:heartbeat_frequency).and_return(0.001)
+
+    Timecop.freeze do
+      em do
+        env = current_session.send(:env_for, "/", 'HTTP_LAST_EVENT_ID' => 1)
+        request = Rack::Request.new(env)
+        status, headers, body = app.call(request.env)
+
+        response = Rack::MockResponse.new(status, headers, body, env["rack.errors"].flush)
+
+        event = Pubsubstub::Event.new('ping', name: 'heartbeat', retry_after: Pubsubstub::StreamAction::RECONNECT_TIMEOUT)
+
+        EM.add_timer(0.001) {
+          body.close
+          response.finish
+
+          expect(response.body).to eq(event.to_message)
+          EM.stop
+        }
+      end
+    end
+  end
 end

metadata

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