dnsimple 4.0.0 → 4.1.0

data/lib/dnsimple/struct/domain_premium_price.rb

@@ -0,0 +1,13 @@
+module Dnsimple
+  module Struct
+
+    class DomainPremiumPrice < Base
+      # @return [String] The domain premium price
+      attr_accessor :premium_price
+
+      # @return [String] The action: registration/transfer/renewal
+      attr_accessor :action
+    end
+
+  end
+end

data/lib/dnsimple/struct/domain_push.rb

@@ -2,16 +2,16 @@ module Dnsimple
   module Struct
 
     class DomainPush < Base
-      # @return [Fixnum] The domain push ID in DNSimple.
+      # @return [Integer] The domain push ID in DNSimple.
       attr_accessor :id
 
-      # @return [Fixnum] The associated domain ID.
+      # @return [Integer] The associated domain ID.
       attr_accessor :domain_id
 
-      # @return [Fixnum] The associated contact ID.
+      # @return [Integer] The associated contact ID.
       attr_accessor :contact_id
 
-      # @return [Fixnum] The associated account ID.
+      # @return [Integer] The associated account ID.
       attr_accessor :account_id
 
       # @return [String] When the domain push was created in DNSimple.

data/lib/dnsimple/struct/domain_registration.rb

@@ -0,0 +1,37 @@
+module Dnsimple
+  module Struct
+
+    class DomainRegistration < Base
+      # @return [Integer] The domain registration ID in DNSimple.
+      attr_accessor :id
+
+      # @return [Integer] The associated domain ID.
+      attr_accessor :domain_id
+
+      # @return [Integer] The associated registrant (contact) ID.
+      attr_accessor :registrant_id
+
+      # @return [Integer] The number of years the domain was registered for.
+      attr_accessor :period
+
+      # @return [String] The state of the renewal.
+      attr_accessor :state
+
+      # @return [Bool] True if the domain auto-renew was requested.
+      attr_accessor :auto_renew
+
+      # @return [Bool] True if the domain WHOIS privacy was requested.
+      attr_accessor :whois_privacy
+
+      # @return [String] The premium price requested for the registration.
+      attr_accessor :premium_price
+
+      # @return [String] When the domain renewal was created in DNSimple.
+      attr_accessor :created_at
+
+      # @return [String] When the domain renewal was last updated in DNSimple.
+      attr_accessor :updated_at
+    end
+
+  end
+end

data/lib/dnsimple/struct/domain_renewal.rb

@@ -0,0 +1,28 @@
+module Dnsimple
+  module Struct
+
+    class DomainRenewal < Base
+      # @return [Integer] The domain renewal ID in DNSimple.
+      attr_accessor :id
+
+      # @return [Integer] The associated domain ID.
+      attr_accessor :domain_id
+
+      # @return [Integer] The number of years the domain was renewed for.
+      attr_accessor :period
+
+      # @return [String] The state of the renewal.
+      attr_accessor :state
+
+      # @return [String] The premium price requested for the renewal.
+      attr_accessor :premium_price
+
+      # @return [String] When the domain renewal was created in DNSimple.
+      attr_accessor :created_at
+
+      # @return [String] When the domain renewal was last updated in DNSimple.
+      attr_accessor :updated_at
+    end
+
+  end
+end

data/lib/dnsimple/struct/domain_transfer.rb

@@ -0,0 +1,34 @@
+module Dnsimple
+  module Struct
+
+    class DomainTransfer < Base
+      # @return [Integer] The domain registration ID in DNSimple.
+      attr_accessor :id
+
+      # @return [Integer] The associated domain ID.
+      attr_accessor :domain_id
+
+      # @return [Integer] The associated registrant (contact) ID.
+      attr_accessor :registrant_id
+
+      # @return [String] The state of the renewal.
+      attr_accessor :state
+
+      # @return [Bool] True if the domain auto-renew was requested.
+      attr_accessor :auto_renew
+
+      # @return [Bool] True if the domain WHOIS privacy was requested.
+      attr_accessor :whois_privacy
+
+      # @return [String] The premium price requested for the registration.
+      attr_accessor :premium_price
+
+      # @return [String] When the domain renewal was created in DNSimple.
+      attr_accessor :created_at
+
+      # @return [String] When the domain renewal was last updated in DNSimple.
+      attr_accessor :updated_at
+    end
+
+  end
+end

