@@ -127,7 +127,7 @@ module Net # :nodoc: :ignore_truncated => false, :packet_size => 512, :tcp_timeout => TcpTimeout.new(5), - :udp_timeout => UdpTimeout.new(5) + :udp_timeout => UdpTimeout.new(5), } # Create a new resolver object. lib/net/dns/resolver.rb @@ -1,72 +1,79 @@ require 'timeout' +module Net # :nodoc: + module DNS + class Resolver -class DnsTimeout + class DnsTimeout - attr_reader :seconds + attr_reader :seconds - def initialize(seconds) - if seconds.is_a? Numeric and seconds >= 0 - @seconds = seconds - else - raise ArgumentError, "Invalid value for tcp timeout" - end - end + def initialize(seconds) + if seconds.is_a? Numeric and seconds >= 0 + @seconds = seconds + else + raise ::ArgumentError, "Invalid value for tcp timeout" + end + end - # Returns a string representation of the timeout corresponding - # to the number of <tt>@seconds</tt>. - def to_s - if @seconds == 0 - @output.to_s - else - @seconds.to_s - end - end - - def pretty_to_s - transform(@seconds) - end + # Returns a string representation of the timeout corresponding + # to the number of <tt>@seconds</tt>. + def to_s + if @seconds == 0 + @output.to_s + else + @seconds.to_s + end + end + + def pretty_to_s + transform(@seconds) + end + + # Executes the method's block. If the block execution terminates before +sec+ + # seconds has passed, it returns true. If not, it terminates the execution + # and raises Timeout::Error. + # If @seconds is 0 or nil, no timeout is set. + def timeout(&block) + raise LocalJumpError, "no block given" unless block_given? + Timeout.timeout(@seconds, &block) + end - # Executes the method's block. If the block execution terminates before +sec+ - # seconds has passed, it returns true. If not, it terminates the execution - # and raises Timeout::Error. - # If @seconds is 0 or nil, no timeout is set. - def timeout(&block) - raise LocalJumpError, "no block given" unless block_given? - Timeout.timeout(@seconds, &block) - end + private - private + def transform(secs) + case secs + when 0 + to_s + when 1..59 + "#{secs} seconds" + when 60..3559 + "#{secs / 60} minutes and #{secs % 60} seconds" + else + hours = secs / 3600 + secs -= (hours * 3600) + "#{hours} hours, #{secs / 60} minutes and #{secs % 60} seconds" + end + end - def transform(secs) - case secs - when 0 - to_s - when 1..59 - "#{secs} seconds" - when 60..3559 - "#{secs / 60} minutes and #{secs % 60} seconds" - else - hours = secs / 3600 - secs -= (hours * 3600) - "#{hours} hours, #{secs / 60} minutes and #{secs % 60} seconds" end - end - -end -class TcpTimeout < DnsTimeout - def initialize(seconds) - @output = "infinite" - super - end -end + class TcpTimeout < DnsTimeout + def initialize(seconds) + @output = "infinite" + super + end + end -class UdpTimeout < DnsTimeout - def initialize(seconds) - @output = "not defined" - super + class UdpTimeout < DnsTimeout + def initialize(seconds) + @output = "not defined" + super + end + end + + end end end \ No newline at end of file lib/net/dns/resolver/timeouts.rb @@ -1,10 +1,10 @@ require 'test_helper' -require 'net/dns/resolver/timeouts.rb' +require 'net/dns/resolver/timeouts' class DnsTimeoutTest < Test::Unit::TestCase def setup - @klass = DnsTimeout + @klass = Net::DNS::Resolver::DnsTimeout end def test_initialize @@ -42,33 +42,33 @@ class TcpTimeoutTest < Test::Unit::TestCase def test_initialize assert_raise(ArgumentError) do - TcpTimeout.new("a") + Net::DNS::Resolver::TcpTimeout.new("a") end assert_raise(ArgumentError) do - TcpTimeout.new(-1) + Net::DNS::Resolver::TcpTimeout.new(-1) end assert_raise(TimeoutError) do - TcpTimeout.new(0.1).timeout { sleep 2 } + Net::DNS::Resolver::TcpTimeout.new(0.1).timeout { sleep 2 } end end def test_to_s - assert_equal "infinite", TcpTimeout.new(0).to_s - assert_equal "30", TcpTimeout.new(30).to_s + assert_equal "infinite", Net::DNS::Resolver::TcpTimeout.new(0).to_s + assert_equal "30", Net::DNS::Resolver::TcpTimeout.new(30).to_s end def test_pretty_to_s - assert_equal "30 seconds", TcpTimeout.new(30).pretty_to_s - assert_equal "1 minutes and 30 seconds", TcpTimeout.new(90).pretty_to_s - assert_equal "1 hours, 1 minutes and 30 seconds", TcpTimeout.new(3690).pretty_to_s + assert_equal "30 seconds", Net::DNS::Resolver::TcpTimeout.new(30).pretty_to_s + assert_equal "1 minutes and 30 seconds", Net::DNS::Resolver::TcpTimeout.new(90).pretty_to_s + assert_equal "1 hours, 1 minutes and 30 seconds", Net::DNS::Resolver::TcpTimeout.new(3690).pretty_to_s end def test_timeout - assert_equal 2, TcpTimeout.new(1).timeout { 1 + 1 } + assert_equal 2, Net::DNS::Resolver::TcpTimeout.new(1).timeout { 1 + 1 } end def test_timeout_should_raise_localjumperror_without_block - assert_raise(LocalJumpError) { TcpTimeout.new(1).timeout } + assert_raise(LocalJumpError) { Net::DNS::Resolver::TcpTimeout.new(1).timeout } end end @@ -77,33 +77,33 @@ class UdpTimeoutTest < Test::Unit::TestCase def test_initialize assert_raise(ArgumentError) do - UdpTimeout.new("a") + Net::DNS::Resolver::UdpTimeout.new("a") end assert_raise(ArgumentError) do - UdpTimeout.new(-1) + Net::DNS::Resolver::UdpTimeout.new(-1) end assert_raise(TimeoutError) do - UdpTimeout.new(0.1).timeout {sleep 2} + Net::DNS::Resolver::UdpTimeout.new(0.1).timeout {sleep 2} end end def test_to_s - assert_equal "not defined", UdpTimeout.new(0).to_s - assert_equal "30", UdpTimeout.new(30).to_s + assert_equal "not defined", Net::DNS::Resolver::UdpTimeout.new(0).to_s + assert_equal "30", Net::DNS::Resolver::UdpTimeout.new(30).to_s end def test_pretty_to_s - assert_equal "30 seconds", UdpTimeout.new(30).pretty_to_s - assert_equal "1 minutes and 30 seconds", UdpTimeout.new(90).pretty_to_s - assert_equal "1 hours, 1 minutes and 30 seconds", UdpTimeout.new(3690).pretty_to_s + assert_equal "30 seconds", Net::DNS::Resolver::UdpTimeout.new(30).pretty_to_s + assert_equal "1 minutes and 30 seconds", Net::DNS::Resolver::UdpTimeout.new(90).pretty_to_s + assert_equal "1 hours, 1 minutes and 30 seconds", Net::DNS::Resolver::UdpTimeout.new(3690).pretty_to_s end def test_timeout - assert_equal 2, UdpTimeout.new(1).timeout { 1 + 1 } + assert_equal 2, Net::DNS::Resolver::UdpTimeout.new(1).timeout { 1 + 1 } end def test_timeout_should_raise_localjumperror_without_block - assert_raise(LocalJumpError) { UdpTimeout.new(1).timeout } + assert_raise(LocalJumpError) { Net::DNS::Resolver::UdpTimeout.new(1).timeout } end end test/resolver/timeouts_test.rb 8977377b6d18a9965c2cdeed43d714c985a3b4fc Simone Carletti weppos@weppos.net http://github.com/bluemonk/net-dns/commit/f0a778a38223d83af0a140c548b7b4950f193ebb f0a778a38223d83af0a140c548b7b4950f193ebb 2009-11-04T13:15:53-08:00 2009-11-04T13:15:53-08:00 Refactoring Timeout classes into the Net::DNS namescope. a6079b3535d836e7811fb9a07462a4193b228b7e Simone Carletti weppos@weppos.net