net-dns 0.8.0 → 0.9.0

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

@@ -1,7 +1,6 @@
 module Net # :nodoc:
   module DNS
     class RR
-
       #------------------------------------------------------------
       # RR type NULL
       #------------------------------------------------------------
@@ -20,11 +19,11 @@ module Net # :nodoc:
         end
 
         def get_inspect
-          "#@null"
+          @null.to_s
         end
 
         def subclass_new_from_hash(args)
-          if args.has_key? :null
+          if args.key? :null
             @null = args[:null]
           else
             raise ArgumentError, ":null field is mandatory but missing"
@@ -35,19 +34,17 @@ module Net # :nodoc:
           @null = str.strip
         end
 
-        def subclass_new_from_binary(data,offset)
-          @null = data[offset..offset+@rdlength]
-          return offset + @rdlength
+        def subclass_new_from_binary(data, offset)
+          @null = data[offset..offset + @rdlength]
+          offset + @rdlength
         end
 
         private
 
-          def set_type
-            @type = Net::DNS::RR::Types.new("NULL")
-          end
-
+        def set_type
+          @type = Net::DNS::RR::Types.new("NULL")
+        end
       end
-
     end
   end
 end

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

@@ -1,18 +1,16 @@
 module Net
   module DNS
     class RR
-
       #
       # = Pointer Record (PTR)
       #
       # Class for DNS Pointer (PTR) resource records.
       #
-      # Pointer records are the opposite of A and AAAA RRs 
+      # Pointer records are the opposite of A and AAAA RRs
       # and are used in Reverse Map zone files to map
       # an IP address (IPv4 or IPv6) to a host name.
       #
       class PTR < RR
-
         # Gets the PTR value.
         #
         # Returns a String.
@@ -20,7 +18,7 @@ module Net
           @ptrdname.to_s
         end
 
-        alias_method :ptr, :ptrdname
+        alias ptr ptrdname
 
         # Gets the standardized value for this record,
         # represented by the value of <tt>ptrdname</tt>.
@@ -30,7 +28,6 @@ module Net
           ptrdname.to_s
         end
 
-
         private
 
         def build_pack
@@ -43,7 +40,7 @@ module Net
         end
 
         def subclass_new_from_hash(args)
-          if args.has_key?(:ptrdname) or args.has_key?(:ptr)
+          if args.key?(:ptrdname) || args.key?(:ptr)
             @ptrdname = args[:ptrdname]
           else
             raise ArgumentError, ":ptrdname or :ptr field is mandatory"
@@ -61,23 +58,20 @@ module Net
 
         private
 
-          def set_type
-            @type = Net::DNS::RR::Types.new("PTR")
-          end
-
-          def get_inspect
-            value
-          end
-
+        def set_type
+          @type = Net::DNS::RR::Types.new("PTR")
+        end
 
-          def check_name(input)
-            IPAddr.new(str)
-          rescue
-            raise ArgumentError, "Invalid PTR Section `#{input}'"
-          end
+        def get_inspect
+          value
+        end
 
+        def check_name(input)
+          IPAddr.new(str)
+        rescue StandardError
+          raise ArgumentError, "Invalid PTR Section `#{input}'"
+        end
       end
-
     end
   end
 end

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

@@ -1,19 +1,18 @@
 module Net # :nodoc:
   module DNS
     class RR
-
       #------------------------------------------------------------
       # RR type SOA
       #------------------------------------------------------------
       class SOA < RR
         attr_reader :mname, :rname, :serial, :refresh, :retry, :expire, :minimum
-        
+
         private
-        
+
         def build_pack
           @soa_pack = pack_name(@mname)
           @soa_pack += pack_name(@rname)
-          @soa_pack += [@serial,@refresh,@retry,@expire,@minimum].pack("N5")
+          @soa_pack += [@serial, @refresh, @retry, @expire, @minimum].pack("N5")
         end
 
         def get_data
@@ -21,28 +20,28 @@ module Net # :nodoc:
         end
 
         def get_inspect
