redns 0.1.15 → 0.1.16

data/README.rdoc

@@ -5,6 +5,13 @@ Reactor-Ready DNS Library
 This library includes native Ruby encoder/decoder classes for typical
 DNS records that are specified in RFC1035.
 
+In addition, RFC2671 extension mechanisms are also supported.
+
 == References
 
 [RFC1035](http://www.faqs.org/rfcs/rfc1035.html)
+[RFC2671](http://www.faqs.org/rfcs/rfc2671.html)
+
+== Copyright
+
+(C) 2005-2012 Scott Tadman

data/VERSION

@@ -1 +1 @@
-0.1.15
+0.1.16

data/bin/redig

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH << File.expand_path(File.join('..','lib'), File.dirname(__FILE__))
+
+require 'optparse'
+
+require 'redns'
+
+# == Main ===================================================================
+
+options = {
+  :query_type => :any,
+}
+
+op = OptionParser.new do |op|
+  op.on("-t", "--type=s") do |type|
+    options[:query_type] = type.to_sym
+  end
+end
+
+# Look for command-line arguments prefixed with '@' and push these into the
+# options for nameservers.
+queries = op.parse(*ARGV).select do |query|
+  case (query)
+  when /^@(.*)/
+    (options[:nameservers] ||= [ ]) << $1
+    false
+  else
+    true
+  end
+end
+
+resolver = ReDNS::Resolver.new do |resolver|
+  if (options[:nameservers])
+    resolver.servers = options[:nameservers]
+  end
+end
+
+queries.each do |query|
+  results = resolver.simple_query(options[:query_type], query)
+  
+  if (results)
+    results.each do |result|
+      puts result.to_s
+    end
+  else
+    puts "No results"
+  end
+end

data/lib/redns/buffer.rb

@@ -3,7 +3,7 @@ class ReDNS::Buffer < String
 
   # == Properties ===========================================================
   
-  alias_method :total_length, :length
+  alias_method :string_length, :length
   alias_method :total_size, :size
 
   attr_reader :offset
@@ -24,23 +24,27 @@ class ReDNS::Buffer < String
       super('')
       
       @offset = 0
-      @size = total_length
+      @size = string_length
       
       contents.serialize(self)
     else
       super(contents || '')
 
       @offset = offset ? offset.to_i : 0
-      @size = size ? size.to_i : total_length
+      @size = size ? size.to_i : string_length
     end
     
     advance(0)
   end
   
+  def empty?
+    @offset >= string_length
+  end
+  
   def unpack(format)
     return [ ] if (@size <= 0)
     
-    return if (@offset > total_length)
+    return if (@offset > string_length)
 
     data = to_s.unpack(format)
     advance(data.pack(format).length)
@@ -55,7 +59,7 @@ class ReDNS::Buffer < String
   end
   
   def slice(chars = 1)
-    return if (@offset + chars > total_length)
+    return if (@offset + chars > string_length)
 
     result = to_str[@offset, chars]
     advance(chars)
@@ -64,7 +68,7 @@ class ReDNS::Buffer < String
   end
   
   def read(chars = 1)
-    return if (@offset + chars > total_length)
+    return if (@offset + chars > string_length)
 
     result = to_str[@offset, chars]
     advance(chars)
@@ -95,18 +99,18 @@ class ReDNS::Buffer < String
     else
       @offset += chars
 
-      if (@offset > total_length)
-        @offset = total_length
+      if (@offset > string_length)
+        @offset = string_length
       end
 
-      max_length = (total_length - @offset)
+      max_length = (string_length - @offset)
 
       if (!@size or @size > max_length)
         @size = max_length
       end
     end
     
-    @size ||= total_length - @offset
+    @size ||= string_length - @offset
     
     self
   end

data/lib/redns/record/null.rb

@@ -24,8 +24,12 @@ class ReDNS::Record::Null < ReDNS::Fragment
 	end
 
 	def deserialize(buffer)
-	  if (content_length = buffer.unpack('C')[0])
-  	  self.contents = buffer.read(content_length)
+	  self.contents = ''
+	  
+	  while (!buffer.empty?)
+  	  if (content_length = buffer.unpack('C')[0])
+    	  self.contents << buffer.unpack("a#{content_length}")[0]
+  	  end
 	  end
 
 	  self

data/lib/redns/record/spf.rb

@@ -0,0 +1,2 @@
+class ReDNS::Record::SPF < ReDNS::Record::Txt
+end

data/lib/redns/record/txt.rb

@@ -0,0 +1,2 @@
+class ReDNS::Record::TXT < ReDNS::Record::Null
+end

data/lib/redns/record.rb

@@ -4,4 +4,6 @@ class ReDNS::Record < ReDNS::Fragment
   autoload(:MX, 'redns/record/mx')
   autoload(:Null, 'redns/record/null')
   autoload(:SOA, 'redns/record/soa')
+  autoload(:SPF, 'redns/record/spf')
+  autoload(:TXT, 'redns/record/txt')
 end

data/lib/redns/resolver.rb

@@ -216,6 +216,7 @@ class ReDNS::Resolver
 	
 protected
 	def expand_answers(r)
+
 		unless (r and r.answers)
 			return nil
 		end
@@ -223,7 +224,16 @@ protected
 		result = r.answers
 		radd = (r.additional_records or [ ])
 		
-		result.reject { |rr| rr.rtype == :a }.each do |rr|
+		result.select do |rr|
+		  case (rr.rtype)
+	    when :ns
+	      # These record types require further investigation if they are to
+	      # be included in the result-set.
+	      true
+      else
+        false
+		  end
+		end.each do |rr|
 			# Additional resource records may be related to the query, or they
 			# might just be convenience records that are not directly helpful.
 			

data/lib/redns/resource.rb

@@ -68,12 +68,16 @@ class ReDNS::Resource < ReDNS::Fragment
   			self.rdata = ReDNS::Address.new(buffer)
   		when :cname, :ptr, :ns
   			self.rdata = ReDNS::Name.new(buffer)
+  		when :mx
+  			self.rdata = ReDNS::Record::MX.new(buffer)
   		when :soa
   			self.rdata = ReDNS::Record::SOA.new(buffer)
-  		when :txt, :null
+  		when :null
   		  self.rdata = (rdata_length and ReDNS::Record::Null.new(buffer.slice(rdata_length)))
-  		when :mx
-  			self.rdata = ReDNS::Record::MX.new(buffer)
+		  when :spf
+		    self.rdata = (rdata_length and ReDNS::Record::SPF.new(buffer.slice(rdata_length)))
+  		when :txt
+  		  self.rdata = (rdata_length and ReDNS::Record::TXT.new(buffer.slice(rdata_length)))
   		else
         # FUTURE: Throw exception here when trying to decode invalid type
   		  nil

data/redns.gemspec

@@ -4,14 +4,15 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{redns}
-  s.version = "0.1.15"
+  s.name = "redns"
+  s.version = "0.1.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{tadman}]
-  s.date = %q{2011-08-10}
-  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.authors = ["tadman"]
+  s.date = "2012-02-13"
+  s.description = "ReDNS is a pure Ruby DNS library with drivers for reactor-model engines such as EventMachine"
+  s.email = "github@tadman.ca"
+  s.executables = ["redig"]
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -20,6 +21,7 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "bin/redig",
     "lib/redns.rb",
     "lib/redns/address.rb",
     "lib/redns/buffer.rb",
@@ -32,6 +34,8 @@ Gem::Specification.new do |s|
     "lib/redns/record/mx.rb",
     "lib/redns/record/null.rb",
     "lib/redns/record/soa.rb",
+    "lib/redns/record/spf.rb",
+    "lib/redns/record/txt.rb",
     "lib/redns/resolver.rb",
     "lib/redns/resource.rb",
     "lib/redns/support.rb",
@@ -49,10 +53,10 @@ Gem::Specification.new do |s|
     "test/test_redns_resource.rb",
     "test/test_redns_support.rb"
   ]
-  s.homepage = %q{http://github.com/tadman/redns}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.7}
-  s.summary = %q{Ruby Reactor-Ready DNS Library}
+  s.homepage = "http://github.com/tadman/redns"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "Ruby Reactor-Ready DNS Library"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/test_redns_buffer.rb

@@ -13,6 +13,25 @@ class TestReDNSBuffer < Test::Unit::TestCase
     
     assert_equal nil, buffer.read
   end
+
+  def test_empty_state
+    buffer = ReDNS::Buffer.new('test')
+    
+    assert_equal false, buffer.empty?
+    
+    buffer.unpack('C4')
+
+    assert_equal true, buffer.empty?
+    
+    assert_equal 4, buffer.offset
+    
+    buffer.append('test')
+
+    assert_equal 4, buffer.offset
+    assert_equal 4, buffer.length
+    
+    assert_equal false, buffer.empty?
+  end
     
   def test_simple_duplicate
     buffer = ReDNS::Buffer.new('example'.freeze, 1, 3)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redns
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,13 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-10 00:00:00.000000000Z
+date: 2012-02-13 00:00:00.000000000 Z
 dependencies: []
 description: ReDNS is a pure Ruby DNS library with drivers for reactor-model engines
   such as EventMachine
 email: github@tadman.ca
-executables: []
+executables:
+- redig
 extensions: []
 extra_rdoc_files:
 - README.rdoc
@@ -23,6 +24,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/redig
 - lib/redns.rb
 - lib/redns/address.rb
 - lib/redns/buffer.rb
@@ -35,6 +37,8 @@ files:
 - lib/redns/record/mx.rb
 - lib/redns/record/null.rb
 - lib/redns/record/soa.rb
+- lib/redns/record/spf.rb
+- lib/redns/record/txt.rb
 - lib/redns/resolver.rb
 - lib/redns/resource.rb
 - lib/redns/support.rb
@@ -71,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby Reactor-Ready DNS Library