net-dns 0.6.0 → 0.6.1

data/CHANGELOG.rdoc

@@ -1,5 +1,17 @@
 = Changelog
 
+
+== Release 0.6.1
+
+* ADDED: Net::DNS::Packet#to_s method (alias of #inspect)
+
+* FIXED: typo in lib/net/dns/rr/ptr.rb [Thanks to Chris Lundquist]
+
+* FIXED: warning: method redefined; discarding old inspect [Thanks to Kevin Baker] (closes #3)
+
+* FIXED: issue with rescue ArgumentError (closes #5) and with IPAddr handling (closes #6)
+
+
 == Release 0.6.0
 
 *WARNING:* If you are upgrading from a previous minor release, check out the Compatibility issue list below.

data/Rakefile

@@ -16,7 +16,7 @@ begin
     
     gemspec.add_development_dependency "rcov"
   end
-  Jeweler::RubyforgeTasks.new
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler not available."
 end
@@ -57,48 +57,21 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-    
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-    
-    namespace :release do
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
- 
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/net-dns"
-        local_dir = 'rdoc'
- 
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
-  end
-rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
-end
-
-def egrep(pattern)
-  Dir['**/*.rb'].each do |fn|
-    count = 0
-    open(fn) do |f|
-      while line = f.gets
-        count += 1
-        if line =~ pattern
-          puts "#{fn}:#{count}:#{line}"
+desc "Look for TODO and FIXME tags in the code"
+task :todo do
+  def egrep(pattern)
+    Dir['**/*.rb'].each do |fn|
+      count = 0
+      open(fn) do |f|
+        while line = f.gets
+          count += 1
+          if line =~ pattern
+            puts "#{fn}:#{count}:#{line}"
+          end
         end
       end
     end
   end
-end
-
-desc "Look for TODO and FIXME tags in the code"
-task :todo do
   egrep /(FIXME|TODO|TBD)/
 end
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 6
-:patch: 0
+:patch: 1
 :build: 

data/lib/net/dns/packet.rb

@@ -130,14 +130,14 @@ module Net # :nodoc:
       #
       #   packet = Net::DNS::Packet.new("www.example.com")
       #   packet = Net::DNS::Packet.new("example.com", Net::DNS::MX)
-      #   packet = Net::DNS::Packet.new("example.com",Net::DNS::TXT,Net::DNS::CH)
+      #   packet = Net::DNS::Packet.new("example.com", Net::DNS::TXT, Net::DNS::CH)
       #
       # This class no longer instantiate object from binary data coming from
       # network streams. Please use Net::DNS::Packet.new_from_data instead.
       # 
-      def initialize(name,type=Net::DNS::A,cls=Net::DNS::IN)
+      def initialize(name, type = Net::DNS::A, cls = Net::DNS::IN)
         @header = Net::DNS::Header.new(:qdCount => 1)
-        @question = [Net::DNS::Question.new(name,type,cls)]
+        @question = [Net::DNS::Question.new(name, type, cls)]
         @answer = []
         @authority = []
         @additional = []
@@ -302,7 +302,7 @@ module Net # :nodoc:
         
         retval
       end
-
+      alias_method :to_s, :inspect 
       
       # Wrapper to Header#truncated?
       #
@@ -585,4 +585,4 @@ module Net # :nodoc:
     end
     
   end
-end
+end

data/lib/net/dns/question.rb

@@ -90,10 +90,10 @@ module Net # :nodoc:
       # If not specified, +type+ and +cls+ arguments defaults 
       # to Net::DNS::A and Net::DNS::IN respectively.
       #
-      def initialize(name,type=Net::DNS::A,cls=Net::DNS::IN)
+      def initialize(name, type = Net::DNS::A, cls = Net::DNS::IN)
         @qName = check_name name
-        @qType = Net::DNS::RR::Types.new type
-        @qClass = Net::DNS::RR::Classes.new cls
+        @qType = Net::DNS::RR::Types.new(type)
+        @qClass = Net::DNS::RR::Classes.new(cls)
       end
 
       # Return a new Net::DNS::Question object created by
@@ -110,16 +110,6 @@ module Net # :nodoc:
         o
       end
       
-      # Known inspect method with nice formatting
-      def inspect
-        if @qName.size > 29 then 
-          len = @qName.size + 1 
-        else
-          len = 29
-        end
-        [@qName,@qClass.to_s,@qType.to_s].pack("A#{len} A8 A8")
-      end
-      
       # Outputs binary data from a Question object
       #
       #   question.data
@@ -132,7 +122,6 @@ module Net # :nodoc:
       # Return the binary data of the objects, plus an offset
       # and an Hash with references to compressed names. For use in 
       # Net::DNS::Packet compressed packet creation.
-      #
       def comp_data
         arr = @qName.split(".")
         str = pack_name(@qName)

data/lib/net/dns/resolver.rb

@@ -843,6 +843,8 @@ module Net # :nodoc:
       #
       def search(name,type=Net::DNS::A,cls=Net::DNS::IN)
 
+        return query(name,type,cls) if name.class == IPAddr
+
         # If the name contains at least one dot then try it as is first.        
         if name.include? "."
           @logger.debug "Search(#{name},#{Net::DNS::RR::Types.new(type)},#{Net::DNS::RR::Classes.new(cls)})"
@@ -891,7 +893,9 @@ module Net # :nodoc:
       # method instead.
       #
       def query(name,type=Net::DNS::A,cls=Net::DNS::IN)
-        
+
+        return send(name,type,cls) if name.class == IPAddr
+
         # If the name doesn't contain any dots then append the default domain.        
         if name !~ /\./ and name !~ /:/ and @config[:defnames]
           name += "." + @config[:domain]
@@ -912,38 +916,38 @@ module Net # :nodoc:
       #
       # Returns a Net::DNS::Packet object.
       #
-      #   # Sending a +Packet+ object
-      #   send_packet = Net::DNS::Packet.new("host.example.com",Net::DNS::NS,Net::DNS::HS)
+      #   # Executes the query with a +Packet+ object
+      #   send_packet = Net::DNS::Packet.new("host.example.com", Net::DNS::NS, Net::DNS::HS)
       #   packet = res.send(send_packet)
       #
-      #   # Performing a query
+      #   # Executes the query with a host, type and cls
       #   packet = res.send("host.example.com")
-      #   packet = res.send("host.example.com",Net::DNS::NS)
-      #   packet = res.send("host.example.com",Net::DNS::NS,Net::DNS::HS)
+      #   packet = res.send("host.example.com", Net::DNS::NS)
+      #   packet = res.send("host.example.com", Net::DNS::NS, Net::DNS::HS)
       #
       # If the name is an IP address (Ipv4 or IPv6), in the form of a string 
       # or a IPAddr object, then an appropriate PTR query will be performed:
       #
       #   ip = IPAddr.new("172.16.100.2")
       #   packet = res.send(ip)
-      #   packet = res.send("192.168.10.254")
+      #   
+      #   packet = res.send("172.16.100.2")
       #
       # Use +packet.header.ancount+ or +packet.answer+ to find out if there 
       # were any records in the answer section.
       #
-      def send(argument,type=Net::DNS::A,cls=Net::DNS::IN)
+      def send(argument, type = Net::DNS::A, cls = Net::DNS::IN)
         if @config[:nameservers].size == 0
           raise ResolverError, "No nameservers specified!"
         end
 
         method = :send_udp
-        
-        if argument.kind_of? Net::DNS::Packet
-          packet = argument
+        packet = if argument.kind_of? Net::DNS::Packet
+          argument
         else
-          packet = make_query_packet(argument,type,cls)
+          make_query_packet(argument, type, cls)
         end
-        
+
         # Store packet_data for performance improvements,
         # so methods don't keep on calling Packet#data
         packet_data = packet.data
@@ -1100,7 +1104,7 @@ module Net # :nodoc:
         @config[:nameservers] << arr
       end
 
-      def make_query_packet(string,type,cls)
+      def make_query_packet(string, type, cls)
         case string
         when IPAddr
           name = string.reverse
@@ -1108,9 +1112,9 @@ module Net # :nodoc:
           @logger.warn "PTR query required for address #{string}, changing type to PTR"
         when /\d/ # Contains a number, try to see if it's an IP or IPv6 address
           begin
-            name = IPAddr.new(string).reverse
-            type = Net::DNS::PTR            
-          rescue ArgumentError
+            name = IPAddr.new(string.chomp(".")).reverse
+            type = Net::DNS::PTR
+          rescue ::ArgumentError
             name = string if valid? string
           end
         else
@@ -1118,7 +1122,7 @@ module Net # :nodoc:
         end
 
         # Create the packet
-        packet = Net::DNS::Packet.new(name,type,cls)
+        packet = Net::DNS::Packet.new(name, type, cls)
 
         if packet.query?
           packet.header.recursive = @config[:recursive] ? 1 : 0
@@ -1127,10 +1131,9 @@ module Net # :nodoc:
         # DNSSEC and TSIG stuff to be inserted here
         
         packet
-
       end
 
-      def send_tcp(packet,packet_data)
+      def send_tcp(packet, packet_data)
 
         ans = nil
         length = [packet_data.size].pack("n")
@@ -1178,7 +1181,7 @@ module Net # :nodoc:
         end
       end
       
-      def send_udp(packet,packet_data)
+      def send_udp(packet, packet_data)
         socket = UDPSocket.new
         socket.bind(@config[:source_address].to_s,@config[:source_port])
         
@@ -1193,7 +1196,7 @@ module Net # :nodoc:
             end
             break if ans
           rescue TimeoutError
-            @logger.warn "Nameserver #{ns} not responding within UDP timeout, trying next one"            
+            @logger.warn "Nameserver #{ns} not responding within UDP timeout, trying next one"
             next
           end
         end
@@ -1207,10 +1210,10 @@ 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
@@ -1219,9 +1222,9 @@ module Net # :nodoc:
         def platform_windows?
           !!(Config::CONFIG["host_os"] =~ /msdos|mswin|djgpp|mingw/i)
         end
-        
+
       end
-    
+
     end
   end
-end
+end

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

@@ -2,9 +2,15 @@ module Net
   module DNS
     class RR
       
-      #------------------------------------------------------------
-      # RR type PTR
-      #------------------------------------------------------------
+      #
+      # = Pointer Record (PTR)
+      #
+      # Class for DNS Pointer (PTR) resource records.
+      #
+      # Pointer records are the opposite of A and AAAA RRs 
+      # and are used in Reverse Map zone files to map
+      # an IP address (IPv4 or IPv6) to a host name.
+      #
       class PTR < RR
 
         # Getter for PTR resource
@@ -53,13 +59,12 @@ module Net
         
         private
         
-          def set_type
-            @type = Net::DNS::RR::Types.new("PRT")
-          end
+        def set_type
+          @type = Net::DNS::RR::Types.new("PTR")
+        end
         
       end # class PTR
       
     end # class RR
   end # module DNS
 end # module Net
-

data/test/resolver_test.rb

@@ -7,22 +7,66 @@ end
 
 
 class ResolverTest < 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_argumenterror
     assert_raise(Net::DNS::Resolver::ArgumentError) { Net::DNS::Resolver.new("") } 
     assert_raise(Net::DNS::Resolver::ArgumentError) { Net::DNS::Resolver.new(0) } 
     assert_raise(Net::DNS::Resolver::ArgumentError) { Net::DNS::Resolver.new(:foo) } 
   end
-  
-  
+
+
+  # I know private methods are supposed to not be tested directly
+  # but since this library lacks unit tests, for now let me test them in this way.
+
+  def _make_query_packet(*args)
+    # FIXME: horrible hack for horrible hack
+    Net::DNS::Resolver.new.old_send(:make_query_packet, *args)
+  end
+
+  def test_make_query_packet_from_ipaddr
+    packet = _make_query_packet(IPAddr.new("192.168.1.1"), Net::DNS::A, cls = Net::DNS::IN)
+    assert_equal "1.1.168.192.in-addr.arpa",  packet.question.first.qName
+    assert_equal Net::DNS::PTR.to_i,          packet.question.first.qType.to_i
+    assert_equal Net::DNS::IN.to_i,           packet.question.first.qClass.to_i
+  end
+
+  def test_make_query_packet_from_string_like_ipv4
+    packet = _make_query_packet("192.168.1.1", Net::DNS::A, cls = Net::DNS::IN)
+    assert_equal "1.1.168.192.in-addr.arpa",  packet.question.first.qName
+    assert_equal Net::DNS::PTR.to_i,          packet.question.first.qType.to_i
+    assert_equal Net::DNS::IN.to_i,           packet.question.first.qClass.to_i
+  end
+
+  def test_make_query_packet_from_string_like_ipv6
+    packet = _make_query_packet("2001:1ac0::200:0:a5d1:6004:2", Net::DNS::A, cls = Net::DNS::IN)
+    assert_equal "2.0.0.0.4.0.0.6.1.d.5.a.0.0.0.0.0.0.2.0.0.0.0.0.0.c.a.1.1.0.0.2.ip6.arpa",  packet.question.first.qName
+    assert_equal Net::DNS::PTR.to_i,          packet.question.first.qType.to_i
+    assert_equal Net::DNS::IN.to_i,           packet.question.first.qClass.to_i
+  end
+
+  def test_make_query_packet_from_string_like_hostname
+    packet = _make_query_packet("ns2.google.com", Net::DNS::A, cls = Net::DNS::IN)
+    assert_equal "ns2.google.com",            packet.question.first.qName
+    assert_equal Net::DNS::A.to_i,            packet.question.first.qType.to_i
+    assert_equal Net::DNS::IN.to_i,           packet.question.first.qClass.to_i
+  end
+
+  def test_make_query_packet_from_string_like_hostname_with_number
+    packet = _make_query_packet("ns.google.com", Net::DNS::A, cls = Net::DNS::IN)
+    assert_equal "ns.google.com",             packet.question.first.qName
+    assert_equal Net::DNS::A.to_i,            packet.question.first.qType.to_i
+    assert_equal Net::DNS::IN.to_i,           packet.question.first.qClass.to_i
+  end
+
+
   RubyPlatforms = [
     ["darwin9.0", false],   # Mac OS X
     ["darwin", false],      # JRuby on Mac OS X
@@ -31,7 +75,7 @@ class ResolverTest < Test::Unit::TestCase
     ["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, 
@@ -39,10 +83,10 @@ class ResolverTest < Test::Unit::TestCase
                     "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"]
@@ -52,5 +96,5 @@ class ResolverTest < Test::Unit::TestCase
       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.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Marco Ceresa
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-07 00:00:00 +01:00
+date: 2010-01-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency