spec/transport/xhr_stream_spec.rb @@ -7,7 +7,7 @@ task :default => :spec Spec::Rake::SpecTask.new do |t| t.spec_opts = %w(-fs -c) - t.spec_files = FileList["spec/**_spec.rb"] + t.spec_files = FileList["spec/**/*_spec.rb"] end task :client do Rakefile @@ -1,6 +1,4 @@ require "eventmachine" -require "amqp" -require "mq" require "pusher/version" require "pusher/app" lib/pusher.rb @@ -1,19 +1,19 @@ +require "amqp" +require "mq" + module Pusher class Channel def initialize(id) @id = id @mq = MQ.new @topic = @mq.topic("pusher") - end - - def key - "channel.#{@id}" + @key = "channel.#{@id}" end def subscribe(session_id, transport) - queue = @mq.queue("#{key}.#{session_id}") + queue = @mq.queue("#{@key}.#{session_id}") - queue.bind(@topic, :key => key).subscribe do |message| + queue.bind(@topic, :key => @key).subscribe do |message| transport.write message end @@ -22,7 +22,7 @@ module Pusher end def publish(message) - @topic.publish(message, :routing_key => key) + @topic.publish(message, :routing_key => @key) end end end \ No newline at end of file lib/pusher/channel.rb @@ -1,10 +1,16 @@ class DeferrableBody include EM::Deferrable + attr_reader :queue + def initialize @queue = [] end + def closed? + !!@deferred_status + end + def schedule_dequeue return unless @body_callback EM.next_tick do lib/pusher/deferrable_body.rb @@ -27,6 +27,10 @@ module Pusher renderer.errback(&block) end + def closed? + renderer.closed? + end + Backends = {} def self.register(name) lib/pusher/transport/base.rb @@ -4,6 +4,12 @@ require 'spec' $:.unshift File.dirname(__FILE__) + "/../lib" require "pusher" +# Try installing em-spec from http://github.com/macournoyer/em-spec +# if this doesn't work +require 'em/spec' +require 'em/spec/rspec' +EM.spec_backend = EM::Spec::Rspec + module Helpers end spec/spec_helper.rb 0b49aaa69c4edc8e1d85fe38e029879a4ff6a116 macournoyer macournoyer@gmail.com http://github.com/macournoyer/pusher/commit/efa57b72cde296024070eb3e8fe17e572ee9ed1d efa57b72cde296024070eb3e8fe17e572ee9ed1d 2009-05-27T18:10:38-07:00 2009-05-27T18:10:38-07:00 Add specs for XhrStream transport f625b47f757cc242b57a6885249cc77a29111db1 macournoyer macournoyer@gmail.com