dnsimple 2.0.0.alpha4 → 2.0.0.alpha5

data/spec/dnsimple/client/domains_zones_spec.rb

@@ -26,13 +26,13 @@ describe Dnsimple::Client, ".domains / zones" do
     end
 
     context "when domain does not exist" do
-      it "raises RecordNotFound" do
+      it "raises NotFoundError" do
         stub_request(:get, %r[/v1]).
             to_return(read_fixture("domains_zones/notfound-domain.http"))
 
         expect {
           subject.zone("example.com")
-        }.to raise_error(Dnsimple::RecordNotFound)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end

data/spec/dnsimple/client/name_servers_spec.rb

@@ -5,9 +5,9 @@ describe Dnsimple::Client, ".name_servers" do
   subject { described_class.new(api_endpoint: "https://api.zone", username: "user", api_token: "token").name_servers }
 
 
-  describe "#list" do
+  describe "#name_servers" do
     before do
-      stub_request(:get, %r[/v1/domains/.+/name_servers]).
+      stub_request(:get, %r[/v1/domains/.+/name_servers$]).
           to_return(read_fixture("nameservers/list/success.http"))
     end
 
@@ -19,24 +19,24 @@ describe Dnsimple::Client, ".name_servers" do
     end
 
     it "returns the name servers" do
-      expect(subject.list("example.com")).to eq(%w( ns1.dnsimple.com ns2.dnsimple.com ))
+      expect(subject.name_servers("example.com")).to eq(%w( ns1.dnsimple.com ns2.dnsimple.com ))
     end
 
     context "when something does not exist" do
-      it "raises RecordNotFound" do
+      it "raises NotFoundError" do
         stub_request(:get, %r[/v1]).
             to_return(read_fixture("nameservers/notfound-domain.http"))
 
         expect {
-          subject.list("example.com")
-        }.to raise_error(Dnsimple::RecordNotFound)
+          subject.name_servers("example.com")
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end
 
   describe "#change" do
     before do
-      stub_request(:post, %r[/v1/domains/.+/name_servers]).
+      stub_request(:post, %r[/v1/domains/.+/name_servers$]).
           to_return(read_fixture("nameservers/change/success.http"))
     end
 
@@ -53,13 +53,13 @@ describe Dnsimple::Client, ".name_servers" do
     end
 
     context "when something does not exist" do
-      it "raises RecordNotFound" do
+      it "raises NotFoundError" do
         stub_request(:post, %r[/v1]).
             to_return(read_fixture("nameservers/notfound-domain.http"))
 
         expect {
           subject.change("example.com", %w())
-        }.to raise_error(Dnsimple::RecordNotFound)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end
@@ -86,13 +86,13 @@ describe Dnsimple::Client, ".name_servers" do
     end
 
     context "when the domain does not exist" do
-      it "raises RecordNotFound" do
+      it "raises NotFoundError" do
         stub_request(:post, %r[/v1]).
             to_return(read_fixture("nameservers/notfound-domain.http"))
 
         expect {
           subject.register("example.com", "ns1.example.com", "127.0.0.1")
-        }.to raise_error(Dnsimple::RecordNotFound)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end
@@ -117,13 +117,13 @@ describe Dnsimple::Client, ".name_servers" do
     end
 
     context "when the domain does not exist" do
-      it "raises RecordNotFound" do
+      it "raises NotFoundError" do
         stub_request(:delete, %r[/v1]).
             to_return(read_fixture("nameservers/notfound-domain.http"))
 
         expect {
           subject.deregister("example.com", "ns1.example.com")
-        }.to raise_error(Dnsimple::RecordNotFound)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end

data/spec/dnsimple/client/registrar_spec.rb

@@ -24,8 +24,50 @@ describe Dnsimple::Client, ".registrar" do
             to_return(read_fixture("registrar/check/registered.http"))
       end
 
-      it "returns available" do
-        expect(subject.check("example.com")).to eq("registered")
+      it "returns the result" do
+        result = subject.check("example.com")
+
+        expect(result).to be_a(Hash)
+        expect(result['status']).to eq("unavailable")
+      end
+    end
+
+    context "the domain is available" do
+      before do
+        stub_request(:get, %r[/v1/domains/.+/check$]).
+            to_return(read_fixture("registrar/check/available.http"))
+      end
+
+      it "returns the result" do
+        result = subject.check("example.com")
+
+        expect(result).to be_a(Hash)
+        expect(result['status']).to eq("available")
+      end
+    end
+  end
+
+  describe "#available?" do
+    before do
+      stub_request(:get, %r[/v1/domains/.+/check$]).
+          to_return(read_fixture("registrar/check/registered.http"))
+    end
+
+    it "builds the correct request" do
+      subject.check("example.com")
+
+      expect(WebMock).to have_requested(:get, "https://api.zone/v1/domains/example.com/check").
+                             with(headers: { 'Accept' => 'application/json' })
+    end
+
+    context "the domain is registered" do
+      before do
+        stub_request(:get, %r[/v1/domains/.+/check$]).
+            to_return(read_fixture("registrar/check/registered.http"))
+      end
+
+      it "returns false" do
+        expect(subject.available?("example.com")).to be_falsey
       end
     end
 
