dns-zonefile 1.1.0 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2827522219ce8faf8c79547c65317965d5a628eb
-  data.tar.gz: 9cb7a17d1ee296c80c68e682ee1b4d3a2384232e
+SHA256:
+  metadata.gz: 4edd1610f1ecdf845654917cd1f3ea2aa83f1196a87be9bf97c59a34d10392ec
+  data.tar.gz: cf115e357d4763424d310592ebf0eb5d18366fff4a2bb451c61a80371317b62e
 SHA512:
-  metadata.gz: 786c0b7a22598d0f27826ef8c3e7ea8e851e990fedd981f3d88dd112c98a8b483f1c7fd665eddf51a83f60a23360350a81a714699a0a5225c1f2a4482c037e8d
-  data.tar.gz: 654452ea27aa6752a3d2a275e93634dee0283c3e3011a782254e83fe73e7fbaa9e88433bc2b0947d3200475aa6c4aca8c05faff34c68c928c8f45ffae3d2c5c1
+  metadata.gz: 3416c7cc446f189fe4c03e128f37c2b2b9b886c911a7a11345ade49c6ae6bc2a138cf95cc76f77721950ff820bd5817d1e874b9fc90420af42333f54572b4592
+  data.tar.gz: e0ee661f673016703e919225b9fc04b3e40ce59effbba2417c0f5489c9db6109f4c8aac23ffed06f2252fbb08c5d65f6c4f5860bd8caa4ccb384adbccc0d178b

data/.gitignore

@@ -1,3 +1,10 @@
-*.gem
-.rvmrc
-Gemfile.lock
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+/dns-zonefile-*.gem

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.travis.yml

@@ -1,4 +1,10 @@
 language: ruby
+
+before_install:
+  - yes | gem update --system --force
+  - gem install bundler
+
 rvm:
-  - ruby-head
-  - 2.3.0
+  - 2.5
+  - 2.6
+  - 2.7

data/CONTRIBUTING.md