data/lib/dnsimple/struct/email_forward.rb

@@ -2,10 +2,10 @@ module Dnsimple
   module Struct
 
     class EmailForward < Base
-      # @return [Fixnum] The email forward ID in DNSimple.
+      # @return [Integer] The email forward ID in DNSimple.
       attr_accessor :id
 
-      # @return [Fixnum] The associated domain ID.
+      # @return [Integer] The associated domain ID.
       attr_accessor :domain_id
 
       # @return [String] The "local part" of the originating email address. Anything to the left of the @ symbol.

data/lib/dnsimple/struct/oauth_token.rb

@@ -11,7 +11,7 @@ module Dnsimple
       # @return [String] The token scope (not used for now).
       attr_accessor :scope
 
-      # @return [Fixnum] The account ID in DNSimple this token belongs to.
+      # @return [Integer] The account ID in DNSimple this token belongs to.
       attr_accessor :account_id
     end
 

data/lib/dnsimple/struct/service.rb

@@ -23,14 +23,14 @@ module Dnsimple
         attr_accessor :password
       end
 
-      # @return [Fixnum] The service ID in DNSimple.
+      # @return [Integer] The service ID in DNSimple.
       attr_accessor :id
 
       # @return [String] The service name.
       attr_accessor :name
 
-      # @return [String] A short name for the service.
-      attr_accessor :short_name
+      # @return [String] A string ID for the service.
+      attr_accessor :sid
 
       # @return [String] The service description.
       attr_accessor :description

data/lib/dnsimple/struct/template.rb

@@ -2,17 +2,17 @@ module Dnsimple
   module Struct
 
     class Template < Base
-      # @return [Fixnum] The template ID in DNSimple.
+      # @return [Integer] The template ID in DNSimple.
       attr_accessor :id
 
-      # @return [Fixnum] The associated account ID.
+      # @return [Integer] The associated account ID.
       attr_accessor :account_id
 
       # @return [String] The template name.
       attr_accessor :name
 
-      # @return [String] The short name for the template.
-      attr_accessor :short_name
+      # @return [String] The string ID for the template.
+      attr_accessor :sid
 
       # @return [String] The template description.
       attr_accessor :description

data/lib/dnsimple/struct/template_record.rb

@@ -2,10 +2,10 @@ module Dnsimple
   module Struct
 
     class TemplateRecord < Base
-      # @return [Fixnum] The template record ID in DNSimple.
+      # @return [Integer] The template record ID in DNSimple.
       attr_accessor :id
 
-      # @return [Fixnum] The template ID in DNSimple.
+      # @return [Integer] The template ID in DNSimple.
       attr_accessor :template_id
 
       # @return [String] The type of template record, in uppercase.
@@ -17,10 +17,10 @@ module Dnsimple
       # @return [String] The plain-text template record content.
       attr_accessor :content
 
-      # @return [Fixnum] The template record TTL value.
+      # @return [Integer] The template record TTL value.
       attr_accessor :ttl
 
-      # @return [Fixnum] The priority value, if the type of template record accepts a priority.
+      # @return [Integer] The priority value, if the type of template record accepts a priority.
       attr_accessor :priority
 
       # @return [String] When the template record was created in DNSimple.

data/lib/dnsimple/struct/tld.rb

@@ -5,7 +5,7 @@ module Dnsimple
       # @return [String] The TLD in DNSimple.
       attr_accessor :tld
 
-      # @return [Fixnum] The TLD type.
+      # @return [Integer] The TLD type.
       attr_accessor :tld_type
 
       # @return [Boolean] True if Whois Privacy Protection is available.
@@ -17,7 +17,7 @@ module Dnsimple
       # @return [Boolean] True if IDN is available.
       attr_accessor :idn
 
-      # @return [Fixnum] The minimum registration period, in years.
+      # @return [Integer] The minimum registration period, in years.
       attr_accessor :minimum_registration
 
       # @return [Boolean] True if DNSimple supports registrations for this TLD.

data/lib/dnsimple/struct/user.rb

@@ -2,7 +2,7 @@ module Dnsimple
   module Struct
 
     class User < Base
-      # @return [Fixnum] The user ID in DNSimple.
+      # @return [Integer] The user ID in DNSimple.
       attr_accessor :id
 
       # @return [String] The user email.

data/lib/dnsimple/struct/webhook.rb

@@ -2,7 +2,7 @@ module Dnsimple
   module Struct
 
     class Webhook < Base
-      # @return [Fixnum] The contact ID in DNSimple.
+      # @return [Integer] The contact ID in DNSimple.
       attr_accessor :id
 
       # @return [String] The callback URL.

data/lib/dnsimple/struct/whois_privacy.rb

@@ -2,7 +2,7 @@ module Dnsimple
   module Struct
 
     class WhoisPrivacy < Base
-      # @return [Fixnum] The associated domain ID.
+      # @return [Integer] The associated domain ID.
       attr_accessor :domain_id
 
       # @return [Boolean] Whether the whois privacy is enabled for the domain.

data/lib/dnsimple/struct/zone.rb

@@ -2,10 +2,10 @@ module Dnsimple
   module Struct
 
     class Zone < Base
-      # @return [Fixnum] The zone ID in DNSimple.
+      # @return [Integer] The zone ID in DNSimple.
       attr_accessor :id
 
-      # @return [Fixnum] The associated account ID.
+      # @return [Integer] The associated account ID.
       attr_accessor :account_id
 
       # @return [String] The zone name.

data/lib/dnsimple/struct/zone_record.rb

@@ -2,13 +2,13 @@ module Dnsimple
   module Struct
 
     class ZoneRecord < Base
-      # @return [Fixnum] The record ID in DNSimple.
+      # @return [Integer] The record ID in DNSimple.
       attr_accessor :id
 
       # @return [String] The associated zone ID.
       attr_accessor :zone_id
 
-      # @return [Fixnum] The ID of the parent record, if this record is dependent on another record.
+      # @return [Integer] The ID of the parent record, if this record is dependent on another record.
       attr_accessor :parent_id
 
       # @return [String] The type of record, in uppercase.
@@ -20,10 +20,10 @@ module Dnsimple
       # @return [String] The plain-text record content.
       attr_accessor :content
 
-      # @return [Fixnum] The TTL value.
+      # @return [Integer] The TTL value.
       attr_accessor :ttl
 
-      # @return [Fixnum] The priority value, if the type of record accepts a priority.
+      # @return [Integer] The priority value, if the type of record accepts a priority.
       attr_accessor :priority
 
       # @return [Bool] True if this is a system record created by DNSimple. System records are read-only.

data/lib/dnsimple/version.rb

@@ -1,3 +1,3 @@
 module Dnsimple
-  VERSION = "4.0.0".freeze
+  VERSION = "4.1.0".freeze
 end

data/spec/dnsimple/client/certificates_spec.rb

@@ -92,8 +92,8 @@ describe Dnsimple::Client, ".certificates" do
       expect(result.csr).to eq("-----BEGIN CERTIFICATE REQUEST-----\nMIICljCCAX4CAQAwGTEXMBUGA1UEAwwOd3d3LndlcHBvcy5uZXQwggEiMA0GCSqG\nSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3MJwx9ahBG3kAwRjQdRvYZqtovUaxY6jp\nhd09975gO+2eYPDbc1yhNftVJ4KBT0zdEqzX0CwIlxE1MsnZ2YOsC7IJO531hMBp\ndBxM4tSG07xPz70AVUi9rY6YCUoJHmxoFbclpHFbtXZocR393WyzUK8047uM2mlz\n03AZKcMdyfeuo2/9TcxpTSCkklGqwqS9wtTogckaDHJDoBunAkMioGfOSMe7Yi6E\nYRtG4yPJYsDaq2yPJWV8+i0PFR1Wi5RCnPt0YdQWstHuZrxABi45+XVkzKtz3TUc\nYxrvPBucVa6uzd953u8CixNFkiOefvb/dajsv1GIwH6/Cvc1ftz1AgMBAAGgODA2\nBgkqhkiG9w0BCQ4xKTAnMCUGA1UdEQQeMByCDnd3dy53ZXBwb3MubmV0ggp3ZXBw\nb3MubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQCDnVBO9RdJX0eFeZzlv5c8yG8duhKP\nl0Vl+V88fJylb/cbNj9qFPkKTK0vTXmS2XUFBChKPtLucp8+Z754UswX+QCsdc7U\nTTSG0CkyilcSubdZUERGej1XfrVQhrokk7Fu0Jh3BdT6REP0SIDTpA8ku/aRQiAp\np+h19M37S7+w/DMGDAq2LSX8jOpJ1yIokRDyLZpmwyLxutC21DXMGoJ3xZeUFrUT\nqRNwzkn2dJzgTrPkzhaXalUBqv+nfXHqHaWljZa/O0NVCFrHCdTdd53/6EE2Yabv\nq5SFTkRCpaxrvM/7a8Tr4ixD1/VKD6rw3+WC00000000000000000000\n-----END CERTIFICATE REQUEST-----\n")
       expect(result.state).to eq("issued")
       expect(result.authority_identifier).to eq("letsencrypt")
-      expect(result.created_at).to eq("2016-06-11T18:47:08.949Z")
-      expect(result.updated_at).to eq("2016-06-11T18:47:37.546Z")
+      expect(result.created_at).to eq("2016-06-11T18:47:08Z")
+      expect(result.updated_at).to eq("2016-06-11T18:47:37Z")
       expect(result.expires_on).to eq("2016-09-09")
     end
 

data/spec/dnsimple/client/contacts_spec.rb

@@ -133,8 +133,8 @@ describe Dnsimple::Client, ".contacts" do
       expect(result).to be_a(Dnsimple::Struct::Contact)
       expect(result.id).to eq(1)
       expect(result.account_id).to eq(1010)
-      expect(result.created_at).to eq("2016-01-19T20:50:26.066Z")
-      expect(result.updated_at).to eq("2016-01-19T20:50:26.066Z")
+      expect(result.created_at).to eq("2016-01-19T20:50:26Z")
+      expect(result.updated_at).to eq("2016-01-19T20:50:26Z")
     end
 
     context "when the contact does not exist" do

data/spec/dnsimple/client/domains_email_forwards_spec.rb

@@ -151,8 +151,8 @@ describe Dnsimple::Client, ".domains" do
       expect(result.domain_id).to eq(228963)
       expect(result.from).to eq("jim@a-domain.com")
       expect(result.to).to eq("jim@another.com")
-      expect(result.created_at).to eq("2016-02-04T14:26:50.282Z")
-      expect(result.updated_at).to eq("2016-02-04T14:26:50.282Z")
+      expect(result.created_at).to eq("2016-02-04T14:26:50Z")
+      expect(result.updated_at).to eq("2016-02-04T14:26:50Z")
     end
 
     context "when the email forward does not exist" do

data/spec/dnsimple/client/domains_spec.rb

@@ -151,8 +151,8 @@ describe Dnsimple::Client, ".domains" do
       expect(result.auto_renew).to eq(false)
       expect(result.private_whois).to eq(false)
       expect(result.expires_on).to eq(nil)
