diff --git a/lib/fog/dns/models/dnsimple/zone.rb b/lib/fog/dns/models/dnsimple/zone.rb index e2cf4b1dc..d39550206 100644 --- a/lib/fog/dns/models/dnsimple/zone.rb +++ b/lib/fog/dns/models/dnsimple/zone.rb @@ -7,14 +7,13 @@ module Fog class Zone < Fog::Model - identity :id, :aliases => "name" + identity :id attribute :domain, :aliases => "name" attribute :created_at attribute :updated_at def destroy - requires :identity connection.delete_domain(identity) true end @@ -40,6 +39,7 @@ module Fog def save requires :domain data = connection.create_domain(domain).body["domain"] + merge_attributes(data) true end diff --git a/lib/fog/dns/models/dnsimple/zones.rb b/lib/fog/dns/models/dnsimple/zones.rb index 85f01ed8a..39858d6e9 100644 --- a/lib/fog/dns/models/dnsimple/zones.rb +++ b/lib/fog/dns/models/dnsimple/zones.rb @@ -16,10 +16,8 @@ module Fog def get(zone_id) data = connection.get_domain(zone_id).body["domain"] - zone = new(data) - zone.records.load(data["record"]) - zone - rescue Fog::Service::NotFound + new(data) + rescue Excon::Errors::NotFound nil end diff --git a/lib/fog/dns/requests/dnsimple/get_domain.rb b/lib/fog/dns/requests/dnsimple/get_domain.rb index aa7c9f08d..6989cebd3 100644 --- a/lib/fog/dns/requests/dnsimple/get_domain.rb +++ b/lib/fog/dns/requests/dnsimple/get_domain.rb @@ -26,8 +26,8 @@ module Fog def get_domain(id) request( :expects => 200, - :method => 'GET', - :path => '/domains/#{id}' + :method => "GET", + :path => "/domains/#{id}" ) end