dnsimple-ruby 1.4.1 → 1.5.1

data/lib/dnsimple/extended_attribute.rb

@@ -38,7 +38,7 @@ module DNSimple
 
     # Find the extended attributes for the given TLD
     def self.find(tld, options={})
-      response = DNSimple::Client.get("extended_attributes/#{tld}", options)
+      response = DNSimple::Client.get("/v1/extended_attributes/#{tld}", options)
 
       case response.code
       when 200

data/lib/dnsimple/record.rb

@@ -7,18 +7,13 @@ module DNSimple
     }
 
     attr_accessor :id
-
     attr_accessor :domain
-
     attr_accessor :name
-
     attr_accessor :content
-
-    attr_accessor :record_type
-
     attr_accessor :ttl
-
     attr_accessor :prio
+    attr_accessor :record_type
+
 
     def fqdn
       [name, domain.name].delete_if { |v| v !~ DNSimple::BLANK_REGEX }.join(".")
@@ -32,7 +27,7 @@ module DNSimple
 
       options.merge!(:body => {:record => record_hash})
 
-      response = DNSimple::Client.put("domains/#{domain.id}/records/#{id}", options)
+      response = DNSimple::Client.put("/v1/domains/#{domain.id}/records/#{id}", options)
 
       case response.code
       when 200
@@ -43,7 +38,7 @@ module DNSimple
     end
 
     def delete(options={})
-      DNSimple::Client.delete("domains/#{domain.id}/records/#{id}", options)
+      DNSimple::Client.delete("/v1/domains/#{domain.id}/records/#{id}", options)
     end
     alias :destroy :delete
 
@@ -59,7 +54,7 @@ module DNSimple
 
       options.merge!({:body => {:record => record_hash}})
 
-      response = DNSimple::Client.post("domains/#{domain.name}/records", options)
+      response = DNSimple::Client.post("/v1/domains/#{domain.name}/records", options)
 
       case response.code
       when 201
@@ -72,7 +67,7 @@ module DNSimple
     end
 
     def self.find(domain, id, options={})
-      response = DNSimple::Client.get("domains/#{domain.name}/records/#{id}", options)
+      response = DNSimple::Client.get("/v1/domains/#{domain.name}/records/#{id}", options)
 
       case response.code
       when 200
@@ -85,7 +80,7 @@ module DNSimple
     end
 
     def self.all(domain, options={})
-      response = DNSimple::Client.get("domains/#{domain.name}/records", options)
+      response = DNSimple::Client.get("/v1/domains/#{domain.name}/records", options)
 
       case response.code
       when 200

data/lib/dnsimple/service.rb

@@ -14,7 +14,7 @@ module DNSimple
     # Find a service by its ID or short name
     def self.find(id_or_short_name, options={})
       id = id_or_short_name
-      response = DNSimple::Client.get("services/#{id}", options)
+      response = DNSimple::Client.get("/v1/services/#{id}", options)
 
       case response.code
       when 200
@@ -28,7 +28,7 @@ module DNSimple
 
     # Get all of the services that can be applied to a domain
     def self.all(options={})
-      response = DNSimple::Client.get("services", options)
+      response = DNSimple::Client.get("/v1/services", options)
 
       case response.code
       when 200

data/lib/dnsimple/template.rb

@@ -1,25 +1,11 @@
 module DNSimple
-
   class Template < Base
 
-    # The template ID in DNSimple
     attr_accessor :id
-
-    # The template name
     attr_accessor :name
-
-    # The template short name
     attr_accessor :short_name
-
-    # The template description
     attr_accessor :description
 
