firehose 1.2.20 → 1.3.6

data/spec/lib/server/publisher_spec.rb

@@ -7,21 +7,17 @@ describe Firehose::Server::Publisher do
   let(:channel_key) { "/firehose/publisher/test/#{Time.now.to_i}" }
   let(:message)     { "howdy friends!" }
 
-  it "should have 100 MAX_MESSAGES" do
-    Firehose::Server::Publisher::MAX_MESSAGES.should == 100
-  end
-
-  it "should have 1 day TTL" do
-    Firehose::Server::Publisher::TTL.should == 86400
+  it "has 1 day TTL" do
+    expect(Firehose::Server::Publisher::TTL).to eql(86400)
   end
 
   describe "#publish" do
-    it "should publish message change" do
+    it "publishes message change" do
       em do
-        hiredis = EM::Hiredis.connect.pubsub
+        hiredis = Firehose::Server.redis.connection.pubsub
         hiredis.subscribe "firehose:channel_updates"
         hiredis.on(:message) {|_, msg|
-          msg.should == "#{channel_key}\n1\n#{message}"
+          expect(msg).to eql("#{channel_key}\n1\n#{message}")
           em.next_tick { em.stop }
         }
         Firehose::Server::Publisher.new.publish channel_key, message
@@ -29,52 +25,63 @@ describe Firehose::Server::Publisher do
     end
 
     "\"'\r\t\n!@\#$%^&*()[]\v\f\a\b\e{}/=?+\\|".each_char do |char|
-      it "should publish messages with the '#{char.inspect}' character" do
+      it "publishes messages with the '#{char.inspect}' character" do
         msg = [char, message, char].join
         em 1 do
           Firehose::Server::Publisher.new.publish(channel_key, msg).callback { em.stop }
         end
-        redis_exec('lpop', "firehose:#{channel_key}:list").should == msg
+        expect(redis_exec('lpop', "firehose:#{channel_key}:list")).to eql(msg)
       end
     end
 
-    it "should add message to list" do
+    it "adds message to list" do
       em do
         Firehose::Server::Publisher.new.publish(channel_key, message).callback { em.stop }
       end
-      redis_exec('lpop', "firehose:#{channel_key}:list").should == message
+      expect(redis_exec('lpop', "firehose:#{channel_key}:list")).to eql(message)
     end
 
-    it "should limit list to MAX_MESSAGES messages" do
+    it "limits list to DEFAULT_SIZE messages" do
       em do
-        Firehose::Server::Publisher::MAX_MESSAGES.times do |n|
+        Firehose::Server::MessageBuffer::DEFAULT_SIZE.times do |n|
           publisher.publish(channel_key, message)
         end
         publisher.publish(channel_key, message).callback { em.stop }
       end
-      redis_exec('llen', "firehose:#{channel_key}:list").should == Firehose::Server::Publisher::MAX_MESSAGES
+      expect(redis_exec('llen', "firehose:#{channel_key}:list")).to eql(Firehose::Server::MessageBuffer::DEFAULT_SIZE)
+    end
+
+    it "limits message list to a custom buffer size" do
+      buffer_size = rand(100)
+      em do
+        Firehose::Server::MessageBuffer::DEFAULT_SIZE.times do |n|
+          publisher.publish(channel_key, message)
+        end
+        publisher.publish(channel_key, message, buffer_size: buffer_size).callback { em.stop }
+      end
+      redis_exec('llen', "firehose:#{channel_key}:list").should == buffer_size
     end
 
-    it "should increment sequence" do
+    it "increments sequence" do
       sequence_key = "firehose:#{channel_key}:sequence"
 
       @done_counter = 0
-      redis_exec('get', sequence_key).should be_nil
+      expect(redis_exec('get', sequence_key)).to be_nil
       em do
         publisher.publish(channel_key, message).callback { @done_counter += 1; em.next_tick { em.stop } if @done_counter > 1 }
         publisher.publish(channel_key, message).callback { @done_counter += 1; em.next_tick { em.stop } if @done_counter > 1 }
       end
-      redis_exec('get', sequence_key).to_i.should == 2
+      expect(redis_exec('get', sequence_key).to_i).to eql(2)
     end
 
-    it "should set expirery on sequence and list keys" do
+    it "sets expiry on sequence and list keys" do
       ttl = 78 # Why 78? Why not!
 
       em do
         publisher.publish(channel_key, message, :ttl => 78).callback do
           # Allow for 1 second of slippage/delay
-          redis_exec('TTL', "firehose:#{channel_key}:sequence").should > (ttl- 1)
-          redis_exec('TTL', "firehose:#{channel_key}:list").should > (ttl - 1)
+          expect(redis_exec('TTL', "firehose:#{channel_key}:sequence")).to be > (ttl- 1)
+          expect(redis_exec('TTL', "firehose:#{channel_key}:list")).to be > (ttl - 1)
           em.stop
         end
       end

