net-dns 0.6.1 → 0.7.0

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

@@ -1,68 +1,108 @@
-module Net
+module Net # :nodoc:
   module DNS
     class RR
-      
-      #------------------------------------------------------------
-      # RR type HINFO
-      #------------------------------------------------------------
+
+      #
+      # = System Information Record (HINFO)
+      #
+      # Class for DNS HINFO resource records.
+      #
+      # Allows definition of the Hardware type and Operating System (OS) in use at a host.
+      # For security reasons these records are rarely used on public servers.
+      # If a space exists in the field it must be enclosed in quotes.
+      # Single space between CPU and OS parameters.
+      #
       class HINFO < RR
-        attr_reader :cpu, :os
 
-        private
-        
-        def check_hinfo(str)
-          if str.strip =~ /^["'](.*?)["']\s+["'](.*?)["']$/
-            return $1,$2
-          else
-            raise ArgumentError, "HINFO section not valid: #{str.inspect}"
-          end
-        end
-        
-        def build_pack
-          @hinfo_pack = [@cpu.size].pack("C") + @cpu
-          @hinfo_pack += [@os.size].pack("C") + @os
-          @rdlength = @hinfo_pack.size
+        # Gets the CPU value.
+        #
+        # Returns a String.
+        def cpu
+          @cpu
         end
 
-        def get_data
-          @hinfo_pack
+        # Gets the OS value.
+        #
+        # Returns a String.
+        def os
+          @os
         end
 
-        def get_inspect
-          "#@cpu #@os"
+        # Gets the standardized value for this record,
+        # represented by the value of <tt>cpu</tt> and <tt>os</tt>.
+        #
+        # Returns a String.
+        def value
+          %Q{"#{cpu}" "#{os}"}
         end
 
-        def subclass_new_from_hash(args)
-          if args.has_key? :cpu and args.has_key? :os
-            @cpu = args[:cpu]
-            @os =  args[:os]
-          else
-            raise ArgumentError, ":cpu and :os fields are mandatory but missing"
-          end
-        end
 
-        def subclass_new_from_string(str)
-          @cpu,@os = check_hinfo(str)
+        # Gets a list of all the attributes for this record.
+        #
+        # Returns an Array of values.
+        def to_a
+          [nil, nil, cls.to_s, type.to_s, value]
         end
 
-        def subclass_new_from_binary(data,offset)
-          len = data.unpack("@#{offset} C")[0]
-          @cpu = data[offset+1..offset+1+len]
-          offset += len+1
-          len = @data.unpack("@#{offset} C")[0]
-          @os = data[offset+1..offset+1+len]
-          return offset += len+1
-        end
-        
+
         private
-        
+
+          def subclass_new_from_hash(options)
+            if options.has_key?(:cpu) && options.has_key?(:os)
+              @cpu = options[:cpu]
+              @os  = options[:os]
+            else
+              raise ArgumentError, ":cpu and :os fields are mandatory"
+            end
+          end
+
+          def subclass_new_from_string(str)
+            @cpu, @os = check_hinfo(str)
+          end
+
+          def subclass_new_from_binary(data, offset)
+            len  = data.unpack("@#{offset} C").first
+            offset += 1
+            @cpu = data[offset..(offset + len)]
+            offset += len
+            
+            len  = data.unpack("@#{offset} C").first
+            offset += 1
+            @os  = data[offset..(offset + len)]
+            offset += len
+          end
+
+
           def set_type
             @type = Net::DNS::RR::Types.new("HINFO")
           end
-        
-      end # class HINFO
-      
-    end # class RR
-  end # module DNS
-end # module Net
 
+          def get_inspect
+            value
+          end
+
+
+          def check_hinfo(input)
+            if input.to_s.strip =~ /^(?:["']?(.*?)["']?)\s+(?:["']?(.*?)["']?)$/
+              [$1, $2]
+            else
+              raise ArgumentError, "Invalid HINFO Section `#{input}'"
+            end
+          end
+
+          def build_pack
+            @hinfo_pack  = ""
+            @hinfo_pack += [cpu.size].pack("C") + cpu
+            @hinfo_pack += [os.size ].pack("C") + os
+            @rdlength = @hinfo_pack.size
+          end
+
+          def get_data
+            @hinfo_pack
+          end
+
+      end
+
+    end
+  end
+end

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

@@ -1,62 +1,79 @@
-module Net
+module Net # :nodoc:
   module DNS
 
     class RR
-      
-      #------------------------------------------------------------
-      # RR type MR
-      #------------------------------------------------------------
+
+      #
+      # = Mail Rename Record (MR)
+      #
+      # Class for DNS MR resource records.
+      #
       class MR < RR
-        attr_reader :newname
 
-        private
-        
-        def check_name(name)
-          unless name =~ /(\w\.?)+\s*$/
-            raise ArgumentError, "Name not valid: #{name.inspect}"
-          end
-          name
+        # Gets the newname value.
+        #
+        # Returns a String.
+        def newname
+          @newname
         end
 
-        def build_pack
-          @newname_pack = pack_name(@newname)
-          @rdlength = @newname_pack.size
+        # Gets the standardized value for this record,
+        # represented by the value of <tt>newname</tt>.
+        #
+        # Returns a String.
+        def value
+          newname.to_s
         end
 
-        def get_data
-          @newname_pack
-        end
 
-        def get_inspect
-          "#@newname"
-        end
-          
-        def subclass_new_from_hash(args)
-          if args.has_key? :newname
-            @newname = check_name args[:newname]
-          else
-            raise ArgumentError, ":newname field is mandatory but missing"
+        private
+
+          def subclass_new_from_hash(options)
+            if options.has_key?(:newname)
+              @newname = check_name(options[:newname])
+            else
+              raise ArgumentError, ":newname field is mandatory"
+            end
+          end
+
+          def subclass_new_from_string(str)
+            @newname = check_name(str)
+          end
+
+          def subclass_new_from_binary(data, offset)
+            @newname = dn_expand(data,offset)
+            offset
           end
-        end
 
-        def subclass_new_from_string(str)
-          @newname = check_name(str)
-        end
 
-        def subclass_new_from_array(data,offset)
-          @newname = dn_expand(data,offset)
-          return offset
-        end
-        
-        private
-        
           def set_type
             @type = Net::DNS::RR::Types.new("MR")
           end
-        
-      end # class MR
 
-    end # class RR
-  end # module DNS
-end # module Net
+          def get_inspect
+            value
+          end
+
+
+          def check_name(input)
+            name = input.to_s
+            unless name =~ /(\w\.?)+\s*$/
+              raise ArgumentError, "Invalid Domain Name `#{name}'"
+            end
+            name
+          end
+
+          def build_pack
+            @newname_pack = pack_name(@newname)
+            @rdlength = @newname_pack.size
+          end
+
+          def get_data
+            @newname_pack
+          end
+
+      end
 
+    end
+  end
+end

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

@@ -1,67 +1,92 @@
-module Net
+module Net # :nodoc:
   module DNS
     class RR
-      
-      #------------------------------------------------------------
-      # RR type MX
-      #------------------------------------------------------------
+
+      #
+      # = Mail Exchange Record (MX)
+      #
+      # Class for DNS MX resource records.
+      #
+      # A MX record specifies the name and relative preference of mail servers
+      # (mail exchangers in the DNS jargon) for the zone.
+      # The MX RR is used by SMTP (Mail) Agents to route mail for the domain.
+      #
       class MX < RR
-        attr_reader :preference, :exchange
 
-        private
-        
-        def check_mx(str)
-          if str.strip =~ /^(\d+)\s+(\S+)$/
-            return $1.to_i,$2
-          else
-            raise ArgumentError, "MX section not valid"
-          end
-        end
-        
-        def build_pack
-          @mx_pack = [@preference].pack("n") + pack_name(@exchange)
-          @rdlength = @mx_pack.size
+        # Gets the preference value.
+        #
+        # Returns an Integer.
+        def preference
+          @preference
         end
 
-        def get_data
-          @mx_pack
+        # Gets the exchange value.
+        #
+        # Returns a String.
+        def exchange
+          @exchange
         end
 
-        def get_inspect
-          "#@preference #@exchange"
+        # Gets the standardized value for this record,
+        # represented by the value of <tt>preference</tt> and <tt>exchange</tt>.
+        #
+        # Returns a String.
+        def value
+          "#{preference} #{exchange}"
         end
 
-        def subclass_new_from_hash(args)
-          if args.has_key? :preference and args.has_key? :exchange
-            @preference = args[:preference].to_i
-            @exchange =  args[:exchange]
-          else
-            raise ArgumentError, ":preference and :exchange fields are mandatory but missing"
+
+        private
+
+          def subclass_new_from_hash(options)
+            if options.has_key?(:preference) && options.has_key?(:exchange)
+              @preference = options[:preference].to_i
+              @exchange = options[:exchange]
+            else
+              raise ArgumentError, ":preference and :exchange fields are mandatory"
+            end
+          end
+
+          def subclass_new_from_string(str)
+            @preference, @exchange = check_mx(str)
+          end
+
+          def subclass_new_from_binary(data, offset)
+            @preference = data.unpack("@#{offset} n")[0]
+            offset += 2
+            @exchange, offset = dn_expand(data, offset)
+            offset
           end
-        end
 
-        def subclass_new_from_string(str)
-          @preference,@exchange = check_mx(str)
-        end
 
-        def subclass_new_from_binary(data,offset)
-          @preference = data.unpack("@#{offset} n")[0]
-          offset += 2
-          @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
-  end # module DNS
-end # module Net
 
+          def get_inspect
+            value
+          end
+
+
+          def check_mx(input)
+            str = input.to_s
+            unless str.strip =~ /^(\d+)\s+(\S+)$/
+              raise ArgumentError, "Invalid MX section `#{str}'"
+            end
+            [$1.to_i, $2]
+          end
+
+          def build_pack
+            @mx_pack = [@preference].pack("n") + pack_name(@exchange)
+            @rdlength = @mx_pack.size
+          end
+
+          def get_data
+            @mx_pack
+          end
 
+      end
 
+    end
+  end
+end

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

@@ -1,64 +1,78 @@
-module Net
+module Net # :nodoc:
   module DNS
-    
     class RR
-      
-      #------------------------------------------------------------
-      # RR type NS
-      #------------------------------------------------------------
+
+      #
+      # = Name Server Record (NS)
+      #
+      # Class for DNS NS resource records.
+      #
       class NS < RR
-        attr_reader :nsdname
 
-        private
-        
-        def check_name(name)
-          unless name =~ /(\w\.?)+\s*$/ and name =~ /[a-zA-Z]/
-            raise ArgumentError, "NS Domain Name not valid: #{name}"
-          end
-          name
+        # Gets the name server value.
+        #
+        # Returns a String.
+        def nsdname
+          @nsdname
         end
 
-        def build_pack
-          @nsdname_pack = pack_name(@nsdname)
-          @rdlength = @nsdname_pack.size
+        # Gets the standardized value for this record,
+        # represented by the value of <tt>nsdname</tt>.
+        #
+        # Returns a String.
+        def value
+          nsdname.to_s
         end
 
-        def get_data
-          @nsdname_pack
-        end
 
-        def get_inspect
-          "#@nsdname"
-        end
-          
-        def subclass_new_from_hash(args)
-          if args.has_key? :nsdname
-            @nsdname = check_name args[:nsdname]
-          else
-            raise ArgumentError, ":nsdname field is mandatory but missing"
+        private
+
+          def subclass_new_from_hash(options)
+            if options.has_key?(:nsdname)
+              @nsdname = check_name(options[:nsdname])
+            else
+              raise ArgumentError, ":nsdname field is mandatory"
+            end
+          end
+
+          def subclass_new_from_string(str)
+            @nsdname = check_name(str)
+          end
+
+          def subclass_new_from_binary(data, offset)
+            @nsdname, offset = dn_expand(data, offset)
+            offset
           end
-        end
 
-        def subclass_new_from_string(str)
-          @nsdname = check_name(str)
-        end
 
-        def subclass_new_from_binary(data,offset)
-          @nsdname,offset = dn_expand(data,offset)
-          return offset
-        end
-        
-        private
-        
           def set_type
             @type = Net::DNS::RR::Types.new("NS")
           end
-        
-      end # class NS
-      
-    end # class RR
-  end # module DNS
-end # module Net
 
+          def get_inspect
+            value
+          end
+
+
+          def check_name(input)
+            name = input.to_s
+            unless name =~ /(\w\.?)+\s*$/ and name =~ /[a-zA-Z]/
+              raise ArgumentError, "Invalid Name Server `#{name}'"
+            end
+            name
+          end
+
+          def build_pack
+            @nsdname_pack = pack_name(@nsdname)
+            @rdlength = @nsdname_pack.size
+          end
+
+          def get_data
+            @nsdname_pack
+          end
 
+      end
 
+    end
+  end
+end