net-dns 0.5.2 → 0.5.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 5
-:patch: 2
+:patch: 3

data/lib/net/dns/resolver.rb

@@ -4,6 +4,7 @@
 
 
 
+require 'rbconfig'
 require 'socket'
 require 'timeout'
 require 'ipaddr'
@@ -1062,7 +1063,7 @@ module Net # :nodoc:
       # Parse a configuration file specified as the argument. 
       #
       def parse_config_file
-        if RUBY_PLATFORM =~ /win/
+        if self.class.platform_windows?
           require 'win32/resolv'
           arr = Win32::Resolv.get_resolv_info
           self.domain = arr[0]
@@ -1223,7 +1224,21 @@ module Net # :nodoc:
           true
         end
       end
-          
+      
+      
+      class << self
+        
+        # Returns true if running on a Windows platform.
+        #
+        # Note. This method doesn't rely on the RUBY_PLATFORM constant
+        # because the comparison will fail when running on JRuby.
+        # On JRuby RUBY_PLATFORM == 'java'.
+        def platform_windows?
+          !!(Config::CONFIG["host_os"] =~ /msdos|mswin|djgpp|mingw/i)
+        end
+        
+      end
+    
     end # class Resolver
   end # module DNS
 end # module Net

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

@@ -114,7 +114,7 @@ module Net # :nodoc:
         # Gives in output the keys from the +Types+ hash
         # in a format suited for regexps
         def self.regexp
-          Types.keys.join("|")
+          Types.keys.sort.join("|")
         end
 
         # Creates a new object representing an RR type. Performs some

data/net-dns.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{net-dns}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marco Ceresa"]
-  s.date = %q{2009-06-12}
+  s.date = %q{2009-06-16}
   s.description = %q{Net::DNS is a pure Ruby DNS library, with a clean OO interface and an extensible API}
   s.email = %q{ceresa@gmail.com}
   s.extra_rdoc_files = [
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
      "test/net/dns/test_header.rb",
      "test/net/dns/test_packet.rb",
      "test/net/dns/test_question.rb",
+     "test/net/dns/test_resolver.rb",
      "test/net/dns/test_rr.rb"
   ]
   s.homepage = %q{http://github.com/bluemonk/net-dns}
@@ -75,7 +76,8 @@ Gem::Specification.new do |s|
      "test/net/dns/resolver/test_timeouts.rb",
      "test/net/dns/test_rr.rb",
      "test/net/dns/test_packet.rb",
-     "test/net/dns/test_question.rb"
+     "test/net/dns/test_question.rb",
+     "test/net/dns/test_resolver.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/net/dns/rr/test_types.rb

@@ -62,10 +62,7 @@ class Test_Types < Test::Unit::TestCase
       'ANY'       => 255,
     }
 
-    @regexp_string = "UNSPEC|ATMA|EID|LOC|NSAP|ISDN|MX|ANY|MAILA|SRV|AFSDB|MD|" +
-      "A|MAILB|TKEY|GID|KX|GPOS|RT|HINFO|PTR|CNAME|MF|SIGZERO|DNSKEY|DS|AAAA|" + 
-      "MG|UID|NSEC|NIMLOC|NSAP_PTR|X25|TXT|MR|SOA|NS|DNAME|CERT|SIG|AXFR|IXFR|" + 
-      "UINFO|NAPTR|OPT|PX|RP|TSIG|SSHFP|KEY|MINFO|WKS|NULL|RRSIG|NXT|MB"
+    @regexp_string = "A|AAAA|AFSDB|ANY|ATMA|AXFR|CERT|CNAME|DNAME|DNSKEY|DS|EID|GID|GPOS|HINFO|ISDN|IXFR|KEY|KX|LOC|MAILA|MAILB|MB|MD|MF|MG|MINFO|MR|MX|NAPTR|NIMLOC|NS|NSAP|NSAP_PTR|NSEC|NULL|NXT|OPT|PTR|PX|RP|RRSIG|RT|SIG|SIGZERO|SOA|SRV|SSHFP|TKEY|TSIG|TXT|UID|UINFO|UNSPEC|WKS|X25"
   end
     
   def test_default

data/test/net/dns/test_resolver.rb

@@ -0,0 +1,56 @@
+require 'test/unit'
+require 'net/dns/resolver'
+
+class Net::DNS::Resolver
+  attr_reader :config
+end
+
+
+class TestResolver < Test::Unit::TestCase
+  
+  def test_initialize
+    assert_nothing_raised { Net::DNS::Resolver.new } 
+  end
+  
+  def test_initialize_with_config
+    assert_nothing_raised { Net::DNS::Resolver.new({}) } 
+  end
+  
+  def test_initialize_with_invalid_config_should_raise_error
+    assert_raise(ResolverArgumentError) { Net::DNS::Resolver.new("") } 
+    assert_raise(ResolverArgumentError) { Net::DNS::Resolver.new(0) } 
+    assert_raise(ResolverArgumentError) { Net::DNS::Resolver.new(:foo) } 
+  end
+  
+  
+  RubyPlatforms = [
+    ["darwin9.0", false],   # Mac OS X
+    ["darwin", false],      # JRuby on Mac OS X
+    ["linux-gnu", false],
+    ["mingw32", true],      # ruby 1.8.6 (2008-03-03 patchlevel 114) [i386-mingw32]
+    ["mswin32", true],      # ruby 1.8.6 (2008-03-03 patchlevel 114) [i386-mswin32]
+    ["mswin32", true],      # ruby 1.8.6 (2008-04-22 rev 6555) [x86-jruby1.1.1]
+  ]
+  
+  def test_self_platform_windows_question
+    RubyPlatforms.each do |platform, is_windows|
+      assert_equal is_windows, 
+                    override_platform(platform) { Net::DNS::Resolver.platform_windows? }, 
+                    "Expected `#{is_windows}' with platform `#{platform}'"
+    end
+  end
+  
+  
+  protected
+  
+    def override_platform(new_platform, &block)
+      raise LocalJumpError, "no block given" unless block_given?
+      old_platform = Config::CONFIG["host_os"]
+      Config::CONFIG["host_os"] = new_platform
+      result = yield
+    ensure
+      Config::CONFIG["host_os"] = old_platform
+      result
+    end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-dns
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Marco Ceresa
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-12 00:00:00 +01:00
+date: 2009-06-16 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -67,6 +67,7 @@ files:
 - test/net/dns/test_header.rb
 - test/net/dns/test_packet.rb
 - test/net/dns/test_question.rb
+- test/net/dns/test_resolver.rb
 - test/net/dns/test_rr.rb
 has_rdoc: true
 homepage: http://github.com/bluemonk/net-dns
@@ -106,3 +107,4 @@ test_files:
 - test/net/dns/test_rr.rb
 - test/net/dns/test_packet.rb
 - test/net/dns/test_question.rb
+- test/net/dns/test_resolver.rb