firehose 0.0.12 → 0.0.13

data/Guardfile

@@ -0,0 +1,6 @@
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+

data/firehose.gemspec

@@ -23,14 +23,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "amqp", ">= 0.9.4"
   s.add_runtime_dependency "thin"
   s.add_runtime_dependency "thor"
-  s.add_runtime_dependency "websocket-rack"
   s.add_runtime_dependency "faraday"
+  s.add_runtime_dependency "websocket-rack"
+  s.add_runtime_dependency "em-http-request", "~> 1.0.0"
 
   s.add_development_dependency "rspec"
-  s.add_development_dependency "rack-test"
   s.add_development_dependency "guard-rspec"
   s.add_development_dependency "guard-bundler"
-  # 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"
+  s.add_development_dependency "em-websocket-client"
 end

data/lib/firehose.rb

@@ -4,7 +4,9 @@ require 'amqp'
 require 'logger'
 
 module Firehose
+  autoload :Default,      'firehose/default'
   autoload :Subscription, 'firehose/subscription'
+  autoload :Producer,     'firehose/producer'
   autoload :Publisher,    'firehose/publisher'
   autoload :Rack,         'firehose/rack'
   autoload :CLI,          'firehose/cli'

data/lib/firehose/cli.rb

@@ -4,13 +4,18 @@ require 'thin'
 module Firehose
   class CLI < Thor
     desc "server", "starts the firehose server"
-    method_option :port, :type => :numeric, :default => 7474, :required => true, :aliases => '-p'
+    method_option :port, :type => :numeric, :default => Firehose::Default::URI.port, :required => true, :aliases => '-p'
     method_option :host, :type => :string, :default => '0.0.0.0', :required => true, :aliases => '-h'
     def server
       server = Thin::Server.new(options[:host], options[:port]) do
         run Firehose::Rack::App.new
       end
-      server.start!
+
+      begin
+        server.start!
+      rescue AMQP::TCPConnectionFailed => e
+        Firehose.logger.error "Unable to connect to AMQP, are you sure it's running?"
+      end
     end
   end
 end

data/lib/firehose/default.rb

@@ -0,0 +1,7 @@
+require 'uri'
+
+module Firehose
+  module Default
+    URI = URI.parse("//127.0.0.1:7474").freeze
+  end
+end

data/lib/firehose/producer.rb

@@ -0,0 +1,60 @@
+require "faraday"
+require "uri"
+
+module Firehose
+  # Publish messages to Firehose via an HTTP interface.
+  class Producer
+
+    # A DSL for publishing requests.
+    class Builder
+      def initialize(producer, message)
+        @producer, @message = producer, message
+        self
+      end
+
+      def to(channel, &callback)
+        @producer.put(@message, channel, &callback)
+      end
+    end
+
+    attr_reader :uri
+
+    def initialize(uri = Firehose::Default::URI)
+      @uri = URI.parse(uri.to_s)
+      @uri.scheme ||= 'http'
+    end
+
+    # A DSL for publishing messages.
+    def publish(message)
+      Builder.new(self, message)
+    end
+
+    # Publish the message via HTTP.
+    def put(message, channel, &block)
+      conn.put do |req|
+        req.path = channel
+        req.body = message
+      end.on_complete(&block)
+    end
+
+    # What adapter should Firehose use to PUT the message? List of adapters is
+    # available at 
+    def self.adapter=(adapter)
+      @adapter = adapter
+    end
+
+    # Use :net_http for the default Faraday adapter.
+    def self.adapter
+      @adapter ||= Faraday.default_adapter
+    end
+
+  private
+    # Build out a Faraday connection 
+    def conn
+      @conn ||= Faraday.new(:url => uri.to_s) do |builder|
+        builder.adapter   self.class.adapter
+        builder.response  :logger
+      end
+    end
+  end
+end

data/lib/firehose/version.rb

@@ -1,4 +1,4 @@
 module Firehose
-  VERSION = "0.0.12"
-  CODENAME = "Shouty Shamous"
+  VERSION = "0.0.13"
+  CODENAME = "Chug Bug"
 end

data/spec/integrations/thin_spec.rb

@@ -1,13 +1,19 @@
 require 'spec_helper'
+
 require 'thin'
 require 'em-http'
+require 'em-websocket-client'
 
 describe Firehose::Rack do
