dns-zone 0.0.0.alpha → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82c71fa4e618b0bff6f946e6097511699e49aec0
-  data.tar.gz: b4021e5692ea47f2ca8a3d129aed828593155af7
+  metadata.gz: 3052117b3384d87298a0e7d5cd4c1b34d7ef4f6c
+  data.tar.gz: cff80132cb642fdd37318ca8dd80f3e91d2281a0
 SHA512:
-  metadata.gz: f162ed2a6e7804120dd8b6fadac2c5b4c6d2a51b9044e66dc8e48fc2c86e1dbad34f89b185934febb26cc41d6f032dfff742bf7254b5fd553cbf77363d82653c
-  data.tar.gz: 4242b9bbf4fe966a790e948ff5e31affc9488ac0fe5c6f6dd1ae2e92cd4b4e2f68f04bfe2f0bb685e7f8eac15e2420855568da9419a1849534c43e089022acd3
+  metadata.gz: cd218bbea886f9a87aa8e1bba28f13434bf07552871b5467952d932d8a13be2d409c0e5046dcd6779430b3ea33fc90f5a9af202d34552f821e62b572be354f07
+  data.tar.gz: 55a0d835cff7186e60c876ae07d8ed4dab474c12b8388168ac63d0bc5c13f75f2cc26adba9060e068a98e7ab79adc56cc673b4722763b0d74556aa0699475784

data/HISTORY.md

@@ -1,3 +1,9 @@
+## HEAD
+
+## 0.1.0 (2014-03-30)
+
+* Initial non-alpha release with support for common resource records.
+
 ## 0.0.0 (2014-02-16)
 
 * Initial development/hacking initiated.

data/README.md

@@ -1,6 +1,9 @@
 dns-zone
 ========
 
