dripdrop 0.9.6 → 0.9.8

data/Rakefile

@@ -13,9 +13,8 @@ begin
     gem.add_dependency('ffi-rzmq', '>= 0.7.1')
     gem.add_dependency('eventmachine', '>= 0.12.10')
     gem.add_dependency('em-websocket')
-    gem.add_dependency('thin')
+    gem.add_dependency('eventmachine_httpserver')
     gem.add_dependency('em-zeromq', '>= 0.1.2')
-    gem.add_dependency('msgpack')
     gem.add_dependency('yajl-ruby')
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.9.6
+0.9.8

data/dripdrop.gemspec

@@ -1,112 +1,106 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dripdrop}
-  s.version = "0.9.6"
+  s.version = "0.9.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Cholakian"]
-  s.date = %q{2011-02-10}
+  s.date = %q{2011-02-15}
   s.description = %q{Evented framework for ZeroMQ and EventMachine Apps. }
   s.email = %q{andrew@andrewvc.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "doc_img/topology.png",
-     "dripdrop.gemspec",
-     "example/agent_test.rb",
-     "example/combined.rb",
-     "example/complex/README",
-     "example/complex/client.rb",
-     "example/complex/server.rb",
-     "example/complex/service.rb",
-     "example/complex/websocket.rb",
-     "example/http.rb",
-     "example/pubsub.rb",
-     "example/pushpull.rb",
-     "example/subclass.rb",
-     "example/xreq_xrep.rb",
-     "js/dripdrop.html",
-     "js/dripdrop.js",
-     "js/qunit.css",
-     "js/qunit.js",
-     "lib/dripdrop.rb",
-     "lib/dripdrop/agent.rb",
-     "lib/dripdrop/handlers/base.rb",
-     "lib/dripdrop/handlers/http.rb",
-     "lib/dripdrop/handlers/websockets.rb",
-     "lib/dripdrop/handlers/zeromq.rb",
-     "lib/dripdrop/message.rb",
-     "lib/dripdrop/node.rb",
-     "lib/dripdrop/node/nodelet.rb",
-     "spec/gimite-websocket.rb",
-     "spec/message_spec.rb",
-     "spec/node/http_spec.rb",
-     "spec/node/nodelet_spec.rb",
-     "spec/node/routing_spec.rb",
-     "spec/node/websocket_spec.rb",
-     "spec/node/zmq_pushpull_spec.rb",
-     "spec/node/zmq_xrepxreq_spec.rb",
-     "spec/node_spec.rb",
-     "spec/spec_helper.rb"
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "doc_img/topology.png",
+    "dripdrop.gemspec",
+    "example/agent_test.rb",
+    "example/combined.rb",
+    "example/complex/README",
+    "example/complex/client.rb",
+    "example/complex/server.rb",
+    "example/complex/service.rb",
+    "example/complex/websocket.rb",
+    "example/http.rb",
+    "example/pubsub.rb",
+    "example/pushpull.rb",
+    "example/subclass.rb",
+    "example/xreq_xrep.rb",
+    "js/dripdrop.html",
+    "js/dripdrop.js",
+    "js/qunit.css",
+    "js/qunit.js",
+    "lib/dripdrop.rb",
+    "lib/dripdrop/agent.rb",
+    "lib/dripdrop/handlers/base.rb",
+    "lib/dripdrop/handlers/http.rb",
+    "lib/dripdrop/handlers/websockets.rb",
+    "lib/dripdrop/handlers/zeromq.rb",
+    "lib/dripdrop/message.rb",
+    "lib/dripdrop/node.rb",
+    "lib/dripdrop/node/nodelet.rb",
+    "spec/gimite-websocket.rb",
+    "spec/message_spec.rb",
+    "spec/node/http_spec.rb",
+    "spec/node/nodelet_spec.rb",
+    "spec/node/routing_spec.rb",
+    "spec/node/websocket_spec.rb",
+    "spec/node/zmq_pushpull_spec.rb",
+    "spec/node/zmq_xrepxreq_spec.rb",
+    "spec/node_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/andrewvc/dripdrop}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.1}
   s.summary = %q{Evented framework for ZeroMQ and EventMachine Apps.}
   s.test_files = [
+    "spec/gimite-websocket.rb",
+    "spec/message_spec.rb",
+    "spec/node/http_spec.rb",
+    "spec/node/nodelet_spec.rb",
+    "spec/node/routing_spec.rb",
+    "spec/node/websocket_spec.rb",
+    "spec/node/zmq_pushpull_spec.rb",
+    "spec/node/zmq_xrepxreq_spec.rb",
     "spec/node_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/gimite-websocket.rb",
-     "spec/message_spec.rb",
-     "spec/node/nodelet_spec.rb",
-     "spec/node/zmq_pushpull_spec.rb",
-     "spec/node/zmq_xrepxreq_spec.rb",
-     "spec/node/routing_spec.rb",
-     "spec/node/websocket_spec.rb",
-     "spec/node/http_spec.rb"
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ffi-rzmq>, [">= 0.7.1"])
       s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
       s.add_runtime_dependency(%q<em-websocket>, [">= 0"])
-      s.add_runtime_dependency(%q<thin>, [">= 0"])
+      s.add_runtime_dependency(%q<eventmachine_httpserver>, [">= 0"])
       s.add_runtime_dependency(%q<em-zeromq>, [">= 0.1.2"])
-      s.add_runtime_dependency(%q<msgpack>, [">= 0"])
       s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
     else
       s.add_dependency(%q<ffi-rzmq>, [">= 0.7.1"])
       s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
       s.add_dependency(%q<em-websocket>, [">= 0"])
-      s.add_dependency(%q<thin>, [">= 0"])
+      s.add_dependency(%q<eventmachine_httpserver>, [">= 0"])
       s.add_dependency(%q<em-zeromq>, [">= 0.1.2"])
-      s.add_dependency(%q<msgpack>, [">= 0"])
       s.add_dependency(%q<yajl-ruby>, [">= 0"])
     end
   else
     s.add_dependency(%q<ffi-rzmq>, [">= 0.7.1"])
     s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
     s.add_dependency(%q<em-websocket>, [">= 0"])
-    s.add_dependency(%q<thin>, [">= 0"])
+    s.add_dependency(%q<eventmachine_httpserver>, [">= 0"])
     s.add_dependency(%q<em-zeromq>, [">= 0.1.2"])
-    s.add_dependency(%q<msgpack>, [">= 0"])
     s.add_dependency(%q<yajl-ruby>, [">= 0"])
   end
 end

data/example/http.rb

@@ -14,7 +14,7 @@ DripDrop::Node.new do
     client = http_client(addr)
     msg = DripDrop::Message.new('http/status', :body => "Success #{i}")
     client.send_message(msg) do |resp_msg|
-      puts resp_msg.inspect
+      puts "RESP: #{resp_msg.inspect}"
     end
   end
 

data/lib/dripdrop/handlers/base.rb

@@ -1,6 +1,27 @@
 class DripDrop
   class BaseHandler
     
+    def on_error(&block)
+      @err_cbak = block
+    end
+
+    def handle_error(exception,*extra)
+      if @err_cbak
+        begin
+          @err_cbak.call(exception,*extra)
+        rescue StandardError => e
+          print_exception(e)
+        end
+      else
+        print_exception(e)
+      end
+    end
+
+    def print_exception(exception)
+      $stderr.write exception.message
+      $stderr.write exception.backtrace.join("\t\n")
+    end
+     
     private
     # Normalize Hash objs and DripDrop::Message objs into DripDrop::Message objs
     def dd_messagify(message)

data/lib/dripdrop/handlers/http.rb

@@ -1,89 +1,64 @@
-require 'thin'
-require 'thin_parser'
+require 'eventmachine'
+require 'evma_httpserver'
 
 class DripDrop
-  class HTTPDeferrableBody < BaseHandler
-    include EventMachine::Deferrable
-    
-    def call(body)
-      body.each do |chunk|
-        @body_callback.call(chunk)
-      end
+  class HTTPServerHandlerResponse < BaseHandler
+    attr_reader :em_response, :message_class
+    def initialize(em_response)
+      @em_response   = em_response
     end
 
-    def each(&blk)
-      @body_callback = blk
-    end
-    
-    def send_message(raw_msg)
-      msg = dd_messagify(raw_msg)
-      if msg.is_a?(DripDrop::Message)
-        json = msg.encode_json
-        self.call([json])
-        self.succeed
-      else
-        raise "Message Type '#{msg.class}' not supported"
-      end
+    def send_message(message)
+      message = dd_messagify(message)
+      @em_response.status = 200
+      @em_response.content      = message.json_encoded
+      @em_response.send_response
     end
   end
-  
-  class HTTPApp
+   
+  class HTTPEMServer < EM::Connection
+    include EM::HttpServer
     
-    AsyncResponse = [-1, {}, []].freeze
-    
-    def initialize(msg_format,&block)
-      @msg_format = msg_format
-      @recv_cbak  = block
+    def initialize(dd_handler)
+      @dd_handler = dd_handler
+    end
+     
+    def post_init
+      super
+      no_environment_strings
     end
     
-    def call(env)
-      body = HTTPDeferrableBody.new
-      
-      EM.next_tick do
-        env['async.callback'].call([200, {'Content-Type' => 'text/plain', 'Access-Control-Allow-Origin' => '*'}, body])
-        EM.next_tick do
-          case @msg_format
-          when :dripdrop_json
-            msg = DripDrop::Message.decode_json(env['rack.input'].read)
-            @recv_cbak.call(msg,body,env)
-          else
-            raise "Unsupported message type #{@msg_format}"
-          end
-        end
+    def process_http_request
+      begin
+        message     = @dd_handler.message_class.decode_json(@http_post_content)
+        response    = EM::DelegatedHttpResponse.new(self)
+        dd_response = HTTPServerHandlerResponse.new(response)
+        @dd_handler.recv_cbak.call(message, dd_response) if @dd_handler.recv_cbak
+      rescue StandardError => e
+        handler_error(e)
       end
-       
-      AsyncResponse
     end
   end
-  
+
   class HTTPServerHandler < BaseHandler
-    attr_reader :address, :opts
+    attr_reader :address, :opts, :message_class, :uri, :recv_cbak
     
     def initialize(uri,opts={})
-      @uri     = uri
-      @address = uri.to_s
-      @opts    = opts
+      @uri      = uri
+      @uri_path = @uri.path.empty? ? '/' : @uri.path
+      @address  = uri.to_s
+      @opts     = opts
       @message_class = @opts[:message_class] || DripDrop.default_message_class
     end
     
     def on_recv(msg_format=:dripdrop_json,&block)
-      #Thin's error handling only rescues stuff w/o a backtrace
-      begin
-        Thin::Logging.silent = true
-         
-        uri_path = @uri.path.empty? ? '/' : @uri.path
-         
-        Thin::Server.start(@uri.host, @uri.port) do
-          map uri_path do
-            run HTTPApp.new(msg_format,&block)
-          end
-        end
-      rescue Exception => e
-        $stderr.write "Error in Thin server: #{e.message}\n#{e.backtrace.join("\n")}"
-      end
+      @recv_cbak = block
+      @conn = EM.start_server(@uri.host, @uri.port, HTTPEMServer, self)
+      self
     end
   end
 
+
   class HTTPClientHandler < BaseHandler
     attr_reader :address, :opts
     
@@ -106,7 +81,14 @@ class DripDrop
           :content => dd_message.encode_json
         )
         req.callback do |response|
