net-dns 0.2.5 → 0.3

data/InstalledFiles

@@ -1,22 +1 @@
-/usr/local/lib/site_ruby/1.8/net/dns/resolver.rb
-/usr/local/lib/site_ruby/1.8/net/dns/dns.rb
 /usr/local/lib/site_ruby/1.8/net/dns/rr.rb
-/usr/local/lib/site_ruby/1.8/net/dns/question.rb
-/usr/local/lib/site_ruby/1.8/net/dns/header.rb
-/usr/local/lib/site_ruby/1.8/net/dns/packet.rb
-/usr/local/lib/site_ruby/1.8/net/dns/names/names.rb
-/usr/local/lib/site_ruby/1.8/net/dns/resolver/timeouts.rb
-/usr/local/lib/site_ruby/1.8/net/dns/resolver/socks.rb
-/usr/local/lib/site_ruby/1.8/net/dns/rr/null.rb
-/usr/local/lib/site_ruby/1.8/net/dns/rr/types.rb
-/usr/local/lib/site_ruby/1.8/net/dns/rr/hinfo.rb
-/usr/local/lib/site_ruby/1.8/net/dns/rr/mr.rb
-/usr/local/lib/site_ruby/1.8/net/dns/rr/soa.rb
-/usr/local/lib/site_ruby/1.8/net/dns/rr/mx.rb
-/usr/local/lib/site_ruby/1.8/net/dns/rr/txt.rb
-/usr/local/lib/site_ruby/1.8/net/dns/rr/cname.rb
-/usr/local/lib/site_ruby/1.8/net/dns/rr/a.rb
-/usr/local/lib/site_ruby/1.8/net/dns/rr/aaaa.rb
-/usr/local/lib/site_ruby/1.8/net/dns/rr/ns.rb
-/usr/local/lib/site_ruby/1.8/net/dns/rr/classes.rb
-/usr/local/lib/site_ruby/1.8/net/dns/rr/ptr.rb

data/Rakefile

@@ -6,7 +6,23 @@ require 'rake/gempackagetask'
 
 require 'rubygems'
 
-$VERSION = "0.2.5"
+$VERSION = "0.3"
+
+task :package => [:version, :clean]
+
+desc "Library version"
+task :version do
+  file = "lib/net/dns/dns.rb"
+  str = IO.readlines(file).to_s
+  offset = (str =~ /VERSION = "(.*)"/)
+  unless $1 == $VERSION
+    str.gsub!($1,$VERSION)
+    File.open(file,"w") do |out|
+      out << str
+    end
+  end
+end
+
 
 desc "Run the tests"
 Rake::TestTask.new do |t|

data/lib/net/dns/dns.rb

@@ -10,8 +10,8 @@ module Net # :nodoc:
   module DNS
     
     # Version of the library
-    VERSION = 0.1
-    
+    VERSION = "0.3"
+  
     # Packet size in bytes
     PACKETSZ = 512
     

data/lib/net/dns/packet.rb

@@ -291,6 +291,13 @@ module Net # :nodoc:
         retval
       end
 
+      
+      # Wrapper to Header#truncated?
+      #
+      def truncated?
+        @header.truncated?
+      end
+            
       # Assing a Net::DNS::Header object to a Net::DNS::Packet 
       # instance.
       #

data/lib/net/dns/resolver.rb

@@ -15,7 +15,7 @@ require 'net/dns/resolver/timeouts'
 module Net # :nodoc:
   module DNS 
     
-
+    include Logger::Severity
 
     # =Name
     # 
@@ -108,7 +108,6 @@ module Net # :nodoc:
         :packet_size => 512,
         :tcp_timeout => TcpTimeout.new(120),
         :udp_timeout => UdpTimeout.new(0)}
-        
       
       # Create a new resolver object.
       # 
@@ -208,7 +207,7 @@ module Net # :nodoc:
 
         # New logger facility
         @logger = Logger.new(@config[:log_file])
-        @logger.level = Logger::WARN
+        @logger.level = $DEBUG ? Logger::DEBUG : Logger::WARN
         
         #------------------------------------------------------------
         # Resolver configuration will be set in order from:
@@ -774,10 +773,6 @@ module Net # :nodoc:
       #
       # Note that this will destroy the precedent logger.
       #
-      # This is the only mode user will have to control their logger, such
-      # as setting the level threshold, because no reader is set for this 
-      # instance variable.
-      #
       def logger=(logger)
         if logger.kind_of? Logger
           @logger.close
@@ -787,6 +782,27 @@ module Net # :nodoc:
         end
       end
 
+      # Set the log level for the built-in logging facility.
+      #
+      # The log level can be one of the following:
+      # 
+      # - +Net::DNS::DEBUG+ 
+      # - +Net::DNS::INFO+ 
+      # - +Net::DNS::WARN+ 
+      # - +Net::DNS::ERROR+ 
+      # - +Net::DNS::FATAL+ 
+      #
+      # Note that if the global variable $DEBUG is set (like when the
+      # -d switch is used at the command line) the logger level is
+      # automatically set at DEGUB.
+      #
+      # For further informations, see Logger documentation in the
+      # Ruby standard library.
+      #
+      def log_level=(level)
+        @logger.level = level
+      end
+      
       # Performs a DNS query for the given name, applying the searchlist if 
       # appropriate.  The search algorithm is as follows:
       #
@@ -1040,37 +1056,60 @@ module Net # :nodoc:
       end
 
       def send_tcp(packet,packet_data)
-        # Generate new TCP socket or use persistent one
-        if @config[:persistent_tcp] and @@tcp_socket
-          socket = @@tcp_socket
-          @logger.info "Using persistent socket #{socket.inspect}"
-        else
-          socket = Socket.new(Socket::AF_INET,Socket::SOCK_STREAM,0)
-          socket.bind(Socket.pack_sockaddr_in(@config[:source_port],@config[:source_address].to_s))
-          @@tcp_socket = socket if @config[:persistent_tcp]
-        end
 
-        ans = ""
-        response = ""
+        ans = nil
         length = [packet_data.size].pack("n")
         @config[:nameservers].each do |ns|
-          @config[:tcp_timeout].timeout do
+          begin
+            
+            # Generate new TCP socket or use persistent one
+            if @config[:persistent_tcp] and @@tcp_socket
+              socket = @@tcp_socket
+              @logger.info "Using persistent socket #{socket.inspect}"
+            else
+              socket = Socket.new(Socket::AF_INET,Socket::SOCK_STREAM,0)
+              socket.bind(Socket.pack_sockaddr_in(@config[:source_port],@config[:source_address].to_s))
+              @@tcp_socket = socket if @config[:persistent_tcp]
+            end
+            
             sockaddr = Socket.pack_sockaddr_in(@config[:port],ns.to_s)
-            socket.connect(sockaddr)
-            socket.write(length+packet_data)
-            ans = socket.recv(Net::DNS::INT16SZ)
-            len = ans.unpack("n")[0]
-            p len
-            next if len == 0
-            ans = socket.recv(len)
-            next if ans.size == 0
-            p ans.size
+            
+            @config[:tcp_timeout].timeout do
+              socket.connect(sockaddr)              
+              @logger.info "Contacting nameserver #{ns} port #{@config[:port]}"
+              socket.write(length+packet_data)
+              ans = socket.recv(Net::DNS::INT16SZ)
+              len = ans.unpack("n")[0]
+              
+              if len == 0
+                @logger.warn "Receiving 0 lenght packet from nameserver #{ns}, trying next."
+                next
+              end
+              
+              ans = socket.recv(len)
+              unless ans.size == len
+                @logger.warn "Malformed packet from nameserver #{ns}, trying next."
+                next
+              end
+            end
+            
             ans = [ans,["",@config[:port],ns.to_s,ns.to_s]]
             @logger.info "Received #{ans[0].size} bytes from #{ans[1][2]+":"+ans[1][1].to_s}"
+
+          rescue TimeoutError
+            @logger.warn "Nameserver #{ns} not responding within TCP timeout, trying next one"            
+            next
+          ensure
+            socket.close unless @config[:persistent_tcp]
           end
-          response = Net::DNS::Packet.parse(ans[0],ans[1])
         end
-        return response
+        
+        if ans
+          return Net::DNS::Packet.parse(ans[0],ans[1])
+        else
+          @logger.fatal "No response from nameservers list: aborting"
+          raise NoResponseError
+        end
       end
       
       
@@ -1090,6 +1129,7 @@ module Net # :nodoc:
         @config[:nameservers].each do |ns|
           begin
             @config[:udp_timeout].timeout do
+              @logger.info "Contacting nameserver #{ns} port #{@config[:port]}"              
               socket.send(packet_data,0,ns.to_s,@config[:port])
               ans = socket.recvfrom(@config[:packet_size])
             end
@@ -1102,7 +1142,12 @@ module Net # :nodoc:
             next
           end
         end
-        return Net::DNS::Packet.parse(ans[0],ans[1])
+        if ans
+          return Net::DNS::Packet.parse(ans[0],ans[1])
+        else
+          @logger.fatal "No response from nameservers list: aborting"
+          raise NoResponseError
+        end
       end
 
       def valid?(name)
@@ -1119,7 +1164,9 @@ end # module Net
 
 class ResolverArgumentError < ArgumentError # :nodoc:
 end
-     
+class NoResponseError < StandardError # :nodoc:
+end
+
 module ExtendHash # :nodoc: 
   # Returns an hash with all the 
   # keys turned into downcase

data/lib/net/dns/rr.rb

@@ -212,20 +212,36 @@ module Net # :nodoc:
       #     #=> example.com.            7200    IN      MX      10 mailhost.example.com.
       #
       def inspect
-        # Organize data for pretty format
-        if @name.size >= 24
-          nlen = @name.size + 1
-          tlen = @ttl.to_s.size+2
-        else
-          nlen = 24
-          tlen = 8
-        end
         data = get_inspect 
         # Returns the preformatted string
-        [@name, @ttl.to_s, @cls.to_s, @type.to_s, 
-          data].pack("A#{nlen} A#{tlen} A#{8-(nlen-24)-(tlen-8)} A8 A*")
+        if @name.size < 24
+          [@name, @ttl.to_s, @cls.to_s, @type.to_s, 
+            data].pack("A24 A8 A8 A8 A*")
+        else
+          to_a.join("   ")
+        end
+      end
+
+      # Returns the RR in a string format.
+      #
+      #   mx = Net::DNS::RR.new("example.com. 7200 MX 10 mailhost.example.com.")
+      #   mx.to_s
+      #     #=> "example.com.            7200    IN      MX      10 mailhost.example.com."
+      #
+      def to_s
+        "#{self.inspect}"
       end
 
+      # Returns an array with all the fields for the RR record.
+      #
+      #   mx = Net::DNS::RR.new("example.com. 7200 MX 10 mailhost.example.com.")
+      #   mx.to_a
+      #     #=> ["example.com.",7200,"IN","MX","10 mailhost.example.com."]
+      #
+      def to_a
+        [@name,@ttl,@cls.to_s,@type.to_s,get_inspect]
+      end
+      
       # Type accessor
       def type
         @type.to_s

data/test/net/dns/test_rr.rb

@@ -33,6 +33,8 @@ class Test_RR < Test::Unit::TestCase
     @a_binary = Net::DNS::RR.parse(@a_data)
     @mx_data = @mx.data 
     @mx_binary = Net::DNS::RR.parse(@mx_data)
+
+    @array = [@name,@ttl,@cls,@type,@rdata]
     
   end
 
@@ -116,6 +118,9 @@ class Test_RR < Test::Unit::TestCase
     
     assert_equal(@a_data, @a_binary.data)
     assert_equal(@mx_data, @mx_binary.data)
+
+    assert_equal(@str, @a_hash.to_s)
+    assert_equal(@array, @a_hash.to_a)
   end
 
   def test_range

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: net-dns
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
-date: 2007-02-02 00:00:00 +00:00
+  version: "0.3"
+date: 2007-02-04 00:00:00 +00:00
 summary: Pure Ruby DNS library
 require_paths: 
 - lib
@@ -50,7 +50,6 @@ files:
 - lib/net/dns/dns.rb
 - lib/net/dns/rr.rb
 - lib/net/dns/question.rb
-- lib/net/dns/rr.rb~
 - lib/net/dns/header.rb
 - lib/net/dns/packet.rb
 - lib/net/dns/rr
@@ -58,7 +57,6 @@ files:
 - lib/net/dns/resolver/timeouts.rb
 - lib/net/dns/resolver/socks.rb
 - lib/net/dns/rr/null.rb
-- lib/net/dns/rr/ptr.rb~
 - lib/net/dns/rr/types.rb
 - lib/net/dns/rr/hinfo.rb
 - lib/net/dns/rr/mr.rb

data/lib/net/dns/rr.rb~

@@ -1,391 +0,0 @@
-#
-#       $Id: RR.rb,v 1.19 2006/07/28 07:33:36 bluemonk Exp $    
-#
-
-require 'net/dns/names/names'
-require 'net/dns/rr/types'
-require 'net/dns/rr/classes'
-
-
-files = %w[a ns mx cname txt soa ptr aaaa mr] # hinfo mb mg mr
-files.each do |file|
-  require "net/dns/rr/#{file}"
-end
-
-module Net # :nodoc:
-  module DNS 
-    
-    # =Name
-    #
-    # Net::DNS::RR - DNS Resource Record class
-    #
-    # =Synopsis
-    # 
-    #   require 'net/dns/rr'
-    #
-    # =Description
-    # 
-    # The Net::DNS::RR is the base class for DNS Resource 
-    # Record (RR) objects. A RR is a pack of data that represents
-    # resources for a DNS zone. The form in which this data is 
-    # shows can be drawed as follow:
-    #
-    #   "name  ttl  class  type  data"
-    # 
-    # The +name+ is the name of the resource, like an canonical
-    # name for an +A+ record (internet ip address). The +ttl+ is the
-    # time to live, expressed in seconds. +type+ and +class+ are 
-    # respectively the type of resource (+A+ for ip addresses, +NS+
-    # for nameservers, and so on) and the class, which is almost 
-    # always +IN+, the Internet class. At the end, +data+ is the
-    # value associated to the name for that particular type of 
-    # resource record. An example:
-    #
-    #   # A record for IP address
-    #   "www.example.com  86400  IN  A  172.16.100.1"
-    #   
-    #   # NS record for name server
-    #   "www.example.com  86400  IN  NS  ns.example.com"
-    #
-    # A new RR object can be created in 2 ways: passing a string
-    # such the ones above, or specifying each field as the pair
-    # of an hash. See the Net::DNS::RR.new method for details.
-    #
-    # =Error classes
-    #
-    # Some error classes has been defined for the Net::DNS::RR class,
-    # which are listed here to keep a light and browsable main documentation.
-    # We have:
-    #
-    # * RRArgumentError: Generic argument error for class Net::DNS::RR
-    # * RRDataError: Error in parsing binary data, maybe from a malformed packet
-    #
-    # =Copyright
-    # 
-    # Copyright (c) 2006 Marco Ceresa
-    #
-    # All rights reserved. This program is free software; you may redistribute 
-    # it and/or modify it under the same terms as Ruby itself.
-    #
-    class RR
-      include Net::DNS::Names
-      
-      # Regexp matching an RR string
-      RR_REGEXP = Regexp.new("^\\s*(\\S+)\\s*(\\d+)?\\s+(" +
-                               Net::DNS::RR::Classes.regexp + 
-                               "|CLASS\\d+)?\\s*(" +
-                               Net::DNS::RR::Types.regexp + 
-                               "|TYPE\\d+)?\\s*(.*)$", Regexp::IGNORECASE)
-
-      # Dimension of the sum of class, type, TTL and rdlength fields in a
-      # RR portion of the packet, in bytes
-      RRFIXEDSZ = 10
-
-      # Name of the RR
-      attr_reader :name
-      # TTL time (in seconds) of the RR
-      attr_reader :ttl
-      # Data belonging to that appropriate class, 
-      # not to be used (use real accessors instead)
-      attr_reader :rdata
-      
-      # Create a new instance of Net::DNS::RR class, or an instance of
-      # any of the subclass of the appropriate type.
-      # 
-      # Argument can be a string or an hash. With a sting, we can pass
-      # a RR resource record in the canonical format:
-      #
-      #   a     = Net::DNS::RR.new("foo.example.com. 86400 A 10.1.2.3")
-      #   mx    = Net::DNS::RR.new("example.com. 7200 MX 10 mailhost.example.com.")
-      #   cname = Net::DNS::RR.new("www.example.com 300 IN CNAME www1.example.com")
-      #   txt   = Net::DNS::RR.new('baz.example.com 3600 HS TXT "text record"')
-      #
-      # Incidentally, +a+, +mx+, +cname+ and +txt+ objects will be instances of
-      # respectively Net::DNS::RR::A, Net::DNS::RR::MX, Net::DNS::RR::CNAME and 
-      # Net::DNS::RR::TXT classes.
-      #
-      # The name is required; all other informations are optional.  
-      # If omitted, the +TTL+ defaults to 10800, +type+ default to +A+ and the RR class
-      # defaults to +IN+.  Omitting the optional fields is useful for creating the 
-      # empty RDATA sections required for certain dynamic update operations.
-      # All names must be fully qualified.  The trailing dot (.) is optional.
-      #
-      # The preferred method is however passing an hash with keys and values:
-      #
-      #   rr = Net::DNS::RR.new(
-      #                 :name    => "foo.example.com",
-      #                 :ttl     => 86400,
-      #                 :cls     => "IN",
-      #                 :type    => "A",
-      #                 :address => "10.1.2.3"
-      #         )
-      #
-      #   rr = Net::DNS::RR.new(
-      #                 :name => "foo.example.com",
-      #                 :type => "A"
-      #         )
-      #
-      # Name and data are required; all the others fields are optionals like 
-      # we've seen before. The data field can be specified either with the 
-      # right name of the resource (:address in the example above) or with
-      # the generic key :rdata. Consult documentation to find the exact name
-      # for the resource in each subclass.
-      # 
-      def initialize(arg)
-        case arg
-        when String
-          instance = new_from_string(arg)
-        when Hash
-          instance = new_from_hash(arg)
-        else
-          raise RRArgumentError, "Invalid argument, must be a RR string or an hash of values"
-        end
-
-        if @type.to_s == "ANY"
-          @cls = Net::DNS::RR::Classes.new("IN")
-        end
-
-        build_pack
-        set_type
-
-        instance
-      end
-
-      # Return a new RR object of the correct type (like Net::DNS::RR::A
-      # if the type is A) from a binary string, usually obtained from
-      # network stream.
-      #
-      # This method is used when parsing a binary packet by the Packet
-      # class.
-      # 
-      def RR.parse(data)
-        o = allocate
-        obj,offset = o.send(:new_from_binary, data, 0)
-        return obj
-      end
-      
-      # Same as RR.parse, but takes an entire packet binary data to 
-      # perform name expansion. Default when analizing a packet
-      # just received from a network stream.
-      #
-      # Return an instance of appropriate class and the offset 
-      # pointing at the end of the data parsed.
-      #
-      def RR.parse_packet(data,offset)
-        o = allocate
-        o.send(:new_from_binary,data,offset)
-      end
-
-      # Return the RR object in binary data format, suitable 
-      # for using in network streams, with names compressed. 
-      # Must pass as arguments the offset inside the packet
-      # and an hash of compressed names.
-      #
-      # This method is to be used in other classes and is 
-      # not intended for user space programs.
-      #
-      # TO FIX in one of the future releases
-      #
-      def comp_data(offset,compnames)
-        type,cls = @type.to_i, @cls.to_i
-        str,offset,names = dn_comp(@name,offset,compnames)
-        str += [type,cls,@ttl,@rdlength].pack("n2 N n")
-        offset += Net::DNS::RRFIXEDSZ
-        return str,offset,names
-      end
-      
-      # Return the RR object in binary data format, suitable 
-      # for using in network streams.
-      #
-      #   raw_data = rr.data
-      #   puts "RR is #{raw_data.size} bytes long"
-      #
-      def data
-        type,cls = @type.to_i, @cls.to_i
-        str = pack_name(@name)
-        return str + [type,cls,@ttl,@rdlength].pack("n2 N n") + get_data
-      end
-      
-      # Canonical inspect method    
-      #
-      #   mx = Net::DNS::RR.new("example.com. 7200 MX 10 mailhost.example.com.")
-      #     #=> example.com.            7200    IN      MX      10 mailhost.example.com.
-      #
-      def inspect
-        # Organize data for pretty format
-        if @name.size >= 24
-          nlen = @name.size + 1
-          tlen = @ttl.to_s.size+2
-        else
-          nlen = 24
-          tlen = 8
-        end
-        data = get_inspect 
-        # Returns the preformatted string
-        [@name, @ttl.to_s, @cls.to_s, @type.to_s, 
-          data].pack("A#{nlen} A#{tlen} A#{8-(nlen-24)-(tlen-8)} A8 A*")
-      end
-
-      # Type accessor
-      def type
-        @type.to_s
-      end
-      
-      # Class accessor
-      def cls
-        @cls.to_s
-      end
-      
-      private
-      
-      #---
-      # New RR with argument in string form
-      #---
-      def new_from_string(rrstring)
-
-        unless rrstring =~ RR_REGEXP
-          raise RRArgumentError, 
-          "Format error for RR string (maybe CLASS and TYPE not valid?)"
-        end
-
-        # Name of RR - mandatory
-        begin
-          @name = $1.downcase
-        rescue NoMethodError
-          raise RRArgumentError, "Missing name field in RR string #{rrstring}"
-        end
-        
-        # Time to live for RR, default 3 hours
-        @ttl = $2 ? $2.to_i : 10800
-        
-        # RR class, default to IN
-        @cls = Net::DNS::RR::Classes.new $3
-        
-        # RR type, default to A
-        @type = Net::DNS::RR::Types.new $4
-        
-        # All the rest is data 
-        @rdata = $5 ? $5.strip : ""  
-        
-        if self.class == Net::DNS::RR
-          (eval "Net::DNS::RR::#@type").new(rrstring)
-        else
-          subclass_new_from_string(@rdata)
-          self.class
-        end
-      end
-      
-      def new_from_hash(args)
-        
-        # Name field is mandatory   
-        unless args.has_key? :name 
-          raise RRArgumentError, "RR argument error: need at least RR name"
-        end
-
-        @name  = args[:name].downcase
-        @ttl   = args[:ttl] ? args[:ttl].to_i : 10800 # Default 3 hours
-        @type  = Net::DNS::RR::Types.new args[:type]
-        @cls  = Net::DNS::RR::Classes.new args[:cls]
-        
-        @rdata = args[:rdata] ? args[:rdata].strip : ""
-        @rdlength = args[:rdlength] || @rdata.size
-
-        if self.class == Net::DNS::RR
-          (eval "Net::DNS::RR::#@type").new(args)
-        else
-          hash = args - [:name,:ttl,:type,:cls]
-          if hash.has_key? :rdata
-            subclass_new_from_string(hash[:rdata])
-          else
-            subclass_new_from_hash(hash)
-          end
-          self.class
-        end
-      end # new_from_hash
-
-      def new_from_binary(data,offset)
-        if self.class == Net::DNS::RR
-          temp = dn_expand(data,offset)[1]
-          type = Net::DNS::RR::Types.new data.unpack("@#{temp} n")[0]
-          (eval "Net::DNS::RR::#{type}").parse_packet(data,offset)
-        else
-          @name,offset = dn_expand(data,offset)
-          rrtype,cls,@ttl,@rdlength = data.unpack("@#{offset} n2 N n")
-          @type = Net::DNS::RR::Types.new rrtype
-          @cls = Net::DNS::RR::Classes.new cls
-          offset += RRFIXEDSZ
-          offset = subclass_new_from_binary(data,offset)
-          build_pack
-          set_type
-          return [self,offset]
-        end
-#      rescue StandardError => err
-#        raise RRDataError, "Caught exception, maybe packet malformed: #{err}"
-      end
-      
-      # Methods to be overridden by subclasses
-      def subclass_new_from_array(arr)
-      end
-      def subclass_new_from_string(str)
-      end
-      def subclass_new_from_hash(hash)
-      end
-      def subclass_new_from_binary(data,offset)
-      end
-      def build_pack
-      end
-      def set_type
-      end
-      def get_inspect
-        @rdata
-      end
-      def get_data
-        @rdata
-      end
-
-      # NEW new method :)
-      def self.new(*args)
-        o = allocate
-        obj = o.send(:initialize,*args)
-        if self == Net::DNS::RR
-          return obj
-        else
-          return o
-        end
-      end
-            
-    end # class RR
-    
-  end # module DNS
-end # module Net
-
-class RRArgumentError < ArgumentError # :nodoc:
-end
-class RRDataError < StandardError # :nodoc:
-end
-
-module ExtendHash # :nodoc:
-  
-  # Performs a sort of group difference 
-  # operation on hashes or arrays
-  # 
-  #   a = {:a=>1,:b=>2,:c=>3}
-  #   b = {:a=>1,:b=>2}
-  #   c = [:a,:c]
-  #   a-b #=> {:c=>3}
-  #   a-c #=> {:b=>2}
-  #
-  def -(oth)
-    case oth
-    when Hash
-      delete_if {|k,v| oth.has_key? k}
-    when Array
-      delete_if {|k,v| oth.include? k}
-    end
-  end
-end
-
-class Hash # :nodoc:
-  include ExtendHash
-end
-

data/lib/net/dns/rr/ptr.rb~

@@ -1,71 +0,0 @@
-##
-#
-# Net::DNS::RR::PTR
-#
-#       $Id: PTR.rb,v 1.5 2006/07/28 07:33:36 bluemonk Exp $    
-#
-##
-
-module Net
-  module DNS
-    class RR
-      
-      #------------------------------------------------------------
-      # RR type PTR
-      #------------------------------------------------------------
-      class PTR < RR
-
-        # Getter for PTR resource
-        def ptr
-          @ptrdname.to_s
-        end
-        alias_method :ptrdname, :ptr
-        
-        private
-        
-        def check_ptr(str)
-          IPAddr.new str
-        rescue
-          raise RRArgumentError, "PTR section not valid"
-        end
-        
-        def build_pack
-          @ptrdname_pack = pack_name(@ptrdname)
-          @rdlength = @ptrdname_pack.size
-        end
-
-        def set_type
-          @type = Net::DNS::RR::RRTypes.new("PTR")
-        end
-
-        def get_data
-          @ptrdname_pack
-        end
-
-        def get_inspect
-          "#@ptrdname"
-        end
-
-        def subclass_new_from_hash(args)
-          if args.has_key? :ptrdname or args.has_key? :ptr
-            @ptrdname = args[0][:ptrdname]
-          else
-            raise RRArgumentError, ":ptrdname or :ptr field is mandatory but missing"
-          end
-        end
-
-        def subclass_new_from_string(str)
-          @ptrdname = check_ptr(str)
-        end
-
-        def subclass_new_from_binary(data,offset)
-          @ptrdname,offset = dn_expand(data,offset)
-          return offset
-        end
-
-      end # class PTR
-      
-    end # class RR
-  end # module DNS
-end # module Net
-