dnsimple 2.0.0.alpha4 → 2.0.0.alpha5

data/lib/dnsimple/client/domains_sharing.rb

@@ -9,9 +9,9 @@ module Dnsimple
       # @param  [#to_s] domain The domain id or domain name.
       #
       # @return [Array<Struct::Membership>]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
-      def list_memberships(domain)
+      def memberships(domain)
         response = client.get("v1/domains/#{domain}/memberships")
 
         response.map { |r| Struct::Membership.new(r["membership"]) }
@@ -25,7 +25,7 @@ module Dnsimple
       # @param  [String] email
       #
       # @return [Struct::Membership]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
       def create_membership(domain, email)
         options  = { membership: { email: email }}
@@ -42,7 +42,7 @@ module Dnsimple
       # @param  [Fixnum] membership The membership id.
       #
       # @return [void]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
       def delete_membership(domain, membership)
         client.delete("v1/domains/#{domain}/memberships/#{membership}")

data/lib/dnsimple/client/domains_zones.rb

@@ -9,7 +9,7 @@ module Dnsimple
       # @param  [#to_s] domain The domain id or domain name.
       #
       # @return [String]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
       def zone(domain)
         response = client.get("v1/domains/#{domain}/zone")

data/lib/dnsimple/client/name_servers.rb

@@ -9,14 +9,16 @@ module Dnsimple
       # @param  [#to_s] domain The domain id or domain name.
       #
       # @return [Array<String>] The delegates name servers.
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
-      def list(domain)
+      def name_servers(domain)
         response = client.get("v1/domains/#{domain}/name_servers")
 
         response.parsed_response
       end
 
+      alias :list :name_servers
+
       # Changes the name servers for a domain.
       #
       # @see http://developer.dnsimple.com/domains/nameservers/#change
@@ -25,7 +27,7 @@ module Dnsimple
       # @param  [Array<String>] servers The name server list.
       #
       # @return [Array<String>] The delegates name servers.
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
       def change(domain, servers)
         servers = servers.inject({}) { |hash, server| hash.merge("ns#{hash.length + 1}" => server) }

data/lib/dnsimple/client/registrar.rb

@@ -8,15 +8,28 @@ module Dnsimple
       #
       # @param  [#to_s] name The domain name to check.
       #
-      # @return [String] "available" or "registered"
+      # @return [Hash] The response containing the status, price, and more details.
       # @raise  [RequestError] When the request fails.
-      def check(name, options={})
-        begin
-          client.get("v1/domains/#{name}/check", options)
-          "registered"
-        rescue RecordNotFound
-          "available"
+      def check(name)
+        response = begin
+          client.get("v1/domains/#{name}/check")
+        rescue NotFoundError => e
+          e.response
         end
+
+        response.parsed_response
+      end
+
+      # Checks the availability of a domain name.
+      #
+      # @see http://developer.dnsimple.com/domains/registry/#check
+      #
+      # @param  [#to_s] name The domain name to check.
+      #
+      # @return [Boolean] true if the domain is available
+      # @raise  [RequestError] When the request fails.
+      def available?(name)
+        check(name)["status"] == "available"
       end
 
       # Registers a domain.

data/lib/dnsimple/client/services.rb

@@ -8,12 +8,14 @@ module Dnsimple
       #
       # @return [Array<Struct::Service>]
       # @raise  [RequestError] When the request fails.
-      def list
+      def services
         response = client.get("v1/services")
 
         response.map { |r| Struct::Service.new(r["service"]) }
       end
 
+      alias :list :services
+
       # Gets a service.
       #
       # @see http://developer.dnsimple.com/services/#get
@@ -21,9 +23,9 @@ module Dnsimple
       # @param  [Fixnum] service The service id.
       #
       # @return [Struct::Service]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
-      def find(service)
+      def service(service)
         response = client.get("v1/services/#{service}")
 
         Struct::Service.new(response["service"])

data/lib/dnsimple/client/services_domains.rb

@@ -9,7 +9,7 @@ module Dnsimple
       # @param  [#to_s] domain The domain id or domain name.
       #
       # @return [Array<Struct::Service>]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
       def applied(domain)
         response = client.get("v1/domains/#{domain}/applied_services")
@@ -24,7 +24,7 @@ module Dnsimple
       # @param  [#to_s] domain The domain id or domain name.
       #
       # @return [Array<Struct::Service>]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
       def available(domain)
         response = client.get("v1/domains/#{domain}/available_services")
@@ -40,7 +40,7 @@ module Dnsimple
       # @param  [Fixnum] service The service id.
       #
       # @return [void]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
       def apply(domain, service)
         options  = { service: { id: service }}
@@ -56,7 +56,7 @@ module Dnsimple
       # @param  [Fixnum] service The service id.
       #
       # @return [void]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
       def unapply(domain, service)
         response = client.delete("v1/domains/#{domain}/applied_services/#{service}")

data/lib/dnsimple/client/templates.rb

@@ -8,12 +8,14 @@ module Dnsimple
       #
       # @return [Array<Struct::Template>]
       # @raise  [RequestError] When the request fails.
-      def list
+      def templates
         response = client.get("v1/templates")
 
         response.map { |r| Struct::Template.new(r["dns_template"]) }
       end
 
+      alias :list :templates
+
       # Creates a template in the account.
       #
       # @see http://developer.dnsimple.com/templates/#create
@@ -37,9 +39,9 @@ module Dnsimple
       # @param  [#to_s] template The template id or short-name.
       #
       # @return [Struct::Template]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
-      def find(template)
+      def template(template)
         response = client.get("v1/templates/#{template}")
 
         Struct::Template.new(response["dns_template"])
@@ -53,7 +55,7 @@ module Dnsimple
       # @param  [Hash] attributes
       #
       # @return [Struct::Template]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
       def update(template, attributes = {})
         options  = { dns_template: attributes }
@@ -71,7 +73,7 @@ module Dnsimple
       # @param  [#to_s] template The template id or short-name.
       #
       # @return [void]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
       def delete(template)
         client.delete("v1/templates/#{template}")
@@ -86,7 +88,7 @@ module Dnsimple
       # @param  [#to_s] template The template id or short-name.
       #
       # @return [void]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
       def apply(domain, template)
         response = client.post("v1/domains/#{domain}/templates/#{template}/apply")

data/lib/dnsimple/client/templates_records.rb

@@ -9,9 +9,9 @@ module Dnsimple
       # @param  [#to_s] template The template id or short-name.
       #
       # @return [Array<Struct::TemplateRecord>]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
-      def list_records(template)
+      def records(template)
         response = client.get("v1/templates/#{template}/records")
 
         response.map { |r| Struct::TemplateRecord.new(r["dns_template_record"]) }
@@ -25,7 +25,7 @@ module Dnsimple
       # @param  [Hash] attributes
       #
       # @return [Struct::TemplateRecord]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
       def create_record(template, attributes = {})
         Extra.validate_mandatory_attributes(attributes, [:name, :record_type, :content])
@@ -43,9 +43,9 @@ module Dnsimple
       # @param  [Fixnum] record The record id.
       #
       # @return [Struct::TemplateRecord]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
-      def find_record(template, record)
+      def record(template, record)
         response = client.get("v1/templates/#{template}/records/#{record}")
 
         Struct::TemplateRecord.new(response["dns_template_record"])
@@ -60,7 +60,7 @@ module Dnsimple
       # @param  [Hash] attributes
       #
       # @return [Struct::TemplateRecord]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
       def update_record(template, record, attributes = {})
         options  = { dns_template_record: attributes }
@@ -77,7 +77,7 @@ module Dnsimple
       # @param  [Fixnum] record The record id.
       #
       # @return [Template]
-      # @raise  [RecordNotFound]
+      # @raise  [NotFoundError]
       # @raise  [RequestError] When the request fails.
       def delete_record(template, record)
         client.delete("v1/templates/#{template}/records/#{record}")

data/lib/dnsimple/error.rb

@@ -12,7 +12,7 @@ module Dnsimple
     end
   end
 
-  class RecordNotFound < RequestError
+  class NotFoundError < RequestError
   end
 
   class AuthenticationError < Error

data/lib/dnsimple/version.rb

@@ -1,3 +1,3 @@
 module Dnsimple
-  VERSION = '2.0.0.alpha4'
+  VERSION = '2.0.0.alpha5'
 end

data/spec/dnsimple/client/certificates_spec.rb

@@ -5,21 +5,21 @@ describe Dnsimple::Client, ".certificates" do
   subject { described_class.new(api_endpoint: "https://api.zone", username: "user", api_token: "token").certificates }
 
 
-  describe "#list" do
+  describe "#certificates" do
     before do
       stub_request(:get, %r[/v1/domains/.+/certificates$]).
-          to_return(read_fixture("certificates/index/success.http"))
+          to_return(read_fixture("certificates/list/success.http"))
     end
 
     it "builds the correct request" do
-      subject.list("example.com")
+      subject.certificates("example.com")
 
       expect(WebMock).to have_requested(:get, "https://api.zone/v1/domains/example.com/certificates").
                              with(headers: { 'Accept' => 'application/json' })
     end
 
     it "returns the records" do
-      results = subject.list("example.com")
+      results = subject.certificates("example.com")
 
       expect(results).to be_a(Array)
       expect(results.size).to eq(2)
@@ -31,32 +31,32 @@ describe Dnsimple::Client, ".certificates" 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("domains/notfound.http"))
 
         expect {
-          subject.list("example.com")
-        }.to raise_error(Dnsimple::RecordNotFound)
+          subject.certificates("example.com")
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end
 
-  describe "#find" do
+  describe "#certificate" do
     before do
       stub_request(:get, %r[/v1/domains/.+/certificates/.+$]).
-          to_return(read_fixture("certificates/show/success.http"))
+          to_return(read_fixture("certificates/get/success.http"))
     end
 
     it "builds the correct request" do
-      subject.find("example.com", 2)
+      subject.certificate("example.com", 2)
 
       expect(WebMock).to have_requested(:get, "https://api.zone/v1/domains/example.com/certificates/2").
                          with(headers: { 'Accept' => 'application/json' })
     end
 
     it "returns the certificate" do
-      result = subject.find("example.com", 2)
+      result = subject.certificate("example.com", 2)
 
       expect(result).to be_a(Dnsimple::Struct::Certificate)
       expect(result.id).to eq(4576)
@@ -75,13 +75,13 @@ describe Dnsimple::Client, ".certificates" 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("certificates/notfound.http"))
 
         expect {
-          subject.find("example.com", 2)
-        }.to raise_error(Dnsimple::RecordNotFound)
+          subject.certificate("example.com", 2)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end
@@ -116,13 +116,13 @@ describe Dnsimple::Client, ".certificates" 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.purchase("example.com", "www", 100)
-        }.to raise_error(Dnsimple::RecordNotFound)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end
@@ -149,13 +149,13 @@ describe Dnsimple::Client, ".certificates" 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("certificates/notfound.http"))
 
         expect {
           subject.configure("example.com", 2)
-        }.to raise_error(Dnsimple::RecordNotFound)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end
@@ -182,13 +182,13 @@ describe Dnsimple::Client, ".certificates" 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("certificates/notfound.http"))
 
         expect {
           subject.submit("example.com", 2, "admin@example.com")
-        }.to raise_error(Dnsimple::RecordNotFound)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end

data/spec/dnsimple/client/contacts_spec.rb

@@ -5,24 +5,24 @@ describe Dnsimple::Client, ".contacts" do
   subject { described_class.new(api_endpoint: "https://api.zone", username: "user", api_token: "token").contacts }
 
 