-          block.call(@message_class.decode_json(response[:content]))
+          begin
+            # Hack to fix evma http
+            response[:content] =~ /(\{.*\})/ 
+            fixed_body = $1
+            block.call(@message_class.decode(fixed_body)) if block
+          rescue StandardError => e
+            handle_error(e)
+          end
         end
       else
         raise "Unsupported message type '#{dd_message.class}'"

data/lib/dripdrop/handlers/websockets.rb

@@ -1,37 +1,45 @@
 require 'em-websocket'
-require 'json'
+
 
 class DripDrop
   class WebSocketHandler < BaseHandler
+    class SocketError < StandardError; attr_accessor :reason, :connection end
+    
     attr_reader :ws, :address, :thread
    
     def initialize(address,opts={})
-      @raw    = false #Deal in strings or ZMQ::Message objects
-      host, port = address.host, address.port.to_i
-      @debug = opts[:debug] || false
+      @opts = opts
+      @raw           = false #Deal in strings or ZMQ::Message objects
+      host, port     = address.host, address.port.to_i
+      @message_class = @opts[:message_class] || DripDrop.default_message_class
+      @debug         = @opts[:debug] || false
 
       EventMachine::WebSocket.start(:host => host,:port => port,:debug => @debug) do |ws|
         #A WebSocketHandler:Connection gets passed to all callbacks 
         dd_conn = Connection.new(ws)
           
