redns 0.1.17 → 0.2.0

data/lib/redns/resource.rb

@@ -3,12 +3,12 @@ class ReDNS::Resource < ReDNS::Fragment
 
   # == Attributes ===========================================================
   
-  attribute :name, :convert => ReDNS::Name, :default => lambda { ReDNS::Name.new }
-  attribute :rclass, :default => :in
-  attribute :rtype, :default => :a
+  attribute :name, convert: ReDNS::Name, default: lambda { ReDNS::Name.new }
+  attribute :rclass, default: :in
+  attribute :rtype, default: :a
   attribute :rdata
-  attribute :ttl, :default => 0, :convert => :to_i
-  attribute :additional, :default => lambda { [ ] }
+  attribute :ttl, default: 0, convert: :to_i
+  attribute :additional, default: lambda { [ ] }
 
   # == Class Methods ========================================================
 
@@ -18,71 +18,71 @@ class ReDNS::Resource < ReDNS::Fragment
     self.name.empty?
   end
 
-	def to_s
-		"#{name} #{ttl} #{rclass.to_s.upcase} #{rtype.to_s.upcase} #{rdata}"
-	end
+  def to_s
+    "#{name} #{ttl} #{rclass.to_s.upcase} #{rtype.to_s.upcase} #{rdata}"
+  end
 
-	def to_a
-		[ name, ttl, rclass, rtype, rdata.to_a ].flatten
-	end
+  def to_a
+    [ name, ttl, rclass, rtype, rdata.to_a ].flatten
+  end
 
-	def serialize(buffer = ReDNS::Buffer.new)
-	  self.name.serialize(buffer)
-	  
-	  data_buffer = nil
-	  
-	  if (self.rdata)
-  	  data_buffer = ReDNS::Buffer.new
-  	  self.rdata.serialize(data_buffer)
-	  end
-	  
-	  buffer.pack(
+  def serialize(buffer = ReDNS::Buffer.new)
+    self.name.serialize(buffer)
+    
+    data_buffer = nil
+    
+    if (self.rdata)
+      data_buffer = ReDNS::Buffer.new
+      self.rdata.serialize(data_buffer)
+    end
+    
+    buffer.pack(
       'nnNn',
-			ReDNS::RR_TYPE[self.rtype],
-			ReDNS::RR_CLASS[self.rclass],
-			self.ttl,
-			data_buffer ? data_buffer.length : 0
-	  )
-	  
-	  if (data_buffer)
-	    buffer.append(data_buffer)
+      ReDNS::RR_TYPE[self.rtype],
+      ReDNS::RR_CLASS[self.rclass],
+      self.ttl,
+      data_buffer ? data_buffer.length : 0
+    )
+    
+    if (data_buffer)
+      buffer.append(data_buffer)
     end
     
     buffer
-	end
-	
-	def deserialize(buffer)
-		self.name = ReDNS::Name.new(buffer)
+  end
+  
+  def deserialize(buffer)
+    self.name = ReDNS::Name.new(buffer)
 
-		raw = buffer.unpack("nnNn")
-		
-		self.rtype = ReDNS::RR_TYPE_LABEL[raw.shift]
-		self.rclass = ReDNS::RR_CLASS_LABEL[raw.shift]
-		self.ttl = raw.shift
-		
-		rdata_length = raw.shift
+    raw = buffer.unpack("nnNn")
+    
+    self.rtype = ReDNS::RR_TYPE_LABEL[raw.shift]
+    self.rclass = ReDNS::RR_CLASS_LABEL[raw.shift]
+    self.ttl = raw.shift
+    
+    rdata_length = raw.shift
 
     self.rdata =
-  		case (self.rtype)
-  		when :a, :aaaa
-  			self.rdata = ReDNS::Address.new(buffer)
-  		when :cname, :ptr, :ns
-  			self.rdata = ReDNS::Name.new(buffer)
-  		when :mx
-  			self.rdata = ReDNS::Record::MX.new(buffer)
-  		when :soa
-  			self.rdata = ReDNS::Record::SOA.new(buffer)
-  		when :null
-  		  self.rdata = (rdata_length and ReDNS::Record::Null.new(buffer.slice(rdata_length)))
-		  when :spf
-		    self.rdata = (rdata_length and ReDNS::Record::SPF.new(buffer.slice(rdata_length)))
-  		when :txt
-  		  self.rdata = (rdata_length and ReDNS::Record::TXT.new(buffer.slice(rdata_length)))
-  		else
+      case (self.rtype)
+      when :a, :aaaa
+        self.rdata = ReDNS::Address.new(buffer)
+      when :cname, :ptr, :ns
+        self.rdata = ReDNS::Name.new(buffer)
+      when :mx
+        self.rdata = ReDNS::Record::MX.new(buffer)
+      when :soa
+        self.rdata = ReDNS::Record::SOA.new(buffer)
+      when :null
+        self.rdata = (rdata_length and ReDNS::Record::Null.new(buffer.slice(rdata_length)))
+      when :spf
+        self.rdata = (rdata_length and ReDNS::Record::SPF.new(buffer.slice(rdata_length)))
+      when :txt
+        self.rdata = (rdata_length and ReDNS::Record::TXT.new(buffer.slice(rdata_length)))
+      else
         # FUTURE: Throw exception here when trying to decode invalid type
-  		  nil
-  		end
-  		
-  	self
+        nil
+      end
+      
+    self
   end
 end

data/lib/redns/support.rb

@@ -1,47 +1,47 @@
 module ReDNS::Support
   def addr_to_arpa(ip)
-		ip and (ip.split(/\./).reverse.join('.') + '.in-addr.arpa.')
-	end
-	
-	def inet_ntoa(addr)
-		addr.unpack("C4")[0, 4].collect do |v|
-		  v or 0
-		end.join('.')
-	end
-	
-	def inet_aton(s)
-		s.split(/\./).map do |c|
-		  c.to_i
-		end.pack("C*")
-	end
+    ip and (ip.split(/\./).reverse.join('.') + '.in-addr.arpa.')
+  end
+  
+  def inet_ntoa(addr)
+    addr.unpack("C4")[0, 4].collect do |v|
+      v or 0
+    end.join('.')
+  end
+  
+  def inet_aton(s)
+    s.split(/\./).map do |c|
+      c.to_i
+    end.pack("C*")
+  end
 
-	def io_nonblock?(io)
-		(io.fcntl(Fcntl::F_GETFL) & File::NONBLOCK) != 0
-	end
+  def io_nonblock?(io)
+    (io.fcntl(Fcntl::F_GETFL) & File::NONBLOCK) != 0
+  end
 
-	def io_set_nonblock(io, nb = true)
-		flags = io.fcntl(Fcntl::F_GETFL)
-		
-		if (nb)
-			flags |= File::NONBLOCK
-		else
-			flags &= ~File::NONBLOCK
-		end
-		
-		io.fcntl(Fcntl::F_SETFL, flags)
-	end
+  def io_set_nonblock(io, nb = true)
+    flags = io.fcntl(Fcntl::F_GETFL)
+    
+    if (nb)
+      flags |= File::NONBLOCK
+    else
+      flags &= ~File::NONBLOCK
+    end
+    
+    io.fcntl(Fcntl::F_SETFL, flags)
+  end
 
-	def io_nonblock(nb = true, &block)
-	  flag = io_nonblock?(io)
-	  
-		io_set_nonblock(io, nb)
-		
-		yield(block)
-	ensure
-		io_set_nonblock(io, flag)
-	end
-	
-	def bind_all_addr
+  def io_nonblock(nb = true, &block)
+    flag = io_nonblock?(io)
+    
+    io_set_nonblock(io, nb)
+    
+    yield(block)
+  ensure
+    io_set_nonblock(io, flag)
+  end
+  
+  def bind_all_addr
     '0.0.0.0'
   end
 
@@ -60,6 +60,6 @@ module ReDNS::Support
   def default_resolver_address
     ReDNS::Resolver.servers.first
   end
-	
-	extend(self)
+  
+  extend(self)
 end

data/redns.gemspec

