dripdrop 0.5.0 → 0.6.0

data/README.md

@@ -40,7 +40,7 @@ Here's an example of the kind of thing DripDrop makes easy, from [example/combin
       end
     end.start! #Start the reactor and block until complete
 
-Note that these aren't regular ZMQ sockets, and that the HTTP server isn't a regular server. They only speak and respond using DripDrop::Message formatted messages. For HTTP/WebSockets it's JSON that looks like {name: 'name', head: {}, body: anything}, for ZeroMQ it means BERT. There is a raw mode that you can use for other message formats, but using DripDrop::Messages makes things easier, and for some socket types (like XREQ/XREP) the predefined format is very useful in matching requests to replies.
+Note that these aren't regular ZMQ sockets, and that the HTTP server isn't a regular server. They only speak and respond using DripDrop::Message formatted messages. For HTTP/WebSockets it's JSON that looks like {name: 'name', head: {}, body: anything}, for ZeroMQ it means MessagePack. There is a raw mode that you can use for other message formats, but using DripDrop::Messages makes things easier, and for some socket types (like XREQ/XREP) the predefined format is very useful in matching requests to replies.
 
 #RDoc
 
@@ -48,7 +48,7 @@ RDocs can be found [here](http://www.rdoc.info/github/andrewvc/dripdrop/master/f
 
 #How It Works
 
-DripDrop encapsulates both zmqmachine, and eventmachine. It provides some sane default messaging choices, using [BERT](http://github.com/blog/531-introducing-bert-and-bert-rpc) (A binary, JSON, like serialization format) and JSON for serialization. While zmqmachine and eventmachine APIs, some convoluted ones, the goal here is to smooth over the bumps, and make them play together nicely.
+DripDrop encapsulates both zmqmachine, and eventmachine. It provides some sane default messaging choices, using [MessagePack](http://msgpack.org/)(A binary, JSON, like serialization format) and JSON for serialization. While zmqmachine and eventmachine APIs, some convoluted ones, the goal here is to smooth over the bumps, and make them play together nicely.
 
 #Contributors
 

data/Rakefile

@@ -15,7 +15,7 @@ begin
     gem.add_dependency('em-websocket')
     gem.add_dependency('thin')
     gem.add_dependency('zmqmachine')
-    gem.add_dependency('bert')
+    gem.add_dependency('msgpack')
     gem.add_dependency('json')
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/dripdrop.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dripdrop}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Cholakian"]
-  s.date = %q{2010-11-16}
+  s.date = %q{2010-12-17}
   s.description = %q{Evented framework for ZeroMQ and EventMachine Apps. }
   s.email = %q{andrew@andrewvc.com}
   s.extra_rdoc_files = [
@@ -74,16 +74,16 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Evented framework for ZeroMQ and EventMachine Apps.}
   s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/gimite-websocket.rb",
+    "spec/gimite-websocket.rb",
+     "spec/message_spec.rb",
+     "spec/node_spec.rb",
+     "spec/spec_helper.rb",
      "spec/node/http_spec.rb",
-     "spec/node/routing_spec.rb",
-     "spec/node/zmq_xrepxreq_spec.rb",
-     "spec/node/zmq_pushpull_spec.rb",
      "spec/node/nodelet_spec.rb",
+     "spec/node/routing_spec.rb",
      "spec/node/websocket_spec.rb",
-     "spec/message_spec.rb",
-     "spec/node_spec.rb"
+     "spec/node/zmq_pushpull_spec.rb",
+     "spec/node/zmq_xrepxreq_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -96,7 +96,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<em-websocket>, [">= 0"])
       s.add_runtime_dependency(%q<thin>, [">= 0"])
       s.add_runtime_dependency(%q<zmqmachine>, [">= 0"])
-      s.add_runtime_dependency(%q<bert>, [">= 0"])
+      s.add_runtime_dependency(%q<msgpack>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
     else
       s.add_dependency(%q<ffi-rzmq>, [">= 0"])
@@ -104,7 +104,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<em-websocket>, [">= 0"])
       s.add_dependency(%q<thin>, [">= 0"])
       s.add_dependency(%q<zmqmachine>, [">= 0"])
-      s.add_dependency(%q<bert>, [">= 0"])
+      s.add_dependency(%q<msgpack>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
     end
   else
@@ -113,7 +113,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<em-websocket>, [">= 0"])
     s.add_dependency(%q<thin>, [">= 0"])
     s.add_dependency(%q<zmqmachine>, [">= 0"])
-    s.add_dependency(%q<bert>, [">= 0"])
+    s.add_dependency(%q<msgpack>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
   end
 end

data/example/subclass.rb

@@ -10,14 +10,14 @@ Thread.abort_on_exception = true
 class TimestampedMessage < DripDrop::Message
   def self.create_message(*args)
     obj = super
-    obj.head[:timestamps] = []
-    obj.head[:timestamps] << Time.now
+    obj.head['timestamps'] = []
+    obj.head['timestamps'] << Time.now.to_s
     obj
   end
 
   def self.recreate_message(*args)
     obj = super
-    obj.head[:timestamps] << Time.now.to_s
+    obj.head['timestamps'] << Time.now.to_s
     obj
   end
 end
@@ -37,13 +37,13 @@ node = DripDrop::Node.new do
   pull2 = zmq_pull("tcp://127.0.0.1:2202", :connect)
 
   pull1.on_recv do |msg|
-    puts "Pull 1 #{msg.head}"
+    puts "Pull 1 #{msg.head.inspect}"
     sleep 1
     push2.send_message(msg)
   end
 
   pull2.on_recv do |msg|
-    puts "Pull 2 #{msg.head}"
+    puts "Pull 2 #{msg.head.inspect}"
   end
 
   push1.send_message(TimestampedMessage.create_message(:name => 'test', :body => "Hello there"))

data/lib/dripdrop/agent.rb

@@ -8,7 +8,6 @@ else
   ZMQGEM = :ffirzmq
 end
 require 'uri'
-require 'bert'
 
 class DripDrop
   #The Agent class is a simple ZMQ Pub client. It uses DripDrop::Message messages

data/lib/dripdrop/handlers/http.rb

@@ -1,4 +1,5 @@
 require 'thin'
+require 'thin_parser'
 require 'json'
 
 class DripDrop

data/lib/dripdrop/message.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'bert'
+require 'msgpack'
 require 'json'
 
 class DripDrop
@@ -11,8 +11,7 @@ class DripDrop
   # body: anything you'd like, it can be null even
   #
   # Hashes, arrays, strings, integers, symbols, and floats are probably what you should stick to.
-  # Internally, they're just stored as BERT, which is great because if you don't use JSON
-  # things like symbols and binary data are transmitted more efficiently and transparently.
+  # Internally, they're just stored using MsgPack, which is pretty much a super-fast, binary JSON
   #
   # The basic message format is built to mimic HTTP (s/url_path/name/). Why? Because I'm a dumb web developer :)
   # The name is kind of like the URL, its what kind of message this is, but it's a loose definition,
@@ -24,22 +23,22 @@ class DripDrop
 
     # Creates a new message.
     # example:
-    #   DripDrop::Message.new('mymessage', :head => {:timestamp => Time.now},
+    #   DripDrop::Message.new('mymessage', 'head' => {:timestamp => Time.now},
     #     :body => {:mykey => :myval,  :other_key => ['complex']})
     def initialize(name,extra={})
       raise ArgumentError, "Message names may not be empty or null!" if name.nil? || name.empty?
 
-      @head = extra[:head] || {}
+      @head = extra[:head] || extra['head'] || {}
       raise ArgumentError, "Invalid head #{@head}. Head must be a hash!" unless @head.is_a?(Hash)
-      @head[:msg_class] = self.class.to_s
+      @head['msg_class'] = self.class.to_s
 
       @name = name
-      @body = extra[:body]
+      @body = extra[:body] || extra['body']
     end
 
     # The encoded message, ready to be sent across the wire via ZMQ
     def encoded
-      BERT.encode(self.to_hash)
+      self.to_hash.to_msgpack
     end
 
     # Encodes the hash represntation of the message to JSON
@@ -50,15 +49,17 @@ class DripDrop
     def encode_json; json_encoded; end
 
     # Convert the Message to a hash like:
-    # {:name => @name, :head => @head, :body => @body}
+    # {'name' => @name, 'head' => @head, 'body' => @body}
     def to_hash
-      {:name => @name, :head => @head, :body => @body}
+      {'name' => @name, 'head' => @head, 'body' => @body}
     end
 
     # Build a new Message from a hash that looks like
-    #    {:name => name, :body => body, :head => head}
+    #    {:name => name, :body => body, 'head' => head}
     def self.from_hash(hash)
-      self.new(hash[:name],:head => hash[:head], :body => hash[:body])
+      self.new(hash[:name] || hash['name'], 
+               :head => hash[:head] || hash['head'],
+               :body => hash[:body] || hash['body'])
     end
 
     def self.create_message(*args)
@@ -69,7 +70,8 @@ class DripDrop
     end
 
     def self.recreate_message(hash)
-      raise ArgumentError, "Wrong message class #{hash[:head][:msg_class]} for #{self.to_s}" unless hash[:head][:msg_class] == self.to_s
+      raise ArgumentError, "Message missing head: #{hash.inspect}" unless hash['head']
+      raise ArgumentError, "Wrong message class #{hash['head']['msg_class']} for #{self.to_s}" unless hash['head']['msg_class'] == self.to_s
       self.from_hash(hash)
     end
 
@@ -82,7 +84,7 @@ class DripDrop
         msg = msg.copy_out_string
         return nil if msg.empty?
       end
-      decoded = BERT.decode(msg)
+      decoded = MessagePack.unpack(msg)
       self.recreate_message(decoded)
     end
 
@@ -99,10 +101,10 @@ class DripDrop
       end
       
       # Keep this consistent
-      json_hash['head'][:msg_class] = json_hash['head'][:msg_class]
+      json_hash['head']['msg_class'] = json_hash['head']['msg_class']
       json_hash['head'].delete('msg_class')
        
-      self.new(json_hash['name'], :head => json_hash['head'], :body => json_hash['body'])
+      self.new(json_hash['name'], 'head' => json_hash['head'], :body => json_hash['body'])
     end
   end
 
@@ -121,12 +123,15 @@ class DripDrop
       def verify_args(*args)
         head =
           case args[0]
-            when Hash then args[0][:head]
-            else args[1]
+            when Hash
+              az = args[0]
+              az[:head] || az['head']
+            else
+              args[1]
           end
-        raise ArgumentError, "Invalid head #{head}. Head must be a hash!" unless head.is_a?(Hash)
+        raise ArgumentError, "Invalid head #{head.inspect}. Head must be a hash! (args: #{args.inspect})" unless head.is_a?(Hash)
 
-        msg_class = head[:msg_class]
+        msg_class = head['msg_class']
         unless DripDrop::AutoMessageClass.message_subclasses.has_key?(msg_class)
           raise ArgumentError, "Unknown AutoMessage message class #{msg_class}"
         end

data/spec/message_spec.rb

@@ -9,8 +9,8 @@ describe DripDrop::Message do
     def create_basic
       attrs = {
         :name => 'test',
-        :head => {:foo => :bar},
-        :body => [:foo, :bar, :baz]
+        :head => {'foo' => 'bar'},
+        :body => ['foo', 'bar', 'baz']
       }
       message = DripDrop::Message.new(attrs[:name],:head => attrs[:head],
                                                    :body => attrs[:body])
@@ -28,7 +28,7 @@ describe DripDrop::Message do
         }.should_not raise_exception
       end
       it "should set the head to a single key hash containing message class if nil provided" do
-        DripDrop::Message.new('nilhead', :head => nil).head.should == {:msg_class => 'DripDrop::Message'}
+        DripDrop::Message.new('nilhead', :head => nil).head.should == {'msg_class' => 'DripDrop::Message'}
       end
       it "should raise an exception if a non-hash, non-nil head is provided" do
         lambda {
@@ -40,10 +40,10 @@ describe DripDrop::Message do
       before(:all) do
         @message, @attrs = create_basic
       end
-      it "should encode to valid BERT hash without error" do
+      it "should encode to valid MessagePack hash without error" do
         enc = @message.encoded
         enc.should be_a(String)
-        BERT.decode(enc).should be_a(Hash)
+        MessagePack.unpack(enc).should be_a(Hash)
       end
       it "should decode encoded messages without errors" do
         DripDrop::Message.decode(@message.encoded).should be_a(DripDrop::Message)
@@ -67,8 +67,8 @@ describe DripDrop::Message do
       def create_auto_message
         attrs = {
           :name => 'test',
-          :head => {:foo => :bar, :msg_class => 'SpecMessageClass'},
-          :body => [:foo, :bar, :baz]
+          :head => {'foo' => 'bar', 'msg_class' => 'SpecMessageClass'},
+          :body => ['foo', 'bar', 'baz']
         }
 
         message = DripDrop::AutoMessageClass.create_message(attrs)
@@ -81,21 +81,16 @@ describe DripDrop::Message do
       it "should be added to the subclass message class hash if SubclassedMessage included" do
         DripDrop::AutoMessageClass.message_subclasses.should include('SpecMessageClass' => SpecMessageClass)
       end
-      it "should set the msg_class using a symbol, not a string when using JSON" do
-        msg = DripDrop::Message.decode_json(DripDrop::Message.new('test').json_encoded)
-        msg.head['msg_class'].should be_nil
-        msg.head[:msg_class].should  == 'DripDrop::Message'
-      end
       it "should throw an exception if we try to recreate a message of the wrong class" do
         msg = DripDrop::Message.new('test')
         lambda{SpecMessageClass.recreate_message(msg.to_hash)}.should raise_exception
       end
 
       describe "DripDrop::AutoMessageClass" do
-        it "should create a properly classed message based on head[:msg_class]" do
+        it "should create a properly classed message based on head['msg_class']" do
           @message.should be_a(SpecMessageClass)
         end
-        it "should recreate a message based on head[:msg_class]" do
+        it "should recreate a message based on head['msg_class']" do
           DripDrop::AutoMessageClass.recreate_message(@message.to_hash).should be_a(SpecMessageClass)
         end
       end

data/spec/node/http_spec.rb

@@ -36,11 +36,11 @@ describe "http" do
       @sent = []
       10.times {|i| @sent << DripDrop::Message.new("test-#{i}")}
       @client_responses = []
-      http_info = http_send_messages(@sent) do |sent_message,resp_message|
+      @http_info = http_send_messages(@sent) do |sent_message,resp_message|
         @client_responses << {:sent_message  => sent_message,
                               :resp_message  => resp_message}
       end
-      @responses     = http_info[:responses]
+      @responses     = @http_info[:responses]
     end
 
     it "should receive all sent messages" do

data/spec/node/zmq_xrepxreq_spec.rb

@@ -16,7 +16,7 @@ describe "zmq xreq/xrep" do
       rep.on_recv do |message,response|
         recvd << {:message => message, :response => response}
         
-        response.send_message :name => 'response', :body => {:orig_name => message.name}
+        response.send_message :name => 'response', :body => {'orig_name' => message.name}
       end
        
       to_send.each do |message|
@@ -47,7 +47,7 @@ describe "zmq xreq/xrep" do
     
     it "should receive a reply message for each sent message" do
       @sent.zip(@replied).each do |sent, replied|
-        replied.body[:orig_name].should == sent.name
+        replied.body['orig_name'].should == sent.name
       end
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dripdrop
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Andrew Cholakian
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -08:00
+date: 2010-12-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,7 +89,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: bert
+  name: msgpack
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -211,13 +211,13 @@ signing_key:
 specification_version: 3
 summary: Evented framework for ZeroMQ and EventMachine Apps.
 test_files: 
-- spec/spec_helper.rb
 - spec/gimite-websocket.rb
+- spec/message_spec.rb
+- spec/node_spec.rb
+- spec/spec_helper.rb
 - spec/node/http_spec.rb
-- spec/node/routing_spec.rb
-- spec/node/zmq_xrepxreq_spec.rb
-- spec/node/zmq_pushpull_spec.rb
 - spec/node/nodelet_spec.rb
+- spec/node/routing_spec.rb
 - spec/node/websocket_spec.rb
-- spec/message_spec.rb
-- spec/node_spec.rb
+- spec/node/zmq_pushpull_spec.rb
+- spec/node/zmq_xrepxreq_spec.rb