@@ -35,8 +77,8 @@ describe Dnsimple::Client, ".registrar" do
             to_return(read_fixture("registrar/check/available.http"))
       end
 
-      it "returns available" do
-        expect(subject.check("example.com")).to eq("available")
+      it "returns true" do
+        expect(subject.available?("example.com")).to be_truthy
       end
     end
   end
@@ -84,13 +126,13 @@ describe Dnsimple::Client, ".registrar" do
     end
 
     context "when something does not exist" do
-      it "raises RecordNotFound" do
+      it "raises NotFoundError" do
         stub_request(:post, %r[/v1]).
             to_return(read_fixture("domains/notfound.http"))
 
         expect {
           subject.renew("example.com")
-        }.to raise_error(Dnsimple::RecordNotFound)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end

data/spec/dnsimple/client/services_spec.rb

@@ -5,21 +5,21 @@ describe Dnsimple::Client, ".services" do
   subject { described_class.new(api_endpoint: "https://api.zone", username: "user", api_token: "token").services }
 
 
-  describe "#list" do
+  describe "#services" do
     before do
       stub_request(:get, %r[/v1/services$]).
-          to_return(read_fixture("services/index/success.http"))
+          to_return(read_fixture("services/list/success.http"))
     end
 
     it "builds the correct request" do
-      subject.list
+      subject.services
 
       expect(WebMock).to have_requested(:get, "https://api.zone/v1/services").
                          with(headers: { 'Accept' => 'application/json' })
     end
 
     it "returns the services" do
-      results = subject.list
+      results = subject.services
 
       expect(results).to be_a(Array)
       expect(results.size).to eq(3)
@@ -31,21 +31,21 @@ describe Dnsimple::Client, ".services" do
     end
   end
 
-  describe "#find" do
+  describe "#service" do
     before do
       stub_request(:get, %r[/v1/services/.+$]).
-          to_return(read_fixture("services/show/success.http"))
+          to_return(read_fixture("services/get/success.http"))
     end
 
     it "builds the correct request" do
-      subject.find(1)
+      subject.service(1)
 
       expect(WebMock).to have_requested(:get, "https://api.zone/v1/services/1").
                          with(headers: { 'Accept' => 'application/json' })
     end
 
     it "returns the service" do
-      result = subject.find(1)
+      result = subject.service(1)
 
       expect(result).to be_a(Dnsimple::Struct::Service)
       expect(result.id).to eq(1)
@@ -55,13 +55,13 @@ describe Dnsimple::Client, ".services" do
     end
 
     context "when something does not exist" do
-      it "raises RecordNotFound" do
+      it "raises NotFoundError" do
         stub_request(:get, %r[/v1]).
             to_return(read_fixture("services/notfound.http"))
 
         expect {
-          subject.find(1)
-        }.to raise_error(Dnsimple::RecordNotFound)
+          subject.service(1)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end

data/spec/dnsimple/client/templates_records_spec.rb

@@ -5,21 +5,21 @@ describe Dnsimple::Client, ".templates / records" do
   subject { described_class.new(api_endpoint: "https://api.zone", username: "user", api_token: "token").templates }
 
 
-  describe "#list_records" do
+  describe "#records" do
     before do
       stub_request(:get, %r[/v1/templates/.+/records$]).
-          to_return(read_fixture("templates_records/index/success.http"))
+          to_return(read_fixture("templates_records/list/success.http"))
     end
 
     it "builds the correct request" do
-      subject.list_records(1)
+      subject.records(1)
 
       expect(WebMock).to have_requested(:get, "https://api.zone/v1/templates/1/records").
                              with(headers: { 'Accept' => 'application/json' })
     end
 
     it "returns the template records" do
-      results = subject.list_records(1)
+      results = subject.records(1)
 
       expect(results).to be_a(Array)
       expect(results.size).to eq(2)
@@ -53,32 +53,32 @@ describe Dnsimple::Client, ".templates / records" do
     end
 
     context "when something does not exist" do
-      it "raises RecordNotFound" do
+      it "raises NotFoundError" do
         stub_request(:post, %r[/v1]).
             to_return(read_fixture("templates_records/notfound.http"))
 
         expect {
           subject.create_record(1, { name: "", record_type: "", content: "" })
-        }.to raise_error(Dnsimple::RecordNotFound)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end
 
-  describe "#find_record" do
+  describe "#record" do
     before do
       stub_request(:get, %r[/v1/templates/.+/records/.+$]).
-          to_return(read_fixture("templates_records/show/success.http"))
+          to_return(read_fixture("templates_records/get/success.http"))
     end
 
     it "builds the correct request" do
-      subject.find_record(1, 2)
+      subject.record(1, 2)
 
       expect(WebMock).to have_requested(:get, "https://api.zone/v1/templates/1/records/2").
                              with(headers: { 'Accept' => 'application/json' })
     end
 
     it "returns the record" do