-  describe "#list" do
+  describe "#contacts" do
     before do
       stub_request(:get, %r[/v1/contacts$]).
-          to_return(read_fixture("contacts/index/success.http"))
+          to_return(read_fixture("contacts/list/success.http"))
     end
 
     it "builds the correct request" do
-      subject.list
+      subject.contacts
 
       expect(WebMock).to have_requested(:get, "https://api.zone/v1/contacts").
                          with(headers: { 'Accept' => 'application/json' })
     end
 
     it "returns the contacts" do
-      results = subject.list
+      results = subject.contacts
 
       expect(results).to be_a(Array)
-      expect(results.size).to eq(1)
+      expect(results.size).to eq(2)
 
       results.each do |result|
         expect(result).to be_a(Dnsimple::Struct::Contact)
@@ -33,7 +33,7 @@ describe Dnsimple::Client, ".contacts" do
 
   describe "#create" do
     before do
-      stub_request(:post, %r[/v1/contacts]).
+      stub_request(:post, %r[/v1/contacts$]).
           to_return(read_fixture("contacts/create/created.http"))
     end
 
@@ -55,50 +55,50 @@ describe Dnsimple::Client, ".contacts" do
     end
   end
 
-  describe "#find" do
+  describe "#contact" do
     before do
       stub_request(:get, %r[/v1/contacts/.+$]).
-          to_return(read_fixture("contacts/show/success.http"))
+          to_return(read_fixture("contacts/get/success.http"))
     end
 
     it "builds the correct request" do
-      subject.find(1)
+      subject.contact(1)
 
       expect(WebMock).to have_requested(:get, "https://api.zone/v1/contacts/1").
                          with(headers: { 'Accept' => 'application/json' })
     end
 
     it "returns the contact" do
-      result = subject.find(1)
+      result = subject.contact(1)
 
       expect(result).to be_a(Dnsimple::Struct::Contact)
-      expect(result.id).to eq(2)
+      expect(result.id).to eq(1)
       expect(result.label).to eq("Default")
       expect(result.first_name).to eq("Simone")
       expect(result.last_name).to eq("Carletti")
       expect(result.job_title).to eq("Underwater Programmer")
-      expect(result.organization_name).to eq("Dnsimple")
-      expect(result.email_address).to eq("example@example.com")
-      expect(result.phone).to eq("+1 111 000000")
-      expect(result.fax).to eq("+1 222 000000")
+      expect(result.organization_name).to eq("DNSimple")
+      expect(result.email_address).to eq("simone.carletti@dnsimple.com")
+      expect(result.phone).to eq("+1 111 4567890")
+      expect(result.fax).to eq("+1 222 4567890")
       expect(result.address1).to eq("Awesome Street")
       expect(result.address2).to eq("c/o Someone")
       expect(result.city).to eq("Rome")
       expect(result.state_province).to eq("RM")
       expect(result.postal_code).to eq("00171")
       expect(result.country).to eq("IT")
-      expect(result.created_at).to eq("2013-11-08T17:23:15Z")
-      expect(result.updated_at).to eq("2013-11-08T17:23:15Z")
+      expect(result.created_at).to eq("2014-01-15T22:08:07.390Z")
+      expect(result.updated_at).to eq("2014-01-15T22:08:07.390Z")
     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("contacts/notfound.http"))
 
         expect {
-          subject.find(1)
-        }.to raise_error(Dnsimple::RecordNotFound)
+          subject.contact(1)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end
@@ -125,13 +125,13 @@ describe Dnsimple::Client, ".contacts" 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("contacts/notfound.http"))
 
         expect {
           subject.update(1, {})
-        }.to raise_error(Dnsimple::RecordNotFound)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end
@@ -165,13 +165,13 @@ describe Dnsimple::Client, ".contacts" 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("contacts/notfound.http"))
 
         expect {
           subject.delete(1)
-        }.to raise_error(Dnsimple::RecordNotFound)
+        }.to raise_error(Dnsimple::NotFoundError)
       end
     end
   end