net-dns 0.8.0 → 0.20.0

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,49 @@ 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_hash(options)
+          raise ArgumentError, ":newname field is mandatory" unless options.key?(:newname)
 
-          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
+          @newname = check_name(options[:newname])
+        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,52 @@ 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_hash(options)
+          raise ArgumentError, ":preference and :exchange fields are mandatory" unless options.key?(:preference) && options.key?(:exchange)
 
-          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
+          @preference = options[:preference].to_i
+          @exchange = options[:exchange]
+        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.unpack1("@#{offset} n")
+          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,49 @@ 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_hash(options)
+          raise ArgumentError, ":nsdname field is mandatory" unless options.key?(:nsdname)
 
-          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
+          @nsdname = check_name(options[:nsdname])
+        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

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

@@ -1,7 +1,6 @@
 module Net # :nodoc:
   module DNS
     class RR
-
       #------------------------------------------------------------
       # RR type NULL
       #------------------------------------------------------------
@@ -20,34 +19,30 @@ module Net # :nodoc:
         end
 
         def get_inspect
-          "#@null"
+          @null.to_s
         end
 
         def subclass_new_from_hash(args)
-          if args.has_key? :null
-            @null = args[:null]
-          else
-            raise ArgumentError, ":null field is mandatory but missing"
-          end
+          raise ArgumentError, ":null field is mandatory but missing" unless args.key? :null
+
+          @null = args[:null]
         end
 
         def subclass_new_from_string(str)
           @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,11 +40,9 @@ module Net
         end
 
         def subclass_new_from_hash(args)
-          if args.has_key?(:ptrdname) or args.has_key?(:ptr)
-            @ptrdname = args[:ptrdname]
-          else
-            raise ArgumentError, ":ptrdname or :ptr field is mandatory"
-          end
+          raise ArgumentError, ":ptrdname or :ptr field is mandatory" unless args.key?(:ptrdname) || args.key?(:ptr)
+
+          @ptrdname = args[:ptrdname]
         end
 
         def subclass_new_from_string(str)
@@ -61,23 +56,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,24 @@
 module Net # :nodoc:
   module DNS
     class RR
-
       #------------------------------------------------------------
       # RR type SOA
       #------------------------------------------------------------
       class SOA < RR
-        attr_reader :mname, :rname, :serial, :refresh, :retry, :expire, :minimum
-        
+        attr_reader :mname
+        attr_reader :rname
+        attr_reader :serial
+        attr_reader :refresh
+        attr_reader :retry
+        attr_reader :expire
+        attr_reader :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,58 +26,54 @@ 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
-            true
-          else
-            raise ArgumentError, "Wrong format field: #{num} not a number or less than zero"
-          end
+          raise ArgumentError, "Wrong format field: #{num} not a number or less than zero" unless num.is_a?(Integer) && (num > 0)
+
+          true
         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,44 @@
 module Net # :nodoc:
   module DNS
     class RR
-      
       #------------------------------------------------------------
       # RR type SRV
       #------------------------------------------------------------
       class SRV < RR
-        
-        attr_reader :priority, :weight, :port, :host
-        
+        attr_reader :priority
+        attr_reader :weight
+        attr_reader :port
+        attr_reader :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]
+            len = data.unpack1("@#{offset} C")
             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