data/spec/lib/server/redis_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Firehose::Server::Redis do
+  describe ".key" do
+    subject { Firehose::Server::Redis.key("list", "channel", ["fizz", "buzz"]) }
+    it "has root `firehose` key" do
+      expect(subject).to start_with("firehose:")
+    end
+    it "flattens all arguments into key" do
+      expect(subject).to eql("firehose:list:channel:fizz:buzz")
+    end
+  end
+end

data/spec/lib/server/subscriber_spec.rb

@@ -4,23 +4,24 @@ describe Firehose::Server::Subscriber do
   include EM::TestHelper
 
   let(:channel_key)     { '/bears/are/mean' }
-  let(:subscriber)      { Firehose::Server::Subscriber.new(EM::Hiredis.connect) }
+  let(:subscriber)      { Firehose::Server::Subscriber.new(Firehose::Server.redis.connection) }
   let(:dummy_subscriber){ Firehose::Server::Subscriber.new(double('redis', :pubsub => double('pubsub', :subscribe => EM::DefaultDeferrable.new, :on => nil))) }
   let(:message)         { 'Raaaarrrrrr!!!!' }
   let(:publisher)       { Firehose::Server::Publisher.new }
 
   describe "#subscribe" do
-    it "should add the deferrable to the subscriptions hash" do
+    it "adds the deferrable to the subscriptions hash" do
       deferrable = EM::DefaultDeferrable.new
       dummy_subscriber.subscribe(channel_key, deferrable)
-      dummy_subscriber.send(:subscriptions)[channel_key].should == [deferrable]
+      expect(dummy_subscriber.send(:subscriptions)[channel_key]).to eql([deferrable])
     end
 
-    it "should call succeed on the deferrable when a message is published" do
+    it "calls succeed on the deferrable when a message is published" do
       deferrable = EM::DefaultDeferrable.new
-      deferrable.callback do |msg, sequence|
-        msg.should == message
-        sequence.should == 1 # The publisher is fresh, so the sequence ID will be 1.
+      deferrable.callback do |messages|
+        msg = messages.first
+        expect(msg.payload).to eql(message)
+        expect(msg.sequence).to eql(1) # The publisher is fresh, so the sequence ID will be 1.
         em.next_tick { em.stop }
       end
 
@@ -30,10 +31,10 @@ describe Firehose::Server::Subscriber do
       end
     end
 
-    it "shouldn't call succeed on the deferrable when a 2nd message is published" do
+    it "doesn't call succeed on the deferrable when a 2nd message is published" do
       deferrable = EM::DefaultDeferrable.new
-      deferrable.should_receive(:succeed).with(message, 1) # The publisher is fresh, so the sequence ID will be 1.
-      deferrable.should_not_receive(:succeed).with('2nd message', 2)
+      deferrable.should_receive(:succeed).with([Firehose::Server::MessageBuffer::Message.new(message, 1)]) # The publisher is fresh, so the sequence ID will be 1.
+      deferrable.should_not_receive(:succeed).with([Firehose::Server::MessageBuffer::Message.new('2nd message', 2)])
       em do
         subscriber.subscribe(channel_key, deferrable)
         publisher.publish(channel_key, message).callback do
@@ -47,14 +48,14 @@ describe Firehose::Server::Subscriber do
   end
 
   describe "#unsubscribe" do
-    it "should remove the deferrable from the subscriptions hash" do
+    it "removes the deferrable from the subscriptions hash" do
       deferrable = EM::DefaultDeferrable.new
       dummy_subscriber.subscribe(channel_key, deferrable)
       dummy_subscriber.unsubscribe(channel_key, deferrable)
-      dummy_subscriber.send(:subscriptions).has_key?(channel_key).should be_false
+      expect(dummy_subscriber.send(:subscriptions).has_key?(channel_key)).to be_falsey
     end
 
-    it "shouldn't call succeed on the deferrable when a message is published" do
+    it "doesn't call succeed on the deferrable when a message is published" do
       deferrable = EM::DefaultDeferrable.new
       deferrable.should_not_receive(:succeed).with(message, 1) # The publisher is fresh, so the sequence ID will be 1.
       em do

data/spec/spec_helper.rb

@@ -6,6 +6,13 @@ require 'faye/websocket'
 require 'hiredis'
 require 'firehose'
 
+# Test coverage reports on CodeClimate.
+begin
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
+rescue LoadError
+end
+
 # We use both EM::Http and Net::Http in this test lib. When EM:Http is fired up
 # we're usually hitting Rainbows! for integrations, and when Net::Http we want
 # to mock that up.
@@ -34,7 +41,7 @@ module Hiredis::TestHelper
   def redis
     @conn ||= begin
       conn = Hiredis::Connection.new
-      conn.connect("127.0.0.1", 6379)
+      conn.connect(Firehose::Server.redis.url.host, Firehose::Server.redis.url.port)
       conn
     end
   end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: firehose
 version: !ruby/object:Gem::Version
-  version: 1.2.20
+  version: 1.3.6
 platform: ruby
 authors:
 - Brad Gessler
 - Steel Fu
 - Paul Cortens
 - Zach Zolton
