rubydns 0.5.1 → 0.5.2

data/lib/rubydns/extensions/string-1.9.2.rb

@@ -19,19 +19,11 @@
 # THE SOFTWARE.
 
 require 'stringio'
+require 'rubydns/extensions/string-1.9.3'
 
 class String
 	def byteslice(*args)
-		self.dup.force_encoding("binary").slice(*args)
+		self.dup.force_encoding("BINARY").slice(*args)
 	end
 end
 
-module RubyDNS
-	class BinaryStringIO < StringIO
-		def initialize
-			super
-		
-			set_encoding("binary")
-		end
-	end
-end

data/lib/rubydns/extensions/string-1.9.3.rb

@@ -28,6 +28,4 @@ module RubyDNS
 			set_encoding("BINARY")
 		end
 	end
-	
-	
 end

data/lib/rubydns/resolver.rb

@@ -52,6 +52,21 @@ module RubyDNS
 			Request.fetch(message, @servers, @options, &block)
 		end
 
+		# Yields a list of `Resolv::IPv4` and `Resolv::IPv6` addresses for the given `name` and `resource_class`.
+		def addresses_for(name, resource_class = Resolv::DNS::Resource::IN::A, &block)
+			query(name, resource_class) do |response|
+				# Resolv::DNS::Name doesn't retain the trailing dot.
+				name = name.sub(/\.$/, '')
+				
+				case response
+				when Message
+					yield response.answer.select{|record| record[0].to_s == name}.collect{|record| record[2].address}
+				else
+					yield []
+				end
+			end
+		end
+
 		# Manages a single DNS question message across one or more servers.
 		class Request
 			include EventMachine::Deferrable

data/lib/rubydns/version.rb

@@ -22,7 +22,7 @@ module RubyDNS
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 5
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/log/BasicTestServer.log

