net-dns 0.8.0 → 0.9.0

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

@@ -1,7 +1,6 @@
 module Net # :nodoc:
   module DNS
     class RR
-
       #
       # = System Information Record (HINFO)
       #
@@ -13,30 +12,24 @@ module Net # :nodoc:
       # Single space between CPU and OS parameters.
       #
       class HINFO < RR
-
         # Gets the CPU value.
         #
         # Returns a String.
-        def cpu
-          @cpu
-        end
+        attr_reader :cpu
 
         # Gets the OS value.
         #
         # Returns a String.
-        def os
-          @os
-        end
+        attr_reader :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}"}
+          %Q("#{cpu}" "#{os}")
         end
 
-
         # Gets a list of all the attributes for this record.
         #
         # Returns an Array of values.
@@ -44,65 +37,60 @@ module Net # :nodoc:
           [nil, nil, cls.to_s, type.to_s, value]
         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)
+        def subclass_new_from_hash(options)
+          if options.key?(:cpu) && options.key?(:os)
+            @cpu = options[:cpu]
+            @os  = options[:os]
+          else
+            raise ArgumentError, ":cpu and :os fields are mandatory"
           end
+        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 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
 
-          def set_type
-            @type = Net::DNS::RR::Types.new("HINFO")
-          end
-
-          def get_inspect
-            value
-          end
+          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
 
-          def check_hinfo(input)
-            if input.to_s.strip =~ /^(?:["']?(.*?)["']?)\s+(?:["']?(.*?)["']?)$/
-              [$1, $2]
-            else
-              raise ArgumentError, "Invalid HINFO Section `#{input}'"
-            end
-          end
+        def get_inspect
+          value
+        end
 
-          def build_pack
-            @hinfo_pack  = ""
-            @hinfo_pack += [cpu.size].pack("C") + cpu
-            @hinfo_pack += [os.size ].pack("C") + os
-            @rdlength = @hinfo_pack.size
+        def check_hinfo(input)
+          if input.to_s.strip =~ /^(?:["']?(.*?)["']?)\s+(?:["']?(.*?)["']?)$/
+            [Regexp.last_match(1), Regexp.last_match(2)]
+          else
+            raise ArgumentError, "Invalid HINFO Section `#{input}'"
           end
+        end
 
-          def get_data
-            @hinfo_pack
-          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,21 +1,16 @@
 module Net # :nodoc:
   module DNS
-
     class RR
-
       #
       # = Mail Rename Record (MR)
       #
       # Class for DNS MR resource records.
       #
       class MR < RR
-
         # Gets the newname value.
         #
         # Returns a String.
-        def newname
-          @newname
-        end
+        attr_reader :newname
 
         # Gets the standardized value for this record,
         # represented by the value of <tt>newname</tt>.
@@ -25,55 +20,51 @@ module Net # :nodoc:
           newname.to_s
         end
 
-
         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
+        def subclass_new_from_hash(options)
+          if options.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 set_type
-            @type = Net::DNS::RR::Types.new("MR")
-          end
+        def subclass_new_from_binary(data, offset)
+          @newname = dn_expand(data, offset)
+          offset
+        end
 
-          def get_inspect
-            value
-          end
+        def set_type
+          @type = Net::DNS::RR::Types.new("MR")
+        end
 
+        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
+        def check_name(input)
+          name = input.to_s
+          unless name =~ /(\w\.?)+\s*$/
+            raise ArgumentError, "Invalid Domain Name `#{name}'"
           end
 
-          def build_pack
-            @newname_pack = pack_name(@newname)
-            @rdlength = @newname_pack.size
-          end
+          name
+        end
 
-          def get_data
-            @newname_pack
-          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,7 +1,6 @@
 module Net # :nodoc:
   module DNS
     class RR
-
       #
       # = Mail Exchange Record (MX)
       #
@@ -12,20 +11,15 @@ module Net # :nodoc:
       # The MX RR is used by SMTP (Mail) Agents to route mail for the domain.
       #
       class MX < RR
-
         # Gets the preference value.
         #
         # Returns an Integer.
-        def preference
-          @preference
-        end
+        attr_reader :preference
 
         # Gets the exchange value.
         #
         # Returns a String.
-        def exchange
-          @exchange
-        end
+        attr_reader :exchange
 
         # Gets the standardized value for this record,
         # represented by the value of <tt>preference</tt> and <tt>exchange</tt>.
@@ -35,58 +29,54 @@ module Net # :nodoc:
           "#{preference} #{exchange}"
         end
 
-
         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
+        def subclass_new_from_hash(options)
+          if options.key?(:preference) && options.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 set_type
-            @type = Net::DNS::RR::Types.new("MX")
-          end
+        def subclass_new_from_binary(data, offset)
+          @preference = data.unpack("@#{offset} n")[0]
+          offset += 2
+          @exchange, offset = dn_expand(data, offset)
+          offset
+        end
 
-          def get_inspect
-            value
-          end
+        def set_type
+          @type = Net::DNS::RR::Types.new("MX")
+        end
 
+        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]
+        def check_mx(input)
+          str = input.to_s
+          unless str.strip =~ /^(\d+)\s+(\S+)$/
+            raise ArgumentError, "Invalid MX section `#{str}'"
           end
 
-          def build_pack
-            @mx_pack = [@preference].pack("n") + pack_name(@exchange)
-            @rdlength = @mx_pack.size
-          end
+          [Regexp.last_match(1).to_i, Regexp.last_match(2)]
+        end
 
-          def get_data
-            @mx_pack
-          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,20 +1,16 @@
 module Net # :nodoc:
   module DNS
     class RR
-
       #
       # = Name Server Record (NS)
       #
       # Class for DNS NS resource records.
       #
       class NS < RR
-
         # Gets the name server value.
         #
         # Returns a String.
-        def nsdname
-          @nsdname
-        end
+        attr_reader :nsdname
 
         # Gets the standardized value for this record,
         # represented by the value of <tt>nsdname</tt>.
@@ -24,55 +20,51 @@ module Net # :nodoc:
           nsdname.to_s
         end
 
-
         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
+        def subclass_new_from_hash(options)
+          if options.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 set_type
-            @type = Net::DNS::RR::Types.new("NS")
-          end
+        def subclass_new_from_binary(data, offset)
+          @nsdname, offset = dn_expand(data, offset)
+          offset
+        end
 
-          def get_inspect
-            value
-          end
+        def set_type
+          @type = Net::DNS::RR::Types.new("NS")
+        end
 
+        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
+        def check_name(input)
+          name = input.to_s
+          unless name =~ /(\w\.?)+\s*$/ && name =~ /[a-zA-Z]/
+            raise ArgumentError, "Invalid Name Server `#{name}'"
           end
 
-          def build_pack
-            @nsdname_pack = pack_name(@nsdname)
-            @rdlength = @nsdname_pack.size
-          end
+          name
+        end
 
-          def get_data
-            @nsdname_pack
-          end
+        def build_pack
+          @nsdname_pack = pack_name(@nsdname)
+          @rdlength = @nsdname_pack.size
+        end
 
+        def get_data
+          @nsdname_pack
+        end
       end
-
     end
   end
 end