@@ -2,23 +2,29 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: redns 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "redns"
-  s.version = "0.1.17"
+  s.name = "redns".freeze
+  s.version = "0.2.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["tadman"]
-  s.date = "2012-03-12"
-  s.description = "ReDNS is a pure Ruby DNS library with drivers for reactor-model engines such as EventMachine"
-  s.email = "github@tadman.ca"
-  s.executables = ["redig"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["tadman".freeze]
+  s.date = "2017-09-14"
+  s.description = "ReDNS is a pure Ruby DNS library with drivers for reactor-model engines such as EventMachine".freeze
+  s.email = "github@tadman.ca".freeze
+  s.executables = ["redig".freeze]
   s.extra_rdoc_files = [
-    "README.rdoc"
+    "LICENSE.txt",
+    "README.md"
   ]
   s.files = [
     ".document",
-    "README.rdoc",
+    ".travis.yml",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.md",
     "Rakefile",
     "VERSION",
     "bin/redig",
@@ -53,18 +59,23 @@ Gem::Specification.new do |s|
     "test/test_redns_resource.rb",
     "test/test_redns_support.rb"
   ]
-  s.homepage = "http://github.com/tadman/redns"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
-  s.summary = "Ruby Reactor-Ready DNS Library"
+  s.homepage = "http://github.com/tadman/redns".freeze
+  s.rubygems_version = "2.6.11".freeze
+  s.summary = "Ruby Reactor-Ready DNS Library".freeze
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<eventmachine>.freeze, [">= 0"])
     else
+      s.add_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_dependency(%q<eventmachine>.freeze, [">= 0"])
     end
   else
+    s.add_dependency(%q<rake>.freeze, [">= 0"])
+    s.add_dependency(%q<eventmachine>.freeze, [">= 0"])
   end
 end
 

data/test/test_redns_connection.rb

@@ -58,10 +58,10 @@ class TestReDNSConnection < Test::Unit::TestCase
       end
     end
     
-    assert_equal %w[ 192.0.43.10 ], address.collect { |a| a.rdata.to_s }
+    assert_equal %w[ 93.184.216.34 ], address.collect { |a| a.rdata.to_s }
     assert_equal %w[ 43-10.any.icann.org. ], reverse.collect { |a| a.rdata.to_s }
     assert_equal %w[ a.iana-servers.net. b.iana-servers.net. ], nameservers.collect { |a| a.rdata.to_s }.sort
-    assert_equal %w[ 74.207.228.18 ], cname.collect { |a| a.rdata.to_s }
+    assert_equal %w[ 173.255.229.30 ], cname.collect { |a| a.rdata.to_s }
   end
 
   def test_simple_timeout
@@ -89,7 +89,7 @@ class TestReDNSConnection < Test::Unit::TestCase
         c.timeout = nil
       end
       
-      assert_equal ReDNS::Connection::DEFAULT_TIMEOUT, dns.timeout
+      assert_equal ReDNS::Connection::TIMEOUT_DEFAULT, dns.timeout
 
       EventMachine.stop_event_loop
     end
@@ -100,9 +100,20 @@ class TestReDNSConnection < Test::Unit::TestCase
     
     EventMachine.run do
       dns = ReDNS::Connection.instance do |c|
-        c.nameservers += %w[ 127.0.0.2 127.0.0.3 127.0.0.4 127.0.0.5 127.0.0.6 127.0.0.7 127.0.0.8 127.0.0.9  ]
+        c.nameservers = %w[
+          127.0.0.254
+          127.0.0.253
+          127.0.0.252
+          127.0.0.251
+          127.0.0.250
+          127.0.0.249
+          127.0.0.248
+          127.0.0.247
+          127.0.0.246
+          127.0.0.245
+        ] + c.nameservers
         c.timeout = 1
-        c.attempts = 10
+        c.attempts = 20
       end
 
       dns.resolve('example.com') do |result|
@@ -113,6 +124,7 @@ class TestReDNSConnection < Test::Unit::TestCase
     end
     
     assert address
-    assert_equal '192.0.43.10', address.first.rdata.to_s
+
+    assert_equal '93.184.216.34', address.first.rdata.to_s
   end
 end

data/test/test_redns_fragment.rb

@@ -2,11 +2,11 @@ require File.expand_path('helper', File.dirname(__FILE__))
 
 class ExampleFragment < ReDNS::Fragment
   attribute :sample
-  attribute :sample_int, :convert => :to_i, :default => 0
-  attribute :sample_proc, :convert => lambda { |v| v.to_i * 2 }
-  attribute :sample_class, :convert => ReDNS::Buffer
-  attribute :sample_default, :default => lambda { 5 }
-  attribute :sample_boolean, :boolean => true
+  attribute :sample_int, convert: :to_i, default: 0
+  attribute :sample_proc, convert: lambda { |v| v.to_i * 2 }
+  attribute :sample_class, convert: ReDNS::Buffer
+  attribute :sample_default, default: lambda { 5 }
+  attribute :sample_boolean, boolean: true
 end
 
 class TestReDNSFragment < Test::Unit::TestCase