-      result = subject.find_record(1, 2)
+      result = subject.record(1, 2)
 
       expect(result).to be_a(Dnsimple::Struct::TemplateRecord)
       expect(result.id).to eq(8868)
@@ -93,13 +93,13 @@ describe Dnsimple::Client, ".templates / records" do
     end
 
     context "when something does not exist" do
-      it "raises RecordNotFound" do
+      it "raises NotFoundError" do
         stub_request(:get, %r[/v1]).
             to_return(read_fixture("templates_records/notfound.http"))
 
         expect {
-          subject.find_record(1, 2)
-        }.to raise_error(Dnsimple::RecordNotFound)
+          subject.record(1, 2)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end
@@ -126,13 +126,13 @@ describe Dnsimple::Client, ".templates / records" do
     end
 
     context "when something does not exist" do
-      it "raises RecordNotFound" do
+      it "raises NotFoundError" do
         stub_request(:put, %r[/v1]).
             to_return(read_fixture("templates_records/notfound.http"))
 
         expect {
           subject.update_record(1, 2, {})
-        }.to raise_error(Dnsimple::RecordNotFound)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end
@@ -166,13 +166,13 @@ describe Dnsimple::Client, ".templates / records" do
     end
 
     context "when something does not exist" do
-      it "raises RecordNotFound" do
+      it "raises NotFoundError" do
         stub_request(:delete, %r[/v1]).
             to_return(read_fixture("templates_records/notfound.http"))
 
         expect {
           subject.delete_record(1, 2)
-        }.to raise_error(Dnsimple::RecordNotFound)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end

data/spec/dnsimple/client/templates_spec.rb

@@ -5,21 +5,21 @@ describe Dnsimple::Client, ".templates" do
   subject { described_class.new(api_endpoint: "https://api.zone", username: "user", api_token: "token").templates }
 
 
-  describe "#list" do
+  describe "#templates" do
     before do
       stub_request(:get, %r[/v1/templates$]).
-          to_return(read_fixture("templates/index/success.http"))
+          to_return(read_fixture("templates/list/success.http"))
     end
 
     it "builds the correct request" do
-      subject.list
+      subject.templates
 
       expect(WebMock).to have_requested(:get, "https://api.zone/v1/templates").
                          with(headers: { 'Accept' => 'application/json' })
     end
 
     it "returns the templates" do
-      results = subject.list
+      results = subject.templates
 
       expect(results).to be_a(Array)
       expect(results.size).to eq(1)
@@ -55,21 +55,21 @@ describe Dnsimple::Client, ".templates" do
     end
   end
 
-  describe "#find" do
+  describe "#template" do
     before do
       stub_request(:get, %r[/v1/templates/.+$]).
-          to_return(read_fixture("templates/show/success.http"))
+          to_return(read_fixture("templates/get/success.http"))
     end
 
     it "builds the correct request" do
-      subject.find(1)
+      subject.template(1)
 
       expect(WebMock).to have_requested(:get, "https://api.zone/v1/templates/1").
                              with(headers: { 'Accept' => 'application/json' })
     end
 
     it "returns the template" do
-      result = subject.find(1)
+      result = subject.template(1)
 
       expect(result).to be_a(Dnsimple::Struct::Template)
       expect(result.id).to eq(2651)
@@ -79,13 +79,13 @@ describe Dnsimple::Client, ".templates" do
     end
 
     context "when something does not exist" do
-      it "raises RecordNotFound" do
+      it "raises NotFoundError" do
         stub_request(:get, %r[/v1]).
             to_return(read_fixture("templates/notfound.http"))
 
         expect {
-          subject.find(1)
-        }.to raise_error(Dnsimple::RecordNotFound)
+          subject.template(1)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end
@@ -112,13 +112,13 @@ describe Dnsimple::Client, ".templates" do
     end
 
     context "when something does not exist" do
-      it "raises RecordNotFound" do
+      it "raises NotFoundError" do
         stub_request(:put, %r[/v1]).
             to_return(read_fixture("templates/notfound.http"))
 
         expect {
           subject.update(1, {})
-        }.to raise_error(Dnsimple::RecordNotFound)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end
@@ -152,13 +152,13 @@ describe Dnsimple::Client, ".templates" do
     end
 
     context "when something does not exist" do
-      it "raises RecordNotFound" do
+      it "raises NotFoundError" do
         stub_request(:delete, %r[/v1]).
             to_return(read_fixture("templates/notfound.http"))
 
         expect {
           subject.delete(1)
-        }.to raise_error(Dnsimple::RecordNotFound)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end
@@ -184,13 +184,13 @@ describe Dnsimple::Client, ".templates" do
     end
 
     context "when something does not exist" do
-      it "raises RecordNotFound" do
+      it "raises NotFoundError" do
         stub_request(:post, %r[/v1]).
             to_return(read_fixture("templates/notfound.http"))
 
         expect {
           subject.apply(1, 2)
-        }.to raise_error(Dnsimple::RecordNotFound)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end