-    # Delete the template from DNSimple. WARNING: this cannot
-    # be undone.
-    def delete(options={})
-      DNSimple::Client.delete("templates/#{id}", options)
-    end
-    alias :destroy :delete
 
     def self.create(name, short_name, description=nil, options={})
       template_hash = {
@@ -30,7 +16,7 @@ module DNSimple
 
       options.merge!(:body => {:dns_template => template_hash})
 
-      response = DNSimple::Client.post("templates", options)
+      response = DNSimple::Client.post("/v1/templates", options)
 
       case response.code
       when 201
@@ -42,7 +28,7 @@ module DNSimple
 
     def self.find(id_or_short_name, options={})
       id = id_or_short_name
-      response = DNSimple::Client.get("templates/#{id}", options)
+      response = DNSimple::Client.get("/v1/templates/#{id}", options)
 
       case response.code
       when 200
@@ -55,7 +41,7 @@ module DNSimple
     end
 
     def self.all(options={})
-      response = DNSimple::Client.get("templates", options)
+      response = DNSimple::Client.get("/v1/templates", options)
 
       case response.code
       when 200
@@ -65,5 +51,13 @@ module DNSimple
       end
     end
 
+
+    # Delete the template from DNSimple.
+    # WARNING: this cannot be undone.
+    def delete(options={})
+      DNSimple::Client.delete("/v1/templates/#{id}", options)
+    end
+    alias :destroy :delete
+
   end
 end

data/lib/dnsimple/template_record.rb

@@ -25,7 +25,7 @@ module DNSimple
     attr_accessor :prio
 
     def delete(options={})
-      DNSimple::Client.delete("templates/#{template.id}/template_records/#{id}", options)
+      DNSimple::Client.delete("/v1/templates/#{template.id}/template_records/#{id}", options)
     end
     alias :destroy :delete
 
@@ -38,7 +38,7 @@ module DNSimple
 
       options.merge!({:query => {:dns_template_record => record_hash}})
 
-      response = DNSimple::Client.post("templates/#{template.id}/template_records", options)
+      response = DNSimple::Client.post("/v1/templates/#{template.id}/template_records", options)
 
       case response.code
       when 201
@@ -50,7 +50,7 @@ module DNSimple
 
     def self.find(short_name, id, options={})
       template = DNSimple::Template.find(short_name)
-      response = DNSimple::Client.get("templates/#{template.id}/template_records/#{id}", options)
+      response = DNSimple::Client.get("/v1/templates/#{template.id}/template_records/#{id}", options)
 
       case response.code
       when 200
@@ -66,7 +66,7 @@ module DNSimple
     # given short name.
     def self.all(short_name, options={})
       template = DNSimple::Template.find(short_name)
-      response = DNSimple::Client.get("templates/#{template.id}/template_records", options)
+      response = DNSimple::Client.get("/v1/templates/#{template.id}/template_records", options)
 
       case response.code
       when 200

data/lib/dnsimple/transfer_order.rb

@@ -20,7 +20,7 @@ module DNSimple
 
       options.merge!({:body => body})
 
-      response = DNSimple::Client.post("domain_transfers", options)
+      response = DNSimple::Client.post("/v1/domain_transfers", options)
 
       case response.code
       when 201

data/lib/dnsimple/user.rb

@@ -2,29 +2,21 @@ module DNSimple
   class User < Base
 
     attr_accessor :id
-
-    attr_accessor :created_at
-
-    attr_accessor :updated_at
-
     attr_accessor :email
-
+    attr_accessor :domain_count
+    attr_accessor :domain_limit
     attr_accessor :login_count
-
     attr_accessor :failed_login_count
+    attr_accessor :created_at
+    attr_accessor :updated_at
 
-    attr_accessor :domain_count
-
-    attr_accessor :domain_limit
 
-    def self.me(options={})
-      response = DNSimple::Client.get("users/me", options)
+    def self.me
+      response = DNSimple::Client.get("/v1/users/me")
 
       case response.code
       when 200
         new(response["user"])
-      when 404
-        raise RecordNotFound, "Could not find account with current credentials"
       else
         raise RequestError.new("Error finding account", response)
       end

data/lib/dnsimple/version.rb

@@ -1,3 +1,3 @@
 module DNSimple
-  VERSION = '1.4.1'
+  VERSION = '1.5.1'
 end

data/spec/ci/.dnsimple.test

@@ -1,3 +1,3 @@
 username: username
 password: password
-base_uri: https://test.dnsimple.com
+base_uri: https://api.ci.dnsimple.com

data/spec/dnsimple/certificate_spec.rb

@@ -1,45 +1,55 @@
 require 'spec_helper'
 
 describe DNSimple::Certificate do
-  let(:domain_name) { 'example.com' }
-  let(:domain) { DNSimple::Domain.new(:name => domain_name) }
 
-  describe "#fqdn" do
-    it "joins the name and domain name" do
-      certificate = DNSimple::Certificate.new(:name => 'www')
-      certificate.domain = domain
-      certificate.fqdn.should eq("www.#{domain_name}")
+  let(:domain) { DNSimple::Domain.new(:name => "example.com") }
+
+
+  describe ".find" do
+    before do
+      stub_request(:get, %r[/v1/domains/example.com/certificates/2]).
+          to_return(read_fixture("certificates/show/success.http"))
     end
-    it "strips blank parts from name" do
-      certificate = DNSimple::Certificate.new(:name => '')
-      certificate.domain = domain
-      certificate.fqdn.should eq(domain_name)
+
+    it "builds the correct request" do
+      described_class.find(domain, "2")
+
+      WebMock.should have_requested(:get, "https://#{CONFIG['username']}:#{CONFIG['password']}@#{CONFIG['host']}/v1/domains/example.com/certificates/2").
+                     with(:headers => { 'Accept' => 'application/json' })
     end
-  end
 
-  describe ".purchase" do
-    let(:contact) { DNSimple::Contact.new(:id => 1) }
-    use_vcr_cassette
-    it "purchases a certificate" do
-      certificate = DNSimple::Certificate.purchase(domain, 'www', contact)
-      certificate.fqdn.should eq("www.#{domain_name}")
+    context "when the certificate exists" do
+      it "returns the certificate" do
+        result = described_class.find(domain, "2")
+
+        expect(result.id).to eq(4576)
+        expect(result.domain).to eq(domain)
+        expect(result.name).to eq("www")
+        expect(result.csr).to eq("-----BEGIN NEW CERTIFICATE REQUEST-----\nRHr2akB4KMba6FMAsvlStnO/2ika16hNx+d3smPNsER+HA==\n-----END NEW CERTIFICATE REQUEST-----\n")
+        expect(result.ssl_certificate).to eq("-----BEGIN CERTIFICATE-----\nXwTkw5UCPpaVyUYcwHlvaprOe9ZbwIyEHm2AT1rW+70=\n-----END CERTIFICATE-----\n")
+        expect(result.private_key).to eq("-----BEGIN RSA PRIVATE KEY-----\nUeXbFi7o+nuPfRhpBFQEKwacKFc3Hnc1hH6UsnC0KY25cUif7yz38A==\n-----END RSA PRIVATE KEY-----\n")
+        expect(result.approver_email).to eq("example@example.net")
+        expect(result.created_at).to eq("2013-09-17T21:54:42Z")
+        expect(result.updated_at).to eq("2013-09-17T22:25:36Z")
+
+        expect(result.available_approver_emails).to be_nil
+        expect(result.certificate_status).to be_nil
+      end
     end
   end
 
-  describe ".all" do
-    use_vcr_cassette
-    it "returns all certificates for the specific domain" do
-      certificates = DNSimple::Certificate.all(domain)
-      certificates.length.should eq(1)
-      certificates.first.fqdn.should eq('www.example.com')
+
+  describe "#fqdn" do
+    it "joins the name and domain name" do
+      certificate = described_class.new(:name => 'www')
+      certificate.domain = domain
+      expect(certificate.fqdn).to eq("www.#{domain.name}")
     end
-  end
 
-  describe "#submit" do
-    use_vcr_cassette
-    let(:certificate) { DNSimple::Certificate.new(:id => 1, :domain => domain) }
-    it "submits a certificate for purchase" do
-      certificate.submit("admin@example.com")
+    it "strips blank parts from name" do
+      certificate = described_class.new(:name => '')
+      certificate.domain = domain
+      expect(certificate.fqdn).to eq(domain.name)
     end
   end
 

data/spec/dnsimple/client_spec.rb

@@ -26,40 +26,40 @@ describe DNSimple::Client do
         DNSimple::Client.username   = 'user'
         DNSimple::Client.password   = 'pass'
         DNSimple::Client.api_token  = nil
-        DNSimple::Client.base_uri   = 'https://test.example.com'
+        DNSimple::Client.base_uri   = 'https://api.example.com/'
 
         HTTParty.expects(method).
-          with('https://test.example.com/domains',
+          with('https://api.example.com/domains',
             :format => :json, :headers => {'Accept' => 'application/json'},
-            :basic_auth => {:username => 'user', :password => 'pass'}).
+            :basic_auth => { :username => 'user', :password => 'pass'}).
           returns(response)
 
-        DNSimple::Client.send(method, 'domains')
+        DNSimple::Client.send(method, '/domains')
       end
 
       it "uses header authentication if there's an api token provided" do
         DNSimple::Client.username   = 'user'
         DNSimple::Client.password   = nil
         DNSimple::Client.api_token  = 'token'
-        DNSimple::Client.base_uri   = 'https://test.example.com'
+        DNSimple::Client.base_uri   = 'https://api.example.com/'
 
         HTTParty.expects(method).
-          with('https://test.example.com/domains',
+          with('https://api.example.com/domains',
             :format => :json, :headers => {'Accept' => 'application/json',
             'X-DNSimple-Token' => 'user:token'}).
           returns(response)
 
-        DNSimple::Client.send(method, 'domains')
+        DNSimple::Client.send(method, '/domains')
       end
 
       it "raises an error if there's no password or api token provided" do
         DNSimple::Client.username   = 'user'
         DNSimple::Client.password   = nil
         DNSimple::Client.api_token  = nil
-        DNSimple::Client.base_uri   = 'https://test.example.com'
+        DNSimple::Client.base_uri   = 'https://api.example.com/'
 
         lambda {
-          DNSimple::Client.send(method, 'domains')
+          DNSimple::Client.send(method, '/domains')
         }.should raise_error(DNSimple::Error, 'A password or API token is required for all API requests.')
       end
     end

data/spec/dnsimple/contact_spec.rb

@@ -2,35 +2,43 @@ require 'spec_helper'
 
 describe DNSimple::Contact do
 
-  describe "a new contact" do
-    use_vcr_cassette
-
-    let(:contact_attributes) {
-      {
-        :first_name => 'John',
-        :last_name => 'Doe',
-        :address1 => '1 SW 1st Street',
-        :city => 'Miami',
-        :state_province => 'FL',
-        :postal_code => '33143',
-        :country => 'US',
-        :email_address => 'john.doe@example.com',
-        :phone => '305 111 2222'
-      }
-    }
-    it "has specific attributes" do
-      contact = DNSimple::Contact.create(contact_attributes)
-      contact.first_name.should eql(contact_attributes[:first_name])
-      contact.id.should_not be_nil
+  describe ".find" do
+    before do
+      stub_request(:get, %r[/v1/contacts/2]).
+          to_return(read_fixture("contacts/show/success.http"))
     end
-  end
 
-  describe "an existing contact" do
-    use_vcr_cassette
+    it "builds the correct request" do
+      described_class.find("2")
+
+      WebMock.should have_requested(:get, "https://#{CONFIG['username']}:#{CONFIG['password']}@#{CONFIG['host']}/v1/contacts/2").
+                     with(:headers => { 'Accept' => 'application/json' })
+    end
+
+    context "when the contact exists" do
+      it "returns the contact" do
+        result = described_class.find("2")
+
+        expect(result).to be_a(described_class)
+        expect(result.id).to eq(2)
+        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.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")
 
-    it "can be found by id" do
-      contact = DNSimple::Contact.find(1)
-      contact.should_not be_nil
+        expect(result.phone_ext).to be_nil
+      end
     end
   end