em-resolv-replace 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/em-dns-resolver.rb

@@ -8,7 +8,12 @@ module EventMachine
     ##
 
     def self.resolve(hostname)
-      Request.new(socket, hostname)
+      if ::Resolv::AddressRegex =~ hostname
+        # hostname contains an IP address, nothing to resolve
+        Request.new(nil, hostname)
+      else
+        Request.new(socket, hostname)
+      end
     end
 
     def self.socket
@@ -110,6 +115,12 @@ module EventMachine
         EM.next_tick { tick }
       end
       def tick
+        # @hostname contains an IP address
+        if @socket.nil?
+          succeed [ @hostname ]
+          return
+        end
+
         # Break early if nothing to do
         return if @last_send + @retry_interval > Time.now
 

data/lib/em-resolv-replace.rb

@@ -6,22 +6,10 @@ require 'resolv-replace'
 require 'em-dns-resolver'
 require 'fiber'
 
-#
-=begin
-    require './em-resolv-replace'
-    EM.run {
-      Fiber.new do
-        p Resolv.getaddresses('localhost')
-        p Resolv.getaddress('localhost')
-        EM.stop
-      end.resume
-    }
-=end
 # Now override the override with EM-aware functions
 class Resolv
-  
   alias :orig_getaddress :getaddress
-  
+
   def getaddress(host)
     EM.reactor_running? ? em_getaddresses(host)[0] : orig_getaddress(host)
   end
@@ -56,4 +44,4 @@ class Resolv
     end
     result
   end
-end
+end

data/test/test_em-resolv-replace.rb

@@ -2,20 +2,18 @@ require 'helper'
 
 class TestEmResolvReplace < Test::Unit::TestCase
 
-  IPv4 = /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/
-
   should "resolve address without eventmachine" do
     Resolv.any_instance.expects(:em_getaddress).times(0)
 
-    assert_match IPv4, Resolv.getaddress('www.google.com')
+    assert_match ::Resolv::AddressRegex, Resolv.getaddress('www.google.com')
   end
-  
+
   should "resolve address with eventmachine" do
     Resolv.any_instance.expects(:orig_getaddress).times(0)
 
     EM.run do
       Fiber.new do
-        assert_match IPv4, Resolv.getaddress('www.google.com')
+        assert_match ::Resolv::AddressRegex, Resolv.getaddress('www.google.com')
         EM.stop
       end.resume
     end
@@ -25,16 +23,16 @@ class TestEmResolvReplace < Test::Unit::TestCase
     Resolv.any_instance.expects(:em_getaddress).times(0)
 
     results = Resolv.getaddresses('www.google.com')
-    assert_match IPv4, results.first
+    assert_match ::Resolv::AddressRegex, results.first
   end
-  
+
   should "resolve addresses with eventmachine" do
     Resolv.any_instance.expects(:orig_getaddresses).times(0)
 
     EM.run do
       Fiber.new do
         results = Resolv.getaddresses('www.google.com')
-        assert_match IPv4, results.first
+        assert_match ::Resolv::AddressRegex, results.first
         EM.stop
       end.resume
     end
@@ -46,7 +44,21 @@ class TestEmResolvReplace < Test::Unit::TestCase
     EM.run do
       Fiber.new do
         results = Resolv.getaddresses('localhost')
-        assert (results.first =~ IPv4 || results.first =~ /::/), "Invalid IP #{results}"
+        assert (results.first =~ ::Resolv::AddressRegex || results.first =~ /::/), "Invalid IP #{results}"
+        EM.stop
+      end.resume
+    end
+  end
+
+  should "not try to resolve an IP address" do
+    Resolv.any_instance.expects(:orig_getaddresses).times(0)
+
+    EM.run do
+      Fiber.new do
+        results = Resolv.getaddresses('127.0.0.1') # IPv4
+        assert (results.first == '127.0.0.1')
+        results = Resolv.getaddresses('::1') # IPv6
+        assert (results.first == '::1')
         EM.stop
       end.resume
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Mike Perham
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -05:00
+date: 2010-04-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency