firehose 1.1.1 → 1.2.0

data/spec/lib/{subscriber_spec.rb → server/subscriber_spec.rb}

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe Firehose::Subscriber do
+describe Firehose::Server::Subscriber do
   include EM::TestHelper
 
   let(:channel_key)     { '/bears/are/mean' }
-  let(:subscriber)      { Firehose::Subscriber.new(EM::Hiredis.connect) }
-  let(:dummy_subscriber){ Firehose::Subscriber.new(double('redis', :pubsub => double('pubsub', :subscribe => EM::DefaultDeferrable.new, :on => nil))) }
+  let(:subscriber)      { Firehose::Server::Subscriber.new(EM::Hiredis.connect) }
+  let(:dummy_subscriber){ Firehose::Server::Subscriber.new(double('redis', :pubsub => double('pubsub', :subscribe => EM::DefaultDeferrable.new, :on => nil))) }
   let(:message)         { 'Raaaarrrrrr!!!!' }
-  let(:publisher)       { Firehose::Publisher.new }
+  let(:publisher)       { Firehose::Server::Publisher.new }
 
   describe "#subscribe" do
     it "should add the deferrable to the subscriptions hash" do

data/spec/spec_helper.rb

@@ -4,10 +4,8 @@ require 'logger'
 require 'em-http'
 require 'faye/websocket'
 require 'hiredis'
-
 require 'firehose'
 
-
 # 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.
@@ -62,9 +60,6 @@ RSpec.configure do |config|
   end
 end
 
-
-
-
 # Allow async responses to get through rack/lint
 require 'rack/lint'
 class Rack::Lint

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firehose
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Brad Gessler
@@ -17,7 +16,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -25,7 +23,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -33,7 +30,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-hiredis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,7 +37,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -49,7 +44,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -57,7 +51,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -65,7 +58,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -73,7 +65,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -81,7 +72,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -89,7 +79,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,7 +86,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -105,7 +93,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -113,7 +100,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -121,7 +107,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -129,7 +114,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -137,7 +121,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -145,7 +128,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,7 +135,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -161,7 +142,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -169,7 +149,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -177,7 +156,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -185,7 +163,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -193,7 +170,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -201,7 +177,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -209,7 +184,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbows
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -217,7 +191,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -225,7 +198,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -233,7 +205,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -241,7 +212,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -249,7 +219,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -257,7 +226,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: async_rack_test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -265,7 +233,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -273,7 +240,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -281,7 +247,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -289,7 +254,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -297,7 +261,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -305,7 +268,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -313,7 +275,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -357,64 +318,64 @@ files:
 - lib/assets/javascripts/firehose/web_socket.js.coffee
 - lib/firehose.rb
 - lib/firehose/assets.rb
-- lib/firehose/channel.rb
 - lib/firehose/cli.rb
 - lib/firehose/client.rb
-- lib/firehose/default.rb
+- lib/firehose/client/consumer.rb
+- lib/firehose/client/producer.rb
 - lib/firehose/logging.rb
-- lib/firehose/producer.rb
-- lib/firehose/publisher.rb
+- lib/firehose/patches/rainbows.rb
+- lib/firehose/patches/swf_policy_request.rb
+- lib/firehose/patches/thin.rb
 - lib/firehose/rack.rb
-- lib/firehose/rack/consumer_app.rb
-- lib/firehose/rack/ping_app.rb
-- lib/firehose/rack/publisher_app.rb
+- lib/firehose/rack/app.rb
+- lib/firehose/rack/consumer.rb
+- lib/firehose/rack/ping.rb
+- lib/firehose/rack/publisher.rb
 - lib/firehose/rails.rb
 - lib/firehose/server.rb
-- lib/firehose/subscriber.rb
-- lib/firehose/swf_policy_request.rb
+- lib/firehose/server/app.rb
+- lib/firehose/server/channel.rb
+- lib/firehose/server/publisher.rb
+- lib/firehose/server/subscriber.rb
 - lib/firehose/version.rb
-- lib/rainbows_em_swf_policy.rb
-- lib/thin_em_swf_policy.rb
 - spec/integrations/integration_test_helper.rb
 - spec/integrations/rainbows_spec.rb
 - spec/integrations/shared_examples.rb
 - spec/integrations/thin_spec.rb
 - spec/lib/assets_spec.rb
-- spec/lib/broker_spec.rb
-- spec/lib/channel_spec.rb
-- spec/lib/client_spec.rb
-- spec/lib/consumer_spec.rb
-- spec/lib/default_spec.rb
-- spec/lib/producer_spec.rb
-- spec/lib/publisher_spec.rb
-- spec/lib/rack/consumer_app_spec.rb
-- spec/lib/rack/ping_app_spec.rb
-- spec/lib/rack/publisher_app_spec.rb
-- spec/lib/subscriber_spec.rb
+- spec/lib/client/consumer_spec.rb
+- spec/lib/client/producer_spec.rb
+- spec/lib/firehose_spec.rb
+- spec/lib/rack/consumer_spec.rb
+- spec/lib/rack/ping_spec.rb
+- spec/lib/rack/publisher_spec.rb
+- spec/lib/server/app_spec.rb
+- spec/lib/server/channel_spec.rb
+- spec/lib/server/publisher_spec.rb
+- spec/lib/server/subscriber_spec.rb
 - spec/spec_helper.rb
 homepage: http://firehose.io/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: firehose
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Build realtime Ruby web applications
 test_files:
 - spec/integrations/integration_test_helper.rb
@@ -422,15 +383,15 @@ test_files:
 - spec/integrations/shared_examples.rb
 - spec/integrations/thin_spec.rb
 - spec/lib/assets_spec.rb
-- spec/lib/broker_spec.rb
-- spec/lib/channel_spec.rb
-- spec/lib/client_spec.rb
-- spec/lib/consumer_spec.rb
-- spec/lib/default_spec.rb
-- spec/lib/producer_spec.rb
-- spec/lib/publisher_spec.rb
-- spec/lib/rack/consumer_app_spec.rb
-- spec/lib/rack/ping_app_spec.rb
-- spec/lib/rack/publisher_app_spec.rb
-- spec/lib/subscriber_spec.rb
+- spec/lib/client/consumer_spec.rb
+- spec/lib/client/producer_spec.rb
+- spec/lib/firehose_spec.rb
+- spec/lib/rack/consumer_spec.rb
+- spec/lib/rack/ping_spec.rb
+- spec/lib/rack/publisher_spec.rb
+- spec/lib/server/app_spec.rb
+- spec/lib/server/channel_spec.rb
+- spec/lib/server/publisher_spec.rb
+- spec/lib/server/subscriber_spec.rb
 - spec/spec_helper.rb
+has_rdoc: