dns-zone 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmY5NGU3NjIwYmU4ZDg1NjcyNGZkOTgwYjQ4ZGVmZmE5MjIzOTZiZQ==
+    YmIzYWNlOTU4Y2E0OWY1MDczODZmNjc3ZjBlNTdlY2QzOTdjYmQ2OA==
   data.tar.gz: !binary |-
-    OTVkNzhjM2MyZjIzOWMzNTBmZjFhNjBiOTNjOTZiNjY3YmY0NzIzMA==
+    MzNkMzQyNTZhZGJkMWQ1MzVhNmNlZjc1MmI5M2I4N2ZmZjNkNWEwNw==
 SHA512:
   metadata.gz: !binary |-
-    YWFhZDY4OTc3YzYwM2E0OWUwZTIwY2E2YjRlYjM3MTEwZWRlNjljZmEzZGE1
-    YmQ2YzhjYWQyYTg0MzMzNDNkMWE5MWY5ZGVjODAwNjlmZWRjZmIyNGIwODZm
-    MGNlMjgzOTU2YWUyNzAzYjhjNzNlMjg5MTYxZTU4NDBhZmJlOTE=
+    OTNmYjEyYjJkYmNjNDc2N2Y2ZmUxNTBjODlkZDJkM2NjYTAwYWRkNmJhOTBl
+    ZGI4MDcwZDVhNjkwY2VlZjIyZGNhYmJhZGFkODU4M2RjZWVlYWY3ZWQyZTFh
+    M2ZjYzdjZTYxZDc0NDcwMTM0NDFjZDg5YjI5YWExZGNhYTMyMDY=
   data.tar.gz: !binary |-
-    OGRjMWExODhlZTFhMTE5ZTI4MjllYWNmZjAxZTg3NDk4NzQ4YmUxNGY3Njhk
-    YjE4NmMxNDRlNDFmODE2OTEzNjYyMmRmZjQ2MDI0ZDlkOWJjMmNlNTk0OWUy
-    Yzk3M2NmNjEwMjY4MGZmYmZmNTMyZWMyODFkMGNkZjUxOThjMjU=
+    MDllOGJlOWIyMzhmMDk5NWM2M2YwMDM3ZDI2NzY4ZTdlYzk4NjRhNjE5Y2Fj
+    NDM2MjA5MjQ2MTg5NTA2NWRlMWVlZWFhZDJmOTUyNDkwOTA4NjdhMTIwYWY4
+    NThmOTNiMGQ0YzJiMDBjZDAyOWQ1YmQwYzg5MGNjNzA1MTEwY2Q=

data/HISTORY.md

@@ -1,5 +1,9 @@
 ## HEAD
 
+## 0.3.1 (2015-12-23)
+
+* Fix edge case when zone file has multiple `ORIGIN` directives.
+
 ## 0.3.0 (2015-12-23)
 
 * Requires Ruby version >= 2.0

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

@@ -77,7 +77,9 @@ class DNS::Zone::RR::Record
 
     # unroll records nested under other origins
     unrolled_origin = options[:last_origin].sub(options[:origin], '').chomp('.') if options[:last_origin]
-    @label = "#{@label}.#{unrolled_origin}" if unrolled_origin && !unrolled_origin.empty?
+    if unrolled_origin && !unrolled_origin.empty?
+      @label = @label == '@' ? unrolled_origin : "#{@label}.#{unrolled_origin}"
+    end
 
     @ttl = captures[:ttl]
     captures[:rdata]

data/lib/dns/zone/version.rb

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

data/test/zone_test.rb

@@ -85,6 +85,7 @@ app1                    60 A     1.2.3.4
 app2                    60 A     1.2.3.5
 app3                    60 A     1.2.3.6
 $ORIGIN another.lividpenguin.com.
+@                     3600 A     1.1.1.1
 app1                    60 A     4.3.2.1
 
 EOL
@@ -190,11 +191,13 @@ EOL
   def test_load_multiple_origins
     zone = DNS::Zone.load(ZONE_FILE_MULTIPLE_ORIGINS_EXAMPLE)
     assert_equal 'lividpenguin.com.', zone.origin
-    assert_equal 11, zone.records.length, 'we should have multiple records (including SOA)'
+    assert_equal 12, zone.records.length, 'we should have multiple records (including SOA)'
     assert_equal 'app1.sub', zone.records[7].label
     assert_equal '1.2.3.4', zone.records[7].address
-    assert_equal 'app1.another', zone.records[10].label
-    assert_equal '4.3.2.1', zone.records[10].address
+    assert_equal 'another', zone.records[10].label
+    assert_equal '1.1.1.1', zone.records[10].address
+    assert_equal 'app1.another', zone.records[11].label
+    assert_equal '4.3.2.1', zone.records[11].address
   end
 
   def test_extract_entry_from_one_line

metadata

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