+- Christopher Bertels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -59,16 +60,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -97,20 +98,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: json
-  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: rack
   requirement: !ruby/object:Gem::Requirement
@@ -167,62 +154,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-coffeescript
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-copy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbows
   requirement: !ruby/object:Gem::Requirement
@@ -321,20 +252,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: evergreen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
@@ -370,36 +287,43 @@ email:
 - steel@polleverywhere.com
 - paul@polleverywhere.com
 - zach@polleverywhere.com
+- christopher@polleverywhere.com
 executables:
 - firehose
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
+- ".dockerignore"
 - ".env.sample"
 - ".gitignore"
-- ".rbenv-version"
 - ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
+- Dockerfile
 - Gemfile
-- Guardfile
 - LICENSE.txt
 - Procfile
 - Procfile.dev
 - README.md
 - Rakefile
 - bin/firehose
-- config/evergreen.rb
+- coffeelint.json
 - config/rainbows.rb
+- docker-compose.yml
 - firehose.gemspec
+- karma.config.coffee
 - lib/assets/javascripts/firehose.js.coffee
 - lib/assets/javascripts/firehose/base.js.coffee
 - lib/assets/javascripts/firehose/consumer.js.coffee
 - lib/assets/javascripts/firehose/core.js.coffee
 - lib/assets/javascripts/firehose/long_poll.js.coffee
+- lib/assets/javascripts/firehose/multiplexed_consumer.js.coffee
 - lib/assets/javascripts/firehose/transport.js.coffee
 - lib/assets/javascripts/firehose/version.js.coffee.erb
 - lib/assets/javascripts/firehose/web_socket.js.coffee
-- lib/assets/javascripts/vendor/json2.js
 - lib/firehose.rb
 - lib/firehose/assets.rb
 - lib/firehose/cli.rb
@@ -418,7 +342,9 @@ files:
 - lib/firehose/server.rb
 - lib/firehose/server/app.rb
 - lib/firehose/server/channel.rb
+- lib/firehose/server/message_buffer.rb
 - lib/firehose/server/publisher.rb
+- lib/firehose/server/redis.rb
 - lib/firehose/server/subscriber.rb
 - lib/firehose/version.rb
 - package.json
@@ -429,10 +355,14 @@ files:
 - spec/javascripts/firehose/base_spec.coffee
 - spec/javascripts/firehose/consumer_spec.coffee
 - spec/javascripts/firehose/long_poll_spec.coffee
+- spec/javascripts/firehose/multiplexed_consumer_spec.coffee
 - spec/javascripts/firehose/transport_spec.coffee
 - spec/javascripts/firehose/websocket_spec.coffee
 - spec/javascripts/helpers/spec_helper.js
+- spec/javascripts/support/jquery-1.11.1.js
+- spec/javascripts/support/json2.js
 - spec/javascripts/support/sinon-1.7.3.js
+- spec/javascripts/support/spec_helper.coffee
 - spec/lib/assets_spec.rb
 - spec/lib/client/consumer_spec.rb
 - spec/lib/client/producer_spec.rb
@@ -443,7 +373,9 @@ files:
 - spec/lib/rack/publisher_spec.rb
 - spec/lib/server/app_spec.rb
 - spec/lib/server/channel_spec.rb
+- spec/lib/server/message_buffer_spec.rb
 - spec/lib/server/publisher_spec.rb
+- spec/lib/server/redis_spec.rb
 - spec/lib/server/subscriber_spec.rb
 - spec/spec_helper.rb
 homepage: http://firehose.io/
@@ -466,7 +398,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: firehose
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Build realtime Ruby web applications
@@ -478,10 +410,14 @@ test_files:
 - spec/javascripts/firehose/base_spec.coffee
 - spec/javascripts/firehose/consumer_spec.coffee
 - spec/javascripts/firehose/long_poll_spec.coffee
+- spec/javascripts/firehose/multiplexed_consumer_spec.coffee
 - spec/javascripts/firehose/transport_spec.coffee
 - spec/javascripts/firehose/websocket_spec.coffee
 - spec/javascripts/helpers/spec_helper.js
+- spec/javascripts/support/jquery-1.11.1.js
+- spec/javascripts/support/json2.js
 - spec/javascripts/support/sinon-1.7.3.js
+- spec/javascripts/support/spec_helper.coffee
 - spec/lib/assets_spec.rb
 - spec/lib/client/consumer_spec.rb
 - spec/lib/client/producer_spec.rb
@@ -492,6 +428,9 @@ test_files:
 - spec/lib/rack/publisher_spec.rb
 - spec/lib/server/app_spec.rb
 - spec/lib/server/channel_spec.rb
+- spec/lib/server/message_buffer_spec.rb
 - spec/lib/server/publisher_spec.rb
+- spec/lib/server/redis_spec.rb
 - spec/lib/server/subscriber_spec.rb
 - spec/spec_helper.rb
+has_rdoc: