net-dns 0.8.0 → 0.9.0

data/demo/threads.rb

@@ -1,11 +1,11 @@
-require 'rubygems' if "#{RUBY_VERSION}" < "1.9.0"
+require 'rubygems' if RUBY_VERSION.to_s < "1.9.0"
 require 'net/dns'
 
 a = ["ibm.com", "sun.com", "redhat.com"]
 
 threads = []
 
-for dom in a
+a.each do |dom|
   threads << Thread.new(dom) do |domain|
     res = Net::DNS::Resolver.new
     res.query(domain, Net::DNS::NS).each_nameserver do |ns|
@@ -15,8 +15,4 @@ for dom in a
   end
 end
 
-threads.each do |t|
-  t.join
-end
-
-
+threads.each(&:join)

data/lib/net/dns.rb

@@ -1,10 +1,10 @@
-require 'net/dns/core_ext'
-require 'net/dns/version'
-require 'net/dns/resolver'
+require_relative 'dns/version'
+require_relative 'dns/core_ext'
+require_relative 'dns/resolver'
+require_relative 'dns/rr'
 
 module Net
   module DNS
-
     # Packet size in bytes
     PACKETSZ  = 512
 
@@ -23,9 +23,7 @@ module Net
     # Size of a short int
     INT16SZ   = 2
 
-
     module QueryTypes
-
       SIGZERO   = 0
       A         = 1
       NS        = 2
@@ -82,11 +80,9 @@ module Net
       MAILB     = 253
       MAILA     = 254
       ANY       = 255
-
     end
 
     module QueryClasses
-
       # Internet class
       IN        = 1
 
@@ -101,12 +97,9 @@ module Net
 
       # Any class
       ANY       = 255
-
     end
 
     include QueryTypes
     include QueryClasses
-
   end
-
 end

data/lib/net/dns/core_ext.rb

@@ -1,8 +1,6 @@
 module Net # :nodoc:
   module DNS
-
     module HashKeys # :nodoc:
-
       # Returns an hash with all the
       # keys turned into downcase
       #
@@ -11,17 +9,15 @@ module Net # :nodoc:
       #      #=> {"test"=>1,"foobar"=>2}
       #
       def downcase_keys!
-        hsh = Hash.new
-        self.each do |key,val|
+        hsh = {}
+        each do |key, val|
           hsh[key.downcase] = val
         end
-        self.replace(hsh)
+        replace(hsh)
       end
-      
     end
 
     module HashOperators # :nodoc:
-
       # Performs a sort of group difference
       # operation on hashes or arrays
       #
@@ -33,20 +29,17 @@ module Net # :nodoc:
       #
       def -(other)
         case other
-          when Hash
-            delete_if { |k,v| other.has_key?(k) }
-          when Array
-            delete_if { |k,v| other.include?(k) }
+        when Hash
+          delete_if { |k, v| other.key?(k) }
+        when Array
+          delete_if { |k, v| other.include?(k) }
         end
       end
-
     end
-
   end
 end
 
-
 class Hash # :nodoc:
   include Net::DNS::HashKeys
   include Net::DNS::HashOperators
-end
+end

data/lib/net/dns/header.rb

@@ -1,6 +1,5 @@
 module Net
   module DNS
-
     # DNS packet header class
     #
     # The Net::DNS::Header class represents the header portion of a
@@ -37,7 +36,6 @@ module Net
     # more or less the same.
     #
     class Header
-
       # A wrong +count+ parameter has been passed.
       class WrongCountError < ArgumentError
       end
@@ -54,7 +52,6 @@ module Net
       class Error < StandardError
       end
 
-
       # DNS Header RCode handling class
       #
       # It should be used internally by Net::DNS::Header class. However, it's still
@@ -103,7 +100,6 @@ module Net
       # More RCodes has to come for TSIGs and other operations.
       #
       class RCode
-
         # Constant for +rcode+ Response Code No Error
         NOERROR = 0
         # Constant for +rcode+ Response Code Format Error
@@ -117,27 +113,25 @@ module Net
         # Constant for +rcode+ Response Code Refused Error
         REFUSED = 5
 
-
-
         RCodeType = %w[NoError FormErr ServFail NXDomain NotImp
-                      Refused YXDomain YXRRSet NXRRSet NotAuth NotZone]
+                       Refused YXDomain YXRRSet NXRRSet NotAuth NotZone].freeze
 
         RCodeErrorString = ["No errors",
-          "The name server was unable to interpret the query",
-          "The name server was unable to process this query due to problem with the name server",
-          "Domain name referenced in the query does not exists",
-          "The name server does not support the requested kind of query",
-          "The name server refuses to perform the specified operation for policy reasons",
-          "",
-          "",
-          "",
-          "",
-          ""]
+                            "The name server was unable to interpret the query",
+                            "The name server was unable to process this query due to problem with the name server",
+                            "Domain name referenced in the query does not exists",
+                            "The name server does not support the requested kind of query",
+                            "The name server refuses to perform the specified operation for policy reasons",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",].freeze
 
         attr_reader :code, :type, :explanation
 
         def initialize(code)
-          if (0..10).include? code
+          if (0..10).cover? code
             @code         = code
             @type         = RCodeType[code]
             @explanation  = RCodeErrorString[code]
@@ -151,7 +145,6 @@ module Net
         end
       end
 
-
       # Constant for +opCode+ query
       QUERY   = 0
       # Constant for +opCode+ iquery
@@ -159,7 +152,7 @@ module Net
       # Constant for +opCode+ status
       STATUS  = 2
       # Array with given strings
-      OPARR = %w[QUERY IQUERY STATUS]
+      OPARR = %w[QUERY IQUERY STATUS].freeze
 
       # Reader for +id+ attribute
       attr_reader :id
@@ -212,7 +205,7 @@ module Net
       # See also each option for a detailed explanation of usage.
       #
       def initialize(arg = {})
-        if arg.kind_of? Hash
+        if arg.is_a? Hash
           new_from_hash(arg)
         else
           raise ArgumentError, "Wrong argument class `#{arg.class}'"
@@ -232,7 +225,7 @@ module Net
       #     #=> "true" if it comes from authoritative name server
       #
       def self.parse(arg)
-        if arg.kind_of? String
+        if arg.is_a? String
           o = allocate
           o.send(:new_from_binary, arg)
           o
@@ -253,24 +246,24 @@ module Net
       # way of display output.
       #
       def inspect
-        ";; id = #@id\n" +
-          if false # @opCode == "UPDATE"
-            #do stuff
-          else
-            ";; qr = #@qr\t" +
-              "opCode: #{opCode_str}\t" +
-              "aa = #@aa\t" +
-              "tc = #@tc\t" +
-              "rd = #@rd\n" +
-              ";; ra = #@ra\t" +
-              "ad = #@ad\t" +
-              "cd = #@cd\t" +
-              "rcode = #{@rCode.type}\n" +
-              ";; qdCount = #@qdCount\t"+
-              "anCount = #@anCount\t"+
-              "nsCount = #@nsCount\t"+
-              "arCount = #@arCount\n"
-          end
+        ";; id = #{@id}\n" +
+            if false # @opCode == "UPDATE"
+              # do stuff
+            else
+              ";; qr = #{@qr}\t" \
+              "opCode: #{opCode_str}\t" \
+              "aa = #{@aa}\t" \
+              "tc = #{@tc}\t" \
+              "rd = #{@rd}\n" \
+              ";; ra = #{@ra}\t" \
+              "ad = #{@ad}\t" \
+              "cd = #{@cd}\t" \
+              "rcode = #{@rCode.type}\n" \
+              ";; qdCount = #{@qdCount}\t" \
+              "anCount = #{@anCount}\t" \
+              "nsCount = #{@nsCount}\t" \
+              "arCount = #{@arCount}\n"
+            end
       end
 
       # The Net::DNS::Header#format method prints out the header
@@ -297,7 +290,7 @@ module Net
       def format
         del = ("+-" * 16) + "+\n"
         len = del.length
-        str = del + "|" + @id.to_s.center(len-3) + "|\n"
+        str = del + "|" + @id.to_s.center(len - 3) + "|\n"
         str += del + "|" + @qr.to_s
         str += "|" + @opCode.to_s.center(7)
         str += "|" + @aa.to_s
@@ -307,10 +300,10 @@ module Net
         str += "|" + @ad.to_s
         str += "|" + @cd.to_s.center(3)
         str += "|" + @rCode.to_s.center(7) + "|\n"
-        str += del + "|" + @qdCount.to_s.center(len-3) + "|\n"
-        str += del + "|" + @anCount.to_s.center(len-3) + "|\n"
-        str += del + "|" + @nsCount.to_s.center(len-3) + "|\n"
-        str += del + "|" + @arCount.to_s.center(len-3) + "|\n" + del
+        str += del + "|" + @qdCount.to_s.center(len - 3) + "|\n"
+        str += del + "|" + @anCount.to_s.center(len - 3) + "|\n"
+        str += del + "|" + @nsCount.to_s.center(len - 3) + "|\n"
+        str += del + "|" + @arCount.to_s.center(len - 3) + "|\n" + del
         str
       end
 
@@ -323,8 +316,8 @@ module Net
       def data
         arr = []
         arr.push(@id)
