firehose 0.1.1 → 0.2.alpha.2

metadata

@@ -1,31 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: firehose
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.alpha.2
+  prerelease: 4
 platform: ruby
 authors:
 - Brad Gessler
 - Steel Fu
+- Paul Cortens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70305542896500 !ruby/object:Gem::Requirement
+  requirement: &70112078247400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta
+        version: 1.0.0.rc
   type: :runtime
   prerelease: false
-  version_requirements: *70305542896500
+  version_requirements: *70112078247400
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &70305536313020 !ruby/object:Gem::Requirement
+  requirement: &70112078246780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,21 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305536313020
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: &70305536312560 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70305536312560
+  version_requirements: *70112078246780
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70305536312140 !ruby/object:Gem::Requirement
+  requirement: &70112078245860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305536312140
+  version_requirements: *70112078245860
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70305536311720 !ruby/object:Gem::Requirement
+  requirement: &70112078245240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305536311720
+  version_requirements: *70112078245240
 - !ruby/object:Gem::Dependency
-  name: websocket-rack
-  requirement: &70305536311300 !ruby/object:Gem::Requirement
+  name: faye-websocket
+  requirement: &70112078244820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305536311300
+  version_requirements: *70112078244820
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70305536310800 !ruby/object:Gem::Requirement
+  requirement: &70112078244280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +78,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70305536310800
+  version_requirements: *70112078244280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70305536310380 !ruby/object:Gem::Requirement
+  requirement: &70112078243780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305536310380
+  version_requirements: *70112078243780
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70305536309920 !ruby/object:Gem::Requirement
+  requirement: &70112078243260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305536309920
+  version_requirements: *70112078243260
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70305536309500 !ruby/object:Gem::Requirement
+  requirement: &70112078242720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305536309500
+  version_requirements: *70112078242720
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70305536309080 !ruby/object:Gem::Requirement
+  requirement: &70112078242200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +122,43 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305536309080
+  version_requirements: *70112078242200
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
-  requirement: &70305536308660 !ruby/object:Gem::Requirement
+  requirement: &70112078241540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70112078241540
+- !ruby/object:Gem::Dependency
+  name: rainbows
+  requirement: &70112078240700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70112078240700
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &70112078240220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70112078240220
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70112078239540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +166,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305536308660
+  version_requirements: *70112078239540
 - !ruby/object:Gem::Dependency
-  name: em-websocket-client
-  requirement: &70305536308240 !ruby/object:Gem::Requirement
+  name: async_rack_test
+  requirement: &70112078238640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,17 +177,30 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305536308240
+  version_requirements: *70112078238640
+- !ruby/object:Gem::Dependency
+  name: foreman
+  requirement: &70112078238000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70112078238000
 description: Firehose is a realtime web application toolkit for building realtime
   Ruby web applications.
 email:
 - brad@polleverywhere.com
 - steel@polleverywhere.com
+- paul@polleverywhere.com
 executables:
 - firehose
 extensions: []
 extra_rdoc_files: []
 files:
+- .env.sample
 - .gitignore
 - .rbenv-version
 - .rspec
@@ -174,29 +210,52 @@ files:
 - README.md
 - Rakefile
 - bin/firehose
-- config.ru
+- config/rainbows.rb
 - firehose.gemspec
 - lib/assets/flash/firehose/WebSocketMain.swf
 - lib/assets/javascripts/firehose.js.coffee
 - lib/assets/javascripts/firehose/base.js.coffee
 - lib/assets/javascripts/firehose/consumer.js.coffee
+- lib/assets/javascripts/firehose/lib/jquery.cors.headers.js.coffee
+- lib/assets/javascripts/firehose/lib/swfobject.js
+- lib/assets/javascripts/firehose/lib/web_socket.js
 - lib/assets/javascripts/firehose/long_poll.js.coffee
 - lib/assets/javascripts/firehose/transport.js.coffee
 - lib/assets/javascripts/firehose/web_socket.js.coffee
 - lib/firehose.rb
+- lib/firehose/channel.rb
 - lib/firehose/cli.rb
+- lib/firehose/client.rb
 - lib/firehose/default.rb
+- lib/firehose/logging.rb
 - lib/firehose/producer.rb
 - lib/firehose/publisher.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/rails.rb
-- lib/firehose/subscription.rb
+- lib/firehose/server.rb
+- lib/firehose/subscriber.rb
+- lib/firehose/swf_policy_request.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/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/spec_helper.rb
 homepage: http://firehose.io/
 licenses: []
@@ -213,9 +272,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: firehose
 rubygems_version: 1.8.11
@@ -223,9 +282,19 @@ signing_key:
 specification_version: 3
 summary: Build realtime Ruby web applications
 test_files:
+- spec/integrations/integration_test_helper.rb
+- spec/integrations/rainbows_spec.rb
+- spec/integrations/shared_examples.rb
 - spec/integrations/thin_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/spec_helper.rb

data/config.ru

@@ -1,6 +0,0 @@
-require 'firehose'
-require 'rack'
-
-use Rack::Reloader
-
-run Firehose::Rack::App.new

data/lib/firehose/subscription.rb

@@ -1,77 +0,0 @@
-module Firehose
-  class Subscription
-    # consumer_id and channel for the subscription.
-    attr_reader :consumer_id
-
-    # Channel that we'll use for the pub-sub activity. This probably maps to an URL
-    attr_reader :channel
-
-    def initialize(consumer_id, channel)
-      @consumer_id, @channel = consumer_id, channel
-    end
-
-    # Subscribe to messages on the backend to fill up the subscription queue. consumer_ids of the messages
-    # will queue up units of "work" to process data from the subscription.
-    def subscribe(&block)
-      redis.subscribe(channel)
-      redis.on(:message) do |channel, message|
-        Firehose.logger.debug "Redis recieved `#{message}` to `#{consumer_id}@#{channel}`"
-        block.call message, self
-      end
-      Firehose.logger.debug "Redis subscribed to `#{consumer_id}@#{channel}`"
-      self # Return the subscription for chaining.
-    end
-
-    def unsubscribe(&block)
-      redis.unsubscribe(channel)
-      Firehose.logger.debug "Redis unsubscribed from `#{consumer_id}@#{channel}`"
-      redis.close_connection
-      @redis = nil
-      block.call(self) if block
-      self
-    end
-
-  private
-    def redis
-      @redis ||= EM::Hiredis.connect
-    end
-  end
-
-  # Queue subscription messages so that we can remember and/or operate on them
-  class Subscription::Queue
-    attr_reader :subscription, :channel
-
-    def initialize(consumer_id, channel)
-      @subscription = Subscription.new(consumer_id, channel)
-      # Start the subscription and start dropping mesasge onto the queue
-      subscription.subscribe do |message|
-        queue.push message
-      end
-    end
-
-    # Pop an item off the subscription queue so we can work on it.
-    def pop(&block)
-      queue.pop do |message|
-        block.call message, subscription
-      end
-    end
-
-    # Kill the queue in n seconds.
-    def kill(ttl=0, &block)
-      if ttl.zero?
-        subscription.unsubscribe &block
-      else
-        @timer = EM::Timer.new(ttl){ kill 0 }
-      end
-    end
-
-    def live
-      @timer.cancel if @timer
-    end
-
-  private
-    def queue
-      @queue ||= EM::Queue.new
-    end
-  end
-end