-          "#@mname #@rname #@serial #@refresh #@retry #@expire #@minimum"
+          "#{@mname} #{@rname} #{@serial} #{@refresh} #{@retry} #{@expire} #{@minimum}"
         end
 
         def subclass_new_from_hash(args)
-          if args.has_key? :rdata
+          if args.key? :rdata
             subclass_new_from_string(args[:rdata])
           else
-            [:mname,:rname,:serial,:refresh,:retry,:expire,:minimum].each do |key|
-              raise ArgumentError, "Missing field :#{key}" unless args.has_key? key
+            %i[mname rname serial refresh retry expire minimum].each do |key|
+              raise ArgumentError, "Missing field :#{key}" unless args.key? key
             end
-            @mname = args[:mname] if valid? args[:mname] 
+            @mname = args[:mname] if valid? args[:mname]
             @rname = args[:rname] if valid? args[:rname]
-            @serial = args[:serial] if number? args[:serial] 
-            @refresh = args[:refresh] if number? args[:refresh] 
-            @retry = args[:retry] if number? args[:retry] 
-            @expire = args[:expire] if number? args[:expire] 
-            @minimum = args[:minimum] if number? args[:minimum] 
+            @serial = args[:serial] if number? args[:serial]
+            @refresh = args[:refresh] if number? args[:refresh]
+            @retry = args[:retry] if number? args[:retry]
+            @expire = args[:expire] if number? args[:expire]
+            @minimum = args[:minimum] if number? args[:minimum]
           end
         end
-        
+
         def number?(num)
-          if num.kind_of? Integer and num > 0
+          if num.is_a?(Integer) && (num > 0)
             true
           else
             raise ArgumentError, "Wrong format field: #{num} not a number or less than zero"
@@ -50,29 +49,27 @@ module Net # :nodoc:
         end
 
         def subclass_new_from_string(str)
-          mname,rname,serial,refresh,ret,expire,minimum = str.strip.split(" ")
+          mname, rname, serial, refresh, ret, expire, minimum = str.strip.split(" ")
           @mname = mname if valid? mname
           @rname = rname if valid? rname
-          @serial,@refresh,@retry,@expire,@minimum = [serial,refresh,ret,expire,minimum].collect do |i| 
+          @serial, @refresh, @retry, @expire, @minimum = [serial, refresh, ret, expire, minimum].collect do |i|
             i.to_i if valid? i.to_i
           end
         end
 
-        def subclass_new_from_binary(data,offset)
-          @mname,offset = dn_expand(data,offset)
-          @rname,offset = dn_expand(data,offset)
-          @serial,@refresh,@retry,@expire,@minimum = data.unpack("@#{offset} N5")
-          return offset + 5*Net::DNS::INT32SZ
+        def subclass_new_from_binary(data, offset)
+          @mname, offset = dn_expand(data, offset)
+          @rname, offset = dn_expand(data, offset)
+          @serial, @refresh, @retry, @expire, @minimum = data.unpack("@#{offset} N5")
+          offset + 5 * Net::DNS::INT32SZ
         end
-        
+
         private
-        
-          def set_type
-            @type = Net::DNS::RR::Types.new("SOA")
-          end
-        
+
+        def set_type
+          @type = Net::DNS::RR::Types.new("SOA")
+        end
       end
-      
     end
   end
 end

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

@@ -1,45 +1,41 @@
 module Net # :nodoc:
   module DNS
     class RR
-      
       #------------------------------------------------------------
       # RR type SRV
       #------------------------------------------------------------
       class SRV < RR
-        
         attr_reader :priority, :weight, :port, :host
-        
+
         private
-        
+
         def build_pack
           str = ""
         end
-        
-        def subclass_new_from_binary(data,offset)
+
+        def subclass_new_from_binary(data, offset)
           off_end = offset + @rdlength
           @priority, @weight, @port = data.unpack("@#{offset} n n n")
-          offset+=6
+          offset += 6
 
-          @host=[]
+          @host = []
           while offset < off_end
             len = data.unpack("@#{offset} C")[0]
             offset += 1
-            str = data[offset..offset+len-1]
+            str = data[offset..offset + len - 1]
             offset += len
             @host << str
           end