-        ws.onopen { @onopen_handler.call(dd_conn) if @onopen_handler }
+        ws.onopen  { @onopen_handler.call(dd_conn) if @onopen_handler }
         ws.onclose { @onclose_handler.call(dd_conn) if @onclose_handler }
-        ws.onerror {|reason| @onerror_handler.call(reason, dd_conn) if @onerror_handler }
+        ws.onerror {|reason|
+          e = SocketError.new
+          e.reason     = reason
+          e.connection = dd_conn
+          handle_error(e)
+        }
         
-        ws.onmessage do |message|
+        ws.onmessage { |message|
           if @onmessage_handler
             begin
-              message = DripDrop::Message.decode_json(message) unless @raw
+              message = @message_class.decode(message) unless @raw
+              @onmessage_handler.call(message,dd_conn)
             rescue StandardError => e
-              $stderr.write "Could not parse message: #{e.message}" if @debug
+              handle_error(e,dd_conn)
             end
-             
-            @onmessage_handler.call(message,dd_conn)
           end
-        end
+        }
       end
     end
-    
+
     def on_recv(&block)
       @raw = false
       @onmessage_handler = block
@@ -53,11 +61,6 @@ class DripDrop
       @onclose_handler = block
       self
     end
-    
-    def on_error(&block)
-      @onerror_handler = block
-      self
-    end
   end
   
   class WebSocketHandler::Connection < BaseHandler
@@ -69,7 +72,8 @@ class DripDrop
     end
 
     def send_message(message)
-      @ws.send(dd_messagify(message).to_hash.to_json)
+      encoded_message = dd_messagify(message).encoded
+      @ws.send(encoded_message)
     end
   end
 end

data/lib/dripdrop/handlers/zeromq.rb

@@ -38,7 +38,7 @@ class DripDrop
     def initialize(*args)
       super(*args)
       @send_queue = []
-      @send_queue_enabled = true
+      @send_queue_enabled = false
     end
 
     def on_writable(socket)
@@ -48,7 +48,7 @@ class DripDrop
         num_parts = message.length
         message.each_with_index do |part,i|
           # Set the multi-part flag unless this is the last message
-          flags = (i + 1 < num_parts ? ZMQ::SNDMORE : 0) + ZMQ::NOBLOCK
+          flags = (i + 1 < num_parts ? ZMQ::SNDMORE : 0) | ZMQ::NOBLOCK
 
           if part.class == ZMQ::Message
             socket.send(part, flags)
@@ -104,15 +104,19 @@ class DripDrop
     end
 
     def on_readable(socket, messages)
-      case @msg_format
-      when :raw
-        @recv_cbak.call(messages)
-      when :dripdrop
-        raise "Expected message in one part" if messages.length > 1
-        body  = messages.shift.copy_out_string
-        @recv_cbak.call(decode_message(body))
-      else
-        raise "Unknown message format '#{@msg_format}'"
+      begin
+        case @msg_format
+        when :raw
+          @recv_cbak.call(messages)
+        when :dripdrop
+          raise "Expected message in one part" if messages.length > 1
+          body  = messages.shift.copy_out_string
+          @recv_cbak.call(decode_message(body))
+        else
+          raise "Unknown message format '#{@msg_format}'"
+        end
+      rescue StandardError => e
+        handle_error(e)
       end
     end
 
