zonefile 1.00 → 1.01

data/lib/zonefile/zonefile.rb

@@ -3,7 +3,7 @@
 #
 # == Description
 # This class can read, manipulate and create DNS zone files. It supports A, AAAA, MX, NS, SOA, 
-# TXT, CNAME and SRV records. The data can be accessed by the instance method of the same
+# TXT, CNAME, PTR and SRV records. The data can be accessed by the instance method of the same
 # name. All except SOA return an array of hashes containing the named data. SOA directly returns the 
 # hash since there can only be one SOA information.
 #
@@ -23,6 +23,8 @@
 #    - :name, :ttl, :class, :text
 # * A4 (AAAA)
 #    - :name, :ttl, :class, :host
+# * PTR
+#    - :name, :ttl, :class, :host
 # * SRV
 #    - :name, :ttl, :class, :pri, :weight, :port, :host
 #
@@ -69,10 +71,14 @@
 class Zonefile
 
  RECORDS = %w{ mx a a4 ns cname txt ptr srv soa }
- attr :records 
+ attr :records
  attr :soa
  attr :data
-  
+# global $ORIGIN option
+ attr :origin 
+ # global $TTL option
+ attr :ttl
+ 
  def method_missing(m)
    return super unless RECORDS.include?(m.to_s)
    @records[m]
@@ -97,7 +103,7 @@ class Zonefile
  def initialize(zonefile = '', file_name= nil, origin= nil)
    @data = zonefile
    @filename = file_name
-   @origin = origin
+   @origin = origin || (file_name ? file_name.split('/').last : '')
   
    @records = {}
    @soa = {}
@@ -105,6 +111,14 @@ class Zonefile
    parse
  end
  
+ # True if no records (except sao) is defined in this file
+ def empty?
+   RECORDS.each do |r|
+      return false unless @records[r.intern].empty?
+   end
+   true
+ end
+ 
  # Create a new object by reading the content of a file
  def self.from_file(file_name, origin = nil)
     Zonefile.new(File.read(file_name), file_name.split('/').last, origin)
@@ -118,17 +132,17 @@ class Zonefile
  def new_serial
    base = "%04d%02d%02d" % [Time.now.year, Time.now.month, Time.now.day ]
 
-   if ((self.soa[:serial].to_i / 100) > base.to_i) then
-       ns = self.soa[:serial].to_i + 1
-       self.soa[:serial] = ns.to_s
+   if ((@soa[:serial].to_i / 100) > base.to_i) then
+       ns = @soa[:serial].to_i + 1
+       @soa[:serial] = ns.to_s
        return ns.to_s
    end
    
    ii = 0
-   while (("#{base}%02d" % ii).to_i <= self.soa[:serial].to_i) do
+   while (("#{base}%02d" % ii).to_i <= @soa[:serial].to_i) do
     ii += 1
    end
-   self.soa[:serial] = "#{base}%02d" % ii   
+   @soa[:serial] = "#{base}%02d" % ii   
  end
 
  def parse_line(line)
@@ -140,7 +154,9 @@ class Zonefile
     ttl_cls    = Regexp.new("(?:(#{rr_ttl})\s)?(?:(#{rr_class})\s)?")
 
     data = {}
-    if line =~ /^(#{valid_name})? \s*
+    if line =~ /^\$ORIGIN\s*(#{valid_name})/ix then
+        @origin = $1
+    elsif line =~ /^(#{valid_name})? \s*
                  #{ttl_cls}
                  (#{rr_type}) \s
                  (#{valid_name})
@@ -203,7 +219,7 @@ class Zonefile
     elsif line =~ /(#{valid_name})? \s #{ttl_cls} TXT \s \"([^\"]*)\"/ix
             add_record('txt', :name => $1, :ttl => $2, :class => $3, :text => $4)
     elsif line =~ /\$TTL\s+(#{rr_ttl})/i 
-            @soa[:ttl] = $1
+            @ttl = $1
     end
  end
 
@@ -222,7 +238,8 @@ class Zonefile
 ;  Database file #{@filename || 'unknown'} for #{@origin || 'unknown'} zone.
 ;	Zone version: #{self.soa[:serial]}
 ;
-#{self.soa[:ttl] ? "$TTL #{self.soa[:ttl]}" : ''}
+#{@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
@@ -255,6 +272,9 @@ ENDH
    self.srv.each do |srv|
      out << "#{srv[:name]}	#{srv[:ttl]}	#{srv[:class]}	SRV	#{srv[:pri]} #{srv[:weight]} #{srv[:port]}	#{srv[:host]}\n"
    end
+   self.ptr.each do |ptr|
+     out << "#{ptr[:name]}	#{ptr[:ttl]}	#{ptr[:class]}	PTR	#{ptr[:host]}\n"
+   end
    
    out
  end

data/tests/test-zone.db

@@ -1,6 +1,7 @@
 ;  Database file dns-zoneparse-test.net.dns for dns-zoneparse-test.net zone.
 ;      Zone version:  2000100501
 $TTL 1H
+$ORIGIN	 test-zone.db
 @                       3600	IN	SOA	ns0.dns-zoneparse-test.net.	support.dns-zoneparse-test.net.	(
                         2000100501   ; serial number
                         10800       ; refresh
@@ -29,4 +30,5 @@ icarus                  IN      AAAA    fe80::0260:83ff:fe7c:3a2a
 soup                    IN      TXT     "This is a text message"
 txta                            TXT     "This is another text message"
 _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

@@ -17,6 +17,13 @@ class TC_Zonefile  < Test::Unit::TestCase
     @zf = Zonefile.new(@zf.output, 'test-origin')
   end
 
+  def test_empty
+     zf = Zonefile.new
+     zf.soa[:refresh] =  1234
+     assert zf.empty?
+  end
+
+
   def test_soa
     assert_equal '86400', @zf.soa[:minimumTTL]
     assert_equal '691200', @zf.soa[:expire]
@@ -128,14 +135,29 @@ class TC_Zonefile  < Test::Unit::TestCase
     @zf.soa[:serial] = '9999889901'
     @zf.new_serial
     assert_equal '9999889902', @zf.soa[:serial]
+  end
 
+  def test_ptr
+     assert_equal '12.23.21.23.in-addr.arpa', @zf.ptr[0][:name]
+     assert_equal 'www.myhost.example.com.',  @zf.ptr[0][:host] 
+     begin
+       @swap_ptr = true
+       swap
+       test_ptr
+     end unless @swap_ptr
+  end
+  
+  def test_origin
+     assert_equal 'test-zone.db', @zf.origin
+     swap
+     assert_equal 'test-zone.db', @zf.origin     
   end
   
   
   def test_output
-#      puts @zf.data
-#      puts '==================='
-#      puts @zf.output  
+      puts @zf.data
+      puts '==================='
+      puts @zf.output  
   end
 
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: zonefile
 version: !ruby/object:Gem::Version 
-  version: "1.00"
+  hash: 13
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  version: "1.01"
 platform: ruby
 authors: 
 - Martin Boese
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-04 00:00:00 +01:00
+date: 2011-01-24 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -22,36 +27,43 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/zonefile
 - lib/zonefile/zonefile.rb
 - lib/zonefile.rb
 - tests/test-zone.db
 - tests/zonefile.rb
 has_rdoc: true
 homepage: http://zonefile.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: zonefile
-rubygems_version: 1.2.0
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: BIND 8/9 Zonefile Reader and Writer
 test_files: []