net-dns 0.8.0 → 0.20.0

data/lib/net/dns/rr.rb

@@ -1,15 +1,14 @@
 require 'ipaddr'
-require 'net/dns/names'
-require 'net/dns/rr/types'
-require 'net/dns/rr/classes'
+require_relative 'names'
+require_relative 'rr/types'
+require_relative 'rr/classes'
 
-%w(a aaaa cname hinfo mr mx ns ptr soa srv txt).each do |file|
-  require "net/dns/rr/#{file}"
+%w[a aaaa cname hinfo mr mx ns ptr soa srv txt].each do |file|
+  require_relative "rr/#{file}"
 end
 
 module Net
   module DNS
-
     #
     # = Net::DNS::RR - DNS Resource Record class
     #
@@ -42,7 +41,6 @@ module Net
     class RR
       include Names
 
-
       # Base error class.
       class Error < StandardError
       end
@@ -51,7 +49,6 @@ module Net
       class DataError < Error
       end
 
-
       # Regexp matching an RR string
       RR_REGEXP = Regexp.new("^\\s*(\\S+)\\s*(\\d+)?\\s+(" +
                                Net::DNS::RR::Classes.regexp +
@@ -63,7 +60,6 @@ module Net
       # RR portion of the packet, in bytes
       RRFIXEDSZ = 10
 
-
       # Create a new instance of Net::DNS::RR class, or an instance of
       # any of the subclass of the appropriate type.
       #
@@ -108,12 +104,12 @@ module Net
       #
       def initialize(arg)
         instance = case arg
-          when String
-            new_from_string(arg)
-          when Hash
-            new_from_hash(arg)
-          else
-            raise ArgumentError, "Invalid argument, must be a RR string or an hash of values"
+        when String
+          new_from_string(arg)
+        when Hash
+          new_from_hash(arg)
+        else
+          raise ArgumentError, "Invalid argument, must be a RR string or an hash of values"
         end
 
         if @type.to_s == "ANY"
@@ -133,7 +129,7 @@ module Net
       # This method is used when parsing a binary packet by the Packet
       # class.
       #
-      def RR.parse(data)
+      def self.parse(data)
         o = allocate
         obj, offset = o.send(:new_from_binary, data, 0)
         obj
@@ -146,18 +142,14 @@ module Net
       # Return an instance of appropriate class and the offset
       # pointing at the end of the data parsed.
       #
-      def RR.parse_packet(data, offset)
+      def self.parse_packet(data, offset)
         o = allocate
         o.send(:new_from_binary, data, offset)
       end
 
-      def name
-        @name
-      end
+      attr_reader :name
 
-      def ttl
-        @ttl
-      end
+      attr_reader :ttl
 
       # Type accessor
       def type
@@ -169,16 +161,13 @@ module Net
         @cls.to_s
       end
 
-
       def value
         get_inspect
       end
 
       # Data belonging to that appropriate class,
       # not to be used (use real accessors instead)
-      def rdata
-        @rdata
-      end
+      attr_reader :rdata
 
       # Return the RR object in binary data format, suitable
       # for using in network streams.
@@ -201,14 +190,13 @@ module Net
       #
       # TO FIX in one of the future releases
       #
-      def comp_data(offset,compnames)
+      def comp_data(offset, compnames)
         str, offset, names = dn_comp(@name, offset, compnames)
         str    += [@type.to_i, @cls.to_i, ttl, @rdlength].pack("n2 N n")
         offset += Net::DNS::RRFIXEDSZ
         [str, offset, names]
       end
 
-
       # Returns a human readable representation of this record.
       # The value is always a String.
       #
@@ -226,7 +214,7 @@ module Net
       #   #=> "example.com.            7200    IN      MX      10 mailhost.example.com."
       #
       def to_s
-        items = to_a.map { |e| e.to_s }
+        items = to_a.map(&:to_s)
         if @name.size < 24
           items.pack("A24 A8 A8 A8 A*")
         else
@@ -244,123 +232,125 @@ module Net
         [name, ttl, cls.to_s, type.to_s, value]
       end
 
-
       private
 
-        def new_from_string(rrstring)
-          unless rrstring =~ RR_REGEXP
-            raise ArgumentError,
-            "Format error for RR string (maybe CLASS and TYPE not valid?)"
-          end
+      def new_from_string(rrstring)
+        unless rrstring =~ RR_REGEXP
+          raise ArgumentError,
+                "Format error for RR string (maybe CLASS and TYPE not valid?)"
+        end
 
-          # Name of RR - mandatory
-          begin
-            @name = $1.downcase
-          rescue NoMethodError
-            raise ArgumentError, "Missing name field in RR string #{rrstring}"
-          end
+        # Name of RR - mandatory
+        begin
+          @name = Regexp.last_match(1).downcase
+        rescue NoMethodError
+          raise ArgumentError, "Missing name field in RR string #{rrstring}"
+        end
 
-          # Time to live for RR, default 3 hours
-          @ttl = $2 ? $2.to_i : 10800
+        # Time to live for RR, default 3 hours
+        @ttl = Regexp.last_match(2) ? Regexp.last_match(2).to_i : 10_800
 
-          # RR class, default to IN
-          @cls = Net::DNS::RR::Classes.new $3
+        # RR class, default to IN
+        @cls = Net::DNS::RR::Classes.new Regexp.last_match(3)
 
-          # RR type, default to A
-          @type = Net::DNS::RR::Types.new $4
+        # RR type, default to A
+        @type = Net::DNS::RR::Types.new Regexp.last_match(4)
 
-          # All the rest is data
-          @rdata = $5 ? $5.strip : ""
+        # All the rest is data
+        @rdata = Regexp.last_match(5) ? Regexp.last_match(5).strip : ""
 
-          if self.class == Net::DNS::RR
-            Net::DNS::RR.const_get(@type.to_s).new(rrstring)
-          else
-            subclass_new_from_string(@rdata)
-            self.class
-          end
+        if self.class == Net::DNS::RR
+          Net::DNS::RR.const_get(@type.to_s).new(rrstring)
+        else
+          subclass_new_from_string(@rdata)
+          self.class
         end
+      end
 
-        def new_from_hash(args)
-          # Name field is mandatory
-          unless args.has_key? :name
-            raise ArgumentError, ":name field is mandatory"
-          end
+      def new_from_hash(args)
+        # Name field is mandatory
+        unless args.key? :name
+          raise ArgumentError, ":name field is mandatory"
+        end
 
-          @name  = args[:name].downcase
-          @ttl   = args[:ttl] ? args[:ttl].to_i : 10800 # Default 3 hours
-          @type  = Net::DNS::RR::Types.new args[:type]
-          @cls  = Net::DNS::RR::Classes.new args[:cls]
+        @name  = args[:name].downcase
+        @ttl   = args[:ttl] ? args[:ttl].to_i : 10_800 # Default 3 hours
+        @type  = Net::DNS::RR::Types.new args[:type]
+        @cls = Net::DNS::RR::Classes.new args[:cls]
 
-          @rdata = args[:rdata] ? args[:rdata].strip : ""
-          @rdlength = args[:rdlength] || @rdata.size
+        @rdata = args[:rdata] ? args[:rdata].strip : ""
+        @rdlength = args[:rdlength] || @rdata.size
 
-          if self.class == Net::DNS::RR
-            Net::DNS::RR.const_get(@type.to_s).new(args)
+        if self.class == Net::DNS::RR
+          Net::DNS::RR.const_get(@type.to_s).new(args)
+        else
+          hash = args.delete_if { |k, _| %i[name ttl type cls].include?(k) }
+          if hash.key? :rdata
+            subclass_new_from_string(hash[:rdata])
           else
-            hash = args - [:name, :ttl, :type, :cls]
-            if hash.has_key? :rdata
-              subclass_new_from_string(hash[:rdata])
-            else
-              subclass_new_from_hash(hash)
-            end
-            self.class
+            subclass_new_from_hash(hash)
           end
+          self.class
         end
+      end
 
-        def new_from_binary(data,offset)
-          if self.class == Net::DNS::RR
-            temp = dn_expand(data,offset)[1]
-            type = Net::DNS::RR::Types.new data.unpack("@#{temp} n")[0]
-            (eval "Net::DNS::RR::#{type}").parse_packet(data,offset)
-          else
-            @name,offset = dn_expand(data,offset)
-            rrtype,cls,@ttl,@rdlength = data.unpack("@#{offset} n2 N n")
-            @type = Net::DNS::RR::Types.new rrtype
-            @cls = Net::DNS::RR::Classes.new cls
-            offset += RRFIXEDSZ
-            offset = subclass_new_from_binary(data,offset)
-            build_pack
-            set_type
-            [self, offset]
-          end
+      def new_from_binary(data, offset)
+        if self.class == Net::DNS::RR
+          temp = dn_expand(data, offset)[1]
+          type = Net::DNS::RR::Types.new data.unpack1("@#{temp} n")
+          (eval "Net::DNS::RR::#{type}").parse_packet(data, offset)
+        else
+          @name, offset = dn_expand(data, offset)
+          rrtype, cls, @ttl, @rdlength = data.unpack("@#{offset} n2 N n")
+          @type = Net::DNS::RR::Types.new rrtype
+          @cls = Net::DNS::RR::Classes.new cls
+          offset += RRFIXEDSZ
+          offset = subclass_new_from_binary(data, offset)
+          build_pack
+          set_type
+          [self, offset]
         end
+      end
 
-        # Methods to be overridden by subclasses
-        def subclass_new_from_array(arr)
-        end
-        def subclass_new_from_string(str)
-        end
-        def subclass_new_from_hash(hash)
-        end
-        def subclass_new_from_binary(data, offset)
-        end
-        def build_pack
-        end
-        def get_inspect
-          @rdata
-        end
-        def get_data
-          @rdata
-        end
+      # Methods to be overridden by subclasses
+      def subclass_new_from_array(arr)
+      end
 
-        def set_type
-          # TODO: Here we should probably
-          # raise NotImplementedError
-          # if we want the method to be implemented in any subclass.
-        end
+      def subclass_new_from_string(str)
+      end
 
+      def subclass_new_from_hash(hash)
+      end
+
+      def subclass_new_from_binary(data, offset)
+      end
+
+      def build_pack
+      end
+
+      def get_inspect
+        @rdata
+      end
+
+      def get_data
+        @rdata
+      end
+
+      def set_type
+        # TODO: Here we should probably
+        # raise NotImplementedError
+        # if we want the method to be implemented in any subclass.
+      end
 
       def self.new(*args)
         o   = allocate
-        obj = o.send(:initialize,*args)
+        obj = o.send(:initialize, *args)
         if self == Net::DNS::RR
           obj
         else
           o
         end
       end
-
     end
-
   end
 end

data/lib/net/dns/version.rb

@@ -1,16 +1,8 @@
+# frozen_string_literal: true
+
 module Net
   module DNS
-    module Version
-
-      MAJOR = 0
-      MINOR = 8
-      PATCH = 0
-      BUILD = nil
-
-      STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")
-    end
-
-    VERSION = Version::STRING
-
+    # The current library version.
+    VERSION = "0.20.0"
   end
-end
+end

data/lib/net/dns.rb

@@ -1,10 +1,9 @@
-require 'net/dns/core_ext'
-require 'net/dns/version'
-require 'net/dns/resolver'
+require_relative 'dns/version'
+require_relative 'dns/resolver'
+require_relative 'dns/rr'
 
 module Net
   module DNS
-
     # Packet size in bytes
     PACKETSZ  = 512
 
@@ -23,9 +22,7 @@ module Net
     # Size of a short int
     INT16SZ   = 2
 
-
     module QueryTypes
-
       SIGZERO   = 0
       A         = 1
       NS        = 2
@@ -71,6 +68,7 @@ module Net
       RRSIG     = 46
       NSEC      = 47
       DNSKEY    = 48
+      SPF       = 99
       UINFO     = 100
       UID       = 101
       GID       = 102
@@ -82,11 +80,11 @@ module Net
       MAILB     = 253
       MAILA     = 254
       ANY       = 255
-
+      URI       = 256
+      CAA       = 257
     end
 
     module QueryClasses
-
       # Internet class
       IN        = 1
 
@@ -101,12 +99,9 @@ module Net
 
       # Any class
       ANY       = 255
-
     end
 
     include QueryTypes
     include QueryClasses
-
   end
-
 end

metadata

@@ -1,44 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: net-dns
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Marco Ceresa
 - Simone Carletti
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2023-12-18 00:00:00.000000000 Z
+dependencies: []
 description: Net::DNS is a pure Ruby DNS library, with a clean OO interface and an
   extensible API.
 email:
@@ -46,20 +18,18 @@ email:
 - weppos@weppos.net
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- LICENSE.txt
 files:
-- .gitignore
-- .travis.yml
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
+- LICENSE.txt
 - README.md
-- Rakefile
 - THANKS.rdoc
 - demo/check_soa.rb
 - demo/threads.rb
-- fixtures/resolv.conf
 - lib/net/dns.rb
-- lib/net/dns/core_ext.rb
 - lib/net/dns/header.rb
 - lib/net/dns/names.rb
 - lib/net/dns/packet.rb
@@ -83,62 +53,27 @@ files:
 - lib/net/dns/rr/txt.rb
 - lib/net/dns/rr/types.rb
 - lib/net/dns/version.rb
-- net-dns.gemspec
-- test/header_test.rb
-- test/names_test.rb
-- test/packet_test.rb
-- test/question_test.rb
-- test/resolver/timeouts_test.rb
-- test/resolver_test.rb
-- test/rr/a_test.rb
-- test/rr/aaaa_test.rb
-- test/rr/classes_test.rb
-- test/rr/cname_test.rb
-- test/rr/hinfo_test.rb
-- test/rr/mr_test.rb
-- test/rr/mx_test.rb
-- test/rr/ns_test.rb
-- test/rr/types_test.rb
-- test/rr_test.rb
-- test/test_helper.rb
 homepage: http://github.com/bluemonk/net-dns
-licenses: []
+licenses:
+- Ruby
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: net-dns
-rubygems_version: 2.0.3
-signing_key: 
+rubygems_version: 3.4.21
+signing_key:
 specification_version: 4
 summary: Pure Ruby DNS library.
-test_files:
-- test/header_test.rb
-- test/names_test.rb
-- test/packet_test.rb
-- test/question_test.rb
-- test/resolver/timeouts_test.rb
-- test/resolver_test.rb
-- test/rr/a_test.rb
-- test/rr/aaaa_test.rb
-- test/rr/classes_test.rb
-- test/rr/cname_test.rb
-- test/rr/hinfo_test.rb
-- test/rr/mr_test.rb
-- test/rr/mx_test.rb
-- test/rr/ns_test.rb
-- test/rr/types_test.rb
-- test/rr_test.rb
-- test/test_helper.rb
+test_files: []

data/.gitignore

@@ -1,8 +0,0 @@
-# Bundler
-.bundle
-pkg/*
-Gemfile.lock
-
-# YARD artifacts
-.yardoc
-yardoc/

data/Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in whois.gemspec
-gemspec

data/Rakefile

@@ -1,71 +0,0 @@
-require 'rubygems'
-require 'bundler'
-
-$:.unshift(File.dirname(__FILE__) + "/lib")
-require 'net/dns'
-
-
-# Common package properties
-PKG_NAME    = ENV['PKG_NAME']    || 'net-dns'
-PKG_VERSION = ENV['PKG_VERSION'] || Net::DNS::VERSION
-
-
-# Run test by default.
-task :default => :test
-
-
-spec = Gem::Specification.new do |s|
-  s.name              = PKG_NAME
-  s.version           = PKG_VERSION
-  s.summary           = "Pure Ruby DNS library."
-  s.description       = "Net::DNS is a pure Ruby DNS library, with a clean OO interface and an extensible API."
-
-  s.required_ruby_version = ">= 1.8.7"
-
-  s.authors           = ["Marco Ceresa", "Simone Carletti"]
-  s.email             = ["ceresa@gmail.com", "weppos@weppos.net"]
-  s.homepage          = "http://github.com/bluemonk/net-dns"
-  s.rubyforge_project = "net-dns"
-
-  s.add_development_dependency "rake",  "~> 10.0"
-  s.add_development_dependency "yard"
-
-  s.files             = `git ls-files`.split("\n")
-  s.test_files        = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.require_paths     = %w( lib )
-end
-
-
-require 'rubygems/package_task'
-
-Gem::PackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Build the gemspec file #{spec.name}.gemspec"
-task :gemspec do
-  file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
-  File.open(file, "w") {|f| f << spec.to_ruby }
-end
-
-
-require 'rake/testtask'
-
-# Run all the tests in the /test folder
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList["test/**/*_test.rb"]
-  t.verbose = true
-end
-
-
-require 'yard'
-require 'yard/rake/yardoc_task'
-
-YARD::Rake::YardocTask.new(:yardoc)
-
-
-desc "Open an irb session preloaded with this library"
-task :console do
-  sh "irb -rubygems -I lib -r net/dns.rb"
-end

data/fixtures/resolv.conf

@@ -1,4 +0,0 @@
-search corporate.thoughtworks.com
-nameserver 192.168.1.1
-nameserver 192.168.1.2
-nameserver 192.168.1.3 192.168.1.4