dns-zone 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e122134a75d02f715b12de84ddefa330594b8ef
-  data.tar.gz: 94f944642ce7f3edf19a532df43a17ce7e4d2a8c
+  metadata.gz: 43bf2ff0efe2b96de54bf7bbc3884a454a107c7f
+  data.tar.gz: 980b0210b442792230f6506d03ed5bd34455f361
 SHA512:
-  metadata.gz: b49b1e6ec8e1effe4e08610f3a22ea51f80b154f247f2f5194ebb961225fad80547ccc62011872e1822a3472f82af01ea40508584e7192c6f4a1c76024e34002
-  data.tar.gz: a53df7534fe28eca05e5c0340c40ca89c257ed0a10245bd1ab60a622cad0845d77e2ec4b89c719eb0f82402b6292fad7f8234a3cf80b5ebbb81edb5410a38b97
+  metadata.gz: 1b0a1fc1c39fdb7c461b2b8fa9377532ca2124d82addc7efb4116640a9ba19c4201e5d2a06ca16385a69d8da191594af4346e8f6fe7d7b6a99ec2bc48f8a932a
+  data.tar.gz: a5d732f576b589ff0fd9d612e81e478fe4a28fc1270cecd8252f613c4b80e4766469ed94ba25ee9631a8352e4554a6485ec6288ec4233fad3fdf80a7da824bc9

data/HISTORY.md

@@ -1,5 +1,9 @@
 ## HEAD
 
+## 0.1.2 (2014-10-21)
+
+* Fix TXT record parsing bug, when quote enclosed RDATA contained semicolons.
+
 ## 0.1.1 (2014-03-30)
 
 * Remove `required_ruby_version` from gemspec.

data/lib/dns/zone/rr.rb

@@ -20,7 +20,8 @@ module DNS
       # @return [Object]
       def self.load(string, options = {})
         # strip comments, unless its escaped.
-        string.gsub!(/(?<!\\);.*/o, "");
+        # skip semicolons within "quote segments" (TXT records)
+        string.gsub!(/((?<!\\);)(?=(?:[^"]|"[^"]*")*$).*/o, "")
 
         captures = string.match(REGEX_RR)
         return nil unless captures

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

@@ -63,7 +63,8 @@ class DNS::Zone::RR::Record
   # @return [String] remaining RDATA
   def load_general_and_get_rdata(string, options = {})
     # strip comments, unless its escaped.
-    string.gsub!(/(?<!\\);.*/o, "");
+    # skip semicolons within "quote segments" (TXT records)
+    string.gsub!(/((?<!\\);)(?=(?:[^"]|"[^"]*")*$).*/o, "")
 
     captures = string.match(DNS::Zone::RR::REGEX_RR)
     return nil unless captures

data/lib/dns/zone/version.rb

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

data/test/rr_test.rb

@@ -27,6 +27,14 @@ class RRTest < DNS::Zone::TestCase
     assert_equal 'TXT', rr.type
     assert_equal 'test text', rr.text
   end
+  
+  def test_load_txt_semicolon_rr
+    rr = DNS::Zone::RR.load('_domainkey IN TXT "t=y; o=~;"')
+    assert_instance_of DNS::Zone::RR::TXT, rr, 'should be instance of TXT RR'
+    assert_equal '_domainkey', rr.label
+    assert_equal 'TXT', rr.type
+    assert_equal 't=y; o=~;', rr.text
+  end
 
   def test_load_a_rr_with_options_hash
     rr = DNS::Zone::RR.load(' IN A 10.2.3.1', { last_label: 'www' })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dns-zone
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Luke Antins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: A Ruby library for building and parsing DNS zone files.