-        arr.push((@qr<<7)|(@opCode<<3)|(@aa<<2)|(@tc<<1)|@rd)
-        arr.push((@ra<<7)|(@ad<<5)|(@cd<<4)|@rCode.code)
+        arr.push((@qr << 7) | (@opCode << 3) | (@aa << 2) | (@tc << 1) | @rd)
+        arr.push((@ra << 7) | (@ad << 5) | (@cd << 4) | @rCode.code)
         arr.push(@qdCount)
         arr.push(@anCount)
         arr.push(@nsCount)
@@ -336,7 +329,7 @@ module Net
       # performing security tests.
       #
       def id=(val)
-        if (0..65535).include? val
+        if (0..65_535).cover? val
           @id = val
         else
           raise ArgumentError, "ID `#{val}' out of range"
@@ -361,7 +354,7 @@ module Net
           @qr = 1
         when false
           @qr = 0
-        when 0,1
+        when 0, 1
           @qr = val
         else
           raise ArgumentError, ":qr must be true(or 1) or false(or 0)"
@@ -399,7 +392,7 @@ module Net
       #   header.opCode = Header::STATUS
       #
       def opCode=(val)
-        if (0..2).include? val
+        if (0..2).cover? val
           @opCode = val
         else
           raise WrongOpcodeError, "Wrong opCode value (#{val}), must be QUERY, IQUERY or STATUS"
@@ -433,7 +426,7 @@ module Net
           @aa = 1
         when false
           @aa = 0
-        when 0,1
+        when 0, 1
           @aa = val
         else
           raise ArgumentError, ":aa must be true(or 1) or false(or 0)"
@@ -471,7 +464,7 @@ module Net
           @tc = 1
         when false
           @tc = 0
-        when 0,1
+        when 0, 1
           @tc = val
         else
           raise ArgumentError, ":tc must be true(or 1) or false(or 0)"
@@ -536,7 +529,7 @@ module Net
           @ra = 1
         when false
           @ra = 0
-        when 0,1
+        when 0, 1
           @ra = val
         else
           raise ArgumentError, ":ra must be true(or 1) or false(or 0)"
@@ -560,7 +553,7 @@ module Net
           @cd = 1
         when false
           @cd = 0
-        when 0,1
+        when 0, 1
           @cd = val
         else
           raise ArgumentError, ":cd must be true(or 1) or false(or 0)"
@@ -588,7 +581,7 @@ module Net
           @ad = 1
         when false
           @ad = 0
-        when 0,1
+        when 0, 1
           @ad = val
         else
           raise ArgumentError, ":ad must be true(or 1) or false(or 0)"
@@ -604,7 +597,7 @@ module Net
       #     #=> was unable to interpret the query
       #
       def rCode_str
-        return rCode.type, rCode.explanation
+        [rCode.type, rCode.explanation]
       end
 
       # Checks for errors in the DNS packet
@@ -627,7 +620,7 @@ module Net
       # Sets the number of entries in a question section
       #
       def qdCount=(val)
-        if (0..65535).include? val
+        if (0..65_535).cover? val
           @qdCount = val
         else
           raise WrongCountError, "Wrong number of count (#{val}), must be 0-65535"
@@ -637,7 +630,7 @@ module Net
       # Sets the number of RRs in an answer section
       #
       def anCount=(val)
-        if (0..65535).include? val
+        if (0..65_535).cover? val
           @anCount = val
         else
           raise WrongCountError, "Wrong number of count (#{val}), must be 0-65535"
@@ -647,7 +640,7 @@ module Net
       # Sets the number of RRs in an authority section
       #
       def nsCount=(val)
-        if (0..65535).include? val
+        if (0..65_535).cover? val
           @nsCount = val
         else
           raise WrongCountError, "Wrong number of count (#{val}), must be 0-65535"
@@ -657,14 +650,14 @@ module Net
       # Sets the number of RRs in an addictional section
       #
       def arCount=(val)
-        if (0..65535).include? val
+        if (0..65_535).cover? val
           @arCount = val
         else
           raise WrongCountError, "Wrong number of count: `#{val}' must be 0-65535"
         end
       end
 
-    private
+      private
 
       def new_from_scratch
         @id = genID # generate ad unique id
@@ -679,6 +672,7 @@ module Net
         unless str.size == Net::DNS::HFIXEDSZ
           raise ArgumentError, "Header binary data has wrong size: `#{str.size}' bytes"
         end
+
         arr = str.unpack("n C2 n4")
         @id          =  arr[0]
         @qr          = (arr[1] >> 7) & 0x01
@@ -698,16 +692,14 @@ module Net
 
       def new_from_hash(hash)
         new_from_scratch
-        hash.each do |key,val|
-          eval "self.#{key.to_s} = val"
+        hash.each do |key, val|
+          eval "self.#{key} = val"
         end
       end
 
       def genID
-        rand(65535)
+        rand(65_535)
       end
-
     end
-
   end
 end