dripdrop 0.7.1 → 0.8.0

data/Rakefile

@@ -17,6 +17,7 @@ begin
     gem.add_dependency('zmqmachine')
     gem.add_dependency('msgpack')
     gem.add_dependency('json')
+    gem.add_dependency('em-resolv-replace')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.8.0

data/dripdrop.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dripdrop}
-  s.version = "0.7.1"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Cholakian"]
@@ -91,6 +91,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<zmqmachine>, [">= 0"])
       s.add_runtime_dependency(%q<msgpack>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<em-resolv-replace>, [">= 0"])
     else
       s.add_dependency(%q<ffi-rzmq>, [">= 0"])
       s.add_dependency(%q<eventmachine>, [">= 0"])
@@ -99,6 +100,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<zmqmachine>, [">= 0"])
       s.add_dependency(%q<msgpack>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<em-resolv-replace>, [">= 0"])
     end
   else
     s.add_dependency(%q<ffi-rzmq>, [">= 0"])
@@ -108,6 +110,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<zmqmachine>, [">= 0"])
     s.add_dependency(%q<msgpack>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<em-resolv-replace>, [">= 0"])
   end
 end
 

data/example/pubsub.rb

@@ -1,9 +1,10 @@
+require 'rubygems'
 require 'dripdrop/node'
 Thread.abort_on_exception = true
 
 #Define our handlers
 DripDrop::Node.new do
-  route :pub,  :zmq_publish,   'tcp://127.0.0.1:2200', :bind
+  route :pub,  :zmq_publish,   'tcp://localhost:2200', :bind
   route :sub1, :zmq_subscribe, pub.address, :connect, :topic_filter => /[13579]$/
   route :sub2, :zmq_subscribe, pub.address, :connect, :topic_filter => /[02468]$/
   route :sub3, :zmq_subscribe, pub.address, :connect

data/lib/dripdrop/node.rb

@@ -3,6 +3,8 @@ require 'ffi-rzmq'
 require 'zmqmachine'
 require 'eventmachine'
 require 'uri'
+require 'resolv'
+require 'ipaddr'
 
 require 'dripdrop/message'
 require 'dripdrop/node/nodelet'
@@ -11,6 +13,10 @@ require 'dripdrop/handlers/zeromq'
 require 'dripdrop/handlers/websockets'
 require 'dripdrop/handlers/http'
 
+if defined?(Fiber)
+  require 'em-resolv-replace'
+end
+
 class DripDrop
   class Node
     attr_reader   :zm_reactor, :routing, :nodelets
@@ -276,7 +282,12 @@ class DripDrop
     
     def zmq_handler(klass, zm_sock_type, address, socket_ctype, opts={})
       addr_uri = URI.parse(address)
-      zm_addr  = ZM::Address.new(addr_uri.host,addr_uri.port.to_i,addr_uri.scheme.to_sym)
+       
+      host = Resolv.getaddresses(addr_uri.host).first
+      host_addr = Resolv.getaddresses('localhost').map {|a| IPAddr.new(a)}.find {|a| a.ipv4?}
+      host_str  = host_addr.ipv6? ? "[#{host_addr.to_s}]" : host_addr.to_s
+
+      zm_addr  = ZM::Address.new(host_str,addr_uri.port.to_i,addr_uri.scheme.to_sym)
       h_opts   = handler_opts_given(opts)
       handler  = klass.new(zm_addr,@zm_reactor,socket_ctype,h_opts)
       @zm_reactor.send(zm_sock_type,handler)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dripdrop
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 1
-  version: 0.7.1
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Andrew Cholakian
@@ -116,6 +116,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: em-resolv-replace
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
 description: "Evented framework for ZeroMQ and EventMachine Apps. "
 email: andrew@andrewvc.com
 executables: []