@@ -0,0 +1,36 @@
+# Contributing to dns-zonefile
+
+## Getting started
+
+Clone the repository and move into it:
+
+```
+$ git clone git@github.com:craigw/dns-zonefile.git
+$ cd dns-zonefile
+```
+
+Install the dependencies using [Bundler](http://bundler.io/):
+
+```
+$ bundle
+```
+
+[Run the test suite](#testing) to check everything works as expected.
+
+
+## Testing
+
+To run the test suite:
+
+```
+$ 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/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.2.2
+FROM ruby:2.3
 
 RUN mkdir -p /u/app
 WORKDIR /u/app

data/Gemfile

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

data/README.md

@@ -11,21 +11,14 @@ some canonical form.
 
 ## Getting setup
 
-Well, you'll need the treetop and polyglot gems installed. They do all
-the hard work. Thanks!
+Add `gem dns-zonefile` to your Gemfile
 
-    sudo gem install treetop polyglot
+or
 
-Now you'll need to generate the Treetop parser from the Zonefile grammar
-that I've hacked together.
-
-    rake generate_grammar
+`gem install dns-zonefile`
 
 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
 
 Using raw data from the parser. Note that "@" isn't translated in this mode.
@@ -54,19 +47,22 @@ handled in this mode.
     # get all MX records
     puts zone.records_of(DNS::Zonefile::MX)
 
+Open the examples in the `./examples` directory to see more examples.
 
 ## Authors
 
-Original code and concept:
+### Original code and concept:
+
 Craig R Webster <http://barkingiguana.com/>
 
-Additions:
-t.e.morgan <http://zerigo.com/>
+### Additions:
+
+- t.e.morgan <http://zerigo.com/>
+- Anthony Eden <https://dnsimple.com/>
 
 
 ## Contributing
 
-See the TODO. Send me patches or pull request either by email or on
-GitHub.
+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)

data/Rakefile

@@ -1,11 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-require 'rake'
-require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => [ :spec ]
-
-task :build do
-  puts %x[gem build dns-zonefile.gemspec]
-end
+task default: :spec

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "dns/zonefile"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/circle.yml

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

data/dns-zonefile.gemspec

@@ -1,31 +1,41 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "dns/zonefile/version"
 
-Gem::Specification.new do |s|
-  s.name        = "dns-zonefile"
-  s.version     = DNS::Zonefile::VERSION
-  s.authors     = ["Craig R Webster"]
-  s.email       = ["craig@barkingiguana.com"]
-  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
-familiar.
+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"]
 
-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"
 
-  s.rubyforge_project = "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"
+  else
+    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  end
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  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"]
 
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "rake"
-  s.add_runtime_dependency "treetop"
-  s.add_runtime_dependency "polyglot"
+  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

@@ -0,0 +1,12 @@
+# First make sure you have installed the `dns-zonefile` gem.
+#
+# Run this script with `ruby basic.rb`
+
+require "dns/zonefile"
+
+zonefile = "example.com.zonefile"
+zone = DNS::Zonefile.parse(File.read(zonefile))
+
+puts zone.soa.origin.to_s
+puts zone.soa.ns.to_s
+puts zone.rr[0].to_s

data/examples/basic_origin.rb

@@ -0,0 +1,15 @@
+# First make sure you have installed the `dns-zonefile` gem.
+#
+# Run this script with `ruby basic.rb`
+
+require "dns/zonefile"
+
+zonefile = "example.com.zonefile"
+zone = DNS::Zonefile.load(File.read(zonefile), "example.com.")
+
+puts zone.soa.origin
+puts zone.soa.nameserver
+# get all MX records
+zone.records_of(DNS::Zonefile::MX).each do |rec|
+  puts "#{rec.host} #{rec.klass} #{rec.ttl} #{rec.priority} #{rec.domainname}"
+end

data/examples/example.com.no-origin.zonefile

@@ -0,0 +1,16 @@
+$TTL 1h                  ; default expiration time of all resource records without their own TTL value
+example.com.  IN  SOA   ns.example.com. username.example.com. ( 2007120710 1d 2h 4w 1h )
+example.com.  IN  NS    ns                    ; ns.example.com is a nameserver for example.com
+example.com.  IN  NS    ns.somewhere.example. ; ns.somewhere.example is a backup nameserver for example.com
+example.com.  IN  MX    10 mail.example.com.  ; mail.example.com is the mailserver for example.com
+@             IN  MX    20 mail2.example.com. ; equivalent to above line, "@" represents zone origin
+@             IN  MX    50 mail3              ; equivalent to above line, but using a relative host name
+example.com.  IN  A     192.0.2.1             ; IPv4 address for example.com
+              IN  AAAA  2001:db8:10::1        ; IPv6 address for example.com
+ns            IN  A     192.0.2.2             ; IPv4 address for ns.example.com
+              IN  AAAA  2001:db8:10::2        ; IPv6 address for ns.example.com
+www           IN  CNAME example.com.          ; www.example.com is an alias for example.com
+wwwtest       IN  CNAME www                   ; wwwtest.example.com is another alias for www.example.com
+mail          IN  A     192.0.2.3             ; IPv4 address for mail.example.com
+mail2         IN  A     192.0.2.4             ; IPv4 address for mail2.example.com
+mail3         IN  A     192.0.2.5             ; IPv4 address for mail3.example.com

data/examples/example.com.zonefile

@@ -0,0 +1,17 @@
+$ORIGIN example.com.     ; designates the start of this zone file in the namespace
+$TTL 1h                  ; default expiration time of all resource records without their own TTL value
+example.com.  IN  SOA   ns.example.com. username.example.com. ( 2007120710 1d 2h 4w 1h )
+example.com.  IN  NS    ns                    ; ns.example.com is a nameserver for example.com
+example.com.  IN  NS    ns.somewhere.example. ; ns.somewhere.example is a backup nameserver for example.com
+example.com.  IN  MX    10 mail.example.com.  ; mail.example.com is the mailserver for example.com
+@             IN  MX    20 mail2.example.com. ; equivalent to above line, "@" represents zone origin
+@             IN  MX    50 mail3              ; equivalent to above line, but using a relative host name
+example.com.  IN  A     192.0.2.1             ; IPv4 address for example.com
+              IN  AAAA  2001:db8:10::1        ; IPv6 address for example.com
+ns            IN  A     192.0.2.2             ; IPv4 address for ns.example.com
+              IN  AAAA  2001:db8:10::2        ; IPv6 address for ns.example.com
+www           IN  CNAME example.com.          ; www.example.com is an alias for example.com
+wwwtest       IN  CNAME www                   ; wwwtest.example.com is another alias for www.example.com
+mail          IN  A     192.0.2.3             ; IPv4 address for mail.example.com
+mail2         IN  A     192.0.2.4             ; IPv4 address for mail2.example.com
+mail3         IN  A     192.0.2.5             ; IPv4 address for mail3.example.com

data/lib/dns/zonefile.rb

@@ -1,113 +1,84 @@
-require 'dns/zonefile/version'
-require 'treetop'
-Treetop.load 'lib/dns/zonefile'
+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 '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 '@'
-      def self.writer_for_at(*attribs)
-	attribs.each do |attrib|
-	  c = <<-MTH
-	    def #{attrib}=(val)
-	      @#{attrib} = val.gsub('@', @vars['origin'])
-	    end
-	  MTH
-	  class_eval c, __FILE__, __LINE__
-	end
-      end
-
-      # assign, with handling for '@', with inheritance
-      def self.inheriting_writer_for_at(*attribs)
-	attribs.each do |attrib|
-	  c = <<-MTH
-	    def #{attrib}=(val)
-	      if val.strip.empty?
-		@#{attrib} = @vars[:last_host]
-	      else
-		@#{attrib} = val.gsub('@', @vars['origin'])
-	      end
-	    end
-	  MTH
-	  class_eval c, __FILE__, __LINE__
-	end
-      end
-
       # 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
@@ -115,192 +86,218 @@ 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 /^\s*$/.match?(host)
+        host = host.gsub(/@/, origin)
+        if /\.$/.match?(host)
+          host
+        elsif /^\./.match?(origin)
+          host + origin
+        else
+          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
 
-      writer_for_at  :origin, :nameserver, :responsible_party
-
-      def initialize(vars, zonefile_soa=nil)
-	@vars = vars
-	if zonefile_soa
-	  self.origin            = 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        = zonefile_soa.ns.to_s
-	  self.responsible_party = 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
 
     class A < Record
       attr_accessor :host, :address
 
-      inheriting_writer_for_at  :host
-
       def initialize(vars, zonefile_record)
-	@vars = vars
-	if zonefile_record
-	  self.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
 
-      inheriting_writer_for_at  :host
-      writer_for_at :domainname
-
       def initialize(vars, zonefile_record)
-	@vars = vars
-	if zonefile_record
-	  self.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   = 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
 
-      inheriting_writer_for_at  :host
-      writer_for_at :domainname
-
       def initialize(vars, zonefile_record)
-	@vars = vars
-	if zonefile_record
-	  self.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   = 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
 
-      inheriting_writer_for_at  :host
-
       def initialize(vars, zonefile_record)
-	@vars = vars
-	if zonefile_record
-	  self.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
 
     class NS < Record
       attr_accessor :host, :domainname
 
-      inheriting_writer_for_at  :host
-      writer_for_at :domainname
-
       def initialize(vars, zonefile_record)
-	@vars = vars
-	if zonefile_record
-	  self.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   = 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
 
-      inheriting_writer_for_at  :host
-      writer_for_at :domainname
-
       def initialize(vars, zonefile_record)
-	@vars = vars
-	if zonefile_record
-	  self.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   = 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
 
-      inheriting_writer_for_at  :host
-      writer_for_at :domainname
-
       def initialize(vars, zonefile_record)
-	@vars = vars
-	if zonefile_record
-	  self.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   = 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
+      attr_accessor :host, :alg, :fptype, :fp
+
+      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.alg = zonefile_record.alg.to_i
+          self.fptype = zonefile_record.fptype.to_i
+          self.fp = zonefile_record.fp.to_s
+        end
+      end
     end
 
     class TXT < Record
       attr_accessor :host, :data
 
-      inheriting_writer_for_at  :host
-
       def initialize(vars, zonefile_record)
-	@vars = vars
-	if zonefile_record
-	  self.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