net-dns 0.5.3 → 0.6.0

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

@@ -1,18 +1,11 @@
-##
-#
-# Net::DNS::RR::A
-#
-# $id$
-#
-##
-
 require 'ipaddr'
 
+
 module Net # :nodoc:
   module DNS 
     
     class RR 
-
+      
       # =Name
       #
       # Net::DNS::RR::A   DNS A resource record
@@ -39,8 +32,9 @@ module Net # :nodoc:
       # without any imbedded spaces (e.g.,"10.2.0.52" or "192.0.5.6").
       #
       class A < RR
+        
         attr_reader :address
-
+        
         # Assign to the RR::A object a new IPv4 address, which can be in the
         # form of a string or an IPAddr object
         #
@@ -50,7 +44,7 @@ module Net # :nodoc:
         def address=(addr)
           @address = check_address addr
           build_pack
-        end # address=
+        end
         
         private
         
@@ -66,12 +60,12 @@ module Net # :nodoc:
           when IPAddr
             address = addr
           else
-            raise RRArgumentError, "Unknown address type: #{addr}"
+            raise ArgumentError, "Unknown address type `#{addr}'"
           end
-          raise RRArgumentError, "Must specify an IPv4 address" unless address.ipv4?
+          raise ArgumentError, "Must specify an IPv4 address" unless address.ipv4?
           address
-        rescue ArgumentError
-          raise RRArgumentError, "Invalid address #{addr}"
+        rescue ::ArgumentError
+          raise ArgumentError, "Invalid address `#{addr}'"
         end
           
         def build_pack
@@ -79,10 +73,6 @@ module Net # :nodoc:
           @rdlength = @address_pack.size
         end
         
-        def set_type
-          @type = Net::DNS::RR::Types.new("A")
-        end
-        
         def get_data
           @address_pack
         end
@@ -98,7 +88,7 @@ module Net # :nodoc:
             @address = check_address args[:rdata]
           else
             # Address field is mandatory
-            raise RRArgumentError, ":address field is mandatory but missing"
+            raise ArgumentError, ":address field is mandatory but missing"
           end
         end
         
@@ -112,10 +102,14 @@ module Net # :nodoc:
           return offset + 4
         end
         
-      end # class A
+        private
+        
+          def set_type
+            @type = Net::DNS::RR::Types.new("A")
+          end
+        
+      end
       
-    end # class RR
-  end # module DNS
-end # module Net
-
-
+    end
+  end
+end

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

@@ -1,13 +1,6 @@
-##
-#
-# Net::DNS::RR::AAAA
-#
-# $id$
-#
-##
-
 require 'ipaddr'
 
+
 module Net 
   module DNS 
     
@@ -40,12 +33,12 @@ module Net
           when IPAddr
             address = addr
           else
-            raise RRArgumentError, "Unknown address type: #{addr.inspect}"
+            raise ArgumentError, "Unknown address type: #{addr.inspect}"
           end
-          raise RRArgumentError, "Must specify an IPv6 address" unless address.ipv6?
+          raise ArgumentError, "Must specify an IPv6 address" unless address.ipv6?
           address
         rescue ArgumentError
-          raise RRArgumentError, "Invalid address #{addr.inspect}"
+          raise ArgumentError, "Invalid address #{addr.inspect}"
         end
           
         def build_pack
@@ -53,10 +46,6 @@ module Net
           @rdlength = @address_pack.size
         end
         
-        def set_type
-          @type = Net::DNS::RR::Types.new("AAAA")
-        end
-        
         def get_data
           @address_pack
         end
@@ -69,7 +58,7 @@ module Net
           if args.has_key? :address 
             @address = check_address args[:address]
           else
-            raise RRArgumentError, ":address field is mandatory but missing"
+            raise ArgumentError, ":address field is mandatory but missing"
           end
         end
         
@@ -83,10 +72,16 @@ module Net
           return offset + 16
         end
         
-      end # class AAAA
+        private
+        
+          def set_type
+            @type = Net::DNS::RR::Types.new("AAAA")
+          end
+        
+      end
       
-    end # class RR
-  end # module DNS
-end # module Net
+    end
+  end
+end
 
 

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

