dnsimple-ruby 1.0.0 → 1.1.1

data/lib/dnsimple/domain.rb

@@ -30,7 +30,7 @@ module DNSimple #:nodoc:
     # be undone.
     def delete(options={})
       options.merge!(DNSimple::Client.standard_options_with_credentials)
-      self.class.delete("#{DNSimple::Client.base_uri}/domains/#{id}", options)
+      self.class.delete("#{DNSimple::Client.base_uri}/domains/#{name}", options)
     end
     alias :destroy :delete
 
@@ -38,8 +38,9 @@ module DNSimple #:nodoc:
     # all of the records in the template to the domain.
     def apply(template, options={})
       options.merge!(DNSimple::Client.standard_options_with_credentials)
+      options.merge!(:body => {})
       template = resolve_template(template)
-      self.class.post("#{DNSimple::Client.base_uri}/domains/#{id}/templates/#{template.id}/apply", options)
+      self.class.post("#{DNSimple::Client.base_uri}/domains/#{name}/templates/#{template.id}/apply", options)
     end
 
     #:nodoc:
@@ -54,7 +55,7 @@ module DNSimple #:nodoc:
 
     def applied_services(options={})
       options.merge!(DNSimple::Client.standard_options_with_credentials)
-      response = self.class.get("#{Client.base_uri}/domains/#{id}/applied_services", options)
+      response = self.class.get("#{Client.base_uri}/domains/#{name}/applied_services", options)
       pp response if DNSimple::Client.debug?
       case response.code
       when 200
@@ -68,7 +69,7 @@ module DNSimple #:nodoc:
 
     def available_services(options={})
       options.merge!(DNSimple::Client.standard_options_with_credentials)
-      response = self.class.get("#{DNSimple::Client.base_uri}/domains/#{id}/available_services", options)
+      response = self.class.get("#{DNSimple::Client.base_uri}/domains/#{name}/available_services", options)
       pp response if DNSimple::Client.debug?
       case response.code
       when 200

data/lib/dnsimple/record.rb

@@ -65,18 +65,16 @@ module DNSimple
       aliases[name] || name
     end
 
-    def self.create(domain_name, name, record_type, content, options={})
-      domain = DNSimple::Domain.find(domain_name)
-      
+    def self.create(domain, name, record_type, content, options={})
       record_hash = {:name => name, :record_type => record_type, :content => content}
       record_hash[:ttl] = options.delete(:ttl) || 3600
       record_hash[:prio] = options.delete(:priority)
       record_hash[:prio] = options.delete(:prio) || ''
       
       options.merge!(DNSimple::Client.standard_options_with_credentials)
-      options.merge!({:query => {:record => record_hash}})
+      options.merge!({:body => {:record => record_hash}})
 
-      response = self.post("#{DNSimple::Client.base_uri}/domains/#{domain.id}/records", options) 
+      response = self.post("#{DNSimple::Client.base_uri}/domains/#{domain.name}/records", options) 
 
       pp response if DNSimple::Client.debug?
 
@@ -86,16 +84,15 @@ module DNSimple
       when 401
         raise RuntimeError, "Authentication failed"
       when 406
-        raise DNSimple::RecordExists.new("#{name}.#{domain_name}", response["errors"])
+        raise DNSimple::RecordExists.new("#{name}.#{domain.name}", response["errors"])
       else
-        raise DNSimple::Error.new("#{name}.#{domain_name}", response["errors"])
+        raise DNSimple::Error.new("#{name}.#{domain.name}", response["errors"])
       end
     end
 
-    def self.find(domain_name, id, options={})
-      domain = DNSimple::Domain.find(domain_name)
+    def self.find(domain, id, options={})
       options.merge!(DNSimple::Client.standard_options_with_credentials)
-      response = self.get("#{DNSimple::Client.base_uri}/domains/#{domain.id}/records/#{id}", options)
+      response = self.get("#{DNSimple::Client.base_uri}/domains/#{domain.name}/records/#{id}", options)
 
       pp response if DNSimple::Client.debug?
 