-      expect(result.created_at).to eq("2014-12-06T15:56:55.573Z")
-      expect(result.updated_at).to eq("2015-12-09T00:20:56.056Z")
+      expect(result.created_at).to eq("2014-12-06T15:56:55Z")
+      expect(result.updated_at).to eq("2015-12-09T00:20:56Z")
     end
 
     context "when the domain does not exist" do

data/spec/dnsimple/client/identity_spec.rb

@@ -29,7 +29,7 @@ describe Dnsimple::Client, ".identity" do
     context "when authenticated as account" do
       before do
         stub_request(:get, %r{/v2/whoami$}).
-            to_return(read_http_fixture("whoami/success_account.http"))
+            to_return(read_http_fixture("whoami/success-account.http"))
       end
 
       it "sets the account" do
@@ -42,7 +42,7 @@ describe Dnsimple::Client, ".identity" do
     context "when authenticated as user" do
       before do
         stub_request(:get, %r{/v2/whoami$}).
-            to_return(read_http_fixture("whoami/success_user.http"))
+            to_return(read_http_fixture("whoami/success-user.http"))
       end
 
       it "sets the user" do

data/spec/dnsimple/client/registrar_auto_renewal_spec.rb

@@ -10,7 +10,7 @@ describe Dnsimple::Client, ".registrar" do
 
     before do
       stub_request(:put, %r{/v2/#{account_id}/registrar/domains/#{domain_id}}).
-          to_return(read_http_fixture("enableAutoRenewal/success.http"))
+          to_return(read_http_fixture("enableDomainAutoRenewal/success.http"))
     end
 
 
@@ -47,7 +47,7 @@ describe Dnsimple::Client, ".registrar" do
 
     before do
       stub_request(:delete, %r{/v2/#{account_id}/registrar/domains/#{domain_id}}).
-          to_return(read_http_fixture("disableAutoRenewal/success.http"))
+          to_return(read_http_fixture("disableDomainAutoRenewal/success.http"))
     end
 
 

data/spec/dnsimple/client/registrar_spec.rb

@@ -26,9 +26,57 @@ describe Dnsimple::Client, ".registrar" do
 
       result = response.data
       expect(result).to be_a(Dnsimple::Struct::DomainCheck)
-      expect(result.domain).to eq("example.com")
+      expect(result.domain).to eq("ruby.codes")
       expect(result.available).to be_truthy
-      expect(result.premium).to be_falsey
+      expect(result.premium).to be_truthy
+    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
 
@@ -55,8 +103,9 @@ describe Dnsimple::Client, ".registrar" do
       expect(response).to be_a(Dnsimple::Response)
 
       result = response.data
-      expect(result).to be_a(Dnsimple::Struct::Domain)
+      expect(result).to be_a(Dnsimple::Struct::DomainRegistration)
       expect(result.id).to be_a(Integer)
+      expect(result.domain_id).to be_a(Integer)
     end
 
     context "when the attributes are incomplete" do
@@ -89,8 +138,9 @@ describe Dnsimple::Client, ".registrar" do
       expect(response).to be_a(Dnsimple::Response)
 
       result = response.data
-      expect(result).to be_a(Dnsimple::Struct::Domain)
+      expect(result).to be_a(Dnsimple::Struct::DomainRenewal)
       expect(result.id).to be_a(Integer)
+      expect(result.domain_id).to be_a(Integer)
     end
 
     context "when it is too soon for the domain to be renewed" do
@@ -128,9 +178,9 @@ describe Dnsimple::Client, ".registrar" do
       expect(response).to be_a(Dnsimple::Response)
 
       result = response.data
-      expect(result).to be_a(Dnsimple::Struct::Domain)
-      expect(result.name).to eq("example.com")
-      expect(result.registrant_id).to eq(10)
+      expect(result).to be_a(Dnsimple::Struct::DomainTransfer)
+      expect(result.id).to be_a(Integer)
+      expect(result.domain_id).to be_a(Integer)
     end
 
     context "when the attributes are incomplete" do