@@ -61,7 +61,7 @@ module Net # :nodoc:
         # Gives in output the keys from the +Classes+ hash
         # in a format suited for regexps
         def self.regexp
-          Classes.keys.join("|")
+          Classes.keys.sort.join("|")
         end
 
         # Creates a new object representing an RR class. Performs some

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

@@ -1,11 +1,3 @@
-##
-#
-# Net::DNS::RR::CNAME
-#
-#       $Id: CNAME.rb,v 1.7 2006/07/28 07:33:36 bluemonk Exp $  
-#
-##
-
 module Net
   module DNS
 
@@ -21,7 +13,7 @@ module Net
         
         def check_name(name)
           unless name =~ /(\w\.?)+\s*$/ and name =~ /[a-zA-Z]/
-            raise RRArgumentError, "Canonical Name not valid: #{name}"
+            raise ArgumentError, "Canonical Name not valid: #{name}"
           end
           name
         end
@@ -31,10 +23,6 @@ module Net
           @rdlength = @cname_pack.size
         end
 
-        def set_type
-          @type = Net::DNS::RR::Types.new("CNAME")
-        end
-
         def get_data
           @cname_pack
         end
@@ -47,7 +35,7 @@ module Net
           if args.has_key? :cname
             @cname = check_name args[:cname]
           else
-            raise RRArgumentError, ":cname field is mandatory but missing"
+            raise ArgumentError, ":cname field is mandatory but missing"
           end
         end
 
@@ -60,6 +48,12 @@ module Net
           return offset
         end
         
+        private
+        
+          def set_type
+            @type = Net::DNS::RR::Types.new("CNAME")
+          end
+        
       end # class CNAME
        
     end # class RR

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

@@ -1,11 +1,3 @@
-##
-#
-# Net::DNS::RR::HINFO
-#
-# $Id: HINFO.rb,v 1.4 2006/07/28 07:33:36 bluemonk Exp $
-#
-##
-
 module Net
   module DNS
     class RR
@@ -22,7 +14,7 @@ module Net
           if str.strip =~ /^["'](.*?)["']\s+["'](.*?)["']$/
             return $1,$2
           else
-            raise RRArgumentError, "HINFO section not valid: #{str.inspect}"
+            raise ArgumentError, "HINFO section not valid: #{str.inspect}"
           end
         end
         
@@ -32,10 +24,6 @@ module Net
           @rdlength = @hinfo_pack.size
         end
 
-        def set_type
-          @type = Net::DNS::RR::Types.new("HINFO")
-        end
-
         def get_data
           @hinfo_pack
         end
@@ -49,7 +37,7 @@ module Net
             @cpu = args[:cpu]
             @os =  args[:os]
           else
-            raise RRArgumentError, ":cpu and :os fields are mandatory but missing"
+            raise ArgumentError, ":cpu and :os fields are mandatory but missing"
           end
         end
 
@@ -66,6 +54,12 @@ module Net
           return offset += len+1
         end
         
+        private
+        
+          def set_type
+            @type = Net::DNS::RR::Types.new("HINFO")
+          end
+        
       end # class HINFO
       
     end # class RR

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

@@ -1,11 +1,3 @@
-##
-#
-# Net::DNS::RR::MR
-#
-#       $Id: MR.rb,v 1.4 2006/07/28 07:33:36 bluemonk Exp $
-#
-##
-
 module Net
   module DNS
 
@@ -21,7 +13,7 @@ module Net
         
         def check_name(name)
           unless name =~ /(\w\.?)+\s*$/
-            raise RRArgumentError, "Name not valid: #{name.inspect}"
+            raise ArgumentError, "Name not valid: #{name.inspect}"
           end
           name
         end
@@ -31,10 +23,6 @@ module Net
           @rdlength = @newname_pack.size
         end
 
-        def set_type
-          @type = Net::DNS::RR::Types.new("MR")
-        end
-
         def get_data
           @newname_pack
         end
@@ -47,7 +35,7 @@ module Net
           if args.has_key? :newname
             @newname = check_name args[:newname]
           else
-            raise RRArgumentError, ":newname field is mandatory but missing"
+            raise ArgumentError, ":newname field is mandatory but missing"
           end
         end
 
@@ -60,6 +48,12 @@ module Net
           return offset
         end
         
+        private
+        
+          def set_type
+            @type = Net::DNS::RR::Types.new("MR")
+          end
+        
       end # class MR
 
     end # class RR

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

@@ -1,12 +1,3 @@
-##
-#
-# Net::DNS::RR::MX
-#
-#       $Id: MX.rb,v 1.8 2006/07/28 07:33:36 bluemonk Exp $     
-#
-##
-
-
 module Net
   module DNS
     class RR
@@ -23,7 +14,7 @@ module Net
           if str.strip =~ /^(\d+)\s+(\S+)$/
             return $1.to_i,$2
           else
-            raise RRArgumentError, "MX section not valid"
+            raise ArgumentError, "MX section not valid"
           end
         end
         
@@ -32,10 +23,6 @@ module Net
           @rdlength = @mx_pack.size
         end
 
-        def set_type
-          @type = Net::DNS::RR::Types.new("MX")
-        end
-
         def get_data
           @mx_pack
         end
@@ -46,10 +33,10 @@ module Net
 
         def subclass_new_from_hash(args)
           if args.has_key? :preference and args.has_key? :exchange
-            @preference = args[0][:preference].to_i
-            @exchange =  args[0][:exchange]
+            @preference = args[:preference].to_i
+            @exchange =  args[:exchange]
           else
-            raise RRArgumentError, ":preference and :exchange fields are mandatory but missing"
+            raise ArgumentError, ":preference and :exchange fields are mandatory but missing"
           end
         end
 
@@ -63,7 +50,13 @@ module Net
           @exchange,offset = dn_expand(data,offset)
           return offset
         end
-
+        
+        private
+        
+          def set_type
+            @type = Net::DNS::RR::Types.new("MX")
+          end
+          
       end # class MX
       
     end # class RR

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

@@ -1,11 +1,3 @@
-##
-#
-# Net::DNS::RR::NS
-#
-#       $Id: NS.rb,v 1.8 2006/07/28 07:33:36 bluemonk Exp $     
-#
-##
-
 module Net
   module DNS
     
@@ -21,7 +13,7 @@ module Net
         
         def check_name(name)
           unless name =~ /(\w\.?)+\s*$/ and name =~ /[a-zA-Z]/
-            raise RRArgumentError, "NS Domain Name not valid: #{name}"
+            raise ArgumentError, "NS Domain Name not valid: #{name}"
           end
           name
         end
@@ -31,10 +23,6 @@ module Net
           @rdlength = @nsdname_pack.size
         end
 
-        def set_type
-          @type = Net::DNS::RR::Types.new("NS")
-        end
-
         def get_data
           @nsdname_pack
         end
@@ -47,7 +35,7 @@ module Net
           if args.has_key? :nsdname
             @nsdname = check_name args[:nsdname]
           else
-            raise RRArgumentError, ":nsdname field is mandatory but missing"
+            raise ArgumentError, ":nsdname field is mandatory but missing"
           end
         end
 
@@ -60,6 +48,12 @@ module Net
           return offset
         end
         
+        private
+        
+          def set_type
+            @type = Net::DNS::RR::Types.new("NS")
+          end
+        
       end # class NS
       
     end # class RR

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

@@ -1,12 +1,3 @@
-##
-#
-# Net::DNS::RR::NULL
-#
-#       $Id: NULL.rb,v 1.5 2006/07/28 07:33:36 bluemonk Exp $
-#
-##
-
-
 module Net
   module DNS
     class RR
@@ -24,10 +15,6 @@ module Net
           @rdlength = @null_pack.size
         end
 
-        def set_type
-          @type = Net::DNS::RR::RRTypes.new("NULL")
-        end
-
         def get_data
           @null_pack
         end
@@ -40,7 +27,7 @@ module Net
           if args.has_key? :null
             @null = args[:null]
           else
-            raise RRArgumentError, ":null field is mandatory but missing"
+            raise ArgumentError, ":null field is mandatory but missing"
           end
         end
 
@@ -53,6 +40,12 @@ module Net
           return offset + @rdlength
         end
         
+        private
+        
+          def set_type
+            @type = Net::DNS::RR::Types.new("NULL")
+          end
+        
       end # class NULL
       
     end # class RR