dnsimple 3.0.0.pre.beta2 → 3.0.0

data/spec/dnsimple/client/zones_records_spec.rb

@@ -10,15 +10,15 @@ describe Dnsimple::Client, ".zones" do
     let(:zone_id) { "example.com" }
 
     before do
-      stub_request(:get, %r[/v2/#{account_id}/zones/#{zone_id}/records])
-          .to_return(read_http_fixture("listZoneRecords/success.http"))
+      stub_request(:get, %r{/v2/#{account_id}/zones/#{zone_id}/records}).
+          to_return(read_http_fixture("listZoneRecords/success.http"))
     end
 
     it "builds the correct request" do
       subject.records(account_id, zone_id)
 
-      expect(WebMock).to have_requested(:get, "https://api.dnsimple.test/v2/#{account_id}/zones/#{zone_id}/records")
-          .with(headers: { 'Accept' => 'application/json' })
+      expect(WebMock).to have_requested(:get, "https://api.dnsimple.test/v2/#{account_id}/zones/#{zone_id}/records").
+          with(headers: { 'Accept' => 'application/json' })
     end
 
     it "supports pagination" do
@@ -58,8 +58,8 @@ describe Dnsimple::Client, ".zones" do
 
     context "when the zone does not exist" do
       it "raises NotFoundError" do
-        stub_request(:get, %r[/v2])
-            .to_return(read_http_fixture("notfound-zone.http"))
+        stub_request(:get, %r{/v2}).
+            to_return(read_http_fixture("notfound-zone.http"))
 
         expect {
           subject.records(account_id, zone_id)
@@ -73,8 +73,8 @@ describe Dnsimple::Client, ".zones" do
     let(:zone_id) { "example.com" }
 
     it "delegates to client.paginate" do
-      expect(subject).to receive(:paginate).with(:records, account_id, zone_id, { foo: "bar" })
-      subject.all_records(account_id, zone_id, { foo: "bar" })
+      expect(subject).to receive(:paginate).with(:records, account_id, zone_id, foo: "bar")
+      subject.all_records(account_id, zone_id, foo: "bar")
     end
   end
 
@@ -83,8 +83,8 @@ describe Dnsimple::Client, ".zones" do
     let(:zone_id) { "example.com" }
 
     before do
-      stub_request(:post, %r[/v2/#{account_id}/zones/#{zone_id}/records$])
-          .to_return(read_http_fixture("createZoneRecord/created.http"))
+      stub_request(:post, %r{/v2/#{account_id}/zones/#{zone_id}/records$}).
+          to_return(read_http_fixture("createZoneRecord/created.http"))
     end
 
     let(:attributes) { { type: "A", name: "www", content: "127.0.0.1" } }
@@ -92,9 +92,9 @@ describe Dnsimple::Client, ".zones" do
     it "builds the correct request" do
       subject.create_record(account_id, zone_id, attributes)
 
-      expect(WebMock).to have_requested(:post, "https://api.dnsimple.test/v2/#{account_id}/zones/#{zone_id}/records")
-          .with(body: attributes)
-          .with(headers: { 'Accept' => 'application/json' })
+      expect(WebMock).to have_requested(:post, "https://api.dnsimple.test/v2/#{account_id}/zones/#{zone_id}/records").
+          with(body: attributes).
+          with(headers: { 'Accept' => 'application/json' })
     end
 
     it "returns the record" do
@@ -108,8 +108,8 @@ describe Dnsimple::Client, ".zones" do
 
     context "when the zone does not exist" do
       it "raises NotFoundError" do
-        stub_request(:post, %r[/v2])
-            .to_return(read_http_fixture("notfound-zone.http"))
+        stub_request(:post, %r{/v2}).
+            to_return(read_http_fixture("notfound-zone.http"))
 
         expect {
           subject.create_record(account_id, zone_id, attributes)
@@ -123,15 +123,15 @@ describe Dnsimple::Client, ".zones" do
     let(:zone_id) { "example.com" }
 
     before do
-      stub_request(:get, %r[/v2/#{account_id}/zones/#{zone_id}/records/.+$])
-          .to_return(read_http_fixture("getZoneRecord/success.http"))
+      stub_request(:get, %r{/v2/#{account_id}/zones/#{zone_id}/records/.+$}).
+          to_return(read_http_fixture("getZoneRecord/success.http"))
     end
 
     it "builds the correct request" do
       subject.record(account_id, zone_id, record_id = 2)
 
-      expect(WebMock).to have_requested(:get, "https://api.dnsimple.test/v2/#{account_id}/zones/#{zone_id}/records/#{record_id}")
-          .with(headers: { 'Accept' => 'application/json' })
+      expect(WebMock).to have_requested(:get, "https://api.dnsimple.test/v2/#{account_id}/zones/#{zone_id}/records/#{record_id}").
+          with(headers: { 'Accept' => 'application/json' })
     end
 
     it "returns the record" do
@@ -155,8 +155,8 @@ describe Dnsimple::Client, ".zones" do
 
     context "when the zone does not exist" do
       it "raises NotFoundError" do
-        stub_request(:get, %r[/v2])
-            .to_return(read_http_fixture("notfound-zone.http"))
+        stub_request(:get, %r{/v2}).
+            to_return(read_http_fixture("notfound-zone.http"))
 
         expect {
           subject.record(account_id, zone_id, "0")
@@ -166,8 +166,8 @@ describe Dnsimple::Client, ".zones" do
 
     context "when the record does not exist" do
       it "raises NotFoundError" do
-        stub_request(:get, %r[/v2])
-            .to_return(read_http_fixture("notfound-record.http"))
+        stub_request(:get, %r{/v2}).
+            to_return(read_http_fixture("notfound-record.http"))
 
         expect {
           subject.record(account_id, zone_id, "0")
@@ -181,8 +181,8 @@ describe Dnsimple::Client, ".zones" do
     let(:zone_id) { "example.com" }
 
     before do
-      stub_request(:patch, %r[/v2/#{account_id}/zones/#{zone_id}/records/.+$])
-          .to_return(read_http_fixture("updateZoneRecord/success.http"))
+      stub_request(:patch, %r{/v2/#{account_id}/zones/#{zone_id}/records/.+$}).
+          to_return(read_http_fixture("updateZoneRecord/success.http"))
     end
 
     let(:attributes) { { content: "127.0.0.1", priority: "1" } }
@@ -190,9 +190,9 @@ describe Dnsimple::Client, ".zones" do
     it "builds the correct request" do
       subject.update_record(account_id, zone_id, record_id = 2, attributes)
 
-      expect(WebMock).to have_requested(:patch, "https://api.dnsimple.test/v2/#{account_id}/zones/#{zone_id}/records/#{record_id}")
-          .with(body: attributes)
-          .with(headers: { 'Accept' => 'application/json' })
+      expect(WebMock).to have_requested(:patch, "https://api.dnsimple.test/v2/#{account_id}/zones/#{zone_id}/records/#{record_id}").
+          with(body: attributes).
+          with(headers: { 'Accept' => 'application/json' })
     end
 
     it "returns the record" do
@@ -206,8 +206,8 @@ describe Dnsimple::Client, ".zones" do
 
     context "when the zone does not exist" do
       it "raises NotFoundError" do
-        stub_request(:patch, %r[/v2])
-            .to_return(read_http_fixture("notfound-zone.http"))
+        stub_request(:patch, %r{/v2}).
+            to_return(read_http_fixture("notfound-zone.http"))
 
         expect {
           subject.update_record(account_id, zone_id, "0", {})
@@ -217,8 +217,8 @@ describe Dnsimple::Client, ".zones" do
 
     context "when the record does not exist" do
       it "raises NotFoundError" do
-        stub_request(:patch, %r[/v2])
-            .to_return(read_http_fixture("notfound-record.http"))
+        stub_request(:patch, %r{/v2}).
+            to_return(read_http_fixture("notfound-record.http"))
 
         expect {
           subject.update_record(account_id, zone_id, "0", {})
@@ -232,15 +232,15 @@ describe Dnsimple::Client, ".zones" do
     let(:zone_id) { "example.com" }
 
     before do
-      stub_request(:delete, %r[/v2/#{account_id}/zones/#{zone_id}/records/.+$])
-          .to_return(read_http_fixture("deleteZoneRecord/success.http"))
+      stub_request(:delete, %r{/v2/#{account_id}/zones/#{zone_id}/records/.+$}).
+          to_return(read_http_fixture("deleteZoneRecord/success.http"))
     end
 
     it "builds the correct request" do
       subject.delete_record(account_id, zone_id, record_id = 2)
 
-      expect(WebMock).to have_requested(:delete, "https://api.dnsimple.test/v2/#{account_id}/zones/#{zone_id}/records/#{record_id}")
-          .with(headers: { 'Accept' => 'application/json' })
+      expect(WebMock).to have_requested(:delete, "https://api.dnsimple.test/v2/#{account_id}/zones/#{zone_id}/records/#{record_id}").
+          with(headers: { 'Accept' => 'application/json' })
     end
 
     it "returns nothing" do
@@ -253,8 +253,8 @@ describe Dnsimple::Client, ".zones" do
 
     context "when the zone does not exist" do
       it "raises NotFoundError" do
-        stub_request(:delete, %r[/v2])
-            .to_return(read_http_fixture("notfound-zone.http"))
+        stub_request(:delete, %r{/v2}).
+            to_return(read_http_fixture("notfound-zone.http"))
 
         expect {
           subject.delete_record(account_id, zone_id, "0")
@@ -264,8 +264,8 @@ describe Dnsimple::Client, ".zones" do
 
     context "when the record does not exist" do
       it "raises NotFoundError" do
-        stub_request(:delete, %r[/v2])
-            .to_return(read_http_fixture("notfound-record.http"))
+        stub_request(:delete, %r{/v2}).
+            to_return(read_http_fixture("notfound-record.http"))
 
         expect {
           subject.delete_record(account_id, zone_id, "0")

data/spec/dnsimple/client/zones_spec.rb

@@ -9,15 +9,15 @@ describe Dnsimple::Client, ".zones" do
     let(:account_id) { 1010 }
 
     before do
-      stub_request(:get, %r[/v2/#{account_id}/zones])
-          .to_return(read_http_fixture("listZones/success.http"))
+      stub_request(:get, %r{/v2/#{account_id}/zones}).
+          to_return(read_http_fixture("listZones/success.http"))
     end
 
     it "builds the correct request" do
       subject.zones(account_id)
 
-      expect(WebMock).to have_requested(:get, "https://api.dnsimple.test/v2/#{account_id}/zones")
-          .with(headers: { 'Accept' => 'application/json' })
+      expect(WebMock).to have_requested(:get, "https://api.dnsimple.test/v2/#{account_id}/zones").
+          with(headers: { 'Accept' => 'application/json' })
     end
 
     it "supports pagination" do
@@ -60,8 +60,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
   end
 
@@ -69,15 +69,15 @@ describe Dnsimple::Client, ".zones" do
     let(:account_id) { 1010 }
 
     before do
-      stub_request(:get, %r[/v2/#{account_id}/zones/.+$])
-          .to_return(read_http_fixture("getZone/success.http"))
+      stub_request(:get, %r{/v2/#{account_id}/zones/.+$}).
+          to_return(read_http_fixture("getZone/success.http"))
     end
 
     it "builds the correct request" do
       subject.zone(account_id, zone = "example.com")
 
-      expect(WebMock).to have_requested(:get, "https://api.dnsimple.test/v2/#{account_id}/zones/#{zone}")
-          .with(headers: { 'Accept' => 'application/json' })
+      expect(WebMock).to have_requested(:get, "https://api.dnsimple.test/v2/#{account_id}/zones/#{zone}").
+          with(headers: { 'Accept' => 'application/json' })
     end
 
     it "returns the zone" do
@@ -96,8 +96,8 @@ describe Dnsimple::Client, ".zones" do
 
     context "when the zone does not exist" do
       it "raises NotFoundError" do
-        stub_request(:get, %r[/v2])
-            .to_return(read_http_fixture("notfound-zone.http"))
+        stub_request(:get, %r{/v2}).
+            to_return(read_http_fixture("notfound-zone.http"))
 
         expect {
           subject.zone(account_id, "example.com")

data/spec/dnsimple/client_spec.rb

@@ -26,7 +26,7 @@ describe Dnsimple::Client do
 
   describe "authentication" do
     it "uses HTTP authentication if there's a password provided" do
-      stub_request(:any, %r[/test])
+      stub_request(:any, %r{/test})
 
       subject = described_class.new(username: "user", password: "pass")
       subject.execute(:get, "test", {})
@@ -34,24 +34,14 @@ describe Dnsimple::Client do
       expect(WebMock).to have_requested(:get, "https://user:pass@api.dnsimple.com/test")
     end
 
-    it "uses header authentication if there's a domain api token provided" do
-      stub_request(:any, %r[/test])
-
-      subject = described_class.new(domain_api_token: "domaintoken")
-      subject.execute(:get, "test", {})
-
-      expect(WebMock).to have_requested(:get, "https://api.dnsimple.com/test").
-                         with { |req| req.headers["X-Dnsimple-Domain-Token"] == "domaintoken" }
-    end
-
     it "uses access token if there's an access token provided" do
-      stub_request(:any, %r[/test])
+      stub_request(:any, %r{/test})
 
       subject = described_class.new(access_token: "access-token")
       subject.execute(:get, "test", {})
 
       expect(WebMock).to have_requested(:get, "https://api.dnsimple.com/test").
-                         with { |req| req.headers["Authorization"] == "Bearer access-token" }
+          with { |req| req.headers["Authorization"] == "Bearer access-token" }
     end
 
     it "raises an error if there's no password, domain token or access token provided" do
@@ -65,7 +55,7 @@ describe Dnsimple::Client do
 
   describe "#get" do
     it "delegates to #request" do
-      expect(subject).to receive(:execute).with(:get, "path", nil, { foo: "bar" }).and_return(:returned)
+      expect(subject).to receive(:execute).with(:get, "path", nil, foo: "bar").and_return(:returned)
       expect(subject.get("path", foo: "bar")).to eq(:returned)
     end
   end
@@ -101,13 +91,28 @@ describe Dnsimple::Client do
   describe "#execute" do
     subject { described_class.new(username: "user", password: "pass") }
 
-    it "raises RequestError in case of error" do
-      stub_request(:get, %r[/foo]).
-          to_return(status: [500, "Internal Server Error"])
+    it "raises RequestError in case of error with a JSON response" do
+      stub_request(:post, %r{/foo}).to_return(read_http_fixture("transferDomain/error-indnsimple.http"))
+
+      expect {
+        subject.execute(:post, "foo", {})
+      }.to raise_error(Dnsimple::RequestError, "The domain google.com is already in DNSimple and cannot be added")
+    end
+
+    it "raises RequestError in case of error with an HTML response" do
+      stub_request(:get, %r{/foo}).to_return(read_http_fixture("badgateway.http"))
 
       expect {
         subject.execute(:get, "foo", {})
-      }.to raise_error(Dnsimple::RequestError, "500")
+      }.to raise_error(Dnsimple::RequestError, "502 Bad Gateway")
+    end
+
+    it "raises RequestError in absence of content types" do
+      stub_request(:put, %r{/foo}).to_return(read_http_fixture("method-not-allowed.http"))
+
+      expect {
+        subject.execute(:put, "foo", {})
+      }.to raise_error(Dnsimple::RequestError, "405 Method Not Allowed")
     end
   end
 
@@ -115,53 +120,56 @@ describe Dnsimple::Client do
     subject { described_class.new(username: "user", password: "pass") }
 
     it "performs a request" do
-      stub_request(:get, %r[/foo])
+      stub_request(:get, %r{/foo})
 
       subject.request(:get, 'foo', {})
 
       expect(WebMock).to have_requested(:get, "https://user:pass@api.dnsimple.com/foo").
-                         with(headers: { 'Accept' => 'application/json', 'User-Agent' => "dnsimple-ruby/#{Dnsimple::VERSION}" })
+          with(headers: { 'Accept' => 'application/json', 'User-Agent' => "dnsimple-ruby/#{Dnsimple::VERSION}" })
     end
 
     it "delegates to HTTParty" do
-      stub_request(:get, %r[/foo])
+      stub_request(:get, %r{/foo})
 
       expect(HTTParty).to receive(:get).
-                          with("#{subject.base_url}foo",
-                               format: :json,
-                               basic_auth: { username: "user", password: "pass" },
-                               headers: { 'Accept' => 'application/json', 'User-Agent' => "dnsimple-ruby/#{Dnsimple::VERSION}" }
-                          ).
-                          and_return(double('response', code: 200))
+          with(
+              "#{subject.base_url}foo",
+              format: :json,
+              basic_auth: { username: "user", password: "pass" },
+              headers: { 'Accept' => 'application/json', 'User-Agent' => "dnsimple-ruby/#{Dnsimple::VERSION}" }
+          ).
+          and_return(double('response', code: 200))
 
       subject.request(:get, 'foo')
     end
 
     it "properly extracts processes options and encodes data" do
       expect(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-ruby/#{Dnsimple::VERSION}", "Custom" => "Header" }
-                          ).
-                          and_return(double('response', code: 200))
+          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-ruby/#{Dnsimple::VERSION}", "Custom" => "Header" }
+          ).
+          and_return(double('response', code: 200))
 
       subject.request(:put, 'foo', { something: "else" }, { query: { foo: "bar" }, headers: { "Custom" => "Header" } })
     end
 
     it "handles non application/json content types" do
       expect(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-ruby/#{Dnsimple::VERSION}" }
-                          ).
-                          and_return(double('response', code: 200))
-
-      subject.request(:post, 'foo', { something: "else" }, headers: { "Content-Type" => "application/x-www-form-urlencoded" })
+          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-ruby/#{Dnsimple::VERSION}" }
+          ).
+          and_return(double('response', code: 200))
+
+      subject.request(:post, 'foo', { something: "else" }, { headers: { "Content-Type" => "application/x-www-form-urlencoded" } })
     end
   end
 

data/spec/dnsimple/extra_spec.rb

@@ -22,17 +22,17 @@ describe Dnsimple::Extra do
   end
 
   describe ".validate_mandatory_attributes" do
-    let(:mandatory_attributes) { %i{name email} }
+    let(:mandatory_attributes) { %i(name email) }
 
     it "raises an error if a mandatory attribute is not present " do
       expect {
-        described_class.validate_mandatory_attributes({name: "foo"}, mandatory_attributes)
+        described_class.validate_mandatory_attributes({ name: "foo" }, mandatory_attributes)
       }.to raise_error(ArgumentError, ":email is required")
     end
 
     it "does not raise an error if all attributes are present" do
       expect {
-        described_class.validate_mandatory_attributes({name: "foo", email: "bar"}, mandatory_attributes)
+        described_class.validate_mandatory_attributes({ name: "foo", email: "bar" }, mandatory_attributes)
       }.not_to raise_error
     end
 

data/spec/fixtures.http/changeDomainDelegation/success.http

@@ -0,0 +1,17 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Thu, 24 Mar 2016 11:17:01 GMT
+Content-Type: application/json; charset=utf-8
+Transfer-Encoding: chunked
+Connection: keep-alive
+Status: 200 OK
+X-RateLimit-Limit: 2400
+X-RateLimit-Remaining: 2392
+X-RateLimit-Reset: 1458821049
+ETag: W/"cb540984f806b12ac437cc1f76092f90"
+Cache-Control: max-age=0, private, must-revalidate
+X-Request-Id: 0ea7bdd2-63ca-4eef-9c41-4a83d2fe0067
+X-Runtime: 2.845860
+Strict-Transport-Security: max-age=31536000
+
+{"data":["ns1.dnsimple.com","ns2.dnsimple.com","ns3.dnsimple.com","ns4.dnsimple.com"]}