firehose 0.0.5 → 0.0.6

data/Gemfile

@@ -1,5 +1,4 @@
 source "http://rubygems.org"
 
-gem 'goliath', :git => 'git://github.com/postrank-labs/goliath.git'
 # Specify your gem's dependencies in firehose.gemspec
 gemspec

data/firehose.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-#  s.add_runtime_dependency "goliath", "=> 0.9.4"
   s.add_runtime_dependency "eventmachine", ">= 1.0.0.beta"
   s.add_runtime_dependency "amqp", ">= 0.9.4"
   s.add_runtime_dependency "thin"
@@ -30,7 +29,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rack-test"
   s.add_development_dependency "guard-rspec"
   s.add_development_dependency "guard-bundler"
-  s.add_development_dependency "thin"
   # em-http dropped support for WS as of version 1.0+ (https://github.com/igrigorik/em-http-request/issues/164)
   s.add_development_dependency "em-http-request", "~> 0.3.0" 
   s.add_development_dependency "guard-coffeescript"

data/lib/firehose.rb

@@ -5,7 +5,6 @@ require 'amqp'
 module Firehose
   autoload :Subscription, 'firehose/subscription'
   autoload :Publisher,    'firehose/publisher'
-  autoload :Goliath,      'firehose/goliath'
   autoload :Rack,         'firehose/rack'
   autoload :CLI,          'firehose/cli'
 

data/lib/firehose/version.rb

@@ -1,4 +1,4 @@
 module Firehose
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
   CODENAME = "Trickle"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firehose
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70096762306280 !ruby/object:Gem::Requirement
+  requirement: &70252551384180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0.beta
   type: :runtime
   prerelease: false
-  version_requirements: *70096762306280
+  version_requirements: *70252551384180
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70096762305560 !ruby/object:Gem::Requirement
+  requirement: &70252551383460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *70096762305560
+  version_requirements: *70252551383460
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70096762305160 !ruby/object:Gem::Requirement
+  requirement: &70252551382280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096762305160
+  version_requirements: *70252551382280
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70096762304600 !ruby/object:Gem::Requirement
+  requirement: &70252551381540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096762304600
+  version_requirements: *70252551381540
 - !ruby/object:Gem::Dependency
   name: websocket-rack
-  requirement: &70096762304060 !ruby/object:Gem::Requirement
+  requirement: &70252551380900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096762304060
+  version_requirements: *70252551380900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70096762294340 !ruby/object:Gem::Requirement
+  requirement: &70252551379840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096762294340
+  version_requirements: *70252551379840
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70096762293700 !ruby/object:Gem::Requirement
+  requirement: &70252551378580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096762293700
+  version_requirements: *70252551378580
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70096762292860 !ruby/object:Gem::Requirement
+  requirement: &70252551377980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096762292860
+  version_requirements: *70252551377980
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70096762291880 !ruby/object:Gem::Requirement
+  requirement: &70252551377360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,21 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096762291880
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: &70096762290940 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70096762290940
+  version_requirements: *70252551377360
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70096762289780 !ruby/object:Gem::Requirement
+  requirement: &70252551376760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +121,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70096762289780
+  version_requirements: *70252551376760
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
-  requirement: &70096762288920 !ruby/object:Gem::Requirement
+  requirement: &70252551376320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +132,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096762288920
+  version_requirements: *70252551376320
 description: Firehose is a realtime web application toolkit for building realtime
   Ruby web applications.
 email:
@@ -175,7 +164,6 @@ files:
 - lib/assets/javascripts/firehose/web_socket.js.coffee
 - lib/firehose.rb
 - lib/firehose/cli.rb
-- lib/firehose/goliath.rb
 - lib/firehose/http_publisher.rb
 - lib/firehose/publisher.rb
 - lib/firehose/rack.rb
@@ -183,7 +171,6 @@ files:
 - lib/firehose/thin.rb
 - lib/firehose/version.rb
 - spec/integrations/amqp_resources_spec.rb
-- spec/integrations/goliath_spec.rb
 - spec/integrations/thin_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/polleverywhere/firehose
@@ -212,6 +199,5 @@ specification_version: 3
 summary: Build realtime Ruby web applications
 test_files:
 - spec/integrations/amqp_resources_spec.rb