@@ -255,8 +259,12 @@ class DripDrop
     end
 
     def on_readable(socket, messages)
-      # Strip out empty delimiter
-      super(socket, messages[1..-1])
+      begin
+        # Strip out empty delimiter
+        super(socket, messages[1..-1])
+      rescue StandardError => e
+        handle_error(e)
+      end
     end
   end
 end

data/lib/dripdrop/message.rb

@@ -1,9 +1,15 @@
 require 'rubygems'
-require 'msgpack'
-require 'yajl'
+
+if PLATFORM == 'java'
+  require 'json'
+else
+  require 'yajl'
+  require 'yajl/json_gem'
+end
 
 class DripDrop
   class WrongMessageClassError < StandardError; end
+  
   # DripDrop::Message messages are exchanged between all tiers in the architecture
   # A Message is composed of a name, head, and body, and should be restricted to types that
   # can be readily encoded to JSON.
@@ -40,12 +46,12 @@ class DripDrop
 
     # The encoded message, ready to be sent across the wire via ZMQ
     def encoded
-      self.to_hash.to_msgpack
+      self.to_hash.to_json
     end
 
-    # Encodes the hash represntation of the message to JSON
+    # (Deprecated) Encodes the hash represntation of the message to JSON
     def json_encoded
-      Yajl::Encoder.encode self.to_hash
+      encoded
     end
     # (Deprecated, use json_encoded)
     def encode_json; json_encoded; end
@@ -73,40 +79,56 @@ class DripDrop
 
     def self.recreate_message(hash)
       raise ArgumentError, "Message missing head: #{hash.inspect}" unless hash['head']
-      raise DripDrop::WrongMessageClassError, "Wrong message class #{hash['head']['message_class']} for #{self.to_s}" unless hash['head']['message_class'] == self.to_s
-      self.from_hash(hash)
+       
+      klass = (hash['head'] && hash['head']['message_class']) ? constantize(hash['head']['message_class']) : nil
+      if klass && (!(klass == self) && !self.subclasses.include?(klass))
+        raise DripDrop::WrongMessageClassError, "Wrong message class '#{klass}', expected '#{self}'"
+      end
+       
+      klass ? klass.from_hash(hash) : self.from_hash(hash)
     end
 
     # Parses an already encoded string
     def self.decode(msg)
       return nil if msg.nil? || msg.empty?
-      #This makes parsing ZMQ messages less painful, even if its ugly here
-      #We check the class name as a string in case we don't have ZMQ loaded
-      if msg.class.to_s == 'ZMQ::Message'
-        msg = msg.copy_out_string
-        return nil if msg.empty?
-      end
-      decoded = MessagePack.unpack(msg)
+
+      decoded = JSON.parse(msg)
       self.recreate_message(decoded)
     end
 
     # (Deprecated). Use decode instead
     def self.parse(msg); self.decode(msg) end
 
-    # Decodes a string containing a JSON representation of a message
+    # (Deprecated) Decodes a string containing a JSON representation of a message
     def self.decode_json(str)
+      self.decode(str)
+    end
+
+    def self.constantize(str)
       begin