+  before(:each) do
+    Firehose::Producer.adapter = :em_http
+  end
+
   let(:app)       { Firehose::Rack::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(:uri)       { Firehose::Default::URI }
+  let(:http_url)  { "http://#{uri.host}:#{uri.port}#{channel}" }
   let(:ws_url)    { "ws://#{uri.host}:#{uri.port}#{channel}" }
   let(:cid)       { "client-#{Time.now.to_i}" }
 
@@ -24,14 +30,14 @@ describe Firehose::Rack do
 
     # Setup a publisher
     publish = Proc.new do
-      http = EM::HttpRequest.new(url).put(:body => outgoing.pop)
-      http.errback  { EM.stop }
-      http.callback { publish.call unless outgoing.empty? }
+      Firehose::Producer.new.publish(outgoing.pop).to(channel) do
+        publish.call unless outgoing.empty?
+      end
     end
 
     # Lets have an HTTP Long poll client
     http_long_poll = Proc.new do
-      http = EM::HttpRequest.new(url).get(:query => {'cid' => cid})
+      http = EM::HttpRequest.new(http_url).get(:query => {'cid' => cid})
       http.errback { EM.stop }
       http.callback do
         received_http << http.response
@@ -45,9 +51,9 @@ describe Firehose::Rack do
 
     # And test a web socket client too, at the same time.
     websocket = Proc.new do
-      http = EventMachine::HttpRequest.new(ws_url).get
-      http.errback  { EM.stop }
-      http.stream do |msg|
+      ws = EventMachine::WebSocketClient.connect(ws_url)
+      ws.errback  { EM.stop }
+      ws.stream do |msg|
         received_ws << msg
         succeed.call unless received_ws.size < messages.size
       end
@@ -59,7 +65,7 @@ describe Firehose::Rack do
       EM.add_timer(30) { EM.stop }
 
       # Start the server
-      ::Thin::Server.new(uri.host, uri.port, app).start
+      ::Thin::Server.new('0.0.0.0', uri.port, app).start
 
       # Start the http_long_pollr.
       http_long_poll.call
@@ -71,6 +77,6 @@ describe Firehose::Rack do
 
     # When EM stops, these assertions will be made.
     received_http.should  =~ messages
-    received_ws.should    =~ messages
+    # received_ws.should    =~ messages
   end
 end

data/spec/lib/default_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Firehose::Default do
+  it "should have 7474 for default port" do
+    Firehose::Default::URI.to_s.should == '//127.0.0.1:7474'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firehose
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70182613622860 !ruby/object:Gem::Requirement
+  requirement: &70150665890720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0.beta
   type: :runtime
   prerelease: false
-  version_requirements: *70182613622860
+  version_requirements: *70150665890720
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70182613621920 !ruby/object:Gem::Requirement
+  requirement: &70150665887200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *70182613621920
+  version_requirements: *70150665887200
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70182613620960 !ruby/object:Gem::Requirement
+  requirement: &70150665886040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182613620960
+  version_requirements: *70150665886040
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70182613619960 !ruby/object:Gem::Requirement
+  requirement: &70150665884200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182613619960
+  version_requirements: *70150665884200
 - !ruby/object:Gem::Dependency
-  name: websocket-rack
-  requirement: &70182613619120 !ruby/object:Gem::Requirement
+  name: faraday
+  requirement: &70150665882880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182613619120
+  version_requirements: *70150665882880
 - !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: &70182613617780 !ruby/object:Gem::Requirement
+  name: websocket-rack
+  requirement: &70150665927120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,21 +77,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182613617780
+  version_requirements: *70150665927120
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70182613617160 !ruby/object:Gem::Requirement
+  name: em-http-request
+  requirement: &70150665926500 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.0.0
+  type: :runtime
   prerelease: false
-  version_requirements: *70182613617160
+  version_requirements: *70150665926500
 - !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: &70182613615900 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &70150665926040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182613615900
+  version_requirements: *70150665926040
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70182613629800 !ruby/object:Gem::Requirement
+  requirement: &70150665925480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182613629800
+  version_requirements: *70150665925480
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70182613627180 !ruby/object:Gem::Requirement
+  requirement: &70150665924560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,21 +121,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182613627180
+  version_requirements: *70150665924560
 - !ruby/object:Gem::Dependency
-  name: em-http-request
-  requirement: &70182613625900 !ruby/object:Gem::Requirement
+  name: guard-coffeescript
+  requirement: &70150665923840 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182613625900
+  version_requirements: *70150665923840
 - !ruby/object:Gem::Dependency
-  name: guard-coffeescript
-  requirement: &70182613624400 !ruby/object:Gem::Requirement
+  name: em-websocket-client
+  requirement: &70150665921360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182613624400
+  version_requirements: *70150665921360
 description: Firehose is a realtime web application toolkit for building realtime
   Ruby web applications.
 email:
@@ -158,6 +158,7 @@ files:
 - .rbenv-version
 - .rspec
 - Gemfile
+- Guardfile
 - Procfile
 - README.md
 - Rakefile
@@ -173,13 +174,15 @@ files:
 - lib/assets/javascripts/firehose/web_socket.js.coffee
 - lib/firehose.rb
 - lib/firehose/cli.rb
-- lib/firehose/http_publisher.rb
+- lib/firehose/default.rb
+- lib/firehose/producer.rb
 - lib/firehose/publisher.rb
 - lib/firehose/rack.rb
 - lib/firehose/subscription.rb
 - lib/firehose/version.rb
 - spec/integrations/amqp_resources_spec.rb
 - spec/integrations/thin_spec.rb
+- spec/lib/default_spec.rb
 - spec/spec_helper.rb
 homepage: http://firehose.io/
 licenses: []
@@ -208,4 +211,5 @@ summary: Build realtime Ruby web applications
 test_files:
 - spec/integrations/amqp_resources_spec.rb
 - spec/integrations/thin_spec.rb
+- spec/lib/default_spec.rb
 - spec/spec_helper.rb

data/lib/firehose/http_publisher.rb

@@ -1,32 +0,0 @@
-require "net/http"
-require "uri"
-
-module Firehose
-  class HttpPublisher
-    attr_reader :uri
-
-    class RequestBuilder
-      attr_reader :uri, :message, :channel
-
-      def initialize(uri, message)
-        @uri, @message = uri, message
-      end
-
-      def to(channel)
-        req = Net::HTTP::Put.new(channel)
-        req.body = message
-        res = Net::HTTP.start(uri.host, uri.port) do |http|
-          response = http.request(req)
-        end
-      end
-    end
-
-    def initialize(uri)
-      @uri = URI.parse(uri)
-    end
-
-    def publish(message)
-      RequestBuilder.new(uri, message)
-    end
-  end
-end