-- spec/integrations/goliath_spec.rb
 - spec/integrations/thin_spec.rb
 - spec/spec_helper.rb

data/lib/firehose/goliath.rb

@@ -1,69 +0,0 @@
-require 'goliath'
-require 'goliath/websocket'
-
-module Firehose
-  module Goliath
-    class WebSocket < ::Goliath::WebSocket
-      use ::Goliath::Rack::Params
-
-      def on_open(env)
-        # TODO Fix the Firehose::App app to not need '/ws' in front of the socket.
-        path    = env['REQUEST_PATH'].gsub(/^\/ws/, '') # Name of the queue in AMQP we'll be pulling from.
-        cid     = params[:cid]
-
-        @subscription = Firehose::Subscription.new(cid)
-        @subscription.subscribe path do |payload|
-          env.stream_send(payload)
-        end
-      end
-
-      def on_close(env)
-        @subscription.unsubscribe if @subscription
-      end
-    end
-
-    class LongPolling < ::Goliath::API
-      use ::Goliath::Rack::Params
-
-      def response(env)
-        method  = env['REQUEST_METHOD'] # We use this to figure out if we're producing or consuming.
-        path    = env['REQUEST_PATH'] # Name of the queue in AMQP we'll be pulling from.
-        cid     = params[:cid]
-
-        case method
-        # GET is how clients subscribe to the queue. When a messages comes in, we flush out a response,
-        # close down the requeust, and the client then reconnects.
-        when 'GET'
-          subscription = Firehose::Subscription.new(cid)
-          subscription.subscribe path do |payload|
-            subscription.unsubscribe
-            env.chunked_stream_send(payload)
-            env.chunked_stream_close
-          end
-          chunked_streaming_response(200, 'Content-Type' => 'text/plain')
-        # PUT is how we throw messages on to the fan-out queue.
-        when 'PUT'
-          body = env['rack.input'].read
-          p [:put, path, body]
-          Firehose::Publisher.new.publish(path, body)
-
-          [202, {}, []]
-        else
-          [501, {}, ["#{method} not supported."]]
-        end
-      end
-
-    private
-      def self.connection
-        @connection ||= AMQP.connect
-      end
-    end
-
-    class App < ::Goliath::API
-      # TODO Figure out how to route this on schema (ws) or HTTP_UGPRADE header... it 
-      # all uses HTTP router under the covers, so it should be doable.
-      map '/ws/*',  WebSocket
-      map '/*',     LongPolling
-    end
-  end
-end

data/spec/integrations/goliath_spec.rb

@@ -1,55 +0,0 @@
-require 'spec_helper'
-require 'goliath'
-require 'em-http'
-
-describe Firehose::Goliath do
-  let(:app)       { Firehose::Goliath::App.new }
-  let(:messages)  { (1..1000).map(&:to_s) }
-  let(:channel)   { "/firehose/integration/#{Time.now.to_i}" }
-  let(:uri)       { URI.parse('http://127.0.0.1:9876') }
-  let(:url)       { "#{uri}#{channel}" }
-  let(:cid)       { "client-#{Time.now.to_i}" }
-
-  it "should pub-sub" do
-    outgoing, received = messages.dup, []
-
-    Goliath.env = :production
-    server = Goliath::Server.new
-    server.address  = uri.host
-    server.port     = uri.port
-    server.api      = app
-    server.app      = Goliath::Rack::Builder.build(Firehose::Goliath::App, server.api)
-    server.logger   = Log4r::Logger.new('goliath')
-
-    server.start do
-      EM.add_timer(30) { EM.stop } # Stop the server no matter what happens.
-
-      publish = Proc.new do
-        http = EM::HttpRequest.new(url).put(:body => outgoing.pop)
-        http.errback  { EM.stop }
-        http.callback { publish.call unless outgoing.empty? }
-      end
-
-      subscribe = Proc.new do
-        http = EM::HttpRequest.new(url).get(:query => {'cid' => cid})
-        http.errback { EM.stop }
-        http.callback do
-          received << http.response
-          if received.size < messages.size
-            subscribe.call
-          else
-            EM.stop
-          end
-        end
-      end
-
-      # Start the subscriber.
-      subscribe.call
-
-      # Wait a sec to let our subscribe setup.
-      EM.add_timer(1){ publish.call }
-    end
-
-    received.should =~ messages
-  end
-end