em-resolv-replace 1.1.1 → 1.1.2

data/History.rdoc

@@ -0,0 +1,15 @@
+= 1.1.2
+
+Gracefully handle whitespace in /etc/resolv.conf (troy)
+
+= 1.1.1
+
+Handle lookups for numeric IPs gracefully. (UVSoft)
+
+= 1.1.0
+
+Add support for local /etc/hosts file.
+
+= 1.0.0
+
+Initial release with Phat.

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Mike Perham
+Copyright (c) 2011 Mike Perham
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,23 +1,6 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "em-resolv-replace"
-    gem.summary = %Q{EventMachine-aware DNS lookup for Ruby}
-    gem.email = "mperham@gmail.com"
-    gem.homepage = "http://github.com/mperham/em-resolv-replace"
-    gem.authors = ["Mike Perham"]
-    gem.add_development_dependency "shoulda", ">= 2.10.3"
-    gem.add_development_dependency "mocha", ">= 0.9.8"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -38,11 +21,9 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/em-dns-resolver.rb

@@ -8,14 +8,27 @@ module EventMachine
     ##
 
     def self.resolve(hostname)
+      type = Resolv::DNS::Resource::IN::A
       if ::Resolv::AddressRegex =~ hostname
         # hostname contains an IP address, nothing to resolve
-        Request.new(nil, hostname)
+        Request.new(nil, hostname, type)
       else
-        Request.new(socket, hostname)
+        Request.new(socket, hostname, type)
       end
     end
 
+    def self.reverse(address)
+      case address
+      when Resolv::IPv4::Regex
+        ptr = Resolv::IPv4.create(address).to_name
+      when Resolv::IPv6::Regex
+        ptr = Resolv::IPv6.create(address).to_name
+      else
+        raise ArgumentError, "invalid address: #{address}"
+      end
+      Request.new(socket, ptr, Resolv::DNS::Resource::IN::PTR)
+    end
+
     def self.socket
       if defined?(@socket) && @socket.connected?
         @socket
@@ -30,7 +43,7 @@ module EventMachine
     def self.nameserver
       unless defined?(@nameserver)
         IO::readlines('/etc/resolv.conf').each do |line|
-          if line =~ /^nameserver (.+)$/
+          if line =~ /^nameserver\s+(.+)$/
             @nameserver = $1.split(/\s+/).first
           end
         end
@@ -105,9 +118,10 @@ module EventMachine
       include Deferrable
       attr_accessor :retry_interval
       attr_accessor :max_tries
-      def initialize(socket, hostname)
+      def initialize(socket, value, type)
         @socket = socket
-        @hostname = hostname
+        @value = value
+        @type = type
         @tries = 0
         @last_send = Time.at(0)
         @retry_interval = 3
@@ -115,9 +129,9 @@ module EventMachine
         EM.next_tick { tick }
       end
       def tick
-        # @hostname contains an IP address
+        # @value already contains the response
         if @socket.nil?
-          succeed [ @hostname ]
+          succeed [ @value ]
           return
         end
 
@@ -132,17 +146,19 @@ module EventMachine
       end
       # Called by DnsSocket#receive_data
       def receive_answer(msg)
-        addrs = []
+        result = []
         msg.each_answer do |name,ttl,data|
-          if data.kind_of?(Resolv::DNS::Resource::IN::A) ||
-              data.kind_of?(Resolv::DNS::Resource::IN::AAAA)
-            addrs << data.address.to_s
+          case data
+          when Resolv::DNS::Resource::IN::A, Resolv::DNS::Resource::IN::AAAA
+            result << data.address.to_s
+          when Resolv::DNS::Resource::IN::PTR
+            result << data.name.to_s
           end
         end
-        if addrs.empty?
+        if result.empty?
           fail "rcode=#{msg.rcode}"
         else
-          succeed addrs
+          succeed result
         end
       end
       private
@@ -165,7 +181,7 @@ module EventMachine
         msg = Resolv::DNS::Message.new
         msg.id = id
         msg.rd = 1
-        msg.add_question @hostname, Resolv::DNS::Resource::IN::A
+        msg.add_question @value, @type
         msg
       end
     end

data/lib/em-resolv-replace.rb

@@ -20,18 +20,38 @@ class Resolv
     EM.reactor_running? ? em_getaddresses(host) : orig_getaddresses(host)
   end
 
+  alias :orig_getname :getname
+
+  def getname(address)
+    EM.reactor_running? ? em_getnames(address)[0] : orig_getname(address)
+  end
+
+  alias :orig_getnames :getnames
+
+  def getnames(address)
+    EM.reactor_running? ? em_getnames(address) : orig_getnames(address)
+  end
+
   private
 
   def em_getaddresses(host)
+    em_request(host, :each_address, :resolve)
+  end
+
+  def em_getnames(address)
+    em_request(address, :each_name, :reverse)
+  end
+
+  def em_request(value, hosts_method, resolv_method)
     # Lookup in /etc/hosts
-    x = []
+    result = []
     @hosts ||= Resolv::Hosts.new
-    @hosts.each_address(host) {|addr| x << addr.to_s }
-    return x unless x.empty?
+    @hosts.send(hosts_method, value) { |x| result << x.to_s }
+    return result unless result.empty?
 
     # Nothing, hit DNS
     fiber = Fiber.current
-    df = EM::DnsResolver.resolve(host)
+    df = EM::DnsResolver.send(resolv_method, value)
     df.callback do |a|
       fiber.resume(a)
     end

data/test/test_em-resolv-replace.rb

@@ -64,4 +64,20 @@ class TestEmResolvReplace < Test::Unit::TestCase
     end
   end
 
+  should "reverse hostname without eventmachine" do
+    Resolv.any_instance.expects(:em_getname).times(0)
+
+    assert_equal 'localhost', Resolv.getname('127.0.0.1')
+  end
+
+  should "reverse hostname with eventmachine" do
+    Resolv.any_instance.expects(:orig_getname).times(0)
+
+    EM.run do
+      Fiber.new do
+        assert_equal 'localhost', Resolv.getname('127.0.0.1')
+        EM.stop
+      end.resume
+    end
+  end
 end

metadata

@@ -1,62 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-resolv-replace
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 1
-  version: 1.1.1
+version: !ruby/object:Gem::Version
+  version: 1.1.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-04-08 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 10
-        - 3
-        version: 2.10.3
+  requirement: &70315159083700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
+  version_requirements: *70315159083700
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70315159083140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70315159083140
 description: 
 email: mperham@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
+- History.rdoc
 - README.rdoc
-files: 
+files:
 - .document
 - .gitignore
+- History.rdoc
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -65,36 +53,31 @@ files:
 - lib/em-resolv-replace.rb
 - test/helper.rb
 - test/test_em-resolv-replace.rb
-has_rdoc: true
 homepage: http://github.com/mperham/em-resolv-replace
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: EventMachine-aware DNS lookup for Ruby
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_em-resolv-replace.rb