@@ -62,3 +62,35 @@ D, [2012-10-21T22:49:22.760125 #67612] DEBUG -- : add_answer: #<Resolv::DNS::Res
 D, [2012-10-21T22:49:22.760447 #67612] DEBUG -- : Passing answer back to caller...
 D, [2012-10-21T22:49:22.760781 #67612] DEBUG -- : Writing response to client (40 bytes) via UDP...
 === Daemon Stopping @ 2012-10-21 22:49:22 +1300 ===
+=== Log Marked @ 2012-10-22 02:33:46 +1300 ===
+I, [2012-10-22T02:33:46.458089 #71723]  INFO -- : Starting RubyDNS server (v0.5.2)...
+I, [2012-10-22T02:33:46.467792 #71723]  INFO -- : Listening on udp:127.0.0.1:5350
+I, [2012-10-22T02:33:46.468438 #71723]  INFO -- : Listening on tcp:127.0.0.1:5350
+D, [2012-10-22T02:33:46.558479 #71723] DEBUG -- : Receiving incoming query (28 bytes)...
+D, [2012-10-22T02:33:46.559042 #71723] DEBUG -- : Processing question test.local Resolv::DNS::Resource::IN::A...
+D, [2012-10-22T02:33:46.559231 #71723] DEBUG -- : Searching for test.local Resolv::DNS::Resource::IN::A
+D, [2012-10-22T02:33:46.559360 #71723] DEBUG -- : Checking rule ["test.local", Resolv::DNS::Resource::IN::A]...
+D, [2012-10-22T02:33:46.559494 #71723] DEBUG -- : String pattern matched.
+I, [2012-10-22T02:33:46.559620 #71723]  INFO -- : Resource class: Resolv::DNS::Resource::IN::A
+I, [2012-10-22T02:33:46.559875 #71723]  INFO -- : Resource: #<Resolv::DNS::Resource::IN::A:0x007fc8c892e508 @address=#<Resolv::IPv4 192.168.1.1>>
+D, [2012-10-22T02:33:46.560053 #71723] DEBUG -- : add_answer: #<Resolv::DNS::Resource::IN::A:0x007fc8c892e508 @address=#<Resolv::IPv4 192.168.1.1>> 1 1
+D, [2012-10-22T02:33:46.560309 #71723] DEBUG -- : Passing answer back to caller...
+D, [2012-10-22T02:33:46.560548 #71723] DEBUG -- : Writing response to client (44 bytes) via UDP...
+=== Daemon Stopping @ 2012-10-22 02:33:46 +1300 ===
+=== Log Marked @ 2012-10-22 02:33:46 +1300 ===
+I, [2012-10-22T02:33:46.667093 #71731]  INFO -- : Starting RubyDNS server (v0.5.2)...
+I, [2012-10-22T02:33:46.667696 #71731]  INFO -- : Listening on udp:127.0.0.1:5350
+I, [2012-10-22T02:33:46.668213 #71731]  INFO -- : Listening on tcp:127.0.0.1:5350
+D, [2012-10-22T02:33:46.766795 #71731] DEBUG -- : Receiving incoming query (24 bytes)...
+D, [2012-10-22T02:33:46.767422 #71731] DEBUG -- : Processing question foobar Resolv::DNS::Resource::IN::A...
+D, [2012-10-22T02:33:46.767647 #71731] DEBUG -- : Searching for foobar Resolv::DNS::Resource::IN::A
+D, [2012-10-22T02:33:46.767790 #71731] DEBUG -- : Checking rule ["test.local", Resolv::DNS::Resource::IN::A]...
+D, [2012-10-22T02:33:46.767938 #71731] DEBUG -- : No pattern matched.
+D, [2012-10-22T02:33:46.768088 #71731] DEBUG -- : Checking rule [/foo.*/, Resolv::DNS::Resource::IN::A]...
+D, [2012-10-22T02:33:46.768299 #71731] DEBUG -- : Regexp pattern matched with #<MatchData "foobar">.
+I, [2012-10-22T02:33:46.768415 #71731]  INFO -- : Resource class: Resolv::DNS::Resource::IN::A
+I, [2012-10-22T02:33:46.768651 #71731]  INFO -- : Resource: #<Resolv::DNS::Resource::IN::A:0x007fc8c89e3728 @address=#<Resolv::IPv4 192.168.1.2>>
+D, [2012-10-22T02:33:46.768826 #71731] DEBUG -- : add_answer: #<Resolv::DNS::Resource::IN::A:0x007fc8c89e3728 @address=#<Resolv::IPv4 192.168.1.2>> 1 1
+D, [2012-10-22T02:33:46.769030 #71731] DEBUG -- : Passing answer back to caller...
+D, [2012-10-22T02:33:46.769230 #71731] DEBUG -- : Writing response to client (40 bytes) via UDP...
+=== Daemon Stopping @ 2012-10-22 02:33:46 +1300 ===

data/test/log/SlowServer.log

@@ -46,3 +46,27 @@ D, [2012-10-21T22:49:24.443120 #67618] DEBUG -- : Regexp pattern matched with #<
 D, [2012-10-21T22:49:26.444681 #67618] DEBUG -- : Passing answer back to caller...
 D, [2012-10-21T22:49:26.445484 #67618] DEBUG -- : Writing response to client (27 bytes) via UDP...
 === Daemon Stopping @ 2012-10-21 22:49:26 +1300 ===
+=== Log Marked @ 2012-10-22 02:33:47 +1300 ===
+I, [2012-10-22T02:33:47.402681 #71735]  INFO -- : Starting RubyDNS server (v0.5.2)...
+I, [2012-10-22T02:33:47.403158 #71735]  INFO -- : Listening on udp:127.0.0.1:5330
+I, [2012-10-22T02:33:47.403670 #71735]  INFO -- : Listening on tcp:127.0.0.1:5330
+D, [2012-10-22T02:33:47.503841 #71735] DEBUG -- : Receiving incoming query (35 bytes)...
+D, [2012-10-22T02:33:47.504990 #71735] DEBUG -- : Processing question oriontransfer.org Resolv::DNS::Resource::IN::A...
+D, [2012-10-22T02:33:47.505414 #71735] DEBUG -- : Searching for oriontransfer.org Resolv::DNS::Resource::IN::A
+D, [2012-10-22T02:33:47.505728 #71735] DEBUG -- : Checking rule [/\.*.com/, Resolv::DNS::Resource::IN::A]...
+D, [2012-10-22T02:33:47.506189 #71735] DEBUG -- : No pattern matched.
+D, [2012-10-22T02:33:47.506509 #71735] DEBUG -- : Passing answer back to caller...
+D, [2012-10-22T02:33:47.506874 #71735] DEBUG -- : Writing response to client (35 bytes) via UDP...
+=== Daemon Stopping @ 2012-10-22 02:33:47 +1300 ===
+=== Log Marked @ 2012-10-22 02:33:47 +1300 ===
+I, [2012-10-22T02:33:47.614210 #71737]  INFO -- : Starting RubyDNS server (v0.5.2)...
+I, [2012-10-22T02:33:47.614771 #71737]  INFO -- : Listening on udp:127.0.0.1:5330
+I, [2012-10-22T02:33:47.615358 #71737]  INFO -- : Listening on tcp:127.0.0.1:5330
+D, [2012-10-22T02:33:47.714403 #71737] DEBUG -- : Receiving incoming query (27 bytes)...
+D, [2012-10-22T02:33:47.714891 #71737] DEBUG -- : Processing question apple.com Resolv::DNS::Resource::IN::A...
+D, [2012-10-22T02:33:47.715061 #71737] DEBUG -- : Searching for apple.com Resolv::DNS::Resource::IN::A
+D, [2012-10-22T02:33:47.715183 #71737] DEBUG -- : Checking rule [/\.*.com/, Resolv::DNS::Resource::IN::A]...
+D, [2012-10-22T02:33:47.715419 #71737] DEBUG -- : Regexp pattern matched with #<MatchData ".com">.
+D, [2012-10-22T02:33:49.716180 #71737] DEBUG -- : Passing answer back to caller...
+D, [2012-10-22T02:33:49.716575 #71737] DEBUG -- : Writing response to client (27 bytes) via UDP...
+=== Daemon Stopping @ 2012-10-22 02:33:49 +1300 ===

data/test/log/TestPassthroughServer.log

@@ -22,3 +22,15 @@ D, [2012-10-21T22:49:22.973159 #67614] DEBUG -- : Regexp pattern matched with #<
 D, [2012-10-21T22:49:23.411110 #67614] DEBUG -- : Passing answer back to caller...
 D, [2012-10-21T22:49:23.411601 #67614] DEBUG -- : Writing response to client (204 bytes) via UDP...
 === Daemon Stopping @ 2012-10-21 22:49:23 +1300 ===
+=== Log Marked @ 2012-10-22 02:33:46 +1300 ===
+I, [2012-10-22T02:33:46.876476 #71733]  INFO -- : Starting RubyDNS server (v0.5.2)...
+I, [2012-10-22T02:33:46.877001 #71733]  INFO -- : Listening on udp:127.0.0.1:5340
+I, [2012-10-22T02:33:46.877464 #71733]  INFO -- : Listening on tcp:127.0.0.1:5340
+D, [2012-10-22T02:33:46.976777 #71733] DEBUG -- : Receiving incoming query (28 bytes)...
+D, [2012-10-22T02:33:46.977411 #71733] DEBUG -- : Processing question google.com Resolv::DNS::Resource::IN::A...
+D, [2012-10-22T02:33:46.977629 #71733] DEBUG -- : Searching for google.com Resolv::DNS::Resource::IN::A
+D, [2012-10-22T02:33:46.977808 #71733] DEBUG -- : Checking rule [/.*\.com/, Resolv::DNS::Resource::IN::A]...
+D, [2012-10-22T02:33:46.978094 #71733] DEBUG -- : Regexp pattern matched with #<MatchData "google.com">.
+D, [2012-10-22T02:33:47.035386 #71733] DEBUG -- : Passing answer back to caller...
+D, [2012-10-22T02:33:47.035869 #71733] DEBUG -- : Writing response to client (204 bytes) via UDP...
+=== Daemon Stopping @ 2012-10-22 02:33:47 +1300 ===

data/test/log/TruncatedServer.log

@@ -50,3 +50,29 @@ D, [2012-10-21T22:49:26.700206 #67632] DEBUG -- : add_answer: #<Resolv::DNS::Res
 D, [2012-10-21T22:49:26.700327 #67632] DEBUG -- : Passing answer back to caller...
 D, [2012-10-21T22:49:26.700529 #67632] DEBUG -- : Writing response to client (1346 bytes) via TCP...
 === Daemon Stopping @ 2012-10-21 22:49:26 +1300 ===
+=== Log Marked @ 2012-10-22 02:33:49 +1300 ===
+I, [2012-10-22T02:33:49.864962 #71751]  INFO -- : Starting RubyDNS server (v0.5.2)...
+I, [2012-10-22T02:33:49.865606 #71751]  INFO -- : Listening on udp:127.0.0.1:5320
+I, [2012-10-22T02:33:49.866149 #71751]  INFO -- : Listening on tcp:127.0.0.1:5320
+D, [2012-10-22T02:33:49.966882 #71751] DEBUG -- : Receiving incoming query (28 bytes)...
+D, [2012-10-22T02:33:49.967905 #71751] DEBUG -- : Processing question truncation Resolv::DNS::Resource::IN::TXT...
+D, [2012-10-22T02:33:49.968321 #71751] DEBUG -- : Searching for truncation Resolv::DNS::Resource::IN::TXT
+D, [2012-10-22T02:33:49.968579 #71751] DEBUG -- : Checking rule ["truncation", Resolv::DNS::Resource::IN::TXT]...
+D, [2012-10-22T02:33:49.968832 #71751] DEBUG -- : String pattern matched.
+I, [2012-10-22T02:33:49.969120 #71751]  INFO -- : Resource class: Resolv::DNS::Resource::IN::TXT
+I, [2012-10-22T02:33:49.969555 #71751]  INFO -- : Resource: #<Resolv::DNS::Resource::IN::TXT:0x007fc8c8b6e4d0 @strings=["Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello Wo", "rld! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hel", "lo World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World", "! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello ", "World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! H", "ello World! Hello World! "]>
+D, [2012-10-22T02:33:49.970010 #71751] DEBUG -- : add_answer: #<Resolv::DNS::Resource::IN::TXT:0x007fc8c8b6e4d0 @strings=["Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello Wo", "rld! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hel", "lo World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World", "! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello ", "World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! H", "ello World! Hello World! "]> 16 1
+D, [2012-10-22T02:33:49.970649 #71751] DEBUG -- : Passing answer back to caller...
+D, [2012-10-22T02:33:49.971044 #71751] DEBUG -- : Writing response to client (1346 bytes) via UDP...
+W, [2012-10-22T02:33:49.971207 #71751]  WARN -- : Response via UDP was larger than 512!
+D, [2012-10-22T02:33:49.972475 #71751] DEBUG -- : Receiving incoming query (28 bytes)...
+D, [2012-10-22T02:33:49.972713 #71751] DEBUG -- : Processing question truncation Resolv::DNS::Resource::IN::TXT...
+D, [2012-10-22T02:33:49.972828 #71751] DEBUG -- : Searching for truncation Resolv::DNS::Resource::IN::TXT
+D, [2012-10-22T02:33:49.972928 #71751] DEBUG -- : Checking rule ["truncation", Resolv::DNS::Resource::IN::TXT]...
+D, [2012-10-22T02:33:49.973012 #71751] DEBUG -- : String pattern matched.
+I, [2012-10-22T02:33:49.973149 #71751]  INFO -- : Resource class: Resolv::DNS::Resource::IN::TXT
+I, [2012-10-22T02:33:49.973341 #71751]  INFO -- : Resource: #<Resolv::DNS::Resource::IN::TXT:0x007fc8c8b79600 @strings=["Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello Wo", "rld! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hel", "lo World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World", "! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello ", "World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! H", "ello World! Hello World! "]>
+D, [2012-10-22T02:33:49.973531 #71751] DEBUG -- : add_answer: #<Resolv::DNS::Resource::IN::TXT:0x007fc8c8b79600 @strings=["Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello Wo", "rld! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hel", "lo World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World", "! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello ", "World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! H", "ello World! Hello World! "]> 16 1
+D, [2012-10-22T02:33:49.973692 #71751] DEBUG -- : Passing answer back to caller...
+D, [2012-10-22T02:33:49.973894 #71751] DEBUG -- : Writing response to client (1346 bytes) via TCP...
+=== Daemon Stopping @ 2012-10-22 02:33:49 +1300 ===

data/test/test_resolver.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'helper'
-require 'rubydns/resolver'
+require 'rubydns'
 
 class ResolverTest < Test::Unit::TestCase
 	def test_basic_resolver
@@ -32,4 +32,22 @@ class ResolverTest < Test::Unit::TestCase
 			end
 		end
 	end
+	
+	def test_addresses_for
+		resolver = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
+		resolved_addresses = nil
+		
+		EventMachine::run do
+			resolver.addresses_for("www.google.com.") do |addresses|
+				resolved_addresses = addresses
+				
+				EventMachine::stop
+			end
+		end
+		
+		assert resolved_addresses.count > 0
+		
+		address = resolved_addresses[0]
+		assert address.kind_of?(Resolv::IPv4) || address.kind_of?(Resolv::IPv6)
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubydns
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1826136753171810618
+      hash: -2570367066356706581
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: