pubsubstub 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfd7d496f0e2ce3d0a48c9bc7a88a96b53d14150
-  data.tar.gz: c4849cbfb57dc5f9415edd74beb2737592d35921
+  metadata.gz: 6549edd3271aea9f63868a73df5e2d7abbac4cc3
+  data.tar.gz: 771ff6a8653ff3f956ba5396b1bbcef79f6f6eb4
 SHA512:
-  metadata.gz: b6a1b5013dbaef4a34fc7486f9f8095818d599a1083d0361c9e57a9b51698d92048eff0d524d924b6a9826e401583ba572a04c477ba2919c57812d34d02c1212
-  data.tar.gz: 818686cfa16835e0a430c830b4af65fc61820217bc08da80cd9b3128f69f2fa4d8e6828424dcc7b9aa2f2305f34b833744e83cf8e75e193a11587579ee1cecb4
+  metadata.gz: fc27ef10f261293dc52adf96789fb5c7de4ac1065cc4a2b8257f3c36d9afe63c9a4c734c90c923d43bc2960404e733bdbe6c525a91197e15b6a166361bde8a4f
+  data.tar.gz: 3ccd4fb1ef9886ba092d1d33d16c9d8e013a165f31eeb6f229354fea5fa6bc89bb3f115fd465f15f2cfac8a3817aa82589aa1f50aa53bfb9bb5f074e2da9d26c

data/lib/pubsubstub.rb

@@ -21,7 +21,8 @@ module Pubsubstub
 
   class << self
     attr_accessor :heartbeat_frequency, :redis_url, :channels_scrollback_size,
-      :channels_scrollback_ttl, :logger, :reconnect_timeout, :error_handler
+      :channels_scrollback_ttl, :logger, :reconnect_timeout, :error_handler,
+      :use_persistent_connections
 
     def publish(channel_name, *args)
       Channel.new(channel_name).publish(Event.new(*args))
@@ -69,6 +70,7 @@ module Pubsubstub
   self.channels_scrollback_size = 1000
   self.channels_scrollback_ttl = 24 * 60 * 60
   self.reconnect_timeout = 10_000
+  self.use_persistent_connections = true
 
   # Deprecated. Use Pubsubstub.publish instead
   module RedisPubSub

data/lib/pubsubstub/stream_action.rb

@@ -19,10 +19,10 @@ module Pubsubstub
       request = Rack::Request.new(env)
       channels = (request.params['channels'] || [:default]).map(&Channel.method(:new))
 
-      stream = if event_machine?
-        send_scrollback(channels, last_event_id)
-      else
+      stream = if use_persistent_connections?
         subscribe_connection(channels, last_event_id)
+      else
+        send_scrollback(channels, last_event_id)
       end
       [200, HEADERS, stream]
     end
@@ -40,6 +40,10 @@ module Pubsubstub
       end
     end
 
+    def use_persistent_connections?
+      Pubsubstub.use_persistent_connections && !event_machine?
+    end
+
     def event_machine?
       defined?(EventMachine) && EventMachine.reactor_running?
     end

data/lib/pubsubstub/version.rb

@@ -1,3 +1,3 @@
 module Pubsubstub
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/channel_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Pubsubstub::Channel do
+RSpec.describe Pubsubstub::Channel do
   subject { described_class.new('foobar') }
 
   it "has a name" do

data/spec/event_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Pubsubstub::Event do
+RSpec.describe Pubsubstub::Event do
   subject {
     Pubsubstub::Event.new("refresh #1500\nnew #1400", id: 12345678, name: "toto", retry_after: 1_000)
   }

data/spec/publish_action_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Pubsubstub::StreamAction do
+RSpec.describe Pubsubstub::StreamAction do
   let(:app) { Pubsubstub::PublishAction.new }
   let(:channel) { Pubsubstub::Channel.new('foo') }
 

data/spec/stream_action_spec.rb

@@ -1,5 +1,23 @@
 require 'spec_helper'
 
+RSpec.shared_examples "short lived connections" do
+  it "immediately returns the scrollback" do
+    Pubsubstub.publish('foo', 'bar', id: 1)
+    Pubsubstub.publish('foo', 'baz', id: 2)
+
+    get '/?channels[]=foo', {}, 'HTTP_LAST_EVENT_ID' => 1
+    expect(last_response.body).to eq("id: 2\ndata: baz\n\n")
+  end
+
+  it "returns and heartbeat if scrollback is empty" do
+    Timecop.freeze('2015-01-01T00:00:00+00:00') do
+      get '/'
+      message = "id: 1420070400000\nevent: heartbeat\nretry: #{Pubsubstub.reconnect_timeout}\ndata: ping\n\n"
+      expect(last_response.body).to eq(message)
+    end
+  end
+end
+
 describe Pubsubstub::StreamAction do
   let(:app) { Pubsubstub::StreamAction.new }
 
@@ -8,21 +26,18 @@ describe Pubsubstub::StreamAction do
       allow(EventMachine).to receive(:reactor_running?).and_return(true)
     end
 
-    it "immediately returns the scrollback" do
-      Pubsubstub.publish('foo', 'bar', id: 1)
-      Pubsubstub.publish('foo', 'baz', id: 2)
+    it_behaves_like "short lived connections"
+  end
 
-      get '/?channels[]=foo', {}, 'HTTP_LAST_EVENT_ID' => 1
-      expect(last_response.body).to eq("id: 2\ndata: baz\n\n")
+  context "with persistent connections disabled" do
+    around :example do |example|
+      previous = Pubsubstub.use_persistent_connections
+      Pubsubstub.use_persistent_connections = false
+      example.run
+      Pubsubstub.use_persistent_connections = previous
     end
 
-    it "returns and heartbeat if scrollback is empty" do
-      Timecop.freeze('2015-01-01T00:00:00+00:00') do
-        get '/'
-        message = "id: 1420070400000\nevent: heartbeat\nretry: #{Pubsubstub.reconnect_timeout}\ndata: ping\n\n"
-        expect(last_response.body).to eq(message)
-      end
-    end
+    it_behaves_like "short lived connections"
   end
 
   it "immediately send a heartbeat event if there is no scrollback" do

data/spec/subscriber_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Pubsubstub::Subscriber do
+RSpec.describe Pubsubstub::Subscriber do
   describe "#start" do
     let(:channel) { Pubsubstub::Channel.new('plop') }
     let(:events) { (1..10).map { |i| Pubsubstub::Event.new("refresh ##{i}", id: i) } }

data/spec/subscription_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Pubsubstub::Subscription do
+RSpec.describe Pubsubstub::Subscription do
   let(:event) { Pubsubstub::Event.new('hello') }
   let(:connection) { [] }
   let(:channels) { %w(foo bar).map(&Pubsubstub::Channel.method(:new)) }

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: pubsubstub
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Guillaume Malette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 description: Pubsubstub can be added to a rack Application or deployed standalone.
@@ -62,9 +62,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -109,17 +109,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Pubsubstub is a rack middleware to add Pub/Sub