dns-zonefile 1.0.3 → 1.0.4

data/.gitignore

@@ -1,2 +1,3 @@
 *.gem
 .rvmrc
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - ruby-head
+  - 1.9.3
+  - 1.9.2
+  - 1.8.7
+  - ree

data/{README → README.md}

@@ -1,65 +1,61 @@
-DNS::Zonefile
-=============
+# DNS::Zonefile
 
 The format of a DNS Zonefile is defined in RFC 1035 section 5 and RFC
-1034 section 3.6.1. To anyone who's using BIND they'll look very 
+1034 section 3.6.1. To anyone who's using BIND they'll look very
 familiar.
 
-This is an attempt to use Ruby parse them into an object graph which can 
-be investigated programatically, manipulated, validated or printed into 
+This is an attempt to use Ruby parse them into an object graph which can
+be investigated programatically, manipulated, validated or printed into
 some canonical form.
 
 
-Getting setup
--------------
+## Getting setup
 
-Well, you'll need the treetop and polyglot gems installed. They do all 
+Well, you'll need the treetop and polyglot gems installed. They do all
 the hard work. Thanks!
 
-  sudo gem install treetop polyglot
+    sudo gem install treetop polyglot
 
-Now you'll need to generate the Treetop parser from the Zonefile grammar 
+Now you'll need to generate the Treetop parser from the Zonefile grammar
 that I've hacked together.
 
-  rake generate_grammar
+    rake generate_grammar
 
 Okay, you're ready to move onto the examples now.
 
 The above steps should not be necessary if you install the gem via rubygems.
 
 
-Examples
---------
+## Examples
 
 Using raw data from the parser. Note that "@" isn't translated in this mode.
 Nor are inherited TTLs interpreted.
 
-  zonefile = "/path/to/file.zone"
-  zone_string = File.read(zonefile)
-  zone = DNS::Zonefile.parse(zone_string)
+    zonefile = "/path/to/file.zone"
+    zone_string = File.read(zonefile)
+    zone = DNS::Zonefile.parse(zone_string)
 
-  puts zone.soa.origin.to_s
-  puts zone.soa.ns.to_s
-  puts zone.rr[0].to_s
+    puts zone.soa.origin.to_s
+    puts zone.soa.ns.to_s
+    puts zone.rr[0].to_s
 
 Using more structure data. @, TTLs, and empty hostname inheritance are all
 handled in this mode.
 
-  zonefile = "/path/to/file.zone"
-  zone_string = File.read(zonefile)
-  zone = DNS::Zonefile.load(zone_string)
-  # or, if no $origin is in the zone file
-  zone = DNS::Zonefile.load(zone_string, 'example.com.')
+    zonefile = "/path/to/file.zone"
+    zone_string = File.read(zonefile)
+    zone = DNS::Zonefile.load(zone_string)
+    # or, if no $origin is in the zone file
+    zone = DNS::Zonefile.load(zone_string, 'example.com.')
 
-  puts zone.soa.origin
-  puts zone.soa.nameserver
-  puts zone.records[1]
-  # get all MX records
-  puts zone.records_of(DNS::MX)
+    puts zone.soa.origin
+    puts zone.soa.nameserver
+    puts zone.records[1]
+    # get all MX records
+    puts zone.records_of(DNS::Zonefile::MX)
 
 
-Authors
--------
+## Authors
 
 Original code and concept:
 Craig R Webster <http://barkingiguana.com/>
@@ -68,8 +64,9 @@ Additions:
 t.e.morgan <http://zerigo.com/>
 
 
-Contributing
-------------
+## Contributing
 