-        json_hash = Yajl::Parser.parse(str)
-      rescue Yajl::ParseError => e
-        puts "Could not parse msg '#{str}': #{e.message}"
-        return nil
+        str.split('::').inject(Object) {|memo,name|
+          memo =  memo.const_get(name); memo
+        }
+      rescue NameError => e
+        nil
       end
-      
-      # Keep this consistent
-      json_hash['head']['message_class'] = json_hash['head']['message_class']
-      json_hash['head'].delete('message_class')
-       
-      self.new(json_hash['name'], 'head' => json_hash['head'], :body => json_hash['body'])
+    end
+
+    #Used for reconstructing messages
+    def self.subclasses(direct = false)
+      classes = []
+      if direct
+        ObjectSpace.each_object(Class) do |c|
+          next unless c.superclass == self
+          classes << c
+        end
+      else
+        ObjectSpace.each_object(Class) do |c|
+          next unless c.ancestors.include?(self) and (c != self)
+          classes << c
+        end
+      end
+      classes
     end
   end
 
@@ -157,6 +179,7 @@ class DripDrop
     end
   end
 
+
   #Including this module into your subclass will automatically register the class
   #with AutoMessageClass
   module SubclassedMessage

data/lib/dripdrop/node/nodelet.rb

@@ -3,10 +3,15 @@ class DripDrop::Node
   class Nodelet
     attr_accessor :name, :routing
     
-    def initialize(ctx, name, routes)
+    def initialize(ctx, name, *configure_args) 
       @ctx              = ctx
       @name             = name
       @internal_routing = {}
+      configure(*configure_args)
+    end
+    
+    def configure(*args)
+      # Do nothing!
     end
     
     def route(name,handler_type,*handler_args)

data/lib/dripdrop/node.rb

@@ -138,8 +138,8 @@ class DripDrop
     #
     # If you specify a block, Nodelet#action will be ignored and the block
     # will be run
-    def nodelet(name,klass=Nodelet,&block)
-      nlet = @nodelets[name] ||= klass.new(self,name,routing)
+    def nodelet(name,klass=Nodelet,*configure_args,&block)
+      nlet = @nodelets[name] ||= klass.new(self,name,*configure_args)
       if block
         block.call(nlet)
       else
@@ -147,7 +147,7 @@ class DripDrop
       end
       nlet
     end
-
+    
     # Creates a ZMQ::SUB type socket. Can only receive messages via +on_recv+.
     # zmq_subscribe sockets have a +topic_filter+ option, which restricts which
     # messages they can receive. It takes a regexp as an option.
@@ -269,7 +269,8 @@ class DripDrop
     end
 
     # Catch all error handler
-    def error_handler(e)
+    # Global to all DripDrop Nodes
+    def self.error_handler(e)
       $stderr.write "#{e.class}: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
     end
 

data/spec/message_spec.rb

@@ -40,19 +40,14 @@ describe DripDrop::Message do
       before(:all) do
         @message, @attrs = create_basic
       end
-      it "should encode to valid MessagePack hash without error" do
+      it "should encode to valid JSON hash without error" do
         enc = @message.encoded
         enc.should be_a(String)
-        MessagePack.unpack(enc).should be_a(Hash)
+        JSON.parse(enc).should be_a(Hash)
       end
       it "should decode encoded messages without errors" do
         DripDrop::Message.decode(@message.encoded).should be_a(DripDrop::Message)
       end
-      it "should encode to valid JSON without error" do
-        enc = @message.json_encoded
-        enc.should be_a(String)
-        JSON.parse(enc).should be_a(Hash)
-      end
       it "should decode JSON encoded messages without errors" do
         DripDrop::Message.decode_json(@message.json_encoded).should be_a(DripDrop::Message)
       end

data/spec/node/http_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+require 'set'
+
 describe "http" do
   
   def http_send_messages(to_send,addr=rand_addr('http'),&block)

data/spec/node/websocket_spec.rb

@@ -4,6 +4,7 @@ describe "websockets" do
   def websockets_send_messages(to_send,&block)
     received  = []
     responses = []
