dns-zonefile 1.1.6 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5ec11df0243060f498e791d455121e688836e89e
-  data.tar.gz: 60e6d94574f023f6eb9446af7ae8bf44e26291e4
+SHA256:
+  metadata.gz: e88aecfb00a572044b1e71d5c3bfc9f4fd4fa88d1ee7a2ae85d2127230d483d8
+  data.tar.gz: f121b1c044894597fd2c3b9d1e12892efa444179834ec307001060bf650bd302
 SHA512:
-  metadata.gz: 4e16724a0649b230bc9fc34a8689f5852c16e08ac415e1f8b419e4950944756c207b3f451333c90b77cb15280e64674c302454aa9982711ab45139519de42bc7
-  data.tar.gz: d0ff6c4667591e49e23d579078ec584067d436ce3d37fad5d6e7d4b3c088972cdd838c74969732fcac1436d91ae374689cd56b82feda690eb0a338bcafb1db06
+  metadata.gz: 871370b42902039616ed6a2fd7d6fc3556f99abe54cb53fa17b3989ac47735c8e4be82a41ff9b2ba551da4352886607d686137018859a87be575407d4ebd1386
+  data.tar.gz: 8933e2220b5aa111d6b54e3870c1cbb67c02b213e78faaa328d05339aa367be3837c84e7054c70b7bd08f44c3b0b21a3efeb30edd22afda56968add0697cdb94

data/.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

data/.github/workflows/ci.yml

@@ -0,0 +1,31 @@
+name: CI
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+  push:
+    branches: [ main ]
+
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, ubuntu-latest]
+        ruby: ['2.7', '3.0', '3.1', head, jruby, truffleruby]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }} 
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - run: bundle exec rake

data/CONTRIBUTING.md

@@ -30,3 +30,7 @@ $ rake
 ## Tests
 
 Submit unit tests for your changes. You can test your changes on your machine by [running the test suite](#testing).
+
+## Publishing
+
+Once a PR is merged into master, bump the version in `lib/dns/zonefile/version.rb` and commit that change. Next, add a new tag with that version number and push the tag to GitHub. Finally, if you are a maintainer with access rights for rubygems.org, run `gem build dnsimple-zonefile.gemspec` followed by `gem push dnsimple-zonefile-x.x.x.gem` where x.x.x is the version number you just set.

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in dns-zonefile.gemspec
 gemspec

data/README.md

@@ -24,28 +24,32 @@ Okay, you're ready to move onto the examples now.
 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)
+```ruby
+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.')
+```ruby
+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::Zonefile::MX)
+puts zone.soa.origin
+puts zone.soa.nameserver
+puts zone.records[1]
+# get all MX records
+puts zone.records_of(DNS::Zonefile::MX)
+```
 
 Open the examples in the `./examples` directory to see more examples.
 
@@ -65,4 +69,4 @@ Craig R Webster <http://barkingiguana.com/>
 
 See the TODO. Read CONTRIBUTING.md for more details on how to contribute to this project.
 
-[![Build Status](https://secure.travis-ci.org/craigw/dns-zonefile.png)](http://travis-ci.org/craigw/dns-zonefile)
+[![Build Status](https://secure.travis-ci.org/craigw/dns-zonefile.svg)](http://travis-ci.org/craigw/dns-zonefile)

data/Rakefile

@@ -3,4 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/dns-zonefile.gemspec

@@ -1,42 +1,41 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'dns/zonefile/version'
+require "dns/zonefile/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "dns-zonefile"
-  spec.version       = DNS::Zonefile::VERSION
-  spec.authors       = ["Craig R Webster", "Anthony Eden"]
-  spec.email         = ["craig@barkingiguana.com", "anthonyeden@gmail.com"]
+  spec.name = "dns-zonefile"
+  spec.version = DNS::Zonefile::VERSION
+  spec.authors = ["Craig R Webster", "Anthony Eden"]
+  spec.email = ["craig@barkingiguana.com", "anthonyeden@gmail.com"]
 
-  spec.summary     = %q{Work with zonefiles (RFC 1035 section 5 and RFC 1034 section 3.6.1)}
-  spec.description = <<-EOD
-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.
+  spec.summary = "Work with zonefiles (RFC 1035 section 5 and RFC 1034 section 3.6.1)"
+  spec.description = <<~EOD
+    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.
   EOD
-  spec.homepage      = "https://github.com/craigw/dns-zonefile"
+  spec.homepage = "https://github.com/craigw/dns-zonefile"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+    spec.metadata["allowed_push_host"] = "https://rubygems.org"
   else
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "treetop", '~> 1.6'
-  spec.add_dependency "polyglot", '~> 0.3'
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "treetop", "~> 1.6"
+  spec.add_dependency "polyglot", "~> 0.3"
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/examples/basic.rb

@@ -1,8 +1,8 @@
 # First make sure you have installed the `dns-zonefile` gem.
-# 
+#
 # Run this script with `ruby basic.rb`
 
-require 'dns/zonefile'
+require "dns/zonefile"
 
 zonefile = "example.com.zonefile"
 zone = DNS::Zonefile.parse(File.read(zonefile))

data/examples/basic_origin.rb

@@ -1,11 +1,11 @@
 # First make sure you have installed the `dns-zonefile` gem.
-# 
+#
 # Run this script with `ruby basic.rb`
 
-require 'dns/zonefile'
+require "dns/zonefile"
 
 zonefile = "example.com.zonefile"
-zone = DNS::Zonefile.load(File.read(zonefile), 'example.com.')
+zone = DNS::Zonefile.load(File.read(zonefile), "example.com.")
 
 puts zone.soa.origin
 puts zone.soa.nameserver

data/lib/dns/zonefile/version.rb

@@ -1,5 +1,5 @@
 module DNS
   module Zonefile
-    VERSION = "1.1.6"
+    VERSION = "1.1.10"
   end
 end

data/lib/dns/zonefile.rb

@@ -1,86 +1,84 @@
-require 'dns/zonefile/version'
-require 'treetop'
-Treetop.load File.expand_path('../zonefile', __FILE__)
+require "dns/zonefile/version"
+require "treetop"
+Treetop.load File.expand_path("../zonefile", __FILE__)
 
 module DNS
   module Zonefile
     class << self
       def parse(zone_string)
-	parser = ZonefileParser.new
-	if result = parser.parse(zone_string)
-	  result
-	else
-	  raise ParsingError, parser.failure_reason
-	end
+        parser = ZonefileParser.new
+        result = parser.parse(zone_string)
+        return result if result
+        raise ParsingError, parser.failure_reason
       end
 
-      def load(zone_string, alternate_origin=nil)
-	Zone.new(parse(zone_string).entries, alternate_origin)
+      def load(zone_string, alternate_origin = nil)
+        Zone.new(parse(zone_string).entries, alternate_origin)
       end
     end
 
-    class ParsingError < RuntimeError ; end
-    class UnknownRecordType < RuntimeError ; end
+    class ParsingError < RuntimeError; end
+    class UnknownRecordType < RuntimeError; end
     class Zone
-      attr_reader :origin, :soa
+      attr_reader :origin
       attr_reader :records
 
-      def initialize(entries, alternate_origin=nil)
-	alternate_origin ||= '.'
-	@records = []
-	@vars = {'origin'=>alternate_origin, :last_host=>'.'}
-	entries.each do |e|
-	  case e.parse_type
-	  when :variable
-	    case key = e.name.text_value.downcase
-	    when 'ttl'
-	      @vars[key] = e.value.text_value.to_i
-	    else
-	      @vars[key] = e.value.text_value
-	    end
-	  when :soa
-	    @records << SOA.new(@vars, e)
-	  when :record
-	    case e.record_type
-	    when 'A'      then @records << A.new(@vars, e)
-	    when 'AAAA'   then @records << AAAA.new(@vars, e)
-	    when 'CNAME'  then @records << CNAME.new(@vars, e)
-	    when 'MX'     then @records << MX.new(@vars, e)
-	    when 'NAPTR'  then @records << NAPTR.new(@vars, e)
-	    when 'NS'     then @records << NS.new(@vars, e)
-	    when 'PTR'    then @records << PTR.new(@vars, e)
-	    when 'SRV'    then @records << SRV.new(@vars, e)
-	    when 'SPF'    then @records << SPF.new(@vars, e)
-            when 'SSHFP'  then @records << SSHFP.new(@vars, e)
-	    when 'TXT'    then @records << TXT.new(@vars, e)
-	    when 'SOA'    then ;
-	    else
-	      raise UnknownRecordType, "Unknown record type: #{e.record_type}"
-	    end
-	  end
-	end
+      def initialize(entries, alternate_origin = nil)
+        alternate_origin ||= "."
+        @records = []
+        @vars = {"origin" => alternate_origin, :last_host => "."}
+        entries.each do |e|
+          case e.parse_type
+          when :variable
+            key = e.name.text_value.downcase
+            @vars[key] = case key
+            when "ttl"
+              e.value.text_value.to_i
+            else
+              e.value.text_value
+            end
+          when :soa
+            @records << SOA.new(@vars, e)
+          when :record
+            case e.record_type
+            when "A" then @records << A.new(@vars, e)
+            when "AAAA" then @records << AAAA.new(@vars, e)
+            when "CAA" then @records << CAA.new(@vars, e)
+            when "CNAME" then @records << CNAME.new(@vars, e)
+            when "MX" then @records << MX.new(@vars, e)
+            when "NAPTR" then @records << NAPTR.new(@vars, e)
+            when "NS" then @records << NS.new(@vars, e)
+            when "PTR" then @records << PTR.new(@vars, e)
+            when "SRV" then @records << SRV.new(@vars, e)
+            when "SPF" then @records << SPF.new(@vars, e)
+            when "SSHFP" then @records << SSHFP.new(@vars, e)
+            when "TXT" then @records << TXT.new(@vars, e)
+            when "SOA" then
+              # No-op
+            else
+              raise UnknownRecordType, "Unknown record type: #{e.record_type}"
+            end
+          end
+        end
       end
 
       def soa
-	records_of(SOA).first
+        records_of(SOA).first
       end
 
       def records_of(kl)
-	@records.select{|r| r.instance_of? kl}
+        @records.select { |r| r.instance_of? kl }
       end
     end
 
     class Record
       # assign, with handling for global TTL
       def self.writer_for_ttl(*attribs)
-	attribs.each do |attrib|
-	  c = <<-MTH
-	    def #{attrib}=(val)
-	      @#{attrib} = val || @vars['ttl']
-	    end
-	  MTH
-	  class_eval c, __FILE__, __LINE__
-	end
+        attribs.each do |attrib|
+          define_method "#{attrib}=" do |val|
+            instance_variable_set("@#{attrib}", val || @vars["ttl"])
+          end
+        end
       end
 
       attr_reader :ttl
@@ -88,47 +86,45 @@ module DNS
       writer_for_ttl :ttl
 
       def klass
-	@klass = nil if @klass == ''
-	@klass ||= 'IN'
+        @klass = nil if @klass == ""
+        @klass ||= "IN"
       end
 
       private
+
       def qualify_host(host)
-        origin = vars['origin']
-        host = vars[:last_host] if host =~ /^\s*$/
+        origin = vars["origin"]
+        host = vars[:last_host] if /^\s*$/.match?(host)
         host = host.gsub(/@/, origin)
-        if host =~ /\.$/
+        if /\.$/.match?(host)
           host
+        elsif /^\./.match?(origin)
+          host + origin
         else
-          if origin =~ /^\./
-            host + origin
-          else
-            host + "." + origin
-          end
+          host + "." + origin
         end
       end
       attr_accessor :vars
-
     end
 
     class SOA < Record
       attr_accessor :origin, :nameserver, :responsible_party, :serial, :refresh_time, :retry_time, :expiry_time, :nxttl
 
-      def initialize(vars, zonefile_soa=nil)
-	@vars = vars
-	if zonefile_soa
-	  self.origin            = qualify_host(zonefile_soa.origin.to_s)
-	  @vars[:last_host]      = self.origin
-	  self.ttl               = zonefile_soa.ttl.to_i
-	  self.klass             = zonefile_soa.klass.to_s
-          self.nameserver        = qualify_host(zonefile_soa.ns.to_s)
-	  self.responsible_party = qualify_host(zonefile_soa.rp.to_s)
-	  self.serial            = zonefile_soa.serial.to_i
-	  self.refresh_time      = zonefile_soa.refresh.to_i
-	  self.retry_time        = zonefile_soa.reretry.to_i
-	  self.expiry_time       = zonefile_soa.expiry.to_i
-	  self.nxttl             = zonefile_soa.nxttl.to_i
-	end
+      def initialize(vars, zonefile_soa = nil)
+        @vars = vars
+        if zonefile_soa
+          self.origin = qualify_host(zonefile_soa.origin.to_s)
+          @vars[:last_host] = origin
+          self.ttl = zonefile_soa.ttl.to_i
+          self.klass = zonefile_soa.klass.to_s
+          self.nameserver = qualify_host(zonefile_soa.ns.to_s)
+          self.responsible_party = qualify_host(zonefile_soa.rp.to_s)
+          self.serial = zonefile_soa.serial.to_i
+          self.refresh_time = zonefile_soa.refresh.to_i
+          self.retry_time = zonefile_soa.reretry.to_i
+          self.expiry_time = zonefile_soa.expiry.to_i
+          self.nxttl = zonefile_soa.nxttl.to_i
+        end
       end
     end
 
@@ -136,69 +132,86 @@ module DNS
       attr_accessor :host, :address
 
       def initialize(vars, zonefile_record)
-	@vars = vars
-	if zonefile_record
-	  self.host         = qualify_host(zonefile_record.host.to_s)
-	  @vars[:last_host] = self.host
-	  self.ttl          = zonefile_record.ttl.to_i
-	  self.klass        = zonefile_record.klass.to_s
-	  self.address      = zonefile_record.ip_address.to_s
-	end
+        @vars = vars
+        if zonefile_record
+          self.host = qualify_host(zonefile_record.host.to_s)
+          @vars[:last_host] = host
+          self.ttl = zonefile_record.ttl.to_i
+          self.klass = zonefile_record.klass.to_s
+          self.address = zonefile_record.ip_address.to_s
+        end
       end
     end
 
     class AAAA < A
     end
 
+    class CAA < Record
+      attr_accessor :host, :flags, :tag, :value
+
+      def initialize(vars, zonefile_record)
+        @vars = vars
+        if zonefile_record
+          self.host = qualify_host(zonefile_record.host.to_s)
+          @vars[:last_host] = host
+          self.ttl = zonefile_record.ttl.to_i
+          self.klass = zonefile_record.klass.to_s
+          self.flags = zonefile_record.flags.to_i
+          self.tag = zonefile_record.tag.to_s
+          self.value = zonefile_record.value.to_s
+        end
+      end
+    end
+
     class CNAME < Record
       attr_accessor :host, :domainname
 
       def initialize(vars, zonefile_record)
-	@vars = vars
-	if zonefile_record
-	  self.host         = qualify_host(zonefile_record.host.to_s)
-	  @vars[:last_host] = self.host
-	  self.ttl          = zonefile_record.ttl.to_i
-	  self.klass        = zonefile_record.klass.to_s
-	  self.domainname   = qualify_host(zonefile_record.target.to_s)
-	end
+        @vars = vars
+        if zonefile_record
+          self.host = qualify_host(zonefile_record.host.to_s)
+          @vars[:last_host] = host
+          self.ttl = zonefile_record.ttl.to_i
+          self.klass = zonefile_record.klass.to_s
+          self.domainname = qualify_host(zonefile_record.target.to_s)
+        end
       end
 
-      alias :target :domainname
-      alias :alias :host
+      alias target domainname
+      alias alias host
     end
 
     class MX < Record
       attr_accessor :host, :priority, :domainname
 
       def initialize(vars, zonefile_record)
-	@vars = vars
-	if zonefile_record
-	  self.host         = qualify_host(zonefile_record.host.to_s)
-	  @vars[:last_host] = self.host
-	  self.ttl          = zonefile_record.ttl.to_i
-	  self.klass        = zonefile_record.klass.to_s
-	  self.priority     = zonefile_record.priority.to_i
-	  self.domainname   = qualify_host(zonefile_record.exchanger.to_s)
-	end
+        @vars = vars
+        if zonefile_record
+          self.host = qualify_host(zonefile_record.host.to_s)
+          @vars[:last_host] = host
+          self.ttl = zonefile_record.ttl.to_i
+          self.klass = zonefile_record.klass.to_s
+          self.priority = zonefile_record.priority.to_i
+          self.domainname = qualify_host(zonefile_record.exchanger.to_s)
+        end
       end
 
-      alias :exchange :domainname
-      alias :exchanger :domainname
+      alias exchange domainname
+      alias exchanger domainname
     end
 
     class NAPTR < Record
       attr_accessor :host, :data
 
       def initialize(vars, zonefile_record)
-	@vars = vars
-	if zonefile_record
-	  self.host         = qualify_host(zonefile_record.host.to_s)
-	  @vars[:last_host] = self.host
-	  self.ttl          = zonefile_record.ttl.to_i
-	  self.klass        = zonefile_record.klass.to_s
-	  self.data         = zonefile_record.data.to_s
-	end
+        @vars = vars
+        if zonefile_record
+          self.host = qualify_host(zonefile_record.host.to_s)
+          @vars[:last_host] = host
+          self.ttl = zonefile_record.ttl.to_i
+          self.klass = zonefile_record.klass.to_s
+          self.data = zonefile_record.data.to_s
+        end
       end
     end
 
@@ -206,54 +219,54 @@ module DNS
       attr_accessor :host, :domainname
 
       def initialize(vars, zonefile_record)
-	@vars = vars
-	if zonefile_record
-	  self.host         = qualify_host(zonefile_record.host.to_s)
-	  @vars[:last_host] = self.host
-	  self.ttl          = zonefile_record.ttl.to_i
-	  self.klass        = zonefile_record.klass.to_s
-	  self.domainname   = qualify_host(zonefile_record.nameserver.to_s)
-	end
+        @vars = vars
+        if zonefile_record
+          self.host = qualify_host(zonefile_record.host.to_s)
+          @vars[:last_host] = host
+          self.ttl = zonefile_record.ttl.to_i
+          self.klass = zonefile_record.klass.to_s
+          self.domainname = qualify_host(zonefile_record.nameserver.to_s)
+        end
       end
 
-      alias :nameserver :domainname
+      alias nameserver domainname
     end
 
     class PTR < Record
       attr_accessor :host, :domainname
 
       def initialize(vars, zonefile_record)
-	@vars = vars
-	if zonefile_record
-	  self.host         = qualify_host(zonefile_record.host.to_s)
-	  @vars[:last_host] = self.host
-	  self.ttl          = zonefile_record.ttl.to_i
-	  self.klass        = zonefile_record.klass.to_s
-	  self.domainname   = qualify_host(zonefile_record.target.to_s)
-	end
+        @vars = vars
+        if zonefile_record
+          self.host = qualify_host(zonefile_record.host.to_s)
+          @vars[:last_host] = host
+          self.ttl = zonefile_record.ttl.to_i
+          self.klass = zonefile_record.klass.to_s
+          self.domainname = qualify_host(zonefile_record.target.to_s)
+        end
       end
 
-      alias :target :domainname
+      alias target domainname
     end
 
     class SRV < Record
       attr_accessor :host, :priority, :weight, :port, :domainname
 
       def initialize(vars, zonefile_record)
-	@vars = vars
-	if zonefile_record
-	  self.host         = qualify_host(zonefile_record.host.to_s)
-	  @vars[:last_host] = self.host
-	  self.ttl          = zonefile_record.ttl.to_i
-	  self.klass        = zonefile_record.klass.to_s
-	  self.priority     = zonefile_record.priority.to_i
-	  self.weight       = zonefile_record.weight.to_i
-	  self.port         = zonefile_record.port.to_i
-	  self.domainname   = qualify_host(zonefile_record.target.to_s)
-	end
+        @vars = vars
+        if zonefile_record
+          self.host = qualify_host(zonefile_record.host.to_s)
+          @vars[:last_host] = host
+          self.ttl = zonefile_record.ttl.to_i
+          self.klass = zonefile_record.klass.to_s
+          self.priority = zonefile_record.priority.to_i
+          self.weight = zonefile_record.weight.to_i
+          self.port = zonefile_record.port.to_i
+          self.domainname = qualify_host(zonefile_record.target.to_s)
+        end
       end
 
-      alias :target :domainname
+      alias target domainname
     end
 
     class SSHFP < Record
@@ -262,13 +275,13 @@ module DNS
       def initialize(vars, zonefile_record)
         @vars = vars
         if zonefile_record
-          self.host         = qualify_host(zonefile_record.host.to_s)
-          @vars[:last_host] = self.host
-          self.ttl          = zonefile_record.ttl.to_i
-          self.klass        = zonefile_record.klass.to_s
-          self.alg          = zonefile_record.alg.to_i
-          self.fptype       = zonefile_record.fptype.to_i
-          self.fp           = zonefile_record.fp.to_s
+          self.host = qualify_host(zonefile_record.host.to_s)
+          @vars[:last_host] = host
+          self.ttl = zonefile_record.ttl.to_i
+          self.klass = zonefile_record.klass.to_s
+          self.alg = zonefile_record.alg.to_i
+          self.fptype = zonefile_record.fptype.to_i
+          self.fp = zonefile_record.fp.to_s
         end
       end
     end
@@ -277,14 +290,14 @@ module DNS
       attr_accessor :host, :data
 
       def initialize(vars, zonefile_record)
-	@vars = vars
-	if zonefile_record
-	  self.host         = qualify_host(zonefile_record.host.to_s)
-	  @vars[:last_host] = self.host
-	  self.ttl          = zonefile_record.ttl.to_i
-	  self.klass        = zonefile_record.klass.to_s
-	  self.data         = zonefile_record.data.to_s
-	end
+        @vars = vars
+        if zonefile_record
+          self.host = qualify_host(zonefile_record.host.to_s)
+          @vars[:last_host] = host
+          self.ttl = zonefile_record.ttl.to_i
+          self.klass = zonefile_record.klass.to_s
+          self.data = zonefile_record.data.to_s
+        end
       end
     end
 

data/lib/dns/zonefile.treetop

@@ -43,7 +43,10 @@ grammar Zonefile
   end
 
   rule soa
-    origin space ttl klass "SOA" space ns space rp space "("?  multiline_comment* space_or_break* serial multiline_comment* space_or_break refresh multiline_comment* space_or_break reretry multiline_comment* space_or_break expiry multiline_comment* space_or_break nxttl multiline_comment* space_or_break* ")"? {
+    (
+     origin space ttl klass "SOA" space ns space rp space "("?  multiline_comment* space_or_break* serial multiline_comment* space_or_break refresh multiline_comment* space_or_break reretry multiline_comment* space_or_break expiry multiline_comment* space_or_break nxttl multiline_comment* space_or_break* ")"? /
+     origin space klass ttl "SOA" space ns space rp space "("?  multiline_comment* space_or_break* serial multiline_comment* space_or_break refresh multiline_comment* space_or_break reretry multiline_comment* space_or_break expiry multiline_comment* space_or_break nxttl multiline_comment* space_or_break* ")"?
+    ) {
       def to_s
         "#{origin} #{ttl} #{klass} SOA #{ns} #{rp} (#{serial} #{refresh} #{reretry} #{expiry} #{nxttl})"
       end
@@ -53,7 +56,7 @@ grammar Zonefile
   end
 
   rule resource_record
-    record:(a_record / aaaa_record / cname_record / mx_record / naptr_record / ns_record / ptr_record / srv_record / spf_record / sshfp_record / txt_record / soa_record) space* comment? linebreak {
+    record:(a_record / aaaa_record / caa_record / cname_record / mx_record / naptr_record / ns_record / ptr_record / srv_record / spf_record / sshfp_record / txt_record / soa_record) space* comment? linebreak {
       def zone
         p = parent
         while p.respond_to?(:parent) && p.parent
@@ -89,7 +92,10 @@ grammar Zonefile
   end
 
   rule a_record
-    host space ms_age ttl klass "A" space ip_address {
+    (
+     host space ms_age ttl klass "A" space ip_address /
+     host space ms_age klass ttl "A" space ip_address
+    ) {
       def to_s
         "#{host} #{ms_age} #{ttl} #{klass} A #{ip_address}"
       end
@@ -109,7 +115,10 @@ grammar Zonefile
   end
   
   rule aaaa_record
-    host space ms_age ttl klass "AAAA" space ip_address:ip6_address {
+    (
+     host space ms_age ttl klass "AAAA" space ip_address:ip6_address /
+     host space ms_age klass ttl "AAAA" space ip_address:ip6_address
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} AAAA #{ip_address}"
       end
@@ -128,6 +137,29 @@ grammar Zonefile
     }
   end
 
+  rule caa_record
+    (
+      host space ms_age ttl klass "CAA" space flags:integer space tag:unquoted_string space value:caa_value /
+      host space ms_age klass ttl "CAA" space flags:integer space tag:unquoted_string space value:caa_value
+    ) {
+      def to_s
+        "#{host} #{ttl} #{klass} CAA #{flags} #{tag} #{value}"
+      end
+
+      def record_type
+        "CAA"
+      end
+    }
+  end
+
+  rule caa_value
+    (quoted_string / unquoted_string) {
+      def to_s
+        text_value
+      end
+    }
+  end
+
   rule cname_record
     (
      host space ms_age ttl klass "CNAME" space target:host /
@@ -146,7 +178,10 @@ grammar Zonefile
   end
 
   rule mx_record
-    host space ttl klass "MX" space priority:integer space exchanger:host {
+    (
+     host space ttl klass "MX" space priority:integer space exchanger:host /
+     host space klass ttl "MX" space priority:integer space exchanger:host
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} MX #{priority} #{exchanger}"
       end
@@ -158,7 +193,10 @@ grammar Zonefile
   end
   
   rule naptr_record
-    host space ms_age ttl klass "NAPTR" space data {
+    (
+     host space ms_age ttl klass "NAPTR" space data /
+     host space ms_age klass ttl "NAPTR" space data
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} NAPTR #{data}"
       end
@@ -170,7 +208,10 @@ grammar Zonefile
   end
 
   rule ns_record
-    host space ms_age ttl klass "NS" space nameserver:host {
+    (
+     host space ms_age ttl klass "NS" space nameserver:host /
+     host space ms_age klass ttl "NS" space nameserver:host
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} NS #{nameserver}"
       end
@@ -182,7 +223,10 @@ grammar Zonefile
   end
 
   rule ptr_record
-    host space ms_age ttl klass "PTR" space target:host {
+    (
+     host space ms_age ttl klass "PTR" space target:host /
+     host space ms_age klass ttl "PTR" space target:host
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} PTR #{target}"
       end
@@ -194,7 +238,10 @@ grammar Zonefile
   end
 
   rule soa_record
-    origin space ms_age ttl klass "SOA" space ns space rp space data {
+    (
+     origin space ms_age ttl klass "SOA" space ns space rp space data /
+     origin space ms_age klass ttl "SOA" space ns space rp space data
+    ) {
       def to_s
         "#{origin} #{ttl} #{klass} SOA #{ns} #{rp} (#{space})"
       end
@@ -223,7 +270,10 @@ grammar Zonefile
   end
 
   rule spf_record
-    host space ms_age ttl klass "SPF" space data:txt_data {
+    (
+     host space ms_age ttl klass "SPF" space data:txt_data /
+     host space ms_age klass ttl "SPF" space data:txt_data 
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} SPF #{data}"
       end
@@ -235,7 +285,10 @@ grammar Zonefile
   end
 
   rule sshfp_record
-    host space ms_age ttl klass "SSHFP" space alg:integer space fptype:integer space fp:fingerprint {
+    (
+     host space ms_age ttl klass "SSHFP" space alg:integer space fptype:integer space fp:fingerprint / 
+     host space ms_age klass ttl "SSHFP" space alg:integer space fptype:integer space fp:fingerprint 
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} SSHFP #{alg} #{fptype} #{fp}"
       end
@@ -247,7 +300,10 @@ grammar Zonefile
   end
 
   rule txt_record
-    host space ms_age ttl klass "TXT" space data:ms_txt_data {
+    (
+     host space ms_age ttl klass "TXT" space data:ms_txt_data /
+     host space ms_age klass ttl "TXT" space data:ms_txt_data
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} TXT #{data}"
       end
@@ -505,7 +561,7 @@ grammar Zonefile
   end
 
   rule unquoted_string
-    [a-zA-Z0-9=_]+ {
+    '[a-zA-Z0-9=_\.\-\@\:]+'r {
       def to_s
         text_value
       end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dns-zonefile
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.10
 platform: ruby
 authors:
 - Craig R Webster
 - Anthony Eden
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2022-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -45,28 +45,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -96,9 +96,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CONTRIBUTING.md
 - Dockerfile
 - Gemfile
@@ -108,7 +109,6 @@ files:
 - TODO
 - bin/console
 - bin/setup
-- circle.yml
 - dns-zonefile.gemspec
 - doc/example.com.zone
 - doc/example2.com.zone
@@ -126,7 +126,7 @@ homepage: https://github.com/craigw/dns-zonefile
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,9 +141,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Work with zonefiles (RFC 1035 section 5 and RFC 1034 section 3.6.1)
 test_files: []

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.3

data/circle.yml

@@ -1,6 +0,0 @@
-dependencies:
-  pre:
-    - gem install bundler --version 1.11
-machine:
-  ruby:
-    version: 2.3.0