+[![Build Status](https://secure.travis-ci.org/lantins/dns-zone.png?branch=master)](http://travis-ci.org/lantins/dns-zone)
+[![Gem Version](https://badge.fury.io/rb/dns-zone.png)](http://badge.fury.io/rb/dns-zone)
+
 A Ruby library for building and parsing DNS zone files.
 
 ## Installation
@@ -19,21 +22,20 @@ Require the gem in your code:
 
 ## Usage
 
-    DNS::Zone.new
-    DNS::Zone.load(zone_as_string)
-    DNS::Zone::RR.load(rr_as_string)
-    DNS::Zone::RR::A.load(a_rr_as_string)
+### Loading a zone file
+
+    zone = DNS::Zone.load(zone_as_string)
+
+### Creating a new zone programmatically
 
     zone = DNS::Zone.new
     zone.origin = 'example.com.'
-    # FIXME: not sure what RFC (if any) defines the time formatting
     zone.ttl = '1d'
-    # FIXME: keep DNS style representation? for <domain-name>s and email addresses
     zone.soa.nameserver = 'ns0.lividpenguin.com.'
     zone.soa.email = 'hostmaster.lividpenguin.com.'
 
     # output as dns zone file
-    zone.to_zone_file
+    zone.dump
 
 # Development
 
@@ -55,30 +57,42 @@ Require the gem in your code:
 
 ## Must have
 
-    [ ] Ability to load a whole zone
+    [x] Ability to load a zone made of multiple RR's
     [x] Add support for RR Type: SOA
-    [ ] Add support for RR Type: PTR
-    [ ] Add support for RR Type: SPF
-    [ ] Add support for RR Type: LOC
-    [ ] Add support for RR Type: HINFO
+    [x] Add support for RR Type: NS
+    [x] Add support for RR Type: MX
+    [x] Add support for RR Type: AAAA
+    [x] Add support for RR Type: A
+    [x] Add support for RR Type: CNAME
+    [x] Add support for RR Type: TXT
+    [x] Add support for RR Type: SRV
+    [x] Add support for RR Type: PTR
+    [x] Add support for RR Type: SPF
+    [x] Add support for RR Type: HINFO
+    [x] Support loading zone where some records have an empty label
 
 ## Would be nice
 
     [ ] Handle parsing a zone file that uses more then one $ORIGIN directive.
-    [ ] Validation, error checking...
+    [ ] Basic validation, error checking:
         [ ] Only one SOA per zone.
         [ ] CNAMEs can't use a label of `@`.
+        [ ] PTR zones have some extra conditions:
+            [ ] labels cant be repeted
+            [ ] names should end in a dot, otherwise they are invalid after expansion
+            [ ] IPv4 and IPv6 cant be mixed
 
     [ ] Ability to 'include' defaults/records into a zone.
-        This may or may not want to mean supporting the `$INCLUDE` directive.
+        This may or may not mean supporting the `$INCLUDE` directive.
 
 ## At some point; low priority
 
     [ ] Configuration options:
         [ ] spaces/tabs used between RR params in zone file output
-        [ ] time format to use (seconds or bind time format (e.g. 1d))
-        [ ] add comments to explain TTL's that are in seconds
+        [ ] time format used in output (should parse both formats, seconds or bind time format (e.g. 1d))
+            [ ] add comments to explain TTL's that are in seconds
     [ ] Ability to add comment to RR (n.b. currently we strip comments when parsing)
+    [ ] Add support for RR Type: LOC (RFC 1876)
     [ ] Add support for RR Type: DNAME
     [ ] Add support for RR Type: DNSKEY
     [ ] Add support for RR Type: DS

data/dns-zone.gemspec

@@ -24,18 +24,18 @@ spec = Gem::Specification.new do |s|
   # cross platform gem dependencies
   #s.add_dependency('gli')
   #s.add_dependency('paint')
-  s.add_development_dependency('bundler', '~> 0')
-  s.add_development_dependency('rake', '~> 0')
-  s.add_development_dependency('minitest', '~> 0')
-  s.add_development_dependency('simplecov', '~> 0.7')
-  s.add_development_dependency('yard', '~> 0')
-  s.add_development_dependency('inch', '~> 0')
-  s.add_development_dependency('guard-minitest', '~> 0')
-  s.add_development_dependency('guard-bundler', '~> 0')
+  s.add_development_dependency('bundler',        '~> 1.0')
+  s.add_development_dependency('rake',           '>= 9.0')
+  s.add_development_dependency('minitest',       '~> 5.0')
+  s.add_development_dependency('simplecov',      '~> 0.7.1')
+  s.add_development_dependency('yard',           '~> 0.8')
+  s.add_development_dependency('inch',           '~> 0.3')
+  s.add_development_dependency('guard-minitest', '~> 2.0')
+  s.add_development_dependency('guard-bundler',  '~> 0')
 
   # long description.
   s.description       = <<-EOL
 A Ruby library for building and parsing DNS zone files for use with
 Bind and PowerDNS (with Bind backend) DNS servers.
   EOL
-end
+end

data/lib/dns/zone.rb

@@ -15,6 +15,15 @@ module DNS
       @records = []
     end
 
+    def dump
+      content = []
+      @records.each do |rr|
+        content << rr.dump
+      end
+
+      content.join("\n") << "\n"
+    end
+
     # FROM RFC:
     #     The format of these files is a sequence of entries.  Entries are
     #     predominantly line-oriented, though parentheses can be used to continue
@@ -30,6 +39,7 @@ module DNS
 
       instance = self.new
 
+      options = {}
       entries.each do |entry|
         if entry =~ /\$(ORIGIN|TTL)\s+(.+)/
           instance.ttl    = $2 if $1 == 'TTL'
@@ -37,9 +47,11 @@ module DNS
           next
         end
 
-        if entry =~ DNS::Zone::RR::RX_RR
-          rec = DNS::Zone::RR.load(entry)
-          instance.records << rec if rec
+        if entry =~ DNS::Zone::RR::REGEX_RR
+          rec = DNS::Zone::RR.load(entry, options)
+          next unless rec
+          instance.records << rec
+          options[:last_label] = rec.label
         end
 
       end

data/lib/dns/zone/rr.rb

@@ -5,11 +5,12 @@ module DNS
     # The #{load} method will convert RR string data into a Ruby class.
     module RR
 
-      RX_TTL = /\d+[wdmhs]?/i
-      RX_KLASS = /(?<klass>IN)?/i
-      RX_TYPE = /(?<type>A|AAAA|CNAME|MX|NS|SOA|SRV|TXT)\s{1}/i
-      RX_RR = /^(?<label>\S+|\s{1})\s*(?<ttl>#{RX_TTL})?\s*#{RX_KLASS}\s*#{RX_TYPE}\s*(?<rdata>[\s\S]*)$/i
-      RX_DOMAINNAME = /\S+\./i
+      REGEX_TTL = /\d+[wdmhs]?/i
+      REGEX_KLASS = /(?<klass>IN)?/i
+      REGEX_TYPE = /(?<type>A|AAAA|CNAME|HINFO|MX|NS|SOA|SPF|SRV|TXT|PTR)\s{1}/i
+      REGEX_RR = /^(?<label>\S+|\s{1})\s*(?<ttl>#{REGEX_TTL})?\s*#{REGEX_KLASS}\s*#{REGEX_TYPE}\s*(?<rdata>[\s\S]*)$/i
+      REGEX_DOMAINNAME = /\S+\./i
+      REGEX_STRING = /((?:[^"\\]+|\\.)*)/
 
       # Load RR string data and return an instance representing the RR.
       #
@@ -21,15 +22,21 @@ module DNS
         # strip comments, unless its escaped.
         string.gsub!(/(?<!\\);.*/o, "");
 
-        captures = string.match(RX_RR)
+        captures = string.match(REGEX_RR)
         return nil unless captures
 
         case captures[:type]
         when 'A' then A.new.load(string, options)
         when 'AAAA' then AAAA.new.load(string, options)
-        when 'TXT' then TXT.new.load(string, options)
-        when 'SOA' then SOA.new.load(string, options)
+        when 'CNAME' then CNAME.new.load(string, options)
+        when 'HINFO' then HINFO.new.load(string, options)
+        when 'MX' then MX.new.load(string, options)
         when 'NS' then NS.new.load(string, options)
+        when 'PTR' then PTR.new.load(string, options)
+        when 'SOA' then SOA.new.load(string, options)
+        when 'SPF' then SPF.new.load(string, options)
+        when 'SRV' then SRV.new.load(string, options)
+        when 'TXT' then TXT.new.load(string, options)
         else
           raise 'Unknown RR Type'          
         end
@@ -40,9 +47,12 @@ module DNS
       autoload :A,      'dns/zone/rr/a'
       autoload :AAAA,   'dns/zone/rr/aaaa'
       autoload :CNAME,  'dns/zone/rr/cname'
+      autoload :HINFO,  'dns/zone/rr/hinfo'
       autoload :MX,     'dns/zone/rr/mx'
       autoload :NS,     'dns/zone/rr/ns'
+      autoload :PTR,    'dns/zone/rr/ptr'
       autoload :SOA,    'dns/zone/rr/soa'
+      autoload :SPF,    'dns/zone/rr/spf'
       autoload :SRV,    'dns/zone/rr/srv'
       autoload :TXT,    'dns/zone/rr/txt'
     end

data/lib/dns/zone/rr/a.rb

@@ -5,7 +5,7 @@ class DNS::Zone::RR::A < DNS::Zone::RR::Record
 
   attr_accessor :address
 
-  def to_s
+  def dump
     parts = general_prefix
     parts << address
     parts.join(' ')

data/lib/dns/zone/rr/cname.rb

@@ -5,10 +5,17 @@ class DNS::Zone::RR::CNAME < DNS::Zone::RR::Record
 
   attr_accessor :domainname
 
-  def to_s
+  def dump
     parts = general_prefix
     parts << domainname
     parts.join(' ')
   end
 
+  def load(string, options = {})
+    rdata = load_general_and_get_rdata(string, options)
+    return nil unless rdata
+    @domainname = rdata
+    self
+  end
+
 end

data/lib/dns/zone/rr/hinfo.rb

@@ -0,0 +1,35 @@
+# `HINFO` resource record.
+#
+# RFC 1035
+class DNS::Zone::RR::HINFO < DNS::Zone::RR::Record
+
+  REGEX_QUOTES_OPTIONAL = %r{
+    "#{DNS::Zone::RR::REGEX_STRING}"|#{DNS::Zone::RR::REGEX_STRING}
+  }mx
+
+  REGEX_HINFO_RDATA = %r{
+    (?<cpu>(?:#{REGEX_QUOTES_OPTIONAL})){1}\s
+    (?<os>(?:#{REGEX_QUOTES_OPTIONAL})){1}
+  }mx
+  attr_accessor :cpu
+  attr_accessor :os
+
+  def dump
+    parts = general_prefix
+    parts << %Q{"#{cpu}" "#{os}"}
+    parts.join(' ')
+  end
+
+  def load(string, options = {})
+    rdata = load_general_and_get_rdata(string, options)
+    return nil unless rdata
+
+    captures = rdata.match(REGEX_HINFO_RDATA)
+    return nil unless captures
+
+    @cpu = captures[:cpu].scan(/#{REGEX_QUOTES_OPTIONAL}/).join
+    @os = captures[:os].scan(/"#{DNS::Zone::RR::REGEX_STRING}"|#{DNS::Zone::RR::REGEX_STRING}/).join
+    self
+  end
+
+end

data/lib/dns/zone/rr/mx.rb

@@ -3,14 +3,31 @@
 # RFC 1035
 class DNS::Zone::RR::MX < DNS::Zone::RR::Record
 
-  attr_accessor :preference
+  REGEX_MX_RDATA = %r{
+    (?<priority>\d+)\s*
+    (?<exchange>#{DNS::Zone::RR::REGEX_DOMAINNAME})\s*
+  }mx
+
+  attr_accessor :priority
   attr_accessor :exchange
 
-  def to_s
+  def dump
     parts = general_prefix
-    parts << preference
+    parts << priority
     parts << exchange
     parts.join(' ')
   end
 
+  def load(string, options = {})
+    rdata = load_general_and_get_rdata(string, options)
+    return nil unless rdata
+
+    captures = rdata.match(REGEX_MX_RDATA)
+    return nil unless captures
+
+    @priority = captures[:priority].to_i
+    @exchange = captures[:exchange]
+    self
+  end
+
 end

data/lib/dns/zone/rr/ns.rb

@@ -5,7 +5,7 @@ class DNS::Zone::RR::NS < DNS::Zone::RR::Record
 
   attr_accessor :nameserver
 
-  def to_s
+  def dump
     parts = general_prefix
     parts << nameserver
     parts.join(' ')

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

@@ -0,0 +1,21 @@
+# `PTR` resource record.
+#
+# RFC 1035
+class DNS::Zone::RR::PTR < DNS::Zone::RR::Record
+
+  attr_accessor :name
+
+  def dump
+    parts = general_prefix
+    parts << @name
+    parts.join(' ')
+  end
+
+  def load(string, options = {})
+    rdata = load_general_and_get_rdata(string, options)
+    return nil unless rdata
+    @name = rdata
+    self
+  end
+
+end

data/lib/dns/zone/rr/record.rb

@@ -1,7 +1,7 @@
 # Parent class of all RR types, common resource record code lives here.
 # Is responsible for building a Ruby object given a RR string.
 #
-# @abstract Each RR TYPE should subclass and override: {#load} and #{to_s} 
+# @abstract Each RR TYPE should subclass and override: {#load} and #{dump} 
 class DNS::Zone::RR::Record
 
   attr_accessor :label, :ttl
@@ -43,7 +43,7 @@ class DNS::Zone::RR::Record
   # Build RR zone file output.
   #
   # @return [String] RR zone file output
-  def to_s
+  def dump
     general_prefix.join(' ')
   end
 
@@ -53,7 +53,7 @@ class DNS::Zone::RR::Record
   # @option options [String] :last_label The last label used by the previous RR
   # @return [Object]
   def load(string, options = {})
-    raise 'must be implemented by subclass'
+    raise NotImplementedError, "#load method must be implemented by subclass (#{self.class})"
   end
 
   # Load 'general' RR data/params and return the remaining RDATA for further parsing.
@@ -65,10 +65,10 @@ class DNS::Zone::RR::Record
     # strip comments, unless its escaped.
     string.gsub!(/(?<!\\);.*/o, "");
 
-    captures = string.match(DNS::Zone::RR::RX_RR)
+    captures = string.match(DNS::Zone::RR::REGEX_RR)
     return nil unless captures
 
-    if captures[:label] == ' '
+    if [' ', nil].include?(captures[:label])
       @label = options[:last_label]
     else
       @label = captures[:label]

data/lib/dns/zone/rr/soa.rb

@@ -1,21 +1,21 @@
 # `SRV` resource record.
 #
-# RFC xxxx
+# RFC 1035
 class DNS::Zone::RR::SOA < DNS::Zone::RR::Record
 
-  RX_SOA_RDATA = %r{
-    (?<nameserver>#{DNS::Zone::RR::RX_DOMAINNAME})\s* # get nameserver domainname
-    (?<email>#{DNS::Zone::RR::RX_DOMAINNAME})\s*      # get mailbox domainname
+  REGEX_SOA_RDATA = %r{
+    (?<nameserver>#{DNS::Zone::RR::REGEX_DOMAINNAME})\s* # get nameserver domainname
+    (?<email>#{DNS::Zone::RR::REGEX_DOMAINNAME})\s*      # get mailbox domainname
     (?<serial>\d+)\s*
-    (?<refresh_ttl>#{DNS::Zone::RR::RX_TTL})\s*
-    (?<retry_ttl>#{DNS::Zone::RR::RX_TTL})\s*
-    (?<expiry_ttl>#{DNS::Zone::RR::RX_TTL})\s*
-    (?<minimum_ttl>#{DNS::Zone::RR::RX_TTL})\s*
+    (?<refresh_ttl>#{DNS::Zone::RR::REGEX_TTL})\s*
+    (?<retry_ttl>#{DNS::Zone::RR::REGEX_TTL})\s*
+    (?<expiry_ttl>#{DNS::Zone::RR::REGEX_TTL})\s*
+    (?<minimum_ttl>#{DNS::Zone::RR::REGEX_TTL})\s*
   }mx
 
   attr_accessor :nameserver, :email, :serial, :refresh_ttl, :retry_ttl, :expiry_ttl, :minimum_ttl
 
-  def to_s
+  def dump
     parts = general_prefix
     parts << nameserver
     parts << email
@@ -34,7 +34,7 @@ class DNS::Zone::RR::SOA < DNS::Zone::RR::Record
     rdata = load_general_and_get_rdata(string, options)
     return nil unless rdata
 
-    captures = rdata.match(RX_SOA_RDATA)
+    captures = rdata.match(REGEX_SOA_RDATA)
     return nil unless captures
 
     @nameserver = captures[:nameserver]
@@ -45,7 +45,6 @@ class DNS::Zone::RR::SOA < DNS::Zone::RR::Record
     @expiry_ttl = captures[:expiry_ttl]
     @minimum_ttl = captures[:minimum_ttl]
 
-
     self
   end
 

data/lib/dns/zone/rr/spf.rb

@@ -0,0 +1,5 @@
+# `SPF` resource record.
+#
+# RFC 4408
+class DNS::Zone::RR::SPF < DNS::Zone::RR::TXT
+end

data/lib/dns/zone/rr/srv.rb

@@ -1,11 +1,18 @@
 # `SRV` resource record.
 #
-# RFC xxxx
+# RFC 2782
 class DNS::Zone::RR::SRV < DNS::Zone::RR::Record
 
+  REGEX_SRV_RDATA = %r{
+    (?<priority>\d+)\s*
+    (?<weight>\d+)\s*
+    (?<port>\d+)\s*
+    (?<target>#{DNS::Zone::RR::REGEX_DOMAINNAME})\s*
+  }mx
+
   attr_accessor :priority, :weight, :port, :target
 
-  def to_s
+  def dump
     parts = general_prefix
     parts << priority
     parts << weight
@@ -14,4 +21,18 @@ class DNS::Zone::RR::SRV < DNS::Zone::RR::Record
     parts.join(' ')
   end
 
+  def load(string, options = {})
+    rdata = load_general_and_get_rdata(string, options)
+    return nil unless rdata
+
+    captures = rdata.match(REGEX_SRV_RDATA)
+    return nil unless captures
+
+    @priority = captures[:priority].to_i
+    @weight = captures[:weight].to_i
+    @port = captures[:port].to_i
+    @target = captures[:target]
+    self
+  end
+
 end

data/lib/dns/zone/rr/txt.rb

@@ -5,7 +5,7 @@ class DNS::Zone::RR::TXT < DNS::Zone::RR::Record
 
   attr_accessor :text
 
-  def to_s
+  def dump
     parts = general_prefix
     parts << %Q{"#{text}"}
     parts.join(' ')
@@ -15,7 +15,7 @@ class DNS::Zone::RR::TXT < DNS::Zone::RR::Record
     rdata = load_general_and_get_rdata(string, options)
     return nil unless rdata
     # extract text from within quotes; allow multiple quoted strings; ignore escaped quotes
-    @text = rdata.scan(/"((?:[^"\\]+|\\.)*)"/).join
+    @text = rdata.scan(/"#{DNS::Zone::RR::REGEX_STRING}"/).join
     self
   end
 

data/lib/dns/zone/test_case.rb

@@ -16,7 +16,6 @@ end
 
 # --- load our dependencies using bundler --------------------------------------
 require 'bundler/setup'
-Bundler.setup
 require 'minitest/autorun'
 require 'minitest/pride'
 

data/lib/dns/zone/version.rb

@@ -1,6 +1,6 @@
 module DNS
   class Zone
     # Version number (major.minor.tiny)
-    Version = '0.0.0.alpha'
+    Version = '0.1.0'
   end
 end

data/test/rr/a_test.rb

@@ -7,20 +7,21 @@ class RR_A_Test < DNS::Zone::TestCase
 
     # ensure we can set address parameter
     rr.address = '10.0.1.1'
-    assert_equal '@ IN A 10.0.1.1', rr.to_s
+    assert_equal 'A', rr.type
+    assert_equal '@ IN A 10.0.1.1', rr.dump
     rr.address = '10.0.2.2'
-    assert_equal '@ IN A 10.0.2.2', rr.to_s
+    assert_equal '@ IN A 10.0.2.2', rr.dump
 
     # with a label set
     rr.label = 'labelname'
-    assert_equal 'labelname IN A 10.0.2.2', rr.to_s
+    assert_equal 'labelname IN A 10.0.2.2', rr.dump
 
     # with a ttl
     rr.ttl = '4w'
-    assert_equal 'labelname 4w IN A 10.0.2.2', rr.to_s
+    assert_equal 'labelname 4w IN A 10.0.2.2', rr.dump
   end
 
-  def test_load
+  def test_load_rr__a
     rr = DNS::Zone::RR::A.new.load('@ IN A 127.0.0.1')
     assert_equal '@', rr.label
     assert_equal 'A', rr.type

data/test/rr/aaaa_test.rb

@@ -7,7 +7,21 @@ class RR_AAAA_Test < DNS::Zone::TestCase
 
     # ensure we can set address parameter
     rr.address = '2001:db8::3'
-    assert_equal '@ IN AAAA 2001:db8::3', rr.to_s
+    assert_equal 'AAAA', rr.type
+    assert_equal '@ IN AAAA 2001:db8::3', rr.dump
+  end
+
+  def test_load_rr__aaaa
+    rr = DNS::Zone::RR::AAAA.new.load('@ IN AAAA 2001:db8::6')
+    assert_equal '@', rr.label
+    assert_equal 'AAAA', rr.type
+    assert_equal '2001:db8::6', rr.address
+
+    rr = DNS::Zone::RR::AAAA.new.load('www IN A 2001:db8::6')
+    assert_equal 'www', rr.label
+    assert_equal 'AAAA', rr.type
+    assert_equal 'IN', rr.klass
+    assert_equal '2001:db8::6', rr.address
   end
 
 end

data/test/rr/cname_test.rb

@@ -6,7 +6,14 @@ class RR_CNAME_Test < DNS::Zone::TestCase
     rr = DNS::Zone::RR::CNAME.new
     rr.label = 'google9d97d7f266ee521d'
     rr.domainname = 'google.com.'
-    assert_equal 'google9d97d7f266ee521d IN CNAME google.com.', rr.to_s
+    assert_equal 'google9d97d7f266ee521d IN CNAME google.com.', rr.dump
+  end
+
+  def test_load_rr__cname
+    rr = DNS::Zone::RR::CNAME.new.load('foo IN CNAME example.com.')
+    assert_equal 'foo', rr.label
+    assert_equal 'CNAME', rr.type
+    assert_equal 'example.com.', rr.domainname
   end
 
 end

data/test/rr/hinfo_test.rb

@@ -0,0 +1,44 @@
+require 'dns/zone/test_case'
+
+class RR_HINFO_Test < DNS::Zone::TestCase
+
+  def test_build_rr__hinfo
+    rr = DNS::Zone::RR::HINFO.new
+    rr.cpu = 'Intel'
+    rr.os = 'Ubuntu'
+    assert_equal '@ IN HINFO "Intel" "Ubuntu"', rr.dump
+  end
+
+  def test_build_with_spaces
+    rr = DNS::Zone::RR::HINFO.new
+    rr.label = 'ns0'
+    rr.cpu = 'PC Intel 700mhz'
+    rr.os = 'Ubuntu 12.04 LTS'
+    assert_equal 'ns0 IN HINFO "PC Intel 700mhz" "Ubuntu 12.04 LTS"', rr.dump
+  end
+
+  def test_load_rr__hinfo
+    rr = DNS::Zone::RR::HINFO.new.load('ns0 IN HINFO "Intel" "Ubuntu"')
+    assert_equal 'ns0', rr.label
+    assert_equal 'HINFO', rr.type
+    assert_equal 'Intel', rr.cpu
+    assert_equal 'Ubuntu', rr.os
+  end
+
+  def test_load_with_spaces
+    rr = DNS::Zone::RR::HINFO.new.load('ns0 IN HINFO "PC Intel 700mhz" "Ubuntu 12.04 LTS"')
+    assert_equal 'PC Intel 700mhz', rr.cpu
+    assert_equal 'Ubuntu 12.04 LTS', rr.os
+  end
+
+  def test_load_mixed_quotes
+    rr = DNS::Zone::RR::HINFO.new.load('ns0 IN HINFO Intel "Ubuntu 12.04"')
+    assert_equal 'Intel', rr.cpu
+    assert_equal 'Ubuntu 12.04', rr.os
+
+    rr = DNS::Zone::RR::HINFO.new.load('ns0 IN HINFO "PC Intel" Ubuntu')
+    assert_equal 'PC Intel', rr.cpu
+    assert_equal 'Ubuntu', rr.os
+  end
+
+end

data/test/rr/mx_test.rb

@@ -5,14 +5,22 @@ class RR_MX_Test < DNS::Zone::TestCase
   def test_build_rr__mx
     rr = DNS::Zone::RR::MX.new    
 
-    # ensure we can set preference and exchange parameter
-    rr.preference = '10'
+    # ensure we can set priority and exchange parameter
+    rr.priority = 10
     rr.exchange = 'mx0.lividpenguin.com.'
-    assert_equal '@ IN MX 10 mx0.lividpenguin.com.', rr.to_s
+    assert_equal '@ IN MX 10 mx0.lividpenguin.com.', rr.dump
 
-    rr.preference = '20'
+    rr.priority = 20
     rr.exchange = 'mx1.lividpenguin.com.'
-    assert_equal '@ IN MX 20 mx1.lividpenguin.com.', rr.to_s
+    assert_equal '@ IN MX 20 mx1.lividpenguin.com.', rr.dump
+  end
+
+  def test_load_rr__mx
+    rr = DNS::Zone::RR::MX.new.load('@ IN MX 20 mx1.lividpenguin.com.')
+    assert_equal '@', rr.label
+    assert_equal 'MX', rr.type
+    assert_equal 20, rr.priority
+    assert_equal 'mx1.lividpenguin.com.', rr.exchange
   end
 
 end

data/test/rr/ns_test.rb

@@ -5,7 +5,14 @@ class RR_NS_Test < DNS::Zone::TestCase
   def test_build_rr__ns
     rr = DNS::Zone::RR::NS.new
     rr.nameserver = 'ns0.lividpenguin.com.'
-    assert_equal '@ IN NS ns0.lividpenguin.com.', rr.to_s
+    assert_equal '@ IN NS ns0.lividpenguin.com.', rr.dump
+  end
+
+  def test_load_rr__ns
+    rr = DNS::Zone::RR::NS.new.load('@ IN NS ns0.lividpenguin.com.')
+    assert_equal '@', rr.label
+    assert_equal 'NS', rr.type
+    assert_equal 'ns0.lividpenguin.com.', rr.nameserver
   end
 
 end

data/test/rr/ptr_test.rb

@@ -0,0 +1,19 @@
+require 'dns/zone/test_case'
+
+class RR_PTR_Test < DNS::Zone::TestCase
+
+  def test_build_rr__ptr
+    rr = DNS::Zone::RR::PTR.new
+    rr.label = '69'
+    rr.name = 'mx0.lividpenguin.com.'
+    assert_equal '69 IN PTR mx0.lividpenguin.com.', rr.dump
+  end
+
+  def test_load_rr__ptr
+    rr = DNS::Zone::RR::PTR.new.load('69 IN PTR mx0.lividpenguin.com.')
+    assert_equal '69', rr.label
+    assert_equal 'PTR', rr.type
+    assert_equal 'mx0.lividpenguin.com.', rr.name
+  end
+
+end

data/test/rr/record_test.rb

@@ -11,20 +11,27 @@ class RR_Record_Test < DNS::Zone::TestCase
   def test_rr_record_with_label
     rr = DNS::Zone::RR::Record.new
     rr.label = 'labelname'
-    assert_equal 'labelname IN <type>', rr.to_s
+    assert_equal 'labelname IN <type>', rr.dump
   end
 
   def test_rr_record_with_label_and_ttl
     rr = DNS::Zone::RR::Record.new
     rr.label = 'labelname'
     rr.ttl = '2d'
-    assert_equal 'labelname 2d IN <type>', rr.to_s
+    assert_equal 'labelname 2d IN <type>', rr.dump
   end
 
   def test_rr_record_with_ttl
     rr = DNS::Zone::RR::Record.new
     rr.ttl = '2d'
-    assert_equal '@ 2d IN <type>', rr.to_s
+    assert_equal '@ 2d IN <type>', rr.dump
+  end
+
+  # the load method should be overloaded by a subclass, calling direct should raise
+  def test_record_load_default_method_raises_exception
+    assert_raises(NotImplementedError) {
+      DNS::Zone::RR::Record.new.load('')
+    }
   end
 
 end

data/test/rr/soa_test.rb

@@ -1,11 +1,11 @@
 require 'dns/zone/test_case'
 
-class RR_SRV_Test < DNS::Zone::TestCase
+class RR_SOA_Test < DNS::Zone::TestCase
 
   EXAMPLE_SOA_IN  = '@ IN SOA ns0.lividpenguin.com. luke.lividpenguin.com. 2014021601 3h 15m 4w 30m'
   EXAMPLE_SOA_OUT = '@ IN SOA ns0.lividpenguin.com. luke.lividpenguin.com. ( 2014021601 3h 15m 4w 30m )'
 
-  def test_build
+  def test_build_rr__soa
     rr = DNS::Zone::RR::SOA.new
     rr.nameserver = 'ns0.lividpenguin.com.'
     rr.email = 'luke.lividpenguin.com.'
@@ -14,10 +14,10 @@ class RR_SRV_Test < DNS::Zone::TestCase
     rr.retry_ttl = '15m'
     rr.expiry_ttl = '4w'
     rr.minimum_ttl = '30m'
-    assert_equal EXAMPLE_SOA_OUT, rr.to_s
+    assert_equal EXAMPLE_SOA_OUT, rr.dump
   end
 
-  def test_load
+  def test_load_rr__soa
     rr = DNS::Zone::RR::SOA.new.load(EXAMPLE_SOA_IN)
     assert_equal '@', rr.label
     assert_equal 'SOA', rr.type

data/test/rr/spf_test.rb

@@ -0,0 +1,20 @@
+require 'dns/zone/test_case'
+
+class RR_SPF_Test < DNS::Zone::TestCase
+
+  def test_build_rr__spf
+    rr = DNS::Zone::RR::SPF.new
+    rr.ttl = '2w'
+    rr.text = 'v=spf1 +mx -all'
+    assert_equal '@ 2w IN SPF "v=spf1 +mx -all"', rr.dump
+  end
+
+  def test_load_rr__spf
+    rr = DNS::Zone::RR::SPF.new.load('@ 2w IN SPF "v=spf1 +mx -all"')
+    assert_equal '@', rr.label
+    assert_equal 'IN', rr.klass
+    assert_equal 'SPF', rr.type
+    assert_equal 'v=spf1 +mx -all', rr.text
+  end
+
+end

data/test/rr/srv_test.rb

@@ -8,7 +8,17 @@ class RR_SRV_Test < DNS::Zone::TestCase
     rr.weight = 0
     rr.port = 5269
     rr.target = 'xmpp-server.l.google.com.'
-    assert_equal '@ IN SRV 5 0 5269 xmpp-server.l.google.com.', rr.to_s
+    assert_equal '@ IN SRV 5 0 5269 xmpp-server.l.google.com.', rr.dump
+  end
+
+  def test_load_rr__srv
+    rr = DNS::Zone::RR::SRV.new.load('@ IN SRV 5 0 5269 xmpp-server.l.google.com.')
+    assert_equal '@', rr.label
+    assert_equal 'SRV', rr.type
+    assert_equal 5, rr.priority
+    assert_equal 0, rr.weight
+    assert_equal 5269, rr.port
+    assert_equal 'xmpp-server.l.google.com.', rr.target
   end
 
 end

data/test/rr/txt_test.rb

@@ -7,18 +7,18 @@ class RR_TXT_Test < DNS::Zone::TestCase
 
     # ensure we can set text parameter
     rr.text = 'test text'
-    assert_equal '@ IN TXT "test text"', rr.to_s
+    assert_equal '@ IN TXT "test text"', rr.dump
 
     # with a label set
     rr.label = 'labelname'
-    assert_equal 'labelname IN TXT "test text"', rr.to_s
+    assert_equal 'labelname IN TXT "test text"', rr.dump
 
     # with a ttl
     rr.ttl = '2w'
-    assert_equal 'labelname 2w IN TXT "test text"', rr.to_s
+    assert_equal 'labelname 2w IN TXT "test text"', rr.dump
   end
 
-  def test_load
+  def test_load_rr__txt
     rr = DNS::Zone::RR::TXT.new.load('txtrecord IN TXT "test text"')
     assert_equal 'txtrecord', rr.label
     assert_equal 'IN', rr.klass

data/test/zone_test.rb

@@ -2,46 +2,118 @@ require 'dns/zone/test_case'
 
 class ZoneTest < DNS::Zone::TestCase
 
-  ZONE_EXAMPLE_SIMPLE =<<-EOL
+  # example zone file, with a couple of things that could trip us up.
+  ZONE_FILE_EXAMPLE =<<-EOL
 $ORIGIN lividpenguin.com.
 $TTL 3d
-@    IN  SOA  ns0.lividpenguin.com. luke.lividpenguin.com. (
-                                                             2013101406 ; zone serial number
-                                                             12h        ; refresh ttl
-                                                             15m        ; retry ttl
-                                                             3w         ; expiry ttl
-                                                             3h         ; minimum ttl
-                                                           )
-
-; a more difficult ; comment ( its trying to break things!
-
-@    IN  NS   ns0.lividpenguin.com.
-@    IN  NS   ns1.lividpenguin.com.
-@    IN  NS   ns2.lividpenguin.com.
-
-@    IN  A    77.75.105.197
-@    IN  AAAA 2a01:348::6:4d4b:69c5:0:1
-
-foo  IN  TXT "part1""part2"
-bar  IN  TXT ("part1 "
-              "part2 "
-              "part3")
+@           IN  SOA  ns0.lividpenguin.com. luke.lividpenguin.com. (
+                           2013101406 ; zone serial number
+                           12h        ; refresh ttl
+                           15m        ; retry ttl
+                           3w         ; expiry ttl
+                           3h         ; minimum ttl
+                         )
+
+; a more difficult ; comment ( that is trying to break things!
+
+@           IN  NS    ns0.lividpenguin.com.
+@           IN  NS    ns1.lividpenguin.com.
+@           IN  NS    ns2.lividpenguin.com.
+
+@           IN  MX 10 mx0.lividpenguin.com.
+@           IN  MX 20 mx1.lividpenguin.com.
+
+@           IN  A     78.47.253.85
+ns0         IN  A     78.47.253.85
+ns0         IN  HINFO "Intel" "Ubuntu"
+
+ns0         IN  AAAA  2a01:4f8:d12:5ca::2
+
+foo         IN  TXT   "part1""part2"
+bar         IN  TXT   ("part1 "
+                       "part2 "
+                       "part3")
+
+longttl  5d IN A      10.1.2.3
+
+cake        IN  CNAME the.cake.is.a.lie.com.
+xmpp        IN  SRV 5 0 5269 xmpp-server.google.com.
+@           IN  SPF "v=spf1 +mx -all"
+
+; a record to be expanded
+@           IN  NS    ns3
+
+; a record that uses tab spaces
+tabed				IN	A			10.1.2.3
+
+EOL
+
+  # basic zone file example
+  ZONE_FILE_BASIC_EXAMPLE =<<-EOL
+@ IN SOA ns0.lividpenguin.com. luke.lividpenguin.com. ( 2013101406 12h 15m 3w 3h )
+@ IN NS ns0.lividpenguin.com.
+@ IN A 78.47.253.85
 EOL
 
   def test_create_new_instance
     assert DNS::Zone.new
   end
 
-  def test_load_simple_zone
-    zone = DNS::Zone.load(ZONE_EXAMPLE_SIMPLE)
+  def test_load_zone_basic
+    # load zone file.
+    zone = DNS::Zone.load(ZONE_FILE_BASIC_EXAMPLE)
+    # dump zone file.
+    dump = zone.dump
+    # check input matches output.
+    assert_equal ZONE_FILE_BASIC_EXAMPLE, dump, 'loaded zone file should match dumped zone file'
+  end
+
+  def test_load_zone
+    # load example dns master zone file.
+    zone = DNS::Zone.load(ZONE_FILE_EXAMPLE)
+
+    # test attributes are correct.
     assert_equal '3d', zone.ttl, 'check ttl matches example input'
     assert_equal 'lividpenguin.com.', zone.origin, 'check origin matches example input'
-    assert_equal 8, zone.records.length, 'we should have 8 records (including SOA)'
+    assert_equal 18, zone.records.length, 'we should have multiple records (including SOA)'
+
+    #p ''
+    #zone.records.each do |rec|
+    #  p rec
+    #end
+  end
+
+  def test_load_zone_with_empty_labels
+    # basic zone file that uses empty labels (ie. use previous)
+    zone_as_string =<<-EOL
+@    IN A     78.47.253.85
+     IN AAAA  2a01:4f8:d12:5ca::2
+www  IN A     78.47.253.85
+     IN AAAA  2a01:4f8:d12:5ca::2
+EOL
+
+    # load zone file.
+    zone = DNS::Zone.load(zone_as_string)
 
-    p ''
-    zone.records.each do |rec|
-      p rec
-    end
+    # test labels are 'inherited' from last used.
+    assert_equal '@', zone.records[0].label
+    assert_equal '@', zone.records[1].label, 'label should be inherited from last label used'
+    assert_equal 'www', zone.records[2].label
+    assert_equal 'www', zone.records[3].label, 'label should be inherited from last label used'
+  end
+
+  def test_load_zone_that_uses_tabs_rather_then_spaces
+    zone_as_string =<<-EOL
+*		IN	A			78.47.253.85
+EOL
+
+    # load zone file.
+    zone = DNS::Zone.load(zone_as_string)
+
+    record = zone.records[0]
+    assert_equal '*', record.label
+    assert_equal 'A', record.type
+    assert_equal '78.47.253.85', record.address
   end
 
   def test_extract_entry_from_one_line
@@ -107,5 +179,4 @@ EOL
     assert_equal 'maiow IN TXT "purr((maiow)"', entries[0], 'entry should match expected'
   end
 
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dns-zone
 version: !ruby/object:Gem::Version
-  version: 0.0.0.alpha
+  version: 0.1.0
 platform: ruby
 authors:
 - Luke Antins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '9.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: inch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,10 +142,13 @@ files:
 - lib/dns/zone/rr/a.rb
 - lib/dns/zone/rr/aaaa.rb
 - lib/dns/zone/rr/cname.rb
+- lib/dns/zone/rr/hinfo.rb
 - lib/dns/zone/rr/mx.rb
 - lib/dns/zone/rr/ns.rb
+- lib/dns/zone/rr/ptr.rb
 - lib/dns/zone/rr/record.rb
 - lib/dns/zone/rr/soa.rb
+- lib/dns/zone/rr/spf.rb
 - lib/dns/zone/rr/srv.rb
 - lib/dns/zone/rr/txt.rb
 - lib/dns/zone/test_case.rb
@@ -153,10 +156,13 @@ files:
 - test/rr/a_test.rb
 - test/rr/aaaa_test.rb
 - test/rr/cname_test.rb
+- test/rr/hinfo_test.rb
 - test/rr/mx_test.rb
 - test/rr/ns_test.rb
+- test/rr/ptr_test.rb
 - test/rr/record_test.rb
 - test/rr/soa_test.rb
+- test/rr/spf_test.rb
 - test/rr/srv_test.rb
 - test/rr/txt_test.rb
 - test/rr_test.rb
@@ -177,9 +183,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.0