redns 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/redns/connection.rb

@@ -3,6 +3,12 @@ require 'socket'
 class ReDNS::Connection < EventMachine::Connection
   # == Constants ============================================================
   
+  DEFAULT_TIMEOUT = 5
+  
+  # == Properties ===========================================================
+  
+  attr_accessor :timeout
+
   # == Extensions ===========================================================
 
   include EventMachine::Deferrable
@@ -10,11 +16,15 @@ class ReDNS::Connection < EventMachine::Connection
   # == Class Methods ========================================================
 
   def self.instance
-    EventMachine.open_datagram_socket(
+    connection = EventMachine.open_datagram_socket(
       ReDNS::Support.bind_all_addr,
       0,
       self
     )
+    
+    yield(connection) if (block_given?)
+    
+    connection
   end
 
   # == Instance Methods =====================================================
@@ -26,6 +36,23 @@ class ReDNS::Connection < EventMachine::Connection
     
     # Callback tracking is done by matching response IDs in a lookup table
     @callback = { }
+    
+    EventMachine.add_periodic_timer(1) do
+      check_for_timeouts!
+    end
+  end
+  
+  def random_nameserver
+    nameservers[rand(nameservers.length)]
+  end
+  
+  def nameservers
+    @nameservers ||= ReDNS::Support.default_nameservers
+  end
+  
+  def nameservers=(*list)
+    @nameservers = list.flatten.compact
+    @nameservers = nil if (list.empty?)
   end
   
   def port
@@ -35,8 +62,8 @@ class ReDNS::Connection < EventMachine::Connection
   def receive_data(data)
     message = ReDNS::Message.new(ReDNS::Buffer.new(data))
     
-    if (callback = @callback[message.id])
-      callback.yield(message.answers.collect { |a| a.rdata.to_s })
+    if (callback = @callback.delete(message.id))
+      callback[:callback].call(message.answers.collect { |a| a.rdata.to_s })
     end
   end
   
@@ -47,12 +74,15 @@ class ReDNS::Connection < EventMachine::Connection
 
     result = send_datagram(
       message.serialize.to_s,
-      ReDNS::Support.default_resolver_address,
+      random_nameserver,
       ReDNS::Support.dns_port
     )
 
     if (result > 0)
-      @callback[@sequence] = callback
+      @callback[@sequence] = {
+        :callback => callback,
+        :at => Time.now
+      }
     else
       callback.call(nil)
     end
@@ -62,4 +92,22 @@ class ReDNS::Connection < EventMachine::Connection
   
   def unbind
   end
+  
+  def check_for_timeouts!
+    timeout_at = Time.now - (@timeout || DEFAULT_TIMEOUT)
+    
+    @callback.keys.each do |k|
+      params = @callback[k]
+
+      if (params and params[:at] < timeout_at)
+        params[:callback].call(nil)
+        @callback.delete(k)
+      end
+    end
+  end
+  
+  def timeout=(value)
+    @timeout = value.to_i
+    @timeout = DEFAULT_TIMEOUT if (@timeout == 0)
+  end
 end

data/lib/redns/message.rb

@@ -29,7 +29,14 @@ class ReDNS::Message < ReDNS::Fragment
   # == Class Methods ========================================================
   
   def self.question(name, qtype = nil)
-    qtype ||= ReDNS::Support.is_ip?(name) ? :ptr : :a
+    if (!qtype)
+      if (ReDNS::Support.is_ip?(name))
+        name = ReDNS::Support.addr_to_arpa(name)
+        qtype = :ptr
+      else
+        qtype = :a
+      end
+    end
     
     message = new(
       :questions => [

data/lib/redns/support.rb

@@ -52,6 +52,10 @@ module ReDNS::Support
   def dns_port
     53
   end
+
+  def default_nameservers
+    ReDNS::Resolver.servers
+  end
   
   def default_resolver_address
     ReDNS::Resolver.servers.first

data/redns.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redns}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["tadman"]

data/test/test_redns_connection.rb

@@ -18,22 +18,70 @@ class TestReDNSConnection < Test::Unit::TestCase
 
   def test_simple_resolve
     address = nil
+    reverse = nil
+    nameservers = nil
     
     EventMachine.run do
       dns = ReDNS::Connection.instance
       
+      assert dns.nameservers.length > 0
+      
       dns.resolve('example.com') do |result|
         address = result
 
-        EventMachine.stop_event_loop
+        EventMachine.stop_event_loop if (address and reverse and nameservers)
+      end
+      
+      dns.resolve('192.0.32.10') do |result|
+        reverse = result
+
+        EventMachine.stop_event_loop if (address and reverse and nameservers)
+      end
+      
+      dns.resolve('example.com', :ns) do |result|
+        nameservers = result
+
+        EventMachine.stop_event_loop if (address and reverse and nameservers)
       end
       
-      EventMachine.add_timer(40) do
+      EventMachine.add_timer(4) do
         EventMachine.stop_event_loop
       end
     end
     
-    assert address, "Address was not defined, connection may have timed out"
     assert_equal %w[ 192.0.32.10 ], address
+    assert_equal %w[ www.example.com. ], reverse
+    assert_equal %w[ a.iana-servers.net. b.iana-servers.net. ], nameservers.sort
+  end
+
+  def test_simple_timeout
+    address = :fail
+    
+    EventMachine.run do
+      dns = ReDNS::Connection.instance do |c|
+        c.nameservers = %w[ 127.0.0.127 ]
+        c.timeout = 2
+      end
+
+      dns.resolve('example.com') do |result|
+        address = result
+        
+        EventMachine.stop_event_loop
+      end
+    end
+    
+    assert_equal nil, address
+  end
+
+  def test_default_timeout
+    EventMachine.run do
+      dns = ReDNS::Connection.instance do |c|
+        c.timeout = nil
+      end
+      
+      assert_equal ReDNS::Connection::DEFAULT_TIMEOUT, dns.timeout
+
+      EventMachine.stop_event_loop
+    end
   end
 end

data/test/test_redns_message.rb

@@ -144,7 +144,7 @@ class TestReDNSMessage < Test::Unit::TestCase
     
     assert_equal 1, question.questions.length
 
-    assert_equal '127.0.0.1', question.questions[0].name.to_s
+    assert_equal '1.0.0.127.in-addr.arpa.', question.questions[0].name.to_s
     assert_equal :ptr, question.questions[0].qtype
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - tadman