dnsimple 7.0.0 → 8.0.0

data/lib/dnsimple/client/clients.rb

@@ -23,11 +23,6 @@ module Dnsimple
       @services[:domains] ||= Client::DomainsService.new(self)
     end
 
-    # @return [Dnsimple::Client::DomainServicesService] The domain-services-related API proxy.
-    def domain_services
-      @services[:domains] ||= Client::DomainServicesService.new(self)
-    end
-
     # @return [Dnsimple::Client::IdentityService] The identity-related API proxy.
     def identity
       @services[:auth] ||= Client::IdentityService.new(self)

data/lib/dnsimple/client/domains_delegation_signer_records.rb

@@ -67,15 +67,16 @@ module Dnsimple
       # @param  [#to_s] domain_id The domain ID or domain name
       # @param  [Hash] attributes
       # @option attributes [Integer] :algorithm DNSSEC algorithm as number (required)
-      # @option attributes [String] :digest The hexidecimal representation of the digest of the corresponding DNSKEY record (required)
-      # @option attributes [Integer] :digest_type DNSSEC digest type (required)
-      # @option attributes [String] :keytag A keytag that references the corresponding DNSKEY record (required)
+      # @option attributes [String] :digest The hexidecimal representation of the digest of the corresponding DNSKEY record (required if TLD requires DS data)
+      # @option attributes [Integer] :digest_type DNSSEC digest type (required if TLD requires DS data)
+      # @option attributes [String] :keytag A keytag that references the corresponding DNSKEY record (required if TLD requires DS data)
+      # @option attributes [String] :public_key A public key that references the corresponding DNSKEY record (required if TLD requires KEY data)
       # @param  [Hash] options
       # @return [Dnsimple::Response<Dnsimple::Struct::DelegationSignerRecord>]
       #
       # @raise  [Dnsimple::RequestError]
       def create_delegation_signer_record(account_id, domain_id, attributes, options = {})
-        Extra.validate_mandatory_attributes(attributes, [:algorithm, :digest, :digest_type, :keytag])
+        Extra.validate_mandatory_attributes(attributes, [:algorithm])
         response = client.post(Client.versioned("/%s/domains/%s/ds_records" % [account_id, domain_id]), attributes, options)
 
         Dnsimple::Response.new(response, Struct::DelegationSignerRecord.new(response["data"]))

data/lib/dnsimple/client/registrar.rb

@@ -24,35 +24,6 @@ module Dnsimple
         Dnsimple::Response.new(response, Struct::DomainCheck.new(response["data"]))
       end
 
-      # Checks the premium price for a domain
-      #
-      # @see https://developer.dnsimple.com/v2/registrar/#premium-price
-      #
-      # @example Check the ruby.codes premium price:
-      #   client.registrar.domain_premium_price(1010, "ruby.codes")
-      #
-      # @example Check the ruby.codes premium price for transfer:
-      #   client.registrar.domain_premium_price(1010, "ruby.codes", action: "transfer")
-      #
-      # @param  [Integer] account_id the account ID
-      # @param  [#to_s] domain_name the domain name to check
-      # @param  [Hash] options
-      # @option options [String] :action Optional action between "registration",
-      #   "renewal", and "transfer". If omitted, it defaults to "registration".
-      # @return [Struct::DomainPremiumPrice]
-      #
-      # @raise  [RequestError] When the request fails.
-      #
-      # @deprecated Use {#get_domain_prices} instead of this one as it will soon be removed from the API.
-      def domain_premium_price(account_id, domain_name, options = {})
-        Dnsimple.deprecate("Use {#get_domain_prices} instead of this one as it will soon be removed from the API.")
-        endpoint = Client.versioned("/%s/registrar/domains/%s/premium_price" % [account_id, domain_name])
-        options[:query] = { action: options.delete(:action) } if options.key?(:action)
-        response = client.get(endpoint, options)
-
-        Dnsimple::Response.new(response, Struct::DomainPremiumPrice.new(response["data"]))
-      end
-
       # Get prices for a domain.
       # @see https://developer.dnsimple.com/v2/registrar/#getDomainPrices
       #

data/lib/dnsimple/default.rb

@@ -9,7 +9,7 @@ module Dnsimple
     BASE_URL = "https://api.dnsimple.com/"
 
     # Default User Agent header
-    USER_AGENT = "dnsimple-ruby/#{VERSION}"
+    USER_AGENT = "dnsimple-ruby/#{VERSION}".freeze
 
     class << self
 
@@ -30,49 +30,49 @@ module Dnsimple
       # Configuration options
       # @return [Hash]
       def options
-        keys.map { |key| [key, send(key)] }.to_h
+        keys.to_h { |key| [key, send(key)] }
       end
 
       # Default API endpoint from ENV or {BASE_URL}
       # @return [String]
       def base_url
-        ENV['DNSIMPLE_BASE_URL'] || BASE_URL
+        ENV.fetch('DNSIMPLE_BASE_URL', BASE_URL)
       end
 
       # Default DNSimple username for Basic Auth from ENV
       # @return [String]
       def username
-        ENV['DNSIMPLE_USERNAME']
+        ENV.fetch('DNSIMPLE_USERNAME', nil)
       end
 
       # Default DNSimple password for Basic Auth from ENV
       # @return [String]
       def password
-        ENV['DNSIMPLE_PASSWORD']
+        ENV.fetch('DNSIMPLE_PASSWORD', nil)
       end
 
       # Default DNSimple access token for OAuth authentication from ENV
       # @return [String]
       def access_token
-        ENV['DNSIMPLE_ACCESS_TOKEN']
+        ENV.fetch('DNSIMPLE_ACCESS_TOKEN', nil)
       end
 
       # Default DNSimple Domain API Token for Token Auth from ENV
       # @return [String]
       def domain_api_token
-        ENV['DNSIMPLE_API_DOMAIN_TOKEN']
+        ENV.fetch('DNSIMPLE_API_DOMAIN_TOKEN', nil)
       end
 
       # Default User-Agent header string from ENV
       # @return [String]
       def user_agent
-        ENV['DNSIMPLE_USER_AGENT']
+        ENV.fetch('DNSIMPLE_USER_AGENT', nil)
       end
 
       # Default Proxy address:port from ENV
       # @return [String]
       def proxy
-        ENV['DNSIMPLE_PROXY']
+        ENV.fetch('DNSIMPLE_PROXY', nil)
       end
 
     end

data/lib/dnsimple/extra.rb

@@ -37,7 +37,7 @@ module Dnsimple
           deep_merge(this_value, other_value, &block)
         else
           if block && key?(current_key)
-            block.call(current_key, this_value, other_value)
+            yield(current_key, this_value, other_value)
           else
             other_value
           end

data/lib/dnsimple/struct/delegation_signer_record.rb

@@ -22,6 +22,9 @@ module Dnsimple
       # @return [String] The keytag for the associated DNSKEY.
       attr_accessor :keytag
 
+      # @return [String] The public key that references the corresponding DNSKEY record.
+      attr_accessor :public_key
+
       # @return [String] When the delegation signing record was created in DNSimple.
       attr_accessor :created_at
 

data/lib/dnsimple/struct/tld.rb

@@ -30,6 +30,9 @@ module Dnsimple
 
       # @return [Boolean] True if DNSimple supports inbound transfers for this TLD.
       attr_accessor :transfer_enabled
+
+      # @return [String, nil] Type of data interface required for DNSSEC for this TLD.
+      attr_accessor :dnssec_interface_type
     end
 
   end

data/lib/dnsimple/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dnsimple
-  VERSION = "7.0.0"
+  VERSION = "8.0.0"
 end

data/spec/dnsimple/client/certificates_spec.rb

