em-resolv-replace 1.0.0 → 1.1.0

data/README.rdoc

@@ -14,6 +14,14 @@ Ruby replacement that is not loaded by default:
 Socket objects to use resolv.  This gem monkeypatches the monkeypatch so that the Socket
 classes will use an EventMachine-aware resolver, em-dns-resolver.
 
+== Requirements
+
+em-resolv-replace requires Ruby 1.9.
+
+== Installation
+
+    gem install em-resolv-replace
+
 == Usage
 
 Just require em-resolv-replace when initializing your application:

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/em-resolv-replace.rb

@@ -6,24 +6,42 @@ 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_getaddress(host)[0] : orig_getaddress(host)
+    EM.reactor_running? ? em_getaddresses(host)[0] : orig_getaddress(host)
   end
 
   alias :orig_getaddresses :getaddresses
 
   def getaddresses(host)
-    EM.reactor_running? ? em_getaddress(host) : orig_getaddresses(host)
+    EM.reactor_running? ? em_getaddresses(host) : orig_getaddresses(host)
   end
 
   private
 
-  def em_getaddress(host)
+  def em_getaddresses(host)
+    # Lookup in /etc/hosts
+    x = []
+    @hosts ||= Resolv::Hosts.new
+    @hosts.each_address(host) {|addr| x << addr.to_s }
+    return x unless x.empty?
+
+    # Nothing, hit DNS
     fiber = Fiber.current
     df = EM::DnsResolver.resolve(host)
     df.callback do |a|

data/test/test_em-resolv-replace.rb

@@ -40,4 +40,16 @@ class TestEmResolvReplace < Test::Unit::TestCase
     end
   end
 
+  should "resolve localhost with eventmachine" do
+    Resolv.any_instance.expects(:orig_getaddresses).times(0)
+
+    EM.run do
+      Fiber.new do
+        results = Resolv.getaddresses('localhost')
+        assert (results.first =~ IPv4 || results.first =~ /::/), "Invalid IP #{results}"
+        EM.stop
+      end.resume
+    end
+  end
+
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: em-resolv-replace
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Mike Perham
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 -06:00
+date: 2010-04-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 10
+        - 3
         version: 2.10.3
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 8
         version: 0.9.8
-    version: 
+  type: :development
+  version_requirements: *id002
 description: 
 email: mperham@gmail.com
 executables: []
@@ -65,18 +78,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: EventMachine-aware DNS lookup for Ruby