zonefile 1.02 → 1.03

data/CHANGELOG

@@ -0,0 +1,4 @@
+1.00 - Initial Release
+1.01 - Fixes
+1.02 - Fixes
+1.03 - Fixes TXT records, quotes are not treated anymore

data/lib/zonefile/zonefile.rb

@@ -106,7 +106,15 @@ class Zonefile
     zf.split(/\n/).map do |line|
         r = line.gsub(/\t/, ' ')
         r = r.gsub(/\s+/, ' ')
-        r = r.gsub(/\;.*$/, '')
+        		# FIXME: this is ugly and not accurate, couldn't find proper regex:
+        		#   Don't strip ';' if it's quoted. Happens a lot in TXT records.
+        (0..(r.length - 1)).find_all { |i| r[i].chr == ';' }.each do |comment_idx|
+           if !r[(comment_idx+1)..-1].index(/['"]/) then
+              r = r[0..(comment_idx-1)]
+              break
+           end
+        end
+        r
     end.delete_if { |line| line.empty? || line[0].chr == ';'}.join("\n")
  end
 
@@ -228,8 +236,8 @@ class Zonefile
                 (#{valid_name})
                /ix
             add_record('ptr', :name => $1, :class => $3, :ttl => $2, :host => $4)
-    elsif line =~ /(#{valid_name})? \s #{ttl_cls} TXT \s \"([^\"]*)\"/ix
-            add_record('txt', :name => $1, :ttl => $2, :class => $3, :text => $4)
+    elsif line =~ /^(#{valid_name})? \s* #{ttl_cls} TXT \s+ (.*)$/ix
+             add_record('txt', :name => $1, :ttl => $2, :class => $3, :text => $4.strip)
     elsif line =~ /\$TTL\s+(#{rr_ttl})/i 
             @ttl = $1
     end
@@ -250,8 +258,6 @@ class Zonefile
 ;  Database file #{@filename || 'unknown'} for #{@origin || 'unknown'} zone.
 ;	Zone version: #{self.soa[:serial]}
 ;
-#{@origin ? "$ORIGIN #{@origin}" : ''}
-#{@ttl ? "$TTL #{@ttl}" : ''}
 #{self.soa[:origin]}		#{self.soa[:ttl]} IN  SOA  #{self.soa[:primary]} #{self.soa[:email]} (
 				#{self.soa[:serial]}	; serial number
 				#{self.soa[:refresh]}	; refresh
@@ -259,6 +265,10 @@ class Zonefile
 				#{self.soa[:expire]}	; expire
 				#{self.soa[:minimumTTL]}	; minimum TTL
 				)
+
+#{@origin ? "$ORIGIN #{@origin}" : ''}
+#{@ttl ? "$TTL #{@ttl}" : ''}
+				
 ; Zone NS Records
 ENDH
    self.ns.each do |ns|
@@ -269,21 +279,32 @@ ENDH
      out << "#{mx[:name]}	#{mx[:ttl]}	#{mx[:class]}	MX	#{mx[:pri]} #{mx[:host]}\n"
    end
    
+   out << "\n; Zone A Records\n" unless self.a.empty?
    self.a.each do |a|
         out <<  "#{a[:name]}	#{a[:ttl]}	#{a[:class]}	A	#{a[:host]}\n"
    end   
+
+   out << "\n; Zone CNAME Records\n" unless self.cname.empty?
    self.cname.each do |cn|
      out << "#{cn[:name]}	#{cn[:ttl]}	#{cn[:class]}	CNAME	#{cn[:host]}\n"
    end  
+
+   out << "\n; Zone AAAA Records\n" unless self.a4.empty?
    self.a4.each do |a4|
      out << "#{a4[:name]}	#{a4[:ttl]}	#{a4[:class]}	AAAA	#{a4[:host]}\n"
    end
+
+   out << "\n; Zone TXT Records\n" unless self.txt.empty?
    self.txt.each do |tx|
-     out << "#{tx[:name]}	#{tx[:ttl]}	#{tx[:class]}	TXT	\"#{tx[:text]}\"\n"
+     out << "#{tx[:name]}	#{tx[:ttl]}	#{tx[:class]}	TXT	#{tx[:text]}\n"
    end
+
+   out << "\n; Zone SRV Records\n" unless self.srv.empty?
    self.srv.each do |srv|
      out << "#{srv[:name]}	#{srv[:ttl]}	#{srv[:class]}	SRV	#{srv[:pri]} #{srv[:weight]} #{srv[:port]}	#{srv[:host]}\n"
    end
+   
+   out << "\n; Zone PTR Records\n" unless self.ptr.empty?
    self.ptr.each do |ptr|
      out << "#{ptr[:name]}	#{ptr[:ttl]}	#{ptr[:class]}	PTR	#{ptr[:host]}\n"
    end

data/tests/test-zone.db

@@ -23,12 +23,13 @@ www                     IN	A	127.0.0.1
          43200          IN      A       10.0.0.3
                         IN      MX      10      10.0.0.4
                                 A       10.0.0.5
-                                TXT     "web server"
+                                TXT     "web;server"
 foo                     IN      A       10.0.0.6
 mini                            A       10.0.0.7
 icarus                  IN      AAAA    fe80::0260:83ff:fe7c:3a2a
 soup                    IN      TXT     "This is a text message"
-txta                            TXT     "This is another text message"
+txta                            TXT     "t=y; o=-" 	; Nasty Comment
+_kerberos           IN  TXT     maxnet.ao
 _sip._tcp.example.com. 86400 IN SRV 0 5 5060 sipserver.example.com.
 12.23.21.23.in-addr.arpa	IN 	PTR	www.myhost.example.com.
 

data/tests/zonefile.rb

@@ -99,11 +99,17 @@ class TC_Zonefile  < Test::Unit::TestCase
   end
   
   def test_txt
-    assert_equal 'web server', @zf.txt[0][:text]
+    puts @zf.txt.inspect
+    assert_equal '"web;server"', @zf.txt[0][:text]
     assert_equal 'IN', @zf.txt[1][:class]
     assert_equal 'soup', @zf.txt[1][:name]
     assert_equal 'txta', @zf.txt[2][:name]
-    assert_equal 3, @zf.txt.size
+    assert_equal 'IN', @zf.txt[3][:class]
+    assert_equal "\"t=y; o=-\"", @zf.txt[2][:text]
+    assert_equal 'maxnet.ao', @zf.txt[3][:text]
+    assert_equal '_kerberos', @zf.txt[3][:name]
+    
+    assert_equal 4, @zf.txt.size
     begin
       @swap_txt = true
       swap

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: zonefile
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 1
-  - 2
-  version: "1.02"
+  - 3
+  version: "1.03"
 platform: ruby
 authors: 
 - Martin Boese
@@ -14,11 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-03 00:00:00 +01:00
+date: 2011-10-12 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
-description: 
+description: |-
+  A library that can create, read, write, modify BIND compatible Zonefiles (RFC1035).
+  Warning: It probably works for most cases, but it might not be able to read all files 
+  even if they are valid for bind.
 email: martin@internet.ao
 executables: []
 
@@ -31,6 +34,7 @@ files:
 - lib/zonefile.rb
 - tests/test-zone.db
 - tests/zonefile.rb
+- CHANGELOG
 has_rdoc: true
 homepage: http://zonefile.rubyforge.org/
 licenses: []