@@ -68,8 +68,8 @@ describe Dnsimple::Client, ".certificates" do
     let(:domain_id) { "dnsimple.us" }
 
     it "delegates to client.paginate" do
-      expect(subject).to receive(:paginate).with(:certificates, account_id, domain_id, foo: "bar")
-      subject.all_certificates(account_id, domain_id, foo: "bar")
+      expect(subject).to receive(:paginate).with(:certificates, account_id, domain_id, { foo: "bar" })
+      subject.all_certificates(account_id, domain_id, { foo: "bar" })
     end
 
     it "supports sorting" do
@@ -232,7 +232,6 @@ describe Dnsimple::Client, ".certificates" do
   describe "#purchase_letsencrypt_certificate" do
     let(:account_id) { 1010 }
     let(:domain_id)  { "bingo.pizza" }
-    let(:contact_id) { 100 }
 
     before do
       stub_request(:post, %r{/v2/#{account_id}/domains/#{domain_id}/certificates/letsencrypt})
@@ -240,7 +239,7 @@ describe Dnsimple::Client, ".certificates" do
     end
 
     it "builds the correct request" do
-      attributes = { contact_id: contact_id }
+      attributes = {}
       subject.purchase_letsencrypt_certificate(account_id, domain_id, attributes)
 
       expect(WebMock).to have_requested(:post, "https://api.dnsimple.test/v2/#{account_id}/domains/#{domain_id}/certificates/letsencrypt")
@@ -249,7 +248,7 @@ describe Dnsimple::Client, ".certificates" do
     end
 
     it "passes extra attributes" do
-      attributes = { contact_id: contact_id, name: "www", auto_renew: true, alternate_names: ["api.example.com"] }
+      attributes = { name: "www", auto_renew: true, alternate_names: ["api.example.com"] }
       subject.purchase_letsencrypt_certificate(account_id, domain_id, attributes)
 
       expect(WebMock).to have_requested(:post, "https://api.dnsimple.test/v2/#{account_id}/domains/#{domain_id}/certificates/letsencrypt")
@@ -258,7 +257,7 @@ describe Dnsimple::Client, ".certificates" do
     end
 
     it "returns the certificate purchase" do
-      response = subject.purchase_letsencrypt_certificate(account_id, domain_id, contact_id: contact_id)
+      response = subject.purchase_letsencrypt_certificate(account_id, domain_id)
       expect(response).to be_a(Dnsimple::Response)
 
       result = response.data
@@ -276,7 +275,7 @@ describe Dnsimple::Client, ".certificates" do
             .to_return(read_http_fixture("notfound-domain.http"))
 
         expect {
-          subject.purchase_letsencrypt_certificate(account_id, domain_id, contact_id: contact_id)
+          subject.purchase_letsencrypt_certificate(account_id, domain_id)
         }.to raise_error(Dnsimple::NotFoundError)
       end
     end
@@ -311,7 +310,7 @@ describe Dnsimple::Client, ".certificates" do
       expect(result.common_name).to eq("www.bingo.pizza")
       expect(result.alternate_names).to eq([])
       expect(result.years).to eq(1)
-      expect(result.csr).to be(nil)
+      expect(result.csr).to be_nil
       expect(result.state).to eq("requesting")
       expect(result.authority_identifier).to eq("letsencrypt")
       expect(result.auto_renew).to be(false)
@@ -421,7 +420,7 @@ describe Dnsimple::Client, ".certificates" do
       expect(result.common_name).to eq("www.bingo.pizza")
       expect(result.alternate_names).to eq([])
       expect(result.years).to eq(1)
-      expect(result.csr).to be(nil)
+      expect(result.csr).to be_nil
       expect(result.state).to eq("requesting")
       expect(result.authority_identifier).to eq("letsencrypt")
       expect(result.auto_renew).to be(false)

data/spec/dnsimple/client/contacts_spec.rb

@@ -73,8 +73,8 @@ describe Dnsimple::Client, ".contacts" do
     let(:account_id) { 1010 }
 
     it "delegates to client.paginate" do
-      expect(subject).to receive(:paginate).with(:contacts, account_id, foo: "bar")
-      subject.all_contacts(account_id, foo: "bar")
+      expect(subject).to receive(:paginate).with(:contacts, account_id, { foo: "bar" })
+      subject.all_contacts(account_id, { foo: "bar" })
     end
 
     it "supports sorting" do

data/spec/dnsimple/client/domains_collaborators_spec.rb

@@ -116,8 +116,8 @@ describe Dnsimple::Client, ".domains" do
         result = response.data
         expect(result).to be_a(Dnsimple::Struct::Collaborator)
         expect(result.id).to          be_a(Integer)
-        expect(result.user_id).to     be(nil)
-        expect(result.accepted_at).to be(nil)
+        expect(result.user_id).to     be_nil
+        expect(result.accepted_at).to be_nil
         expect(result.user_email).to  eq(attributes.fetch(:email))
         expect(result.invitation).to  be(true)
       end

data/spec/dnsimple/client/domains_delegation_signer_records_spec.rb

@@ -86,8 +86,8 @@ describe Dnsimple::Client, ".domains" do
     let(:domain_id) { "example.com" }
 
     it "delegates to client.paginate" do
-      expect(subject).to receive(:paginate).with(:delegation_signer_records, account_id, domain_id, foo: "bar")
-      subject.all_delegation_signer_records(account_id, domain_id, foo: "bar")
+      expect(subject).to receive(:paginate).with(:delegation_signer_records, account_id, domain_id, { foo: "bar" })
+      subject.all_delegation_signer_records(account_id, domain_id, { foo: "bar" })
     end
 
     it "supports sorting" do
@@ -155,6 +155,7 @@ describe Dnsimple::Client, ".domains" do
       expect(result.digest).to eq("C1F6E04A5A61FBF65BF9DC8294C363CF11C89E802D926BDAB79C55D27BEFA94F")
       expect(result.digest_type).to eq("2")
       expect(result.keytag).to eq("44620")
+      expect(result.public_key).to be_nil
       expect(result.created_at).to eq("2017-03-03T13:49:58Z")
       expect(result.updated_at).to eq("2017-03-03T13:49:58Z")
     end

data/spec/dnsimple/client/domains_email_forwards_spec.rb

@@ -86,8 +86,8 @@ describe Dnsimple::Client, ".domains" do
     let(:domain_id) { "example.com" }
 
     it "delegates to client.paginate" do
-      expect(subject).to receive(:paginate).with(:email_forwards, account_id, domain_id, foo: "bar")
-      subject.all_email_forwards(account_id, domain_id, foo: "bar")
+      expect(subject).to receive(:paginate).with(:email_forwards, account_id, domain_id, { foo: "bar" })
+      subject.all_email_forwards(account_id, domain_id, { foo: "bar" })
     end
 
     it "supports sorting" do

data/spec/dnsimple/client/domains_spec.rb

@@ -79,8 +79,8 @@ describe Dnsimple::Client, ".domains" do
     let(:account_id) { 1010 }
 
     it "delegates to client.paginate" do
-      expect(subject).to receive(:paginate).with(:domains, account_id, foo: "bar")
-      subject.all_domains(account_id, foo: "bar")
+      expect(subject).to receive(:paginate).with(:domains, account_id, { foo: "bar" })
+      subject.all_domains(account_id, { foo: "bar" })
     end
 
     it "supports sorting" do

data/spec/dnsimple/client/registrar_spec.rb

@@ -34,54 +34,6 @@ describe Dnsimple::Client, ".registrar" do
     end
   end
 
-  describe "#domain_premium_price" do
-    let(:account_id) { 1010 }
-
-    context "when premium price" do
-      before do
-        stub_request(:get, %r{/v2/#{account_id}/registrar/domains/.+/premium_price[?action]*})
-            .to_return(read_http_fixture("getDomainPremiumPrice/success.http"))
-      end
-
-      it "builds the correct request" do
-        subject.domain_premium_price(account_id, domain_name = "ruby.codes")
-
-        expect(WebMock).to have_requested(:get, "https://api.dnsimple.test/v2/#{account_id}/registrar/domains/#{domain_name}/premium_price")
-            .with(headers: { "Accept" => "application/json" })
-      end
-
-      it "returns the premium price" do
-        response = subject.domain_premium_price(account_id, "ruby.codes")
-        expect(response).to be_a(Dnsimple::Response)
-
-        result = response.data
-        expect(result).to be_a(Dnsimple::Struct::DomainPremiumPrice)
-        expect(result.premium_price).to eq("109.00")
-        expect(result.action).to        eq("registration")
-      end
-
-      it "builds the correct request when action is passed" do
-        subject.domain_premium_price(account_id, domain_name = "ruby.codes", action: "registration")
-
-        expect(WebMock).to have_requested(:get, "https://api.dnsimple.test/v2/#{account_id}/registrar/domains/#{domain_name}/premium_price?action=registration")
-            .with(headers: { "Accept" => "application/json" })
-      end
-    end
-
-    context "when not premium price" do
-      before do
-        stub_request(:get, %r{/v2/#{account_id}/registrar/domains/.+/premium_price$})
-            .to_return(read_http_fixture("getDomainPremiumPrice/failure.http"))
-      end
-
-      it "raises error" do
-        expect {
-          subject.domain_premium_price(account_id, "example.com")
-        }.to raise_error(Dnsimple::RequestError, "`example.com` is not a premium domain for registration")
-      end
-    end
-  end
-
   describe "#get_domain_prices" do
     let(:account_id) { 1010 }
 
@@ -317,7 +269,7 @@ describe Dnsimple::Client, ".registrar" do
       expect(result.state).to eq("transferring")
       expect(result.auto_renew).to be(false)
       expect(result.whois_privacy).to be(false)
-      expect(result.status_description).to eq(nil)
+      expect(result.status_description).to be_nil
       expect(result.created_at).to eq("2020-06-05T18:08:00Z")
       expect(result.updated_at).to eq("2020-06-05T18:08:04Z")
     end

data/spec/dnsimple/client/services_spec.rb

@@ -61,7 +61,7 @@ describe Dnsimple::Client, ".services" do
     end
 
     it "delegates to client.paginate" do
-      expect(subject).to receive(:paginate).with(:services, foo: "bar")
+      expect(subject).to receive(:paginate).with(:services, { foo: "bar" })
       subject.all_services(foo: "bar")
     end
 

data/spec/dnsimple/client/templates_records_spec.rb

@@ -65,7 +65,7 @@ describe Dnsimple::Client, ".templates" do
     let(:template_id) { "alpha" }
 
     it "delegates to client.paginate" do
-      expect(subject).to receive(:paginate).with(:records, account_id, template_id, option: "value")
+      expect(subject).to receive(:paginate).with(:records, account_id, template_id, { option: "value" })
       subject.all_records(account_id, template_id, option: "value")
     end
 

data/spec/dnsimple/client/templates_spec.rb

@@ -64,8 +64,8 @@ describe Dnsimple::Client, ".templates" do
     let(:account_id) { 1010 }
 
     it "delegates to client.paginate" do
-      expect(subject).to receive(:paginate).with(:templates, account_id, foo: "bar")
-      subject.all_templates(account_id, foo: "bar")
+      expect(subject).to receive(:paginate).with(:templates, account_id, { foo: "bar" })
+      subject.all_templates(account_id, { foo: "bar" })
     end
 
     it "supports sorting" do

data/spec/dnsimple/client/tlds_spec.rb

@@ -68,7 +68,7 @@ describe Dnsimple::Client, ".tlds" do
     end
 
     it "delegates to client.paginate" do
-      expect(subject).to receive(:paginate).with(:list_tlds, foo: "bar")
+      expect(subject).to receive(:paginate).with(:list_tlds, { foo: "bar" })
       subject.all_tlds(foo: "bar")
     end
 
@@ -107,6 +107,7 @@ describe Dnsimple::Client, ".tlds" do
       expect(result.registration_enabled).to be(true)
       expect(result.renewal_enabled).to be(true)
       expect(result.transfer_enabled).to be(true)
+      expect(result.dnssec_interface_type).to eq("ds")
     end
   end
 

data/spec/dnsimple/client/zones_records_spec.rb

@@ -93,8 +93,8 @@ describe Dnsimple::Client, ".zones" do
     let(:zone_id) { "example.com" }
 
     it "delegates to client.paginate" do
-      expect(subject).to receive(:paginate).with(:list_zone_records, account_id, zone_id, foo: "bar")
-      subject.all_zone_records(account_id, zone_id, foo: "bar")
+      expect(subject).to receive(:paginate).with(:list_zone_records, account_id, zone_id, { foo: "bar" })
+      subject.all_zone_records(account_id, zone_id, { foo: "bar" })
     end
 
     it "supports sorting" do
@@ -179,7 +179,7 @@ describe Dnsimple::Client, ".zones" do
       expect(result).to be_a(Dnsimple::Struct::ZoneRecord)
       expect(result.id).to eq(record_id)
       expect(result.zone_id).to eq("example.com")
-      expect(result.parent_id).to eq(nil)
+      expect(result.parent_id).to be_nil
       expect(result.type).to eq("MX")
       expect(result.name).to eq("")
       expect(result.content).to eq("mxa.example.com")

data/spec/dnsimple/client/zones_spec.rb

@@ -79,8 +79,8 @@ describe Dnsimple::Client, ".zones" do
     let(:account_id) { 1010 }
 
     it "delegates to client.paginate" do
-      expect(subject).to receive(:paginate).with(:zones, account_id, foo: "bar")
-      subject.all_zones(account_id, foo: "bar")
+      expect(subject).to receive(:paginate).with(:zones, account_id, { foo: "bar" })
+      subject.all_zones(account_id, { foo: "bar" })
     end
 
     it "supports sorting" do

data/spec/dnsimple/client_spec.rb

@@ -49,36 +49,36 @@ describe Dnsimple::Client do
 
   describe "#get" do
     it "delegates to #request" do
-      allow(subject).to receive(:execute).with(:get, "path", nil, foo: "bar").and_return(:returned)
-      expect(subject.get("path", foo: "bar")).to eq(:returned)
+      allow(subject).to receive(:execute).with(:get, "path", nil, { foo: "bar" }).and_return(:returned)
+      expect(subject.get("path", { foo: "bar" })).to eq(:returned)
     end
   end
 
   describe "#post" do
     it "delegates to #request" do
       allow(subject).to receive(:execute).with(:post, "path", { foo: "bar" }, {}).and_return(:returned)
-      expect(subject.post("path", foo: "bar")).to eq(:returned)
+      expect(subject.post("path", { foo: "bar" })).to eq(:returned)
     end
   end
 
   describe "#put" do
     it "delegates to #request" do
       allow(subject).to receive(:execute).with(:put, "path", { foo: "bar" }, {}).and_return(:returned)
-      expect(subject.put("path", foo: "bar")).to eq(:returned)
+      expect(subject.put("path", { foo: "bar" })).to eq(:returned)
     end
   end
 
   describe "#patch" do
     it "delegates to #request" do
       allow(subject).to receive(:execute).with(:patch, "path", { foo: "bar" }, {}).and_return(:returned)
-      expect(subject.patch("path", foo: "bar")).to eq(:returned)
+      expect(subject.patch("path", { foo: "bar" })).to eq(:returned)
     end
   end
 
   describe "#delete" do
     it "delegates to #request" do
       allow(subject).to receive(:execute).with(:delete, "path", { foo: "bar" }, {}).and_return(:returned)
-      expect(subject.delete("path", foo: "bar")).to eq(:returned)
+      expect(subject.delete("path", { foo: "bar" })).to eq(:returned)
     end
   end
 
@@ -128,12 +128,12 @@ describe Dnsimple::Client do
 
       allow(HTTParty).to receive(:get)
           .with(
-              "#{subject.base_url}foo",
-              format: :json,
-              basic_auth: { username: "user", password: "pass" },
-              headers: { 'Accept' => 'application/json', 'User-Agent' => Dnsimple::Default::USER_AGENT }
+              "#{subject.base_url}foo", {
+                format: :json,
+                basic_auth: { username: "user", password: "pass" },
+                headers: { 'Accept' => 'application/json', 'User-Agent' => Dnsimple::Default::USER_AGENT },
+              }
             )
-          .and_return(instance_double('response', code: 200))
 
       subject.request(:get, 'foo')
     end
@@ -141,14 +141,14 @@ describe Dnsimple::Client do
     it "properly extracts processes options and encodes data" do
       allow(HTTParty).to receive(:put)
           .with(
-              "#{subject.base_url}foo",
-              format: :json,
-              body: JSON.dump(something: "else"),
-              query: { foo: "bar" },
-              basic_auth: { username: "user", password: "pass" },
-              headers: { 'Accept' => 'application/json', 'Content-Type' => 'application/json', 'User-Agent' => Dnsimple::Default::USER_AGENT, "Custom" => "Header" }
+              "#{subject.base_url}foo", {
+                format: :json,
+                body: JSON.dump(something: "else"),
+                query: { foo: "bar" },
+                basic_auth: { username: "user", password: "pass" },
+                headers: { 'Accept' => 'application/json', 'Content-Type' => 'application/json', 'User-Agent' => Dnsimple::Default::USER_AGENT, "Custom" => "Header" },
+              }
             )
-          .and_return(instance_double('response', code: 200))
 
       subject.request(:put, 'foo', { something: "else" }, { query: { foo: "bar" }, headers: { "Custom" => "Header" } })
     end
@@ -156,13 +156,13 @@ describe Dnsimple::Client do
     it "handles non application/json content types" do
       allow(HTTParty).to receive(:post)
           .with(
-              "#{subject.base_url}foo",
-              format: :json,
-              body: { something: "else" },
-              basic_auth: { username: "user", password: "pass" },
-              headers: { 'Accept' => 'application/json', 'Content-Type' => 'application/x-www-form-urlencoded', 'User-Agent' => Dnsimple::Default::USER_AGENT }
+              "#{subject.base_url}foo", {
+                format: :json,
+                body: { something: "else" },
+                basic_auth: { username: "user", password: "pass" },
+                headers: { 'Accept' => 'application/json', 'Content-Type' => 'application/x-www-form-urlencoded', 'User-Agent' => Dnsimple::Default::USER_AGENT },
+              }
             )
-          .and_return(instance_double('response', code: 200))
 
       subject.request(:post, 'foo', { something: "else" }, { headers: { "Content-Type" => "application/x-www-form-urlencoded" } })
     end
@@ -170,13 +170,13 @@ describe Dnsimple::Client do
     it "includes options for proxy support" do
       allow(HTTParty).to receive(:get)
           .with(
-              "#{subject.base_url}test",
-              format: :json,
-              http_proxyaddr: "example-proxy.com",
-              http_proxyport: "4321",
-              headers: { 'Accept' => 'application/json', 'User-Agent' => Dnsimple::Default::USER_AGENT }
+              "#{subject.base_url}test", {
+                format: :json,
+                http_proxyaddr: "example-proxy.com",
+                http_proxyport: "4321",
+                headers: { 'Accept' => 'application/json', 'User-Agent' => Dnsimple::Default::USER_AGENT },
+              }
             )
-          .and_return(instance_double('response', code: 200))
 
       subject = described_class.new(proxy: "example-proxy.com:4321")
       subject.request(:get, "test", nil, {})
@@ -186,10 +186,9 @@ describe Dnsimple::Client do
       allow(HTTParty).to receive(:get)
           .with(
               "#{subject.base_url}test",
-              format: :json,
-              headers: hash_including("User-Agent" => "customAgent #{Dnsimple::Default::USER_AGENT}")
+              { format: :json,
+                headers: hash_including("User-Agent" => "customAgent #{Dnsimple::Default::USER_AGENT}"), }
             )
-          .and_return(instance_double("response", code: 200))
 
       subject = described_class.new(user_agent: "customAgent")
       subject.request(:get, "test", nil)

data/spec/dnsimple/extra_spec.rb

@@ -26,7 +26,7 @@ describe Dnsimple::Extra do
   describe ".validate_mandatory_attributes" do
     let(:mandatory_attributes) { %i(name email) }
 
-    it "raises an error if a mandatory attribute is not present " do
+    it "raises an error if a mandatory attribute is not present" do
       expect {
         described_class.validate_mandatory_attributes({ name: "foo" }, mandatory_attributes)
       }.to raise_error(ArgumentError, ":email is required")

data/spec/fixtures.http/createDelegationSignerRecord/created.http

@@ -17,4 +17,4 @@ X-Permitted-Cross-Domain-Policies: none
 X-XSS-Protection: 1; mode=block
 Strict-Transport-Security: max-age=31536000
 
-{"data":{"id":2,"domain_id":1010,"algorithm":"13","digest":"684a1f049d7d082b7f98691657da5a65764913df7f065f6f8c36edf62d66ca03","digest_type":"2","keytag":"2371","created_at":"2017-03-03T15:24:00Z","updated_at":"2017-03-03T15:24:00Z"}}
+{"data":{"id":2,"domain_id":1010,"algorithm":"13","digest":"684a1f049d7d082b7f98691657da5a65764913df7f065f6f8c36edf62d66ca03","digest_type":"2","keytag":"2371","public_key":null,"created_at":"2017-03-03T15:24:00Z","updated_at":"2017-03-03T15:24:00Z"}}

data/spec/fixtures.http/getDelegationSignerRecord/success.http

@@ -17,4 +17,4 @@ X-Permitted-Cross-Domain-Policies: none
 X-XSS-Protection: 1; mode=block
 Strict-Transport-Security: max-age=31536000
 
-{"data":{"id":24,"domain_id":1010,"algorithm":"8","digest":"C1F6E04A5A61FBF65BF9DC8294C363CF11C89E802D926BDAB79C55D27BEFA94F","digest_type":"2","keytag":"44620","created_at":"2017-03-03T13:49:58Z","updated_at":"2017-03-03T13:49:58Z"}}
+{"data":{"id":24,"domain_id":1010,"algorithm":"8","digest":"C1F6E04A5A61FBF65BF9DC8294C363CF11C89E802D926BDAB79C55D27BEFA94F","digest_type":"2","keytag":"44620","public_key":null,"created_at":"2017-03-03T13:49:58Z","updated_at":"2017-03-03T13:49:58Z"}}

data/spec/fixtures.http/getTld/success.http

@@ -17,4 +17,4 @@ X-Permitted-Cross-Domain-Policies: none
 X-XSS-Protection: 1; mode=block
 Strict-Transport-Security: max-age=31536000
 
-{"data":{"tld":"com","tld_type":1,"whois_privacy":true,"auto_renew_only":false,"idn":true,"minimum_registration":1,"registration_enabled":true,"renewal_enabled":true,"transfer_enabled":true}}
+{"data":{"tld":"com","tld_type":1,"whois_privacy":true,"auto_renew_only":false,"idn":true,"minimum_registration":1,"registration_enabled":true,"renewal_enabled":true,"transfer_enabled":true,"dnssec_interface_type":"ds"}}