@@ -105,16 +102,15 @@ module DNSimple
       when 401
         raise RuntimeError, "Authentication failed"
       when 404
-        raise RuntimeError, "Could not find record #{id} for domain #{domain_name}"
+        raise RuntimeError, "Could not find record #{id} for domain #{domain.name}"
       else
-        raise DNSimple::Error.new("#{domain_name}/#{id}", response["errors"])
+        raise DNSimple::Error.new("#{domain.name}/#{id}", response["errors"])
       end
     end
 
-    def self.all(domain_name, options={})
-      domain = DNSimple::Domain.find(domain_name)
+    def self.all(domain, options={})
       options.merge!(DNSimple::Client.standard_options_with_credentials)
-      response = self.get("#{DNSimple::Client.base_uri}/domains/#{domain.id}/records", options)
+      response = self.get("#{DNSimple::Client.base_uri}/domains/#{domain.name}/records", options)
 
       pp response if DNSimple::Client.debug?
 

data/spec/certificate_spec.rb

@@ -1,17 +1,45 @@
 require 'spec_helper'
 
 describe DNSimple::Certificate do
-  let(:domain) { DNSimple::Domain.new(:name => 'example.com') }
+  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.example.com')
+      certificate.fqdn.should eq("www.#{domain_name}")
     end
     it "strips blank parts from name" do
       certificate = DNSimple::Certificate.new(:name => '')
       certificate.domain = domain
-      certificate.fqdn.should eq('example.com')
+      certificate.fqdn.should eq(domain_name)
+    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}")
+    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')
+    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")
     end
   end
 

data/spec/command_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+require 'dnsimple/command'
+
+class FakeCommand < DNSimple::Command
+  def execute
+    say "done"
+  end
+end
+
+describe DNSimple::Command do
+  describe "#say" do
+    it "writes to the output" do
+      s = StringIO.new
+      command = FakeCommand.new(s)
+      command.execute
+      s.string.should eq("done\n")
+    end
+  end
+end

data/spec/commands/add_service_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'dnsimple/commands/add_service'
+
+describe DNSimple::Commands::AddService do
+  let(:out) { StringIO.new }
+
+  let(:domain_name) { 'example.com' }
+  let(:short_name) { 'service-name' }
+  let(:args) { [domain_name, short_name] }
+
+  let(:domain) { DNSimple::Domain.new(:name => domain_name) }
+  let(:service) { stub("service", :name => "Service") }
+
+  before do
+    DNSimple::Domain.expects(:find).with(domain_name).returns(domain)
+    DNSimple::Service.expects(:find).with(short_name).returns(service)
+  end
+
+  it "adds a service to a domain" do
+    domain.expects(:add_service).with(short_name)
+    DNSimple::Commands::AddService.new(out).execute(args)
+  end
+
+  it "reports to the caller" do
+    domain.stubs(:add_service)
+    DNSimple::Commands::AddService.new(out).execute(args)
+    out.string.should eq("Added #{service.name} to #{domain_name}\n")
+  end
+end

data/spec/commands/purchase_certificate_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'dnsimple/certificate'
+require 'dnsimple/commands/purchase_certificate'
+
+describe DNSimple::Commands::PurchaseCertificate do
+  let(:out) { StringIO.new }
+  let(:domain_name) { 'example.com' }
+  context "with one argument" do
+    it "purchases the certificate" do
+      DNSimple::Certificate.expects(:purchase).with(domain_name, '').returns(stub("certificate", :fqdn => domain_name))
+      DNSimple::Commands::PurchaseCertificate.new(out).execute([domain_name])
+    end
+  end
+end

data/spec/commands/submit_certificate_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+require 'dnsimple/commands/submit_certificate'
+
+describe DNSimple::Commands::SubmitCertificate do
+  let(:out) { StringIO.new }
+  let(:domain) { DNSimple::Domain.new(:name => domain_name) }
+  let(:domain_name) { 'example.com' }
+  let(:name) { 'www' }
+  let(:certificate) { DNSimple::Certificate.new(:id => certificate_id, :domain => domain) }
+  let(:certificate_id) { 1 }
+  let(:approver_email) { 'admin@example.com' }
+
+  it "submits the certificate" do
+    DNSimple::Domain.stubs(:find).with(domain_name).returns(domain)
+    DNSimple::Certificate.expects(:find).with(domain, certificate_id).returns(certificate)
+    certificate.expects(:submit).with(approver_email)
+    DNSimple::Commands::SubmitCertificate.new(out).execute([domain_name, certificate_id, approver_email])
+  end
+end

data/spec/contact_spec.rb

@@ -28,7 +28,7 @@ describe DNSimple::Contact do
   describe "an existing contact" do
     use_vcr_cassette
     it "can be found by id" do
-      contact = DNSimple::Contact.find(32)
+      contact = DNSimple::Contact.find(1)
       contact.should_not be_nil
     end
   end

data/spec/domain_spec.rb

@@ -1,11 +1,14 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe DNSimple::Domain do
+  let(:domain_name) { "example.com" }
+  let(:contact_id) { 1 }
+
   describe "creating a new domain" do
     use_vcr_cassette
     it "has specific attributes" do 
-      @domain = DNSimple::Domain.create("testdomain.com")
-      @domain.name.should eql("testdomain.com")
+      @domain = DNSimple::Domain.create(domain_name)
+      @domain.name.should eql(domain_name)
       @domain.id.should_not be_nil
     end
   end
@@ -13,33 +16,34 @@ describe DNSimple::Domain do
     context "by id" do
       use_vcr_cassette
       it "can be found" do
-        domain = DNSimple::Domain.find(141)
-        domain.name.should eql("testdomain.com")
+        domain = DNSimple::Domain.find(39)
+        domain.name.should eql(domain_name)
         domain.id.should_not be_nil
       end
     end
     context "by name" do
       use_vcr_cassette
       it "can be found" do
-        domain = DNSimple::Domain.find("testdomain.com")
-        domain.name.should eql("testdomain.com")
+        domain = DNSimple::Domain.find(domain_name)
+        domain.name.should eql(domain_name)
         domain.id.should_not be_nil
       end
     end
   end
 
   context "registration" do
-    let(:name) { "testdomain.net" }
 
     context "with an existing contact" do
+      let(:domain_name) { "dnsimple-example-1321042237.com" }
       use_vcr_cassette
       it "can be registered" do
-        domain = DNSimple::Domain.register(name, {:id => 4})
-        domain.name.should eql(name)
+        domain = DNSimple::Domain.register(domain_name, {:id => contact_id})
+        domain.name.should eql(domain_name)
       end
     end
     
     context "with a new registrant contact" do
+      let(:domain_name) { "dnsimple-example-1321042288.com" }
       use_vcr_cassette
       it "can be registered" do
         registrant = {
@@ -52,8 +56,8 @@ describe DNSimple::Domain do
           :postal_code => '33143',
           :phone => '321 555 1212'
         }
-        domain = DNSimple::Domain.register(name, registrant)
-        domain.name.should eql(name)
+        domain = DNSimple::Domain.register(domain_name, registrant)
+        domain.name.should eql(domain_name)
       end
     end
   end
@@ -62,8 +66,8 @@ describe DNSimple::Domain do
     use_vcr_cassette
     before do
       @domains = []
-      3.times do |n|
-        @domains << DNSimple::Domain.create("testdomain#{n}.com")
+      2.times do |n|
+        @domains << DNSimple::Domain.create("example#{n}.com")
       end
     end
     it "returns a list of domains" do
@@ -74,13 +78,11 @@ describe DNSimple::Domain do
 
   describe "applying templates" do
     use_vcr_cassette
-    before do
-      @domain = DNSimple::Domain.find("testdomain.com")
-    end
+    let(:domain) { DNSimple::Domain.find("example.com") }
     it "applies a named template" do