+    seen_signatures = Set.new
     server = nil
     
     open_message  = DripDrop::Message.new('open',  :body => 'test')
@@ -13,12 +14,13 @@ describe "websockets" do
     
     error_occured = false
     
-    @node = run_reactor(1) do
+    @node = run_reactor(2) do
       addr = rand_addr('ws')
       
       server = websocket(addr)
       server.on_open do |conn|
         conn.send_message(open_message)
+        seen_signatures << conn.signature
       end.on_recv do |message,conn|
         received << message
         conn.send_message(message)
@@ -30,7 +32,7 @@ describe "websockets" do
       
       EM.defer do
         client = WebSocket.new(addr)
-        open_received = DripDrop::Message.decode_json(client.receive)
+        open_received = DripDrop::Message.decode(client.receive)
         to_send.each do |message|
           client.send(message.json_encoded)
         end
@@ -41,6 +43,10 @@ describe "websockets" do
           recvd_count += 1
         end
         client.close
+        
+        # This one only connects to test unique signatures
+        client2 = WebSocket.new(addr)
+        client2.close
       end
       
       zmq_subscribe(rand_addr, :bind) {} #Keep zmqmachine happy
@@ -48,8 +54,8 @@ describe "websockets" do
     
     {:received => received, :responses => responses, 
      :open_message => open_message,   :open_received => open_received,
-     :close_occured => close_occured, :error_occured => error_occured, 
-     :handlers => {:server => server }}
+     :close_occured => close_occured, :error_occured => error_occured,
+     :seen_signatures => seen_signatures,:handlers => {:server => server }}
   end
   describe "basic sending and receiving" do
     before(:all) do
@@ -84,5 +90,9 @@ describe "websockets" do
     it "should not generate an error event" do
       @ws_info[:error_occured].should be_false
     end
+    
+    it "should see unique connection signatures for each client" do
+      @ws_info[:seen_signatures].length.should == 2
+    end
   end
 end

data/spec/node_spec.rb

@@ -72,6 +72,7 @@ describe DripDrop::Node do
     class TestException < StandardError; end
      
     it "should rescue exceptions in the EM reactor" do
+      pending "Not sure if this feature is a good idea"
       expectations = an_instance_of(TestException)
       reactor = run_reactor do
         self.should_receive(:error_handler).with(expectations)

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), %w[. .. lib dripdrop]))
+require 'set'
+
 Thread.abort_on_exception = true
 
 # Used to test websocket clients. 

metadata

@@ -1,127 +1,84 @@
 --- !ruby/object:Gem::Specification 
 name: dripdrop
 version: !ruby/object:Gem::Version 
-  hash: 55
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 6
-  version: 0.9.6
+  prerelease: 
+  version: 0.9.8
 platform: ruby
 authors: 
-- Andrew Cholakian
+  - Andrew Cholakian
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 -08:00
+date: 2011-02-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ffi-rzmq
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 7
-        - 1
-        version: 0.7.1
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 12
-        - 10
-        version: 0.12.10
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: em-websocket
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: thin
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: em-zeromq
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
-        version: 0.1.2
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: msgpack
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id007
+  - !ruby/object:Gem::Dependency 
+    name: ffi-rzmq
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.7.1
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: eventmachine
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.12.10
+    type: :runtime
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: em-websocket
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: eventmachine_httpserver
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: em-zeromq
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.1.2
+    type: :runtime
+    version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: yajl-ruby
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id006
 description: "Evented framework for ZeroMQ and EventMachine Apps. "
 email: andrew@andrewvc.com
 executables: []
@@ -129,94 +86,87 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
-- README.md
+  - LICENSE
+  - README.md
 files: 
