dns-zone 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43bf2ff0efe2b96de54bf7bbc3884a454a107c7f
-  data.tar.gz: 980b0210b442792230f6506d03ed5bd34455f361
+  metadata.gz: e7808869b41dd69a298305fa61daab900891251f
+  data.tar.gz: 163eeab6827fd8387f2405175a9f27d0b8fb5367
 SHA512:
-  metadata.gz: 1b0a1fc1c39fdb7c461b2b8fa9377532ca2124d82addc7efb4116640a9ba19c4201e5d2a06ca16385a69d8da191594af4346e8f6fe7d7b6a99ec2bc48f8a932a
-  data.tar.gz: a5d732f576b589ff0fd9d612e81e478fe4a28fc1270cecd8252f613c4b80e4766469ed94ba25ee9631a8352e4554a6485ec6288ec4233fad3fdf80a7da824bc9
+  metadata.gz: 4049dc65b9e82fb08cbdc8b3e0bd4fccbc13f1ae906852da1cfb28e149b3f34bd4a717ebfc29470efa9d4daf3d2533d70fa514a9949d421810ea506bb63a4c9d
+  data.tar.gz: 9dc5ec1a5236725d891c8be12ded6e9925c37be1960bcf2ec9f39f361dea12479c433ab0e42e95e3db07987f1851e2d26edfc53cb0381932fb0e9789f952cc80

data/HISTORY.md

@@ -1,6 +1,6 @@
 ## HEAD
 
-## 0.1.2 (2014-10-21)
+## 0.1.3 (2014-10-21)
 
 * Fix TXT record parsing bug, when quote enclosed RDATA contained semicolons.
 

data/lib/dns/zone.rb

@@ -70,7 +70,9 @@ module DNS
 
       string.lines.each do |line|
         # strip comments unless escaped
-        line = line.gsub(/(?<!\\);.*/o, '').chomp
+        # strip comments, unless its escaped.
+        # skip semicolons within "quote segments" (TXT records)
+        line = line.gsub(/((?<!\\);)(?=(?:[^"]|"[^"]*")*$).*/o, "").chomp
 
         next if line.gsub(/\s+/, '').empty?
 

data/lib/dns/zone/version.rb

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

data/test/zone_test.rb

@@ -33,6 +33,7 @@ foo         IN  TXT   "part1""part2"
 bar         IN  TXT   ("part1 "
                        "part2 "
                        "part3")
+_domainkey  IN  TXT    "t=y; o=~;"
 
 longttl  5d IN A      10.1.2.3
 
@@ -75,7 +76,7 @@ EOL
     # 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 18, zone.records.length, 'we should have multiple records (including SOA)'
+    assert_equal 19, zone.records.length, 'we should have multiple records (including SOA)'
 
     #p ''
     #zone.records.each do |rec|
@@ -122,6 +123,12 @@ EOL
     assert_equal 'maiow IN TXT "purr"', entries[0], 'entry should match expected'
   end
 
+  def test_extract_entry_including_semicolon_within_quotes
+    entries = DNS::Zone.extract_entries(%Q{_domainkey IN TXT "t=y; o=~;"})
+    assert_equal 1, entries.length, 'we should have 1 entry'
+    assert_equal '_domainkey IN TXT "t=y; o=~;"', entries[0], 'entry should match expected'
+  end
+
   def test_extract_entry_should_ignore_comments
     entries = DNS::Zone.extract_entries(%Q{maiow IN TXT "purr"; this is a comment})
     assert_equal 1, entries.length, 'we should have 1 entry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dns-zone
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Luke Antins