-          @host=@host.join(".")
+          @host = @host.join(".")
           offset
         end
-        
+
         private
-        
-          def set_type
-            @type = Net::DNS::RR::Types.new("SRV")
-          end
-        
+
+        def set_type
+          @type = Net::DNS::RR::Types.new("SRV")
+        end
       end
     end
-        
   end
 end

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

@@ -1,7 +1,6 @@
 module Net # :nodoc:
   module DNS
     class RR
-
       #------------------------------------------------------------
       # RR type TXT
       #------------------------------------------------------------
@@ -13,7 +12,7 @@ module Net # :nodoc:
         def build_pack
           str = ""
           @txt.split(" ").each do |txt|
-            str += [txt.length,txt].pack("C a*")
+            str += [txt.length, txt].pack("C a*")
           end
           @txt_pack = str
           @rdlength = @txt_pack.size
@@ -24,7 +23,7 @@ module Net # :nodoc:
         end
 
         def subclass_new_from_hash(args)
-          if args.has_key? :txt
+          if args.key? :txt
             @txt = args[:txt].strip
           else
             raise ArgumentError, ":txt field is mandatory but missing"
@@ -35,27 +34,25 @@ module Net # :nodoc:
           @txt = str.strip
         end
 
-        def subclass_new_from_binary(data,offset)
+        def subclass_new_from_binary(data, offset)
           off_end = offset + @rdlength
           @txt = ""
           while offset < off_end
             len = data.unpack("@#{offset} C")[0]
             offset += 1
-            str = data[offset..offset+len-1]
+            str = data[offset..offset + len - 1]
             offset += len
             @txt << str << " "
           end
-          return offset
+          offset
         end
 
         private
 
-          def set_type
-            @type = Net::DNS::RR::Types.new("TXT")
-          end
-
+        def set_type
+          @type = Net::DNS::RR::Types.new("TXT")
+        end
       end
-
     end
   end
 end

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

@@ -1,80 +1,81 @@
 module Net # :nodoc:
   module DNS
-
     class RR
-
       # This is an auxiliary class to handle RR type field in a DNS packet.
       class Types
-
         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
-          'MD'        => 3,       # RFC 1035, Section 3.3.4 (obsolete)
-          'MF'        => 4,       # RFC 1035, Section 3.3.5 (obsolete)
-          'CNAME'     => 5,       # RFC 1035, Section 3.3.1
-          'SOA'       => 6,       # RFC 1035, Section 3.3.13
-          'MB'        => 7,       # RFC 1035, Section 3.3.3
-          'MG'        => 8,       # RFC 1035, Section 3.3.6
-          'MR'        => 9,       # RFC 1035, Section 3.3.8
-          'NULL'      => 10,      # RFC 1035, Section 3.3.10
-          'WKS'       => 11,      # RFC 1035, Section 3.4.2 (deprecated)
-          'PTR'       => 12,      # RFC 1035, Section 3.3.12
-          'HINFO'     => 13,      # RFC 1035, Section 3.3.2
-          'MINFO'     => 14,      # RFC 1035, Section 3.3.7
-          'MX'        => 15,      # RFC 1035, Section 3.3.9
-          'TXT'       => 16,      # RFC 1035, Section 3.3.14
-          'RP'        => 17,      # RFC 1183, Section 2.2
-          'AFSDB'     => 18,      # RFC 1183, Section 1
-          'X25'       => 19,      # RFC 1183, Section 3.1
-          'ISDN'      => 20,      # RFC 1183, Section 3.2
-          'RT'        => 21,      # RFC 1183, Section 3.3
-          'NSAP'      => 22,      # RFC 1706, Section 5
-          'NSAP_PTR'  => 23,      # RFC 1348 (obsolete)
+          'SIGZERO' => 0, # RFC2931 consider this a pseudo type
+          'A' => 1, # RFC 1035, Section 3.4.1
+          'NS' => 2,       # RFC 1035, Section 3.3.11
+          'MD' => 3,       # RFC 1035, Section 3.3.4 (obsolete)
+          'MF' => 4,       # RFC 1035, Section 3.3.5 (obsolete)
+          'CNAME' => 5, # RFC 1035, Section 3.3.1
+          'SOA' => 6, # RFC 1035, Section 3.3.13
+          'MB' => 7,       # RFC 1035, Section 3.3.3
+          'MG' => 8,       # RFC 1035, Section 3.3.6
+          'MR' => 9,       # RFC 1035, Section 3.3.8
+          'NULL' => 10, # RFC 1035, Section 3.3.10
+          'WKS' => 11,      # RFC 1035, Section 3.4.2 (deprecated)
+          'PTR' => 12,      # RFC 1035, Section 3.3.12
+          'HINFO' => 13,      # RFC 1035, Section 3.3.2
+          'MINFO' => 14,      # RFC 1035, Section 3.3.7
+          'MX' => 15, # RFC 1035, Section 3.3.9
+          'TXT' => 16, # RFC 1035, Section 3.3.14
+          'RP' => 17, # RFC 1183, Section 2.2
+          'AFSDB' => 18, # RFC 1183, Section 1
+          'X25' => 19, # RFC 1183, Section 3.1
+          'ISDN' => 20, # RFC 1183, Section 3.2
+          'RT' => 21, # RFC 1183, Section 3.3
+          'NSAP' => 22, # RFC 1706, Section 5
+          'NSAP_PTR' => 23, # RFC 1348 (obsolete)
           # The following 2 RRs are impemented in Net::DNS::SEC, TODO