-See the TODO. Send me patches or pull request either by email or on 
-GitHub.
+See the TODO. Send me patches or pull request either by email or on
+GitHub.
+
+[![Build Status](https://secure.travis-ci.org/craigw/dns-zonefile.png)](http://travis-ci.org/craigw/dns-zonefile)

data/TODO

@@ -2,3 +2,5 @@
 * Output the zone object-graph as a zone string.
 * Allow comparison of resource records and zones for checking equality.
 * Allow unqualified ns and rp in SOA
+* Implement the changes in the eam pull request for other record types:
+    https://github.com/craigw/dns-zonefile/pull/1

data/dns-zonefile.gemspec

@@ -10,11 +10,11 @@ Gem::Specification.new do |s|
   s.homepage    = ""
   s.summary     = %q{Work with zonefiles (RFC 1035 section 5 and RFC 1034 section 3.6.1)}
   s.description = %q{The format of a DNS Zonefile is defined in RFC 1035 section 5 and RFC
-1034 section 3.6.1. To anyone who's using BIND they'll look very 
+1034 section 3.6.1. To anyone who's using BIND they'll look very
 familiar.
 
-This is an attempt to use Ruby parse them into an object graph which can 
-be investigated programatically, manipulated, validated or printed into 
+This is an attempt to use Ruby parse them into an object graph which can
+be investigated programatically, manipulated, validated or printed into
 some canonical form.}
 
   s.rubyforge_project = "dns-zonefile"

data/doc/zonefile.treetop

@@ -121,7 +121,12 @@ grammar Zonefile
   end
 
   rule cname_record
-    host space ttl klass "CNAME" space target:host {
+    (
+     host space ttl klass "CNAME" space target:host /
+     host space klass ttl "CNAME" space target:host /
+     host space ttl "CNAME" space target:host /
+     host space klass "CNAME" space target:host 
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} CNAME #{target}"
       end
@@ -169,7 +174,12 @@ grammar Zonefile
   end
 
   rule srv_record
-    host space ttl klass "SRV" space priority:integer space weight:integer space port:integer space target:host {
+    (
+     host space ttl klass "SRV" space priority:integer space weight:integer space port:integer space target:host /
+     host space klass ttl "SRV" space priority:integer space weight:integer space port:integer space target:host /
+     host space ttl "SRV" space priority:integer space weight:integer space port:integer space target:host /
+     host space klass "SRV" space priority:integer space weight:integer space port:integer space target:host
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} SRV #{priority} #{weight} #{port} #{target}"
       end
@@ -249,7 +259,7 @@ grammar Zonefile
   end
 
   rule rp
-    (("\\." / [a-zA-Z0-9\-)])+ ".")+ {
+    (("\\." / [+a-zA-Z0-9\-)])+ ".")+ {
       def to_s
         text_value
       end

data/lib/dns/zonefile/parser.rb

@@ -1082,6 +1082,76 @@ module DNS
       end
 
       module CnameRecord1
+        def host
+          elements[0]
+        end
+
+        def space1
+          elements[1]
+        end
+
+        def klass
+          elements[2]
+        end
+
+        def ttl
+          elements[3]
+        end
+
+        def space2
+          elements[5]
+        end
+
+        def target
+          elements[6]
+        end
+      end
+
+      module CnameRecord2
+        def host
+          elements[0]
+        end
+
+        def space1
+          elements[1]
+        end
+
+        def ttl
+          elements[2]
+        end
+
+        def space2
+          elements[4]
+        end
+
+        def target
+          elements[5]
+        end
+      end
+
+      module CnameRecord3
+        def host
+          elements[0]
+        end
+
+        def space1
+          elements[1]
+        end
+
+        def klass
+          elements[2]
+        end
+
+        def space2
+          elements[4]
+        end
+
+        def target
+          elements[5]
+        end
+      end
+
+      module CnameRecord4
         def to_s
           "#{host} #{ttl} #{klass} CNAME #{target}"
         end
@@ -1098,46 +1168,180 @@ module DNS
           return cached
         end
 
-        i0, s0 = index, []
-        r1 = _nt_host
-        s0 << r1
-        if r1
-          r2 = _nt_space
-          s0 << r2
-          if r2
-            r3 = _nt_ttl
-            s0 << r3
-            if r3
-              r4 = _nt_klass
-              s0 << r4
-              if r4
+        i0 = index
+        i1, s1 = index, []
+        r2 = _nt_host
+        s1 << r2
+        if r2
+          r3 = _nt_space
+          s1 << r3
+          if r3
+            r4 = _nt_ttl
+            s1 << r4
+            if r4
+              r5 = _nt_klass
+              s1 << r5
+              if r5
                 if has_terminal?("CNAME", false, index)
-                  r5 = instantiate_node(SyntaxNode,input, index...(index + 5))
+                  r6 = instantiate_node(SyntaxNode,input, index...(index + 5))
                   @index += 5
                 else
                   terminal_parse_failure("CNAME")
-                  r5 = nil
+                  r6 = nil
                 end
-                s0 << r5
-                if r5
-                  r6 = _nt_space
-                  s0 << r6
-                  if r6
-                    r7 = _nt_host
-                    s0 << r7
+                s1 << r6
+                if r6
+                  r7 = _nt_space
+                  s1 << r7
+                  if r7
+                    r8 = _nt_host
+                    s1 << r8
                   end
                 end
               end
             end
           end
         end
-        if s0.last
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-          r0.extend(CnameRecord0)
-          r0.extend(CnameRecord1)
+        if s1.last
+          r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+          r1.extend(CnameRecord0)
         else
-          @index = i0
-          r0 = nil
+          @index = i1
+          r1 = nil
+        end
+        if r1
+          r0 = r1
+          r0.extend(CnameRecord4)
+        else
+          i9, s9 = index, []
+          r10 = _nt_host
+          s9 << r10
+          if r10
+            r11 = _nt_space
+            s9 << r11
+            if r11
+              r12 = _nt_klass
+              s9 << r12
+              if r12
+                r13 = _nt_ttl
+                s9 << r13
+                if r13
+                  if has_terminal?("CNAME", false, index)
+                    r14 = instantiate_node(SyntaxNode,input, index...(index + 5))
+                    @index += 5
+                  else
+                    terminal_parse_failure("CNAME")
+                    r14 = nil
+                  end
+                  s9 << r14
+                  if r14
+                    r15 = _nt_space
+                    s9 << r15
+                    if r15
+                      r16 = _nt_host
+                      s9 << r16
+                    end
+                  end
+                end
+              end
+            end
+          end
+          if s9.last
+            r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
+            r9.extend(CnameRecord1)
+          else
+            @index = i9
+            r9 = nil
+          end
+          if r9
+            r0 = r9
+            r0.extend(CnameRecord4)
+          else
+            i17, s17 = index, []
+            r18 = _nt_host
+            s17 << r18
+            if r18
+              r19 = _nt_space
+              s17 << r19
+              if r19
+                r20 = _nt_ttl
+                s17 << r20
+                if r20
+                  if has_terminal?("CNAME", false, index)
+                    r21 = instantiate_node(SyntaxNode,input, index...(index + 5))
+                    @index += 5
+                  else
+                    terminal_parse_failure("CNAME")
+                    r21 = nil
+                  end
+                  s17 << r21
+                  if r21
+                    r22 = _nt_space
+                    s17 << r22
+                    if r22
+                      r23 = _nt_host
+                      s17 << r23
+                    end
+                  end
+                end
+              end
+            end
+            if s17.last
+              r17 = instantiate_node(SyntaxNode,input, i17...index, s17)
+              r17.extend(CnameRecord2)
+            else
+              @index = i17
+              r17 = nil
+            end
+            if r17
+              r0 = r17
+              r0.extend(CnameRecord4)
+            else
+              i24, s24 = index, []
+              r25 = _nt_host
+              s24 << r25
+              if r25
+                r26 = _nt_space
+                s24 << r26
+                if r26
+                  r27 = _nt_klass
+                  s24 << r27
+                  if r27
+                    if has_terminal?("CNAME", false, index)
+                      r28 = instantiate_node(SyntaxNode,input, index...(index + 5))
+                      @index += 5
+                    else
+                      terminal_parse_failure("CNAME")
+                      r28 = nil
+                    end
+                    s24 << r28
+                    if r28
+                      r29 = _nt_space
+                      s24 << r29
+                      if r29
+                        r30 = _nt_host
+                        s24 << r30
+                      end
+                    end
+                  end
+                end
+              end
+              if s24.last
+                r24 = instantiate_node(SyntaxNode,input, i24...index, s24)
+                r24.extend(CnameRecord3)
+              else
+                @index = i24
+                r24 = nil
+              end
+              if r24
+                r0 = r24
+                r0.extend(CnameRecord4)
+              else
+                @index = i0
+                r0 = nil
+              end
+            end
+          end
         end
 
         node_cache[:cname_record][start_index] = r0
@@ -1694,6 +1898,148 @@ module DNS
       end
 
       module SrvRecord1
+        def host
+          elements[0]
+        end
+
+        def space1
+          elements[1]
+        end
+
+        def klass
+          elements[2]
+        end
+
+        def ttl
+          elements[3]
+        end
+
+        def space2
+          elements[5]
+        end
+
+        def priority
+          elements[6]
+        end
+
+        def space3
+          elements[7]
+        end
+
+        def weight
+          elements[8]
+        end
+
+        def space4
+          elements[9]
+        end
+
+        def port
+          elements[10]
+        end
+
+        def space5
+          elements[11]
+        end
+
+        def target
+          elements[12]
+        end
+      end
+
+      module SrvRecord2
+        def host
+          elements[0]
+        end
+
+        def space1
+          elements[1]
+        end
+
+        def ttl
+          elements[2]
+        end
+
+        def space2
+          elements[4]
+        end
+
+        def priority
+          elements[5]
+        end
+
+        def space3
+          elements[6]
+        end
+
+        def weight
+          elements[7]
+        end
+
+        def space4
+          elements[8]
+        end
+
+        def port
+          elements[9]
+        end
+
+        def space5
+          elements[10]
+        end
+
+        def target
+          elements[11]
+        end
+      end
+
+      module SrvRecord3
+        def host
+          elements[0]
+        end
+
+        def space1
+          elements[1]
+        end
+
+        def klass
+          elements[2]
+        end
+
+        def space2
+          elements[4]
+        end
+
+        def priority
+          elements[5]
+        end
+
+        def space3
+          elements[6]
+        end
+
+        def weight
+          elements[7]
+        end
+
+        def space4
+          elements[8]
+        end
+
+        def port
+          elements[9]
+        end
+
+        def space5
+          elements[10]
+        end
+
+        def target
+          elements[11]
+        end
+      end
+
+      module SrvRecord4
         def to_s
           "#{host} #{ttl} #{klass} SRV #{priority} #{weight} #{port} #{target}"
         end
@@ -1710,51 +2056,52 @@ module DNS
           return cached
         end
 
-        i0, s0 = index, []
-        r1 = _nt_host
-        s0 << r1
-        if r1
-          r2 = _nt_space
-          s0 << r2
-          if r2
-            r3 = _nt_ttl
-            s0 << r3
-            if r3
-              r4 = _nt_klass
-              s0 << r4
-              if r4
+        i0 = index
+        i1, s1 = index, []
+        r2 = _nt_host
+        s1 << r2
+        if r2
+          r3 = _nt_space
+          s1 << r3
+          if r3
+            r4 = _nt_ttl
+            s1 << r4
+            if r4
+              r5 = _nt_klass
+              s1 << r5
+              if r5
                 if has_terminal?("SRV", false, index)
-                  r5 = instantiate_node(SyntaxNode,input, index...(index + 3))
+                  r6 = instantiate_node(SyntaxNode,input, index...(index + 3))
                   @index += 3
                 else
                   terminal_parse_failure("SRV")
-                  r5 = nil
+                  r6 = nil
                 end
-                s0 << r5
-                if r5
-                  r6 = _nt_space
-                  s0 << r6
-                  if r6
-                    r7 = _nt_integer
-                    s0 << r7
-                    if r7
-                      r8 = _nt_space
-                      s0 << r8
-                      if r8
-                        r9 = _nt_integer
-                        s0 << r9
-                        if r9
-                          r10 = _nt_space
-                          s0 << r10
-                          if r10
-                            r11 = _nt_integer
-                            s0 << r11
-                            if r11
-                              r12 = _nt_space
-                              s0 << r12
-                              if r12
-                                r13 = _nt_host
-                                s0 << r13
+                s1 << r6
+                if r6
+                  r7 = _nt_space
+                  s1 << r7
+                  if r7
+                    r8 = _nt_integer
+                    s1 << r8
+                    if r8
+                      r9 = _nt_space
+                      s1 << r9
+                      if r9
+                        r10 = _nt_integer
+                        s1 << r10
+                        if r10
+                          r11 = _nt_space
+                          s1 << r11
+                          if r11
+                            r12 = _nt_integer
+                            s1 << r12
+                            if r12
+                              r13 = _nt_space
+                              s1 << r13
+                              if r13
+                                r14 = _nt_host
+                                s1 << r14
                               end
                             end
                           end
@@ -1767,13 +2114,218 @@ module DNS
             end
           end
         end
-        if s0.last
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-          r0.extend(SrvRecord0)
-          r0.extend(SrvRecord1)
+        if s1.last
+          r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+          r1.extend(SrvRecord0)
         else
-          @index = i0
-          r0 = nil
+          @index = i1
+          r1 = nil
+        end
+        if r1
+          r0 = r1
+          r0.extend(SrvRecord4)
+        else
+          i15, s15 = index, []
+          r16 = _nt_host
+          s15 << r16
+          if r16
+            r17 = _nt_space
+            s15 << r17
+            if r17
+              r18 = _nt_klass
+              s15 << r18
+              if r18
+                r19 = _nt_ttl
+                s15 << r19
+                if r19
+                  if has_terminal?("SRV", false, index)
+                    r20 = instantiate_node(SyntaxNode,input, index...(index + 3))
+                    @index += 3
+                  else
+                    terminal_parse_failure("SRV")
+                    r20 = nil
+                  end
+                  s15 << r20
+                  if r20
+                    r21 = _nt_space
+                    s15 << r21
+                    if r21
+                      r22 = _nt_integer
+                      s15 << r22
+                      if r22
+                        r23 = _nt_space
+                        s15 << r23
+                        if r23
+                          r24 = _nt_integer
+                          s15 << r24
+                          if r24
+                            r25 = _nt_space
+                            s15 << r25
+                            if r25
+                              r26 = _nt_integer
+                              s15 << r26
+                              if r26
+                                r27 = _nt_space
+                                s15 << r27
+                                if r27
+                                  r28 = _nt_host
+                                  s15 << r28
+                                end
+                              end
+                            end
+                          end
+                        end
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+          if s15.last
+            r15 = instantiate_node(SyntaxNode,input, i15...index, s15)
+            r15.extend(SrvRecord1)
+          else
+            @index = i15
+            r15 = nil
+          end
+          if r15
+            r0 = r15
+            r0.extend(SrvRecord4)
+          else
+            i29, s29 = index, []
+            r30 = _nt_host
+            s29 << r30
+            if r30
+              r31 = _nt_space
+              s29 << r31
+              if r31
+                r32 = _nt_ttl
+                s29 << r32
+                if r32
+                  if has_terminal?("SRV", false, index)
+                    r33 = instantiate_node(SyntaxNode,input, index...(index + 3))
+                    @index += 3
+                  else
+                    terminal_parse_failure("SRV")
+                    r33 = nil
+                  end
+                  s29 << r33
+                  if r33
+                    r34 = _nt_space
+                    s29 << r34
+                    if r34
+                      r35 = _nt_integer
+                      s29 << r35
+                      if r35
+                        r36 = _nt_space
+                        s29 << r36
+                        if r36
+                          r37 = _nt_integer
+                          s29 << r37
+                          if r37
+                            r38 = _nt_space
+                            s29 << r38
+                            if r38
+                              r39 = _nt_integer
+                              s29 << r39
+                              if r39
+                                r40 = _nt_space
+                                s29 << r40
+                                if r40
+                                  r41 = _nt_host
+                                  s29 << r41
+                                end
+                              end
+                            end
+                          end
+                        end
+                      end
+                    end
+                  end
+                end
+              end
+            end
+            if s29.last
+              r29 = instantiate_node(SyntaxNode,input, i29...index, s29)
+              r29.extend(SrvRecord2)
+            else
+              @index = i29
+              r29 = nil
+            end
+            if r29
+              r0 = r29
+              r0.extend(SrvRecord4)
+            else
+              i42, s42 = index, []
+              r43 = _nt_host
+              s42 << r43
+              if r43
+                r44 = _nt_space
+                s42 << r44
+                if r44
+                  r45 = _nt_klass
+                  s42 << r45
+                  if r45
+                    if has_terminal?("SRV", false, index)
+                      r46 = instantiate_node(SyntaxNode,input, index...(index + 3))
+                      @index += 3
+                    else
+                      terminal_parse_failure("SRV")
+                      r46 = nil
+                    end
+                    s42 << r46
+                    if r46
+                      r47 = _nt_space
+                      s42 << r47
+                      if r47
+                        r48 = _nt_integer
+                        s42 << r48
+                        if r48
+                          r49 = _nt_space
+                          s42 << r49
+                          if r49
+                            r50 = _nt_integer
+                            s42 << r50
+                            if r50
+                              r51 = _nt_space
+                              s42 << r51
+                              if r51
+                                r52 = _nt_integer
+                                s42 << r52
+                                if r52
+                                  r53 = _nt_space
+                                  s42 << r53
+                                  if r53
+                                    r54 = _nt_host
+                                    s42 << r54
+                                  end
+                                end
+                              end
+                            end
+                          end
+                        end
+                      end
+                    end
+                  end
+                end
+              end
+              if s42.last
+                r42 = instantiate_node(SyntaxNode,input, i42...index, s42)
+                r42.extend(SrvRecord3)
+              else
+                @index = i42
+                r42 = nil
+              end
+              if r42
+                r0 = r42
+                r0.extend(SrvRecord4)
+              else
+                @index = i0
+                r0 = nil
+              end
+            end
+          end
         end
 
         node_cache[:srv_record][start_index] = r0
@@ -2380,7 +2932,7 @@ module DNS
             if r4
               r3 = r4
             else
-              if has_terminal?('\G[a-zA-Z0-9\\-)]', true, index)
+              if has_terminal?('\G[+a-zA-Z0-9\\-)]', true, index)
                 r5 = true
                 @index += 1
               else

data/lib/dns/zonefile/version.rb

@@ -1,5 +1,5 @@
 module DNS
   module Zonefile
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/spec/dns/zonefile_spec.rb

@@ -73,6 +73,19 @@ unquoted      TXT   some text data
 
 45        IN   PTR   @
 
+
+eam 900 IN SRV 5 0 5269 www
+eam IN 900 SRV 5 0 5269 www
+eam IN SRV 5 0 5269 www
+eam 900 SRV 5 0 5269 www
+eam SRV 5 0 5269 www
+
+eam 900 IN CNAME www
+eam IN 900 CNAME www
+eam IN CNAME www
+eam 900 CNAME www
+eam CNAME www
+
 $ORIGIN test.example.com.
 $TTL 3600; expire in 1 day.
 @             A     10.1.0.1              ; Test with alternate origin
@@ -114,7 +127,7 @@ ZONE
 
     it "should build the correct number of resource records" do
       zone = DNS::Zonefile.parse(@zonefile)
-      zone.rr.size.should be(33)
+      zone.rr.size.should be(43)
     end
 
     it "should build the correct NS records" do
@@ -188,7 +201,7 @@ ZONE
     it "should build the correct CNAME records" do
       zone = DNS::Zonefile.load(@zonefile)
       cname_records = zone.records_of DNS::Zonefile::CNAME
-      cname_records.size.should be(3)
+      cname_records.size.should be(8)
 
       cname_records.detect { |cname|
         cname.host == "www.example.com." && cname.target == "ns.example.com."
@@ -201,6 +214,18 @@ ZONE
       cname_records.detect { |cname|
         cname.host == "www2.example.com." && cname.domainname == "ns.example.com." && cname.ttl == 86400
       }.should_not be_nil
+
+     eam_records = cname_records.select { |c| c.host =~ /eam\./ }
+
+     eam_records.should have(5).records
+
+     eam_records.each { |cname|
+       cname.target.should == "www.example.com."
+     }
+
+     r = eam_records.group_by { |c| c.ttl }
+     (r[900] || []).should have(3).records
+     (r[86400] || []).should have(2).records
     end
 
     it "should build the correct MX records" do
@@ -260,11 +285,24 @@ ZONE
     it "should build the correct SRV records" do
       zone = DNS::Zonefile.load(@zonefile)
       srv_records = zone.records_of DNS::Zonefile::SRV
-      srv_records.size.should be(1)
+      srv_records.size.should be(6)
 
       srv_records.detect { |r|
         r.host == "_xmpp-server._tcp.example.com." && r.priority == 5 && r.weight == 0 && r.port == 5269 && r.target == 'xmpp-server.l.google.com.' && r.ttl == 86400
       }.should_not be_nil
+
+      eam_records = srv_records.select { |s| s.host =~ /eam\./ }
+      eam_records.should have(5).records
+      eam_records.each { |srv|
+        srv.target.should == "www.example.com."
+        srv.priority.should == 5
+        srv.port.should == 5269
+        srv.weight.should == 0
+      }
+
+      r = eam_records.group_by { |c| c.ttl }
+      (r[900] || []).should have(3).records
+      (r[86400] || []).should have(2).records
     end
 
     it "should build the correct TXT records" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dns-zonefile
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-23 00:00:00.000000000Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70172232872340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70172232872340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70172232871920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172232871920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &70172232871460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172232871460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: polyglot
-  requirement: &70172232871040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,11 +69,25 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172232871040
-description: ! "The format of a DNS Zonefile is defined in RFC 1035 section 5 and
-  RFC\n1034 section 3.6.1. To anyone who's using BIND they'll look very \nfamiliar.\n\nThis
-  is an attempt to use Ruby parse them into an object graph which can \nbe investigated
-  programatically, manipulated, validated or printed into \nsome canonical form."
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'The format of a DNS Zonefile is defined in RFC 1035 section 5 and
+  RFC
+
+  1034 section 3.6.1. To anyone who''s using BIND they''ll look very
+
+  familiar.
+
+
+  This is an attempt to use Ruby parse them into an object graph which can
+
+  be investigated programatically, manipulated, validated or printed into
+
+  some canonical form.'
 email:
 - craig@barkingiguana.com
 executables: []
@@ -66,10 +95,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENCE
-- README
+- README.md
 - Rakefile
 - TODO
 - dns-zonefile.gemspec
@@ -95,15 +124,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1344600706130778289
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1344600706130778289
 requirements: []
 rubyforge_project: dns-zonefile
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Work with zonefiles (RFC 1035 section 5 and RFC 1034 section 3.6.1)

data/Gemfile.lock

@@ -1,32 +0,0 @@
-PATH
-  remote: .
-  specs:
-    dns-zonefile (1.0.2)
-      polyglot
-      treetop
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    polyglot (0.3.3)
-    rake (0.9.2.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  dns-zonefile!
-  rake
-  rspec (= 2.6)