em-resolv-replace 1.1.2 → 1.1.3

data/History.rdoc

@@ -1,3 +1,7 @@
+= 1.1.3
+
+Fix use on Windows (stakach)
+
 = 1.1.2
 
 Gracefully handle whitespace in /etc/resolv.conf (troy)

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/lib/em-dns-resolver.rb

@@ -6,6 +6,8 @@ module EventMachine
     ##
     # Global interface
     ##
+    
+    Port = 53
 
     def self.resolve(hostname)
       type = Resolv::DNS::Resource::IN::A
@@ -37,18 +39,19 @@ module EventMachine
       end
     end
 
-    def self.nameserver=(ns)
-      @nameserver = ns
+    def self.nameserver_port= (ns_p)
+      @nameserver_port = ns_p
     end
-    def self.nameserver
-      unless defined?(@nameserver)
-        IO::readlines('/etc/resolv.conf').each do |line|
-          if line =~ /^nameserver\s+(.+)$/
-            @nameserver = $1.split(/\s+/).first
-          end
-        end
+    def self.nameserver_port
+      return @nameserver_port if defined? @nameserver_port
+      config_hash = ::Resolv::DNS::Config.default_config_hash
+      @nameserver_port = if config_hash.include? :nameserver
+        [ config_hash[:nameserver].first, Port ]
+      elsif config_hash.include? :nameserver_port
+        config_hash[:nameserver_port].first
+      else
+        [ '0.0.0.0', Port ]
       end
-      @nameserver
     end
 
     ##
@@ -81,13 +84,13 @@ module EventMachine
         end
       end
       def send_packet(pkt)
-        send_datagram(pkt, nameserver, 53)
+        send_datagram pkt, *nameserver_port
       end
-      def nameserver=(ns)
-        @nameserver = ns
+      def nameserver_port= (ns_p)
+        @nameserver_port = ns_p
       end
-      def nameserver
-        @nameserver ||= DnsResolver.nameserver
+      def nameserver_port
+        @nameserver_port ||= DnsResolver.nameserver_port
       end
       # Decodes the packet, looks for the request and passes the
       # response over to the requester

data/lib/em-resolv-replace.rb

@@ -1,6 +1,6 @@
-# Standard libc DNS resolution
+# Pure Ruby DNS resolution
 require 'resolv'
-# Override with pure Ruby DNS resolution
+# Override sockets to use Ruby DNS resolution
 require 'resolv-replace'
 
 require 'em-dns-resolver'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-resolv-replace
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-11 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70315159083700 !ruby/object:Gem::Requirement
+  requirement: &70139192111000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315159083700
+  version_requirements: *70139192111000
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70315159083140 !ruby/object:Gem::Requirement
+  requirement: &70139192110520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315159083140
+  version_requirements: *70139192110520
 description: 
 email: mperham@gmail.com
 executables: []
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: EventMachine-aware DNS lookup for Ruby