redns 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/redns/resolver.rb

@@ -210,14 +210,14 @@ class ReDNS::Resolver
 		end
 	end
 	
-	protected
+protected
 	def expand_answers(r)
 		unless (r and r.answers)
 			return nil
 		end
 
 		result = r.answers
-		radd = (r.additional or [ ])
+		radd = (r.additional_records or [ ])
 		
 		result.reject { |rr| rr.rtype == :a }.each do |rr|
 			# Additional resource records may be related to the query, or they
@@ -235,7 +235,7 @@ class ReDNS::Resolver
 			
 			if (additional and !additional.empty?)
 				# Push any results into the record itself
-				rr.additional = additional
+				r.additional_records = additional
 			end
 		end
 		
@@ -255,7 +255,7 @@ class ReDNS::Resolver
 			row
 		end
 		
-		r.additional and r.additional.each do |a|
+		r.additional_records and r.additional_records.each do |a|
 			row = a.to_a
 			rev[row[0]] = row[4]
 			res.push(row)

data/redns.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redns}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["tadman"]
-  s.date = %q{2010-08-18}
+  s.date = %q{2010-09-23}
   s.description = %q{ReDNS is a pure Ruby DNS library with drivers for reactor-model engines such as EventMachine}
   s.email = %q{github@tadman.ca}
   s.extra_rdoc_files = [

data/test/test_redns_resolver.rb

@@ -17,6 +17,28 @@ class TestReReDNSResolver < Test::Unit::TestCase
 		assert_equal [ "192.168.1.1" ], res.servers
   end
 
+  def test_simple_query
+		res = ReDNS::Resolver.new
+
+    r = res.simple_query(:a, 'example.com')
+    
+		assert_equal 1, r.size
+
+    assert_equal :a, r[0].rtype
+		assert_equal '192.0.32.10', r[0].rdata.to_s
+  end
+
+  def test_simple_reverse_query
+		res = ReDNS::Resolver.new
+
+    r = res.simple_query(:ptr, '10.32.0.192.in-addr.arpa')
+    
+		assert_equal 1, r.size
+
+    assert_equal :ptr, r[0].rtype
+		assert_equal 'www.example.com.', r[0].rdata.to_s
+  end
+
 	def test_query
 		res = ReDNS::Resolver.new
 
@@ -54,10 +76,12 @@ class TestReReDNSResolver < Test::Unit::TestCase
 
 	def test_bulk_query
 		addrs = %w[
-		  128.100.8.1
-		  128.100.8.2
-		  128.100.8.3
-		  128.100.8.4
+		  192.0.32.1
+		  192.0.32.2
+		  192.0.32.3
+		  192.0.32.4
+		  192.0.32.5
+		  192.0.32.10
 		].collect do |i|
 		  ReDNS::Support.addr_to_arpa(i)
 	  end
@@ -68,17 +92,19 @@ class TestReReDNSResolver < Test::Unit::TestCase
 
 		assert rlist
 
-		assert_equal 4, rlist.length
+		assert_equal 6, rlist.length
 		
 		assert_equal addrs.sort, rlist.keys.sort
 		
 		assert rlist[addrs[0]]
 		
 		expected =  %w[
-		  sf-ecf.gw.utoronto.ca.
-		  fs.ecf.utoronto.ca.
-		  ecf-if.gw.utoronto.ca.
-		  ecf-8-hub.ecf.utoronto.ca.
+		  32-1.lax.icann.org.
+		  32-2.lax.icann.org.
+		  32-3.lax.icann.org.
+		  32-4.lax.icann.org.
+		  32-5.lax.icann.org.
+		  www.example.com.
 		]
 
     answers = addrs.collect do |a|
@@ -90,10 +116,12 @@ class TestReReDNSResolver < Test::Unit::TestCase
 
 	def test_reverse_addresses
     addrs = %w[
-		  128.100.8.1
-		  128.100.8.2
-		  128.100.8.3
-		  128.100.8.4
+		  192.0.32.1
+		  192.0.32.2
+		  192.0.32.3
+		  192.0.32.4
+		  192.0.32.5
+		  192.0.32.10
 		]
 		
 		res = ReDNS::Resolver.new
@@ -105,10 +133,12 @@ class TestReReDNSResolver < Test::Unit::TestCase
 		assert_equal addrs.length, rlist.length
 
 		expected =  %w[
-		  sf-ecf.gw.utoronto.ca.
-		  fs.ecf.utoronto.ca.
-		  ecf-if.gw.utoronto.ca.
-		  ecf-8-hub.ecf.utoronto.ca.
+		  32-1.lax.icann.org.
+		  32-2.lax.icann.org.
+		  32-3.lax.icann.org.
+		  32-4.lax.icann.org.
+		  32-5.lax.icann.org.
+		  www.example.com.
 		]
 		
     answers = addrs.collect do |a|

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - tadman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 -04:00
+date: 2010-09-23 00:00:00 -04:00
 default_executable: 
 dependencies: []