-      DNSimple::Record.all(@domain.name).should be_empty
-      @domain.apply("googleapps")
-      DNSimple::Record.all(@domain.name).should_not be_empty
+      DNSimple::Record.all(domain).should be_empty
+      domain.apply("googleapps")
+      DNSimple::Record.all(domain).should_not be_empty
     end
   end
 end

data/spec/record_spec.rb

@@ -2,23 +2,24 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe DNSimple::Record do
 
-  let(:domain) { DNSimple::Domain.new(:name => 'example.com') }
+  let(:domain_name) { 'example.com' }
+  let(:domain) { DNSimple::Domain.new(:name => domain_name) }
 
   describe "#fqdn" do
     it "joins the name and domain name" do
       record = DNSimple::Record.new(:name => 'www', :domain => domain)
-      record.fqdn.should eq('www.example.com')
+      record.fqdn.should eq("www.#{domain_name}")
     end
     it "strips a blank name" do
       record = DNSimple::Record.new(:name => '', :domain => domain)
-      record.fqdn.should eq('example.com')
+      record.fqdn.should eq(domain_name)
     end
   end
 
   describe "creating a new record" do
     use_vcr_cassette
     it "has specific attributes" do 
-      record = DNSimple::Record.create('testdomain.com', "", "A", "1.2.3.4", :ttl => 600)
+      record = DNSimple::Record.create(domain, "", "A", "1.2.3.4", :ttl => 600)
       record.name.should eql("")
       record.record_type.should eql("A")
       record.content.should eql("1.2.3.4")
@@ -29,7 +30,7 @@ describe DNSimple::Record do
   describe "find a record" do
     use_vcr_cassette
     it "can be found by id" do
-      record = DNSimple::Record.find('testdomain.com', 193)
+      record = DNSimple::Record.find(domain, 70)
       record.name.should eql("")
       record.record_type.should eql("A")
       record.content.should eql("1.2.3.4")
@@ -43,13 +44,13 @@ describe DNSimple::Record do
     before do
       @records = []
       
-      @records << DNSimple::Record.create("testdomain.com", "", "A", "4.5.6.7")
-      @records << DNSimple::Record.create("testdomain.com", "www", "CNAME", "testdomain.com")
-      @records << DNSimple::Record.create("testdomain.com", "", "MX", "mail.foo.com", :prio => 10)
+      @records << DNSimple::Record.create(domain, "", "A", "4.5.6.7")
+      @records << DNSimple::Record.create(domain, "www", "CNAME", "testdomain.com")
+      @records << DNSimple::Record.create(domain, "", "MX", "mail.foo.com", :prio => 10)
     end
     
     it "returns a list of records" do
-      records = DNSimple::Record.all('testdomain.com')
+      records = DNSimple::Record.all(domain)
       records.should_not be_empty
       records.length.should eql(@records.length)
     end

data/spec/spec_helper.rb

@@ -10,6 +10,7 @@ VCR.config do |c|
 end
 
 RSpec.configure do |c|
+  c.mock_framework = :mocha
   c.extend VCR::RSpec::Macros
 end
 

data/spec/user_spec.rb

@@ -3,21 +3,21 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 describe DNSimple::User do
   describe ".me" do
     use_vcr_cassette
-    before do
-      @user = DNSimple::User.me
-    end
+    let(:user) { DNSimple::User.me }
+
     it "returns the current user" do
-      @user.should_not be_nil
+      user.should_not be_nil
     end
+    
     it "has attributes" do
-      @user.id.should_not be_nil
-      @user.created_at.should_not be_nil
-      @user.updated_at.should_not be_nil
-      @user.email.should_not be_nil
-      @user.login_count.should_not be_nil
-      @user.failed_login_count.should_not be_nil
-      @user.domain_count.should_not be_nil
-      @user.domain_limit.should_not be_nil
+      user.id.should_not be_nil
+      user.created_at.should_not be_nil
+      user.updated_at.should_not be_nil
+      user.email.should_not be_nil
+      user.login_count.should_not be_nil
+      user.failed_login_count.should_not be_nil
+      user.domain_count.should_not be_nil
+      user.domain_limit.should_not be_nil
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dnsimple-ruby
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 17
   prerelease: 
   segments: 
   - 1
-  - 0
-  - 0
-  version: 1.0.0
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Anthony Eden
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 Z
+date: 2011-11-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -86,7 +86,7 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id005
-  name: ruby-debug
+  name: mocha
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -100,7 +100,7 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id006
-  name: cucumber
+  name: ruby-debug
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -114,7 +114,7 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id007
-  name: aruba
+  name: cucumber
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -128,7 +128,7 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id008
-  name: ruby-debug
+  name: aruba
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -142,7 +142,7 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id009
-  name: fakeweb
+  name: ruby-debug
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -156,7 +156,7 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id010
-  name: vcr
+  name: fakeweb
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -170,6 +170,20 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id011
+  name: vcr
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id012
   name: httparty
   prerelease: false
   type: :runtime
@@ -215,12 +229,14 @@ files:
 - features/step_definitions/record_steps.rb
 - features/step_definitions/template_steps.rb
 - features/support/env.rb
+- fixtures/vcr_cassettes/DNSimple_Certificate/_all.yml
+- fixtures/vcr_cassettes/DNSimple_Certificate/_purchase.yml
+- fixtures/vcr_cassettes/DNSimple_Certificate/_submit.yml
 - fixtures/vcr_cassettes/DNSimple_Contact/a_new_contact.yml
 - fixtures/vcr_cassettes/DNSimple_Contact/an_existing_contact.yml
 - fixtures/vcr_cassettes/DNSimple_Domain/_all.yml
 - fixtures/vcr_cassettes/DNSimple_Domain/applying_templates.yml
 - fixtures/vcr_cassettes/DNSimple_Domain/creating_a_new_domain.yml
-- fixtures/vcr_cassettes/DNSimple_Domain/finding_an_existing_domain.yml
 - fixtures/vcr_cassettes/DNSimple_Domain/finding_an_existing_domain/by_id.yml
 - fixtures/vcr_cassettes/DNSimple_Domain/finding_an_existing_domain/by_name.yml
 - fixtures/vcr_cassettes/DNSimple_Domain/registration/with_a_new_registrant_contact.yml
@@ -236,6 +252,7 @@ files:
 - lib/dnsimple/certificate.rb
 - lib/dnsimple/cli.rb
 - lib/dnsimple/client.rb
+- lib/dnsimple/command.rb
 - lib/dnsimple/commands/add_service.rb
 - lib/dnsimple/commands/add_template_record.rb
 - lib/dnsimple/commands/apply_template.rb
@@ -267,6 +284,7 @@ files:
 - lib/dnsimple/commands/purchase_certificate.rb
 - lib/dnsimple/commands/register_domain.rb
 - lib/dnsimple/commands/remove_service.rb
+- lib/dnsimple/commands/submit_certificate.rb
 - lib/dnsimple/commands/transfer_domain.rb
 - lib/dnsimple/commands/update_contact.rb
 - lib/dnsimple/commands/update_record.rb
@@ -282,6 +300,10 @@ files:
 - lib/dnsimple/user.rb
 - spec/README
 - spec/certificate_spec.rb
+- spec/command_spec.rb
+- spec/commands/add_service_spec.rb
+- spec/commands/purchase_certificate_spec.rb
+- spec/commands/submit_certificate_spec.rb
 - spec/contact_spec.rb
 - spec/domain_spec.rb
 - spec/extended_attributes_spec.rb
@@ -324,6 +346,10 @@ specification_version: 3
 summary: A ruby wrapper for the DNSimple API
 test_files: 
 - spec/certificate_spec.rb
+- spec/command_spec.rb
+- spec/commands/add_service_spec.rb
+- spec/commands/purchase_certificate_spec.rb
+- spec/commands/submit_certificate_spec.rb
 - spec/contact_spec.rb
 - spec/domain_spec.rb
 - spec/extended_attributes_spec.rb