@@ -46,8 +46,8 @@ class TestReDNSFragment < Test::Unit::TestCase
   end
 
   def test_initialize_with_block
-    fragment = ExampleFragment.new do |fragment|
-      fragment.sample = "Example"
+    fragment = ExampleFragment.new do |f|
+      f.sample = "Example"
     end
     
     assert_equal "Example", fragment.sample

data/test/test_redns_message.rb

@@ -31,11 +31,11 @@ class TestReDNSMessage < Test::Unit::TestCase
 
   def test_message_all_flags
     message = ReDNS::Message.new(
-  	  :authorative => true,
-  	  :truncated => true,
-  	  :recursion_desired => false,
-  	  :recursion_available => true,
-  	  :response_code => :server_failure
+      authorative: true,
+      truncated: true,
+      recursion_desired: false,
+      recursion_available: true,
+      response_code: :server_failure
     )
     
     assert_equal true, message.query?
@@ -66,9 +66,9 @@ class TestReDNSMessage < Test::Unit::TestCase
   def test_simple_query
     message = ReDNS::Message.new
     
-    question = ReDNS::Question.new do |question|
-      question.name = 'example.com'
-      question.qtype = :a
+    question = ReDNS::Question.new do |q|
+      q.name = 'example.com'
+      q.qtype = :a
     end
     
     message.questions << question
@@ -78,38 +78,38 @@ class TestReDNSMessage < Test::Unit::TestCase
 
   def test_encoded_fields
     message = ReDNS::Message.new(
-  	  :authorative => true,
-  	  :truncated => true,
-  	  :questions => [
-  	      ReDNS::Question.new(
-  	        :name => 'example.com',
-  	        :qtype => :a
-  	      )
-  	  ],
-  	  :answers => [
-  	    ReDNS::Resource.new(
-  	      :name => 'example.com',
-  	      :rtype => :a,
-  	      :rdata => ReDNS::Address.new('1.2.3.4'),
-  	      :ttl => 1234
-  	    )
-  	  ],
-  	  :nameservers => [
-  	    ReDNS::Resource.new(
-  	      :name => 'example.com',
-  	      :rtype => :ns,
-  	      :rdata => ReDNS::Name.new('ns.example.com'),
-  	      :ttl => 4321
-  	    )
-  	  ],
-  	  :additional_records => [
-  	    ReDNS::Resource.new(
-  	      :name => 'ns.example.com',
-  	      :rtype => :a,
-  	      :rdata => ReDNS::Address.new('8.6.4.2'),
-  	      :ttl => 9867
-  	    )
-  	  ]
+      authorative: true,
+      truncated: true,
+      questions: [
+          ReDNS::Question.new(
+            name: 'example.com',
+            qtype: :a
+          )
+      ],
+      answers: [
+        ReDNS::Resource.new(
+          name: 'example.com',
+          rtype: :a,
+          rdata: ReDNS::Address.new('1.2.3.4'),
+          ttl: 1234
+        )
+      ],
+      nameservers: [
+        ReDNS::Resource.new(
+          name: 'example.com',
+          rtype: :ns,
+          rdata: ReDNS::Name.new('ns.example.com'),
+          ttl: 4321
+        )
+      ],
+      additional_records: [
+        ReDNS::Resource.new(
+          name: 'ns.example.com',
+          rtype: :a,
+          rdata: ReDNS::Address.new('8.6.4.2'),
+          ttl: 9867
+        )
+      ]
     )
     
     assert_equal ";; HEADER:\n;; opcode: QUERY status: NOERROR id: 1 \n;; flags: aa tc rd; QUERY: 1, ANSWER: 1, AUTHORITY: 1, ADDITIONAL: 1\n;; QUESTION SECTION:\nexample.com. IN A\n;; ANSWER SECTION:\nexample.com. 1234 IN A 1.2.3.4\n;; NAMESERVER SECTION:\nexample.com. 4321 IN NS ns.example.com.\n;; ADDITIONAL SECTION:\nns.example.com. 9867 IN A 8.6.4.2\n", message.to_s