dripdrop 0.9.3 → 0.9.4

data/README.md

@@ -1,8 +1,6 @@
 # DripDrop
 
-**Note: For now, for PUSH/PULL support you'll need to build zmqmachine from my fork of zmqmachine, the official gem does not yet have this**
-
-DripDrop is ZeroMQ(using zmqmachine) + Event Machine simplified for the general use case + serialization helpers.
+DripDrop is a library for structured message-passing async apps using EventMachine, ZeroMQ, and other protocols.
 
 Here's an example of the kind of thing DripDrop makes easy, from [example/combined.rb](http://github.com/andrewvc/dripdrop/blob/master/example/combined.rb)
   
@@ -40,7 +38,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 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.
+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
 

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/dripdrop.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dripdrop}
-  s.version = "0.9.3"
+  s.version = "0.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Cholakian"]
-  s.date = %q{2011-02-02}
+  s.date = %q{2011-02-07}
   s.description = %q{Evented framework for ZeroMQ and EventMachine Apps. }
   s.email = %q{andrew@andrewvc.com}
   s.extra_rdoc_files = [

data/lib/dripdrop/handlers/http.rb

@@ -17,7 +17,7 @@ class DripDrop
     
     def send_message(raw_msg)
       msg = dd_messagify(raw_msg)
-      if msg.class == DripDrop::Message
+      if msg.is_a?(DripDrop::Message)
         json = msg.encode_json
         self.call([json])
         self.succeed
@@ -63,6 +63,7 @@ class DripDrop
       @uri     = uri
       @address = uri.to_s
       @opts    = opts
+      @message_class = @opts[:message_class] || DripDrop.default_message_class
     end
     
     def on_recv(msg_format=:dripdrop_json,&block)
@@ -90,11 +91,12 @@ class DripDrop
       @uri     = uri
       @address = @uri.to_s
       @opts    = opts
+      @message_class = @opts[:message_class] || DripDrop.default_message_class
     end
     
     def send_message(message,&block)
       dd_message = dd_messagify(message)
-      if dd_message.class == DripDrop::Message
+      if dd_message.is_a?(DripDrop::Message)
         uri_path = @uri.path.empty? ? '/' : @uri.path
         
         req = EM::Protocols::HttpClient.request(
@@ -104,7 +106,7 @@ class DripDrop
           :content => dd_message.encode_json
         )
         req.callback do |response|
-          block.call(DripDrop::Message.decode_json(response[:content]))
+          block.call(@message_class.decode_json(response[:content]))
         end
       else
         raise "Unsupported message type '#{dd_message.class}'"

data/lib/dripdrop/handlers/zeromq.rb

@@ -96,7 +96,7 @@ class DripDrop
 
     def initialize(*args)
       super(*args)
-      @message_class = @opts[:msg_class] || DripDrop.default_message_class
+      @message_class = @opts[:message_class] || DripDrop.default_message_class
     end
 
     def decode_message(msg)

data/lib/dripdrop/message.rb

@@ -3,6 +3,7 @@ require 'msgpack'
 require 'yajl'
 
 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.
@@ -31,7 +32,7 @@ class DripDrop
 
       @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['message_class'] = self.class.to_s
 
       @name = name
       @body = extra[:body] || extra['body']
@@ -72,7 +73,7 @@ class DripDrop
 
     def self.recreate_message(hash)
       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
+      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)
     end
 
@@ -96,14 +97,14 @@ class DripDrop
     def self.decode_json(str)
       begin
         json_hash = Yajl::Parser.parse(str)
-      rescue Yajl::ParserError => e
+      rescue Yajl::ParseError => e
         puts "Could not parse msg '#{str}': #{e.message}"
         return nil
       end
       
       # Keep this consistent
-      json_hash['head']['msg_class'] = json_hash['head']['msg_class']
-      json_hash['head'].delete('msg_class')
+      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
@@ -132,7 +133,7 @@ class DripDrop
           end
         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['message_class']
         unless DripDrop::AutoMessageClass.message_subclasses.has_key?(msg_class)
           raise ArgumentError, "Unknown AutoMessage message class #{msg_class}"
         end

data/lib/dripdrop/node.rb

@@ -35,26 +35,7 @@ class DripDrop
     def start
       @thread = Thread.new do
         EM.error_handler {|e| self.error_handler e}
-        EM.run do
-          if @block
-            self.instance_eval(&@block)
-          elsif self.respond_to?(:action)
-            self.action
-          else
-            raise "Could not start, no block or action specified"
-          end
-        end
-      end
-    end
-
-    # If the reactor has started, this blocks until the thread 
-    # running the reactor joins. This should block forever
-    # unless +stop+ is called.
-    def join
-      if @thread
-        @thread.join
-      else
-        raise "Can't join on a node that isn't yet started"
+        EM.run { action }
       end
     end
 
@@ -69,6 +50,27 @@ class DripDrop
       EM.stop
     end
 
+    # When subclassing +DripDrop::Node+ you probably want to define this method
+    # Otherwise it will attempt to run the @block passed into +DripDrop::Node.new+
+    def action
+      if @block
+        self.instance_eval(&@block)
+      else
+        raise "Could not start, no block or specified"
+      end
+    end
+
+    # If the reactor has started, this blocks until the thread 
+    # running the reactor joins. This should block forever
+    # unless +stop+ is called.
+    def join
+      if @thread
+        @thread.join
+      else
+        raise "Can't join on a node that isn't yet started"
+      end
+    end
+     
     # Defines a new route. Routes are the recommended way to instantiate
     # handlers. For example:
     #
@@ -286,7 +288,7 @@ class DripDrop
 
       z_addr      =  "#{addr_uri.scheme}://#{host_str}:#{addr_uri.port.to_i}"
       h_opts      = handler_opts_given(opts)
-      connection = EM::ZeroMQ.create @zctx, sock_type, socket_ctype, address, klass.new
+      connection = EM::ZeroMQ.create @zctx, sock_type, socket_ctype, address, klass.new(h_opts)
       handler            = connection.handler
       handler.connection = connection
       handler.post_setup

data/spec/message_spec.rb

@@ -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 == {'message_class' => 'DripDrop::Message'}
       end
       it "should raise an exception if a non-hash, non-nil head is provided" do
         lambda {
@@ -67,7 +67,7 @@ describe DripDrop::Message do
       def create_auto_message
         attrs = {
           :name => 'test',
-          :head => {'foo' => 'bar', 'msg_class' => 'SpecMessageClass'},
+          :head => {'foo' => 'bar', 'message_class' => 'SpecMessageClass'},
           :body => ['foo', 'bar', 'baz']
         }
 
@@ -87,10 +87,10 @@ describe DripDrop::Message do
       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['message_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['message_class']" do
           DripDrop::AutoMessageClass.recreate_message(@message.to_hash).should be_a(SpecMessageClass)
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dripdrop
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Andrew Cholakian
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 -08:00
+date: 2011-02-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency