net-dns 0.5.3 → 0.6.0

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

@@ -1,11 +1,3 @@
-##
-#
-# Net::DNS::RR::PTR
-#
-#       $Id: PTR.rb,v 1.5 2006/07/28 07:33:36 bluemonk Exp $    
-#
-##
-
 module Net
   module DNS
     class RR
@@ -26,7 +18,7 @@ module Net
         def check_ptr(str)
           IPAddr.new str
         rescue
-          raise RRArgumentError, "PTR section not valid"
+          raise ArgumentError, "PTR section not valid"
         end
         
         def build_pack
@@ -34,10 +26,6 @@ module Net
           @rdlength = @ptrdname_pack.size
         end
 
-        def set_type
-          @type = Net::DNS::RR::Types.new("PTR")
-        end
-
         def get_data
           @ptrdname_pack
         end
@@ -50,7 +38,7 @@ module Net
           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"
+            raise ArgumentError, ":ptrdname or :ptr field is mandatory but missing"
           end
         end
 
@@ -62,7 +50,13 @@ module Net
           @ptrdname,offset = dn_expand(data,offset)
           return offset
         end
-
+        
+        private
+        
+          def set_type
+            @type = Net::DNS::RR::Types.new("PRT")
+          end
+        
       end # class PTR
       
     end # class RR

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

@@ -1,11 +1,3 @@
-##
-#
-# Net::DNS::RR::SOA
-#
-#       $Id: SOA.rb,v 1.4 2006/07/28 07:33:36 bluemonk Exp $    
-#
-##
-
 module Net
   module DNS
     class RR
@@ -24,10 +16,6 @@ module Net
           @soa_pack += [@serial,@refresh,@retry,@expire,@minimum].pack("N5")
         end
 
-        def set_type
-          @type = Net::DNS::RR::Types.new("SOA")
-        end
-
         def get_data
           @soa_pack
         end
@@ -41,7 +29,7 @@ module Net
             subclass_new_from_string(args[:rdata])
           else
             [:mname,:rname,:serial,:refresh,:retry,:expire,:minimum].each do |key|
-              raise RRArgumentError, "Missing field :#{key}" unless args.has_key? key
+              raise ArgumentError, "Missing field :#{key}" unless args.has_key? key
             end
             @mname = args[:mname] if valid? args[:mname] 
             @rname = args[:rname] if valid? args[:rname]
@@ -57,7 +45,7 @@ module Net
           if num.kind_of? Integer and num > 0
             true
           else
-            raise RRArgumentError, "Wrong format field: #{num} not a number or less than zero"
+            raise ArgumentError, "Wrong format field: #{num} not a number or less than zero"
           end
         end
 
@@ -76,7 +64,13 @@ module Net
           @serial,@refresh,@retry,@expire,@minimum = data.unpack("@#{offset} N5")
           return offset + 5*Net::DNS::INT32SZ
         end
-
+        
+        private
+        
+          def set_type
+            @type = Net::DNS::RR::Types.new("SOA")
+          end
+        
       end # class SOA
       
     end # class RR

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

@@ -1,12 +1,3 @@
-##
-#
-# Net::DNS::RR::SRV
-#
-#       $Id$
-#
-##
-
-
 module Net
   module DNS
     class RR
@@ -24,10 +15,6 @@ module Net
           str = ""
         end
         
-        def set_type
-          @type = Net::DNS::RR::Types.new("SRV")
-        end
-        
         def subclass_new_from_binary(data,offset)
           off_end = offset + @rdlength
           @priority, @weight, @port = data.unpack("@#{offset} n n n")
@@ -44,14 +31,18 @@ module Net
           @host=@host.join(".")
           offset
         end
-      
-      
-      end # class SRV
-    end # class RR
         
+        private
+        
+          def set_type
+            @type = Net::DNS::RR::Types.new("SRV")
+          end
+        
+      end
+    end
         
-  end # module DNS
-end # module Net
+  end
+end
 
 
 

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

@@ -1,12 +1,3 @@
-##
-#
-# Net::DNS::RR::TXT
-#
-#       $Id: TXT.rb,v 1.4 2006/07/28 07:33:36 bluemonk Exp $
-#
-##
-
-
 module Net
   module DNS
     class RR
@@ -27,10 +18,6 @@ module Net
           @txt_pack = str
           @rdlength = @txt_pack.size
         end
-        
-        def set_type
-          @type = Net::DNS::RR::Types.new("TXT")
-        end
 
         def get_data
           @txt_pack
@@ -40,7 +27,7 @@ module Net
           if args.has_key? :txt
             @txt = args[:txt].strip
           else
-            raise RRArgumentError, ":txt field is mandatory but missing"
+            raise ArgumentError, ":txt field is mandatory but missing"
           end
         end
         
@@ -60,13 +47,15 @@ module Net
           end
           return offset
         end 
-
+        
+        private
+        
+          def set_type
+            @type = Net::DNS::RR::Types.new("TXT")
+          end
+        
       end # class TXT
       
     end # class RR
   end # module DNS
-end # module Net
-
-
-
-
+end # module Net

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

@@ -3,13 +3,10 @@ module Net # :nodoc:
     
     class RR
       
-      #
-      # This is an auxiliary class to hadle RR type field in a DNS packet. 
-      #
+      # This is an auxiliary class to handle RR type field in a DNS packet.
       class Types
         
-        # :nodoc:
-        Types = { # :nodoc:
+        TYPES = {
           'SIGZERO'   => 0,       # RFC2931 consider this a pseudo type
           'A'         => 1,       # RFC 1035, Section 3.4.1
           'NS'        => 2,       # RFC 1035, Section 3.3.11
@@ -41,7 +38,7 @@ module Net # :nodoc:
           'GPOS'      => 27,      # RFC 1712 (obsolete)
           'AAAA'      => 28,      # RFC 1886, Section 2.1
           'LOC'       => 29,      # RFC 1876
-          # The following RR is impemented in Net::DNS::SEC, TODO
+          # The following RR is implemented in Net::DNS::SEC, TODO
           'NXT'       => 30,      # RFC 2535, Section 5.2
           'EID'       => 31,      # draft-ietf-nimrod-dns-xx.txt
           'NIMLOC'    => 32,      # draft-ietf-nimrod-dns-xx.txt
@@ -52,7 +49,7 @@ module Net # :nodoc:
           'CERT'      => 37,      # RFC 2538
           'DNAME'     => 39,      # RFC 2672
           'OPT'       => 41,      # RFC 2671
-          # The following 4 RRs are impemented in Net::DNS::SEC TODO
+          # The following 4 RRs are implemented in Net::DNS::SEC TODO
           'DS'        => 43,      # draft-ietf-dnsext-delegation-signer
           'SSHFP'     => 44,      # draft-ietf-secsh-dns (No RFC # yet at time of coding)
           'RRSIG'     => 46,      # draft-ietf-dnsext-dnssec-2535typecode-change
@@ -72,27 +69,27 @@ module Net # :nodoc:
         }
 
         # The default value when type is nil in Resource Records
-        @@default = Types["A"]
+        @@default = TYPES["A"]
 
         # Be able to control the default type to assign when
         # type is +nil+. Default to +A+
         def self.default=(str)
-          if Types.has_key? str
-            @@default = Types[str]
+          if TYPES.has_key? str
+            @@default = TYPES[str]
           else
-            raise TypeArgumentError, "Unknown type #{str}"
+            raise ArgumentError, "Unknown type #{str}"
           end
         end
 
         # Checks whether +type+ is a valid RR type.  
         def self.valid?(type)
           case type
-          when String
-            return Types.has_key?(type)
-          when Fixnum
-            return Types.invert.has_key?(type)
-          else
-            raise TypeArgumentError, "Wrong type class: #{type.class}"
+            when String
+              TYPES.has_key?(type)
+            when Fixnum
+              TYPES.invert.has_key?(type)
+            else
+              raise ArgumentError, "Wrong type class: #{type.class}"
           end
         end
         
@@ -100,21 +97,22 @@ module Net # :nodoc:
         # given the numeric value
         def self.to_str(type)
           case type
-          when Fixnum
-            if Types.invert.has_key? type
-              return Types.invert[type]
+            when Fixnum
+              if TYPES.invert.has_key? type
+                TYPES.invert[type]
+              else
+                raise ArgumentError, "Unknown type number #{type}"
+              end
             else
-              raise TypeArgumentError, "Unknown type number #{type}"
-            end
-          else
-            raise TypeArgumentError, "Wrong type class: #{type.class}"
+              raise ArgumentError, "Wrong type class: #{type.class}"
           end
         end
 
         # Gives in output the keys from the +Types+ hash
         # in a format suited for regexps
         def self.regexp
-          Types.keys.sort.join("|")
+          # Longest ones go first, so the regex engine will match AAAA before A.
+          TYPES.keys.sort { |a,b| b.length <=> a.length }.join("|")
         end
 
         # Creates a new object representing an RR type. Performs some
@@ -130,10 +128,10 @@ module Net # :nodoc:
             new_from_num(type) 
           when nil
             # default type, control with Types.default=
-            @str = Types.invert[@@default] 
+            @str = TYPES.invert[@@default]
             @num = @@default
           else
-            raise TypeArgumentError, "Wrong type class: #{type.class}"
+            raise ArgumentError, "Wrong type class: #{type.class}"
           end
         end
         
@@ -155,46 +153,41 @@ module Net # :nodoc:
           @num.to_i
         end
         
-        # Should be used only for testing purpouses
         def to_str
           @num.to_s
         end
 
+
         private
-        
-        # Constructor for string data type,
-        # *PRIVATE* method
-        def new_from_string(type)
-          case type
-          when /^TYPE\\d+/
-            # TODO!!!
-          else 
-            # String with name of type
-            if Types.has_key? type
-              @str = type
-              @num = Types[type]
+
+          # Constructor for string data type.
+          def new_from_string(type)
+            case type
+            when /^TYPE\\d+/
+              # TODO!!!
             else
-              raise TypeArgumentError, "Unknown type #{type}"
+              # String with name of type
+              if TYPES.has_key? type
+                @str = type
+                @num = TYPES[type]
+              else
+                raise ArgumentError, "Unknown type #{type}"
+              end
             end
           end
-        end
 
-        # Contructor for numeric data type
-        # *PRIVATE* method
-        def new_from_num(type)
-          if Types.invert.has_key? type
-            @num = type
-            @str = Types.invert[type]
-          else
-            raise TypeArgumentError, "Unkown type number #{type}"
+          # Contructor for numeric data type.
+          def new_from_num(type)
+            if TYPES.invert.has_key? type
+              @num = type
+              @str = TYPES.invert[type]
+            else
+              raise ArgumentError, "Unkown type number #{type}"
+            end
           end
-        end
         
-      end # class Types
+      end
     
-    end # class RR
-  end # module DNS
-end # module Net
-
-class TypeArgumentError < ArgumentError # :nodoc:
-end
+    end
+  end
+end

data/lib/net/dns/version.rb

@@ -0,0 +1,22 @@
+require 'yaml'
+
+
+module Net # :nodoc:
+  module DNS 
+    module Version
+      
+      @@version = YAML.load_file(File.dirname(__FILE__) + '/../../../VERSION.yml')
+
+      MAJOR = @@version[:major]
+      MINOR = @@version[:minor]
+      PATCH = @@version[:patch]
+
+      STRING = [MAJOR, MINOR, PATCH].join('.')
+    end
+
+    VERSION         = Version::STRING
+    STATUS          = 'beta'
+    BUILD           = nil
+
+  end
+end

data/test/{net/dns/test_header.rb → header_test.rb}

@@ -1,7 +1,7 @@
-require 'test/unit'
+require 'test_helper'
 require 'net/dns/header'
 
-class Test_Header < Test::Unit::TestCase
+class HeaderTest < Test::Unit::TestCase
   include Net::DNS
   
   def setup
@@ -110,58 +110,58 @@ class Test_Header < Test::Unit::TestCase
     assert_equal(@binary.nsCount, 3)
     assert_equal(@binary.arCount, 3)
     
-    assert_raise(HeaderArgumentError) do
+    assert_raise(Header::ArgumentError) do
       Header.new(Array.new)
     end
-    assert_raise(HeaderArgumentError) do
+    assert_raise(Header::ArgumentError) do
       Header.parse(Array.new)
     end
-    assert_raise(HeaderArgumentError) do
+    assert_raise(Header::ArgumentError) do
       Header.parse("aa")
     end
-    assert_raise(HeaderDuplicateID) do
+    assert_raise(Header::DuplicateIDError) do
       @default.id = 441
     end
-    assert_raise(HeaderArgumentError) do
+    assert_raise(Header::ArgumentError) do
       @default.id = 1000000
     end
-    assert_raise(HeaderArgumentError) do
+    assert_raise(Header::ArgumentError) do
       @default.qr=2
     end
-    assert_raise(HeaderWrongOpcode) do
+    assert_raise(Header::WrongOpcodeError) do
       @default.opCode=4
     end
-    assert_raise(HeaderArgumentError) do
+    assert_raise(Header::ArgumentError) do
       @default.aa=2
     end
-    assert_raise(HeaderArgumentError) do
+    assert_raise(Header::ArgumentError) do
       @default.tc=2
     end
-    assert_raise(HeaderWrongRecursive) do
+    assert_raise(Header::WrongRecursiveError) do
       @default.recursive=2
     end
-    assert_raise(HeaderArgumentError) do
+    assert_raise(Header::ArgumentError) do
       @default.ra=2
     end
-    assert_raise(HeaderArgumentError) do
+    assert_raise(Header::ArgumentError) do
       @default.cd=2
     end
-    assert_raise(HeaderArgumentError) do
+    assert_raise(Header::ArgumentError) do
       @default.ad=2
     end
-    assert_raise(HeaderArgumentError) do
+    assert_raise(Header::ArgumentError) do
       @default.rCode=46
     end
-    assert_raise(HeaderWrongCount) do
+    assert_raise(Header::WrongCountError) do
       @default.qdCount=100000
     end
-    assert_raise(HeaderWrongCount) do
+    assert_raise(Header::WrongCountError) do
       @default.anCount=100000
     end
-    assert_raise(HeaderWrongCount) do
+    assert_raise(Header::WrongCountError) do
       @default.nsCount=100000
     end
-    assert_raise(HeaderWrongCount) do
+    assert_raise(Header::WrongCountError) do
       @default.arCount=100000
     end
   end