rubydns 0.5.3 → 0.5.4

data/Gemfile

@@ -1,4 +1,8 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in rubydns.gemspec
+# Specify your gem's dependencies in trenni.gemspec
 gemspec
+
+group :test do
+	gem "rake"
+end

data/README.md

@@ -27,103 +27,113 @@ Or install it yourself as:
 ## Usage
 
 This is copied from `test/examples/test-dns-2.rb`. It has been simplified slightly.
-
-	require 'rubydns'
-
-	Name = Resolv::DNS::Name
-	IN = Resolv::DNS::Resource::IN
-
-	# Use upstream DNS for name resolution.
-	UPSTREAM = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
-
-	def self.run
-		# Start the RubyDNS server
-		RubyDNS::run_server(:listen => INTERFACES) do
-			match("test.mydomain.org", IN::A) do |transaction|
-				transaction.respond!("10.0.0.80")
-			end
-
-			# Default DNS handler
-			otherwise do |transaction|
-				transaction.passthrough!(UPSTREAM)
-			end
-		end
-	end
-
-After starting this server you can test it using dig:
-
-	dig @localhost test1.mydomain.org
-	dig @localhost dev.mydomain.org
-	dig @localhost google.com
+```ruby
+#!/usr/bin/env ruby
+require 'rubydns'
+
+INTERFACES = [
+	[:udp, "0.0.0.0", 53],
+	[:tcp, "0.0.0.0", 53]
+]
+Name = Resolv::DNS::Name
+IN = Resolv::DNS::Resource::IN
+
+# Use upstream DNS for name resolution.
+UPSTREAM = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
+
+def self.run
+    # Start the RubyDNS server
+    RubyDNS::run_server(:listen => INTERFACES) do
+        match(/test.mydomain.org/, IN::A) do |_host, transaction|
+            transaction.respond!("10.0.0.80")
+        end
+
+        # Default DNS handler
+        otherwise do |transaction|
+            transaction.passthrough!(UPSTREAM)
+        end
+    end
+end
+run
+```
+Start the server using `rvmsudo ./test.rb`. You can then test it using dig:
+```
+$ dig @localhost test1.mydomain.org
+$ dig @localhost dev.mydomain.org
+$ dig @localhost google.com
+```
 
 ## Compatibility
 
 ### Migrating from RubyDNS 0.3.x to 0.4.x ###
 
 Due to changes in `resolv.rb`, superficial parts of RubyDNS have changed. Rather than using `:A` to specify A-records, one must now use the class name.
-
-	match(..., :A)
-
+```ruby
+match(..., :A)
+```
 becomes
-
-	IN = Resolv::DNS::Resource::IN
-	match(..., IN::A)
-
+```ruby
+IN = Resolv::DNS::Resource::IN
+match(..., IN::A)
+```
 ### Migrating from RubyDNS 0.4.x to 0.5.x ###
 
 The system standard resolver was synchronous, and this could stall the server when making upstream requests to other DNS servers. A new resolver `RubyDNS::Resolver` now provides an asynchronous interface and the `Transaction::passthrough` makes exclusive use of this to provide high performance asynchonous resolution.
 
 Here is a basic example of how to use the new resolver in full. It is important to provide both `:udp` and `:tcp` connection specifications, so that large requests will be handled correctly:
-
-	resolver = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
-	
-	EventMachine::run do
-		resolver.query('google.com', IN::A) do |response|
-			case response
-			when RubyDNS::Message
-				puts "Got response: #{response.answers.first}"
-			else
-				# Response is of class RubyDNS::ResolutionFailure
-				puts "Failed: #{response.message}"
-			end
-			
-			EventMachine::stop
+```ruby
+resolver = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
+
+EventMachine::run do
+  resolver.query('google.com', IN::A) do |response|
+		case response
+		when RubyDNS::Message
+			puts "Got response: #{response.answers.first}"
+		else
+			# Response is of class RubyDNS::ResolutionFailure
+			puts "Failed: #{response.message}"
 		end
-	end
 
+		EventMachine::stop
+	end
+end
+```
 Existing code that uses `Resolv::DNS` as a resolver will need to be updated:
-
-	# 1/ Add this at the top of your file; Host specific system information:
-	require 'rubydns/system'
+```ruby
+# 1/ Add this at the top of your file; Host specific system information:
+require 'rubydns/system'
 	
-	# 2/ Change from R = Resolv::DNS.new to:
-	R = RubyDNS::Resolver.new(RubyDNS::System::nameservers)
-
+# 2/ Change from R = Resolv::DNS.new to:
+R = RubyDNS::Resolver.new(RubyDNS::System::nameservers)
+```
 Everything else in the server can remain the same. You can see a complete example in `test/test_resolver.rb`.
 
 #### Deferred Transactions ####
 
 The implementation of the above depends on a new feature which was added in 0.5.0:
 
-	transaction.defer!
+```ruby
+transaction.defer!
+```
 
 Once you call this, the transaction won't complete until you call either `transaction.succeed` or `transaction.fail`.
-
-	RubyDNS::run_server(:listen => SERVER_PORTS) do
-		match(/\.*.com/, IN::A) do |match, transaction|
-			transaction.defer!
-			
-			# No domain exists, after 5 seconds:
-			EventMachine::Timer.new(5) do
-				transaction.failure!(:NXDomain)
-			end
-		end
+```ruby
+RubyDNS::run_server(:listen => SERVER_PORTS) do
+	match(/\.*.com/, IN::A) do |match, transaction|
+		transaction.defer!
 		
-		otherwise do
+		# No domain exists, after 5 seconds:
+		EventMachine::Timer.new(5) do
 			transaction.failure!(:NXDomain)
 		end
 	end
 
+	otherwise do
+		transaction.failure!(:NXDomain)
+	end
+end
+```
+
 You can see a complete example in `test/test_slow_server.rb`.
 
 ## Contributing

data/lib/rubydns/resolver.rb

@@ -121,7 +121,7 @@ module RubyDNS
 					
 					try_next_server!
 				elsif response.id != @message.id
-					@logger.warn "[#{@message.id}] Received response with incorrect message id: #{response.id}" if @request.logger
+					@logger.warn "[#{@message.id}] Received response with incorrect message id: #{response.id}" if @logger
 					
 					try_next_server!
 				else

data/lib/rubydns/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module RubyDNS
-	VERSION = "0.5.3"
+	VERSION = "0.5.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubydns
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2013-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexec
@@ -110,12 +110,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4471214807073304118
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4471214807073304118
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24