-          'SIG'       => 24,      # RFC 2535, Section 4.1
-          'KEY'       => 25,      # RFC 2535, Section 3.1
-          'PX'        => 26,      # RFC 2163,
-          'GPOS'      => 27,      # RFC 1712 (obsolete)
-          'AAAA'      => 28,      # RFC 1886, Section 2.1
-          'LOC'       => 29,      # RFC 1876
+          'SIG' => 24,      # RFC 2535, Section 4.1
+          'KEY' => 25,      # RFC 2535, Section 3.1
+          'PX' => 26, # RFC 2163,
+          'GPOS' => 27,      # RFC 1712 (obsolete)
+          'AAAA' => 28,      # RFC 1886, Section 2.1
+          'LOC' => 29, # RFC 1876
           # 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
-          'SRV'       => 33,      # RFC 2052
-          'ATMA'      => 34,      # ???
-          'NAPTR'     => 35,      # RFC 2168
-          'KX'        => 36,      # RFC 2230
-          'CERT'      => 37,      # RFC 2538
-          'DNAME'     => 39,      # RFC 2672
-          'OPT'       => 41,      # RFC 2671
+          'NXT' => 30,      # RFC 2535, Section 5.2
+          'EID' => 31,      # draft-ietf-nimrod-dns-xx.txt
+          'NIMLOC' => 32, # draft-ietf-nimrod-dns-xx.txt
+          'SRV' => 33, # RFC 2052
+          'ATMA' => 34, # ???
+          'NAPTR' => 35, # RFC 2168
+          'KX' => 36, # RFC 2230
+          'CERT' => 37, # RFC 2538
+          'DNAME' => 39, # RFC 2672
+          'OPT' => 41, # RFC 2671
           # 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
