rubydns 0.5.4 → 0.6.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWFmMGQwYzlmMGFkMjczY2VlNzExMjdmMDI3NDZiNTFjMTc2Nzk4NQ==
+  data.tar.gz: !binary |-
+    MjljNzMxODYwNmZlNTdmNzBjMjFkNjRmYjYxZDIxZWRlZmIzYTQ0OA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MWZiMTBlY2YxYjdiYzIzMDU0OTBhMzBkN2RiZjY4OWZlNGFjNzM2ZGUxZTUx
+    NDE0MzdiMjFiZTg5OTM2NmVhNjcwMmY0NjE1MzNlN2JmZWM4MTIxMjQwYjk2
+    MjVjOTViMDNkYzQ0NTBlZTdlODIzM2IyZDg3NjEwZjNhMDBlNTM=
+  data.tar.gz: !binary |-
+    NzJiNGE4YjhjY2Q4MjQ3MWU0ODgwOTk4NWJlM2YwYmQ4OWZlNDdkYTIxOTU2
+    Y2FjN2UwZjZhNGYzMzc5NDY2NDYyNDFmMmVkMDZkYjg4Zjk2MWQyZjA3YzEw
+    NTRlYzZjM2JkYTFjNzUyZDYyNGMwODUxZDdiNjc5NTllZjhmODM=

data/README.md

@@ -44,7 +44,7 @@ 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|
+        match(/test.mydomain.org/, IN::A) do |transaction|
             transaction.respond!("10.0.0.80")
         end
 
@@ -65,6 +65,10 @@ $ dig @localhost google.com
 
 ## Compatibility
 
+### Migrating from RubyDNS 0.5.x to 0.6.x ###
+
+The order of arguments to pattern based rules has changed. For regular expression based rules, the arguments are now ordered `|transaction, match_data|`. The main reason for this change was that in many cases match_data is not important and can thus be ignored, e.g. `|transaction|`.
+
 ### 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.