-- .document
-- .gitignore
-- LICENSE
-- README.md
-- Rakefile
-- VERSION
-- doc_img/topology.png
-- dripdrop.gemspec
-- example/agent_test.rb
-- example/combined.rb
-- example/complex/README
-- example/complex/client.rb
-- example/complex/server.rb
-- example/complex/service.rb
-- example/complex/websocket.rb
-- example/http.rb
-- example/pubsub.rb
-- example/pushpull.rb
-- example/subclass.rb
-- example/xreq_xrep.rb
-- js/dripdrop.html
-- js/dripdrop.js
-- js/qunit.css
-- js/qunit.js
-- lib/dripdrop.rb
-- lib/dripdrop/agent.rb
-- lib/dripdrop/handlers/base.rb
-- lib/dripdrop/handlers/http.rb
-- lib/dripdrop/handlers/websockets.rb
-- lib/dripdrop/handlers/zeromq.rb
-- lib/dripdrop/message.rb
-- lib/dripdrop/node.rb
-- lib/dripdrop/node/nodelet.rb
-- spec/gimite-websocket.rb
-- spec/message_spec.rb
-- spec/node/http_spec.rb
-- spec/node/nodelet_spec.rb
-- spec/node/routing_spec.rb
-- spec/node/websocket_spec.rb
-- spec/node/zmq_pushpull_spec.rb
-- spec/node/zmq_xrepxreq_spec.rb
-- spec/node_spec.rb
-- spec/spec_helper.rb
+  - .document
+  - LICENSE
+  - README.md
+  - Rakefile
+  - VERSION
+  - doc_img/topology.png
+  - dripdrop.gemspec
+  - example/agent_test.rb
+  - example/combined.rb
+  - example/complex/README
+  - example/complex/client.rb
+  - example/complex/server.rb
+  - example/complex/service.rb
+  - example/complex/websocket.rb
+  - example/http.rb
+  - example/pubsub.rb
+  - example/pushpull.rb
+  - example/subclass.rb
+  - example/xreq_xrep.rb
+  - js/dripdrop.html
+  - js/dripdrop.js
+  - js/qunit.css
+  - js/qunit.js
+  - lib/dripdrop.rb
+  - lib/dripdrop/agent.rb
+  - lib/dripdrop/handlers/base.rb
+  - lib/dripdrop/handlers/http.rb
+  - lib/dripdrop/handlers/websockets.rb
+  - lib/dripdrop/handlers/zeromq.rb
+  - lib/dripdrop/message.rb
+  - lib/dripdrop/node.rb
+  - lib/dripdrop/node/nodelet.rb
+  - spec/gimite-websocket.rb
+  - spec/message_spec.rb
+  - spec/node/http_spec.rb
+  - spec/node/nodelet_spec.rb
+  - spec/node/routing_spec.rb
+  - spec/node/websocket_spec.rb
+  - spec/node/zmq_pushpull_spec.rb
+  - spec/node/zmq_xrepxreq_spec.rb
+  - spec/node_spec.rb
+  - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/andrewvc/dripdrop
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Evented framework for ZeroMQ and EventMachine Apps.
 test_files: 
-- spec/node_spec.rb
-- spec/spec_helper.rb
-- spec/gimite-websocket.rb
-- spec/message_spec.rb
-- spec/node/nodelet_spec.rb
-- spec/node/zmq_pushpull_spec.rb
-- spec/node/zmq_xrepxreq_spec.rb
-- spec/node/routing_spec.rb
-- spec/node/websocket_spec.rb
-- spec/node/http_spec.rb
+  - spec/gimite-websocket.rb
+  - spec/message_spec.rb
+  - spec/node/http_spec.rb
+  - spec/node/nodelet_spec.rb
+  - spec/node/routing_spec.rb
+  - spec/node/websocket_spec.rb
+  - spec/node/zmq_pushpull_spec.rb
+  - spec/node/zmq_xrepxreq_spec.rb
+  - spec/node_spec.rb
+  - spec/spec_helper.rb

data/.gitignore

@@ -1,26 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-*.swo
-
-## PROJECT::GENERAL
-coverage
-rdoc
-doc
-pkg
-
-#RBX
-*.rbc
-
-## PROJECT::SPECIFIC