-          'NSEC'      => 47,      # draft-ietf-dnsext-dnssec-2535typecode-change
-          'DNSKEY'    => 48,      # draft-ietf-dnsext-dnssec-2535typecode-change
-          'UINFO'     => 100,     # non-standard
-          'UID'       => 101,     # non-standard
-          'GID'       => 102,     # non-standard
-          'UNSPEC'    => 103,     # non-standard
-          'TKEY'      => 249,     # RFC 2930
-          'TSIG'      => 250,     # RFC 2931
-          'IXFR'      => 251,     # RFC 1995
-          'AXFR'      => 252,     # RFC 1035
-          'MAILB'     => 253,     # RFC 1035 (MB, MG, MR)
-          'MAILA'     => 254,     # RFC 1035 (obsolete - see MX)
-          'ANY'       => 255,     # RFC 1035
-        }
+          '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
+          'NSEC' => 47, # draft-ietf-dnsext-dnssec-2535typecode-change
+          'DNSKEY' => 48, # draft-ietf-dnsext-dnssec-2535typecode-change
+          'UINFO' => 100, # non-standard
+          'UID' => 101,     # non-standard
+          'GID' => 102,     # non-standard
+          'UNSPEC' => 103, # non-standard
+          'TKEY' => 249,     # RFC 2930
+          'TSIG' => 250,     # RFC 2931
+          'IXFR' => 251,     # RFC 1995
+          'AXFR' => 252,     # RFC 1035
+          'MAILB' => 253,     # RFC 1035 (MB, MG, MR)
+          'MAILA' => 254,     # RFC 1035 (obsolete - see MX)
+          'ANY' => 255, # RFC 1035
+        }.freeze
 
         # The default value when type is nil in Resource Records
         @@default = TYPES["A"]
 
+        def self.default
+          @@default
+        end
+
         # 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
+          if TYPES.key? str
             @@default = TYPES[str]
           else
             raise ArgumentError, "Unknown type #{str}"
@@ -84,12 +85,12 @@ module Net # :nodoc:
         # Checks whether +type+ is a valid RR type.
         def self.valid?(type)
           case type
-            when String
-              TYPES.has_key?(type)
-            when Fixnum
-              TYPES.invert.has_key?(type)
-            else
-              raise ArgumentError, "Wrong type class: #{type.class}"
+          when String
+            TYPES.key?(type)
+          when Integer
+            TYPES.invert.key?(type)
+          else
+            raise ArgumentError, "Wrong type class: #{type.class}"
           end
         end
 
@@ -97,14 +98,14 @@ module Net # :nodoc:
         # given the numeric value
         def self.to_str(type)
           case type
-            when Fixnum
-              if TYPES.invert.has_key? type
-                TYPES.invert[type]
-              else
-                raise ArgumentError, "Unknown type number #{type}"
-              end
+          when Integer
+            if TYPES.invert.key? type
+              TYPES.invert[type]
             else
-              raise ArgumentError, "Wrong type class: #{type.class}"
+              raise ArgumentError, "Unknown type number #{type}"
+            end
+          else
+            raise ArgumentError, "Wrong type class: #{type.class}"
           end
         end
 
@@ -112,7 +113,7 @@ module Net # :nodoc:
         # in a format suited for regexps
         def self.regexp
           # Longest ones go first, so the regex engine will match AAAA before A.
-          TYPES.keys.sort { |a,b| b.length <=> a.length }.join("|")
+          TYPES.keys.sort { |a, b| b.length <=> a.length }.join("|")
         end
 
         # Creates a new object representing an RR type. Performs some
@@ -123,7 +124,7 @@ module Net # :nodoc:
           when String
             # type in the form "A" or "NS"
             new_from_string(type.upcase)
-          when Fixnum
+          when Integer
             # type in numeric form
             new_from_num(type)
           when nil
@@ -157,37 +158,34 @@ module Net # :nodoc:
           @num.to_s
         end
 
-
         private
 
-          # Constructor for string data type.
-          def new_from_string(type)
-            case type
-            when /^TYPE\\d+/
-              # TODO!!!
+        # Constructor for string data type.
+        def new_from_string(type)
+          case type
+          when /^TYPE\\d+/
+            # TODO!!!
+          else
+            # String with name of type
+            if TYPES.key? type
+              @str = type
+              @num = TYPES[type]
             else
-              # String with name of type
-              if TYPES.has_key? type
-                @str = type
-                @num = TYPES[type]
-              else
-                raise ArgumentError, "Unknown type #{type}"
-              end
+              raise ArgumentError, "Unknown type #{type}"
             end
           end
+        end
 
-          # 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
+        # Contructor for numeric data type.
+        def new_from_num(type)
+          if TYPES.invert.key? type
+            @num = type
+            @str = TYPES.invert[type]
+          else
+            raise ArgumentError, "Unkown type number #{type}"
           end
-
+        end
       end
-
     end
   end
 end