@@ -119,7 +123,7 @@ transaction.defer!
 Once you call this, the transaction won't complete until you call either `transaction.succeed` or `transaction.fail`.
 ```ruby
 RubyDNS::run_server(:listen => SERVER_PORTS) do
-	match(/\.*.com/, IN::A) do |match, transaction|
+	match(/\.*.com/, IN::A) do |transaction|
 		transaction.defer!
 		
 		# No domain exists, after 5 seconds:

data/lib/rubydns/server.rb

@@ -58,7 +58,7 @@ module RubyDNS
 					match_data = @pattern[0].match(name)
 					if match_data
 						server.logger.debug "Regexp pattern matched with #{match_data.inspect}."
-						return @callback[match_data, *args]
+						return @callback[*args, match_data]
 					end
 				when String
 					if @pattern[0] == name

data/lib/rubydns/version.rb

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

data/test/examples/dropping-dns.rb

@@ -47,7 +47,7 @@ class DroppingDaemon < RExec::Daemon::Base
 	def self.run
 		RubyDNS::run_server(:listen => INTERFACES) do
 			# Fail the resolution of certain domains ;)
-			match(/(m?i?c?r?o?s?o?f?t)/) do |match_data, transaction|
+			match(/(m?i?c?r?o?s?o?f?t)/) do |transaction, match_data|
 				if match_data[1].size > 7
 					logger.info "Dropping domain MICROSOFT..."
 					transaction.failure!(:NXDomain)
@@ -58,7 +58,7 @@ class DroppingDaemon < RExec::Daemon::Base
 			end
 			
 			# Hmm....
-			match(/^(.+\.)?sco\./) do |match_data, transaction|
+			match(/^(.+\.)?sco\./) do |transaction|
 				logger.info "Dropping domain SCO..."
 				transaction.failure!(:NXDomain)
 			end

data/test/examples/fortune-dns.rb

@@ -67,12 +67,12 @@ class FortuneDNS < RExec::Daemon::Base
 				end
 			end
 			
-			match(/stats\.fortune/, IN::TXT) do |match, transaction|
+			match(/stats\.fortune/, IN::TXT) do |transaction|
 				$stderr.puts "Sending stats: #{stats.inspect}"
 				transaction.respond!(stats.inspect)
 			end
 			
-			match(/(.+)\.fortune/, IN::TXT) do |match, transaction|
+			match(/(.+)\.fortune/, IN::TXT) do |transaction|
 				fortune = cache[match[1]]
 				stats[:requested] += 1
 				
@@ -83,7 +83,7 @@ class FortuneDNS < RExec::Daemon::Base
 				end
 			end
 			
-			match(/fortune/, [IN::CNAME, IN::TXT]) do |match, transaction|
+			match(/fortune/, [IN::CNAME, IN::TXT]) do |transaction|
 				fortune = `fortune`.gsub(/\s+/, " ").strip
 				checksum = Digest::MD5.hexdigest(fortune)
 				cache[checksum] = fortune

data/test/examples/geoip-dns.rb

@@ -52,7 +52,7 @@ class GeoIPDNSDaemon < RExec::Daemon::Base
 	
 	def self.run
 		RubyDNS::run_server(:listen => INTERFACES) do
-			match(//, IN::A) do |match_data, transaction|
+			match(//, IN::A) do |transaction|
 				location = nil
 				peer = transaction.options[:peer]
 				

data/test/examples/soa-dns.rb

@@ -57,7 +57,7 @@ RubyDNS::run_server(:listen => [[:udp, "0.0.0.0", 5400]]) do
 
 	# For this exact address record, return an IP address
 	#   dig @localhost -p 5300 CNAME bob.mydomain.org
-	match(/([^.]+).mydomain.org/, IN::CNAME) do |match_data, transaction|
+	match(/([^.]+).mydomain.org/, IN::CNAME) do |transaction|
 		transaction.respond!(Name.create("www.mydomain.org"))
 		transaction.append_query!("www.mydomain.org", IN::A)
 	end

data/test/examples/test-dns-1.rb

@@ -35,7 +35,7 @@ RubyDNS::run_server do
 	# % dig +nocmd +noall +answer @localhost ANY dev.mydomain.org
 	# dev.mydomain.org.	16000	IN	A	10.0.0.80
 	# dev.mydomain.org.	16000	IN	MX	10 mail.mydomain.org.
-	match(/dev.mydomain.org/, IN::ANY) do |match_data, transaction|
+	match(/dev.mydomain.org/, IN::ANY) do |transaction|
 		transaction.append_question!
 		
 		[IN::A, IN::CNAME, IN::MX].each do |resource_class|
@@ -57,7 +57,7 @@ RubyDNS::run_server do
 		transaction.respond!(10, Name.create("mail.mydomain.org."))
 	end
 	
-	match(/^test([0-9]+).mydomain.org$/, IN::A) do |match_data, transaction|
+	match(/^test([0-9]+).mydomain.org$/, IN::A) do |transaction, match_data|
 		offset = match_data[1].to_i
 		
 		if offset > 0 && offset < 10

data/test/test_daemon.rb

@@ -41,7 +41,7 @@ class BasicTestServer < RExec::Daemon::Base
 				transaction.respond!("192.168.1.1")
 			end
 
-			match(/foo.*/, IN::A) do |match, transaction|
+			match(/foo.*/, IN::A) do |transaction|
 				transaction.respond!("192.168.1.2")
 			end
 

data/test/test_passthrough.rb

@@ -39,7 +39,7 @@ class TestPassthroughServer < RExec::Daemon::Base
 		
 		# Start the RubyDNS server
 		RubyDNS::run_server(:listen => SERVER_PORTS) do
-			match(/.*\.com/, IN::A) do |match, transaction|
+			match(/.*\.com/, IN::A) do |transaction|
 				transaction.passthrough!(resolver)
 			end
 

data/test/test_slow_server.rb

@@ -37,7 +37,7 @@ class SlowServer < RExec::Daemon::Base
 
 	def self.run
 		RubyDNS::run_server(:listen => SERVER_PORTS) do
-			match(/\.*.com/, IN::A) do |match, transaction|
+			match(/\.*.com/, IN::A) do |transaction|
 				transaction.defer!
 			
 				# No domain exists, after 5 seconds:

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rubydns
 version: !ruby/object:Gem::Version
-  version: 0.5.4
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-19 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -100,33 +95,26 @@ files:
 - test/test_truncation.rb
 homepage: https://github.com/ioquatix/rubydns
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !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
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An easy to use DNS server and resolver for Ruby.
 test_files:
 - test/examples/dropping-dns.rb