dnsimple-ruby 1.2.6 → 1.3.0

data/.gitignore

@@ -0,0 +1,3 @@
+pkg
+rdoc
+turbulence

data/Gemfile

@@ -1,16 +1,5 @@
 source 'http://rubygems.org'
 
-gem 'httparty'
+gemspec
 
-group :development do
-  gem 'rake'
-  gem 'jeweler'
-  gem 'rspec', '>= 2.0.0'
-  gem 'mocha'
-  gem 'ruby-debug', :platforms => 'ruby_18'
-  gem 'cucumber'
-  gem 'aruba'
-  gem 'ruby-debug'
-  gem 'fakeweb'
-  gem 'vcr'
-end
+gem 'ruby-debug', :platform => :ruby_18, :group => :development

data/Gemfile.lock

@@ -1,3 +1,9 @@
+PATH
+  remote: .
+  specs:
+    dnsimple-ruby (1.3.0)
+      httparty
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -21,14 +27,9 @@ GEM
     ffi (1.0.9)
     gherkin (2.6.3)
       json (>= 1.4.6)
-    git (1.2.5)
     httparty (0.8.1)
       multi_json
       multi_xml
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
     json (1.6.1)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
@@ -61,9 +62,8 @@ PLATFORMS
 DEPENDENCIES
   aruba
   cucumber
+  dnsimple-ruby!
   fakeweb
-  httparty
-  jeweler
   mocha
   rake
   rspec (>= 2.0.0)

data/Rakefile

@@ -1,7 +1,8 @@
 require 'rake'
-require 'rake/testtask'
 require 'rake/rdoctask'
 
+require 'bundler/gem_tasks'
+
 desc 'Default: run tests.'
 task :default => [:spec]
 
@@ -14,20 +15,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/*.rb')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "dnsimple-ruby"
-    gemspec.summary = "A ruby wrapper for the DNSimple API"
-    gemspec.description = "A ruby wrapper for the DNSimple API that also includes a command-line client."
-    gemspec.email = "anthony.eden@dnsimple.com"
-    gemspec.homepage = "http://github.com/aetrion/dnsimple-ruby"
-    gemspec.authors = ["Anthony Eden"]
-    gemspec.add_dependency "httparty"
-    gemspec.executables = 'dnsimple'
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
-

data/dnsimple-ruby.gemspec

@@ -1,185 +1,31 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path('../lib', __FILE__)
+require 'dnsimple/version'
 
 Gem::Specification.new do |s|
-  s.name = "dnsimple-ruby"
-  s.version = "1.1.1"
+  s.name        = 'dnsimple-ruby'
+  s.version     = DNSimple::VERSION
+  s.authors     = ['Anthony Eden']
+  s.email       = ['anthony.eden@dnsimple.com']
+  s.homepage    = 'http://github.com/aetrion/dnsimple-ruby'
+  s.summary     = 'A ruby wrapper for the DNSimple API'
+  s.description = 'A ruby wrapper for the DNSimple API that also includes a command-line client.'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Anthony Eden"]
-  s.date = "2011-11-03"
-  s.description = "A ruby wrapper for the DNSimple API that also includes a command-line client."
-  s.email = "anthony.eden@dnsimple.com"
-  s.executables = ["dnsimple"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README",
-    "README.rdoc",
-    "README.textile"
-  ]
-  s.files = [
-    ".bundle/config",
-    ".rvmrc",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README",
-    "README.rdoc",
-    "README.textile",
-    "Rakefile",
-    "VERSION",
-    "bin/dnsimple",
-    "bin/dnsimple.rb",
-    "dnsimple-ruby.gemspec",
-    "features/README",
-    "features/cli/certificates/purchase_certificate.feature",
-    "features/cli/contacts/create_contact.feature",
-    "features/cli/domains/check_domain.feature",
-    "features/cli/domains/create_domain.feature",
-    "features/cli/domains/delete_domain.feature",
-    "features/cli/domains/register_domain.feature",
-    "features/cli/records/create_ptr_record.feature",
-    "features/cli/records/create_record.feature",
-    "features/cli/records/delete_record.feature",
-    "features/cli/templates/apply_template.feature",
-    "features/step_definitions/certificate_steps.rb",
-    "features/step_definitions/cli_steps.rb",
-    "features/step_definitions/domain_steps.rb",
-    "features/step_definitions/record_steps.rb",
-    "features/step_definitions/template_steps.rb",
-    "features/support/env.rb",
-    "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",
-    "fixtures/vcr_cassettes/DNSimple_Domain/registration/with_an_existing_contact.yml",
-    "fixtures/vcr_cassettes/DNSimple_ExtendedAttribute/list_extended_attributes/for_ca.yml",
-    "fixtures/vcr_cassettes/DNSimple_ExtendedAttribute/list_extended_attributes/for_com.yml",
-    "fixtures/vcr_cassettes/DNSimple_Record/_all.yml",
-    "fixtures/vcr_cassettes/DNSimple_Record/creating_a_new_record.yml",
-    "fixtures/vcr_cassettes/DNSimple_Record/find_a_record.yml",
-    "fixtures/vcr_cassettes/DNSimple_Template/a_template.yml",
-    "fixtures/vcr_cassettes/DNSimple_User/_me.yml",
-    "lib/dnsimple.rb",
-    "lib/dnsimple/certificate.rb",
-    "lib/dnsimple/cli.rb",
-    "lib/dnsimple/client.rb",
-    "lib/dnsimple/commands/add_service.rb",
-    "lib/dnsimple/commands/add_template_record.rb",
-    "lib/dnsimple/commands/apply_template.rb",
-    "lib/dnsimple/commands/check_domain.rb",
-    "lib/dnsimple/commands/clear_domain.rb",
-    "lib/dnsimple/commands/create_contact.rb",
-    "lib/dnsimple/commands/create_domain.rb",
-    "lib/dnsimple/commands/create_record.rb",
-    "lib/dnsimple/commands/create_template.rb",
-    "lib/dnsimple/commands/delete_contact.rb",
-    "lib/dnsimple/commands/delete_domain.rb",
-    "lib/dnsimple/commands/delete_record.rb",
-    "lib/dnsimple/commands/delete_template.rb",
-    "lib/dnsimple/commands/delete_template_record.rb",
-    "lib/dnsimple/commands/describe_contact.rb",
-    "lib/dnsimple/commands/describe_domain.rb",
-    "lib/dnsimple/commands/describe_record.rb",
-    "lib/dnsimple/commands/describe_service.rb",
-    "lib/dnsimple/commands/describe_user.rb",
-    "lib/dnsimple/commands/list_applied_services.rb",
-    "lib/dnsimple/commands/list_available_services.rb",
-    "lib/dnsimple/commands/list_contacts.rb",
-    "lib/dnsimple/commands/list_domains.rb",
-    "lib/dnsimple/commands/list_extended_attributes.rb",
-    "lib/dnsimple/commands/list_records.rb",
-    "lib/dnsimple/commands/list_services.rb",
-    "lib/dnsimple/commands/list_template_records.rb",
-    "lib/dnsimple/commands/list_templates.rb",
-    "lib/dnsimple/commands/purchase_certificate.rb",
-    "lib/dnsimple/commands/register_domain.rb",
-    "lib/dnsimple/commands/remove_service.rb",
-    "lib/dnsimple/commands/transfer_domain.rb",
-    "lib/dnsimple/commands/update_contact.rb",
-    "lib/dnsimple/commands/update_record.rb",
-    "lib/dnsimple/contact.rb",
-    "lib/dnsimple/domain.rb",
-    "lib/dnsimple/error.rb",
-    "lib/dnsimple/extended_attribute.rb",
-    "lib/dnsimple/record.rb",
-    "lib/dnsimple/service.rb",
-    "lib/dnsimple/template.rb",
-    "lib/dnsimple/template_record.rb",
-    "lib/dnsimple/transfer_order.rb",
-    "lib/dnsimple/user.rb",
-    "spec/README",
-    "spec/certificate_spec.rb",
-    "spec/contact_spec.rb",
-    "spec/domain_spec.rb",
-    "spec/extended_attributes_spec.rb",
-    "spec/record_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/template_spec.rb",
-    "spec/user_spec.rb"
-  ]
-  s.homepage = "http://github.com/aetrion/dnsimple-ruby"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "A ruby wrapper for the DNSimple API"
-  s.test_files = [
-    "spec/certificate_spec.rb",
-    "spec/contact_spec.rb",
-    "spec/domain_spec.rb",
-    "spec/extended_attributes_spec.rb",
-    "spec/record_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/template_spec.rb",
-    "spec/user_spec.rb"
-  ]
+  s.require_paths    = ['lib']
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.extra_rdoc_files = %w( LICENSE README README.rdoc README.textile )
+  s.executables      = `git ls-files -- bin/*`.split("\n").collect { |f|
+    File.basename(f)
+  }
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.add_runtime_dependency     'httparty', '>= 0'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_development_dependency(%q<aruba>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<fakeweb>, [">= 0"])
-      s.add_development_dependency(%q<vcr>, [">= 0"])
-      s.add_runtime_dependency(%q<httparty>, [">= 0"])
-    else
-      s.add_dependency(%q<httparty>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<aruba>, [">= 0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<fakeweb>, [">= 0"])
-      s.add_dependency(%q<vcr>, [">= 0"])
-      s.add_dependency(%q<httparty>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<httparty>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<aruba>, [">= 0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<fakeweb>, [">= 0"])
-    s.add_dependency(%q<vcr>, [">= 0"])
-    s.add_dependency(%q<httparty>, [">= 0"])
-  end
+  s.add_development_dependency 'aruba',    '>= 0'
+  s.add_development_dependency 'cucumber', '>= 0'
+  s.add_development_dependency 'fakeweb',  '>= 0'
+  s.add_development_dependency 'mocha',    '>= 0'
+  s.add_development_dependency 'rake',     '>= 0'
+  s.add_development_dependency 'rspec',    '>= 2.0.0'
+  s.add_development_dependency 'vcr',      '>= 0'
 end
-

data/features/support/env.rb

@@ -1,6 +1,9 @@
+require 'rubygems'
+require 'bundler'
+
+Bundler.require :default, :development
+
 require 'aruba/cucumber'
-$:.unshift('lib')
-require 'dnsimple'
 
 Before do
   @aruba_timeout_seconds = 30
@@ -14,4 +17,3 @@ After do |scenario|
     end
   end
 end
-

data/lib/dnsimple-ruby.rb

@@ -0,0 +1 @@
+require 'dnsimple'

data/lib/dnsimple.rb

@@ -5,6 +5,7 @@ module DNSimple
   BLANK_REGEX = /\S+/
 end
 
+require 'dnsimple/base'
 require 'dnsimple/client'
 require 'dnsimple/error'
 require 'dnsimple/user'

data/lib/dnsimple/base.rb

@@ -0,0 +1,8 @@
+class DNSimple::Base
+  def initialize(attributes)
+    attributes.each do |key, value|
+      m = "#{key}=".to_sym
+      self.send(m, value) if self.respond_to?(m)
+    end
+  end
+end

data/lib/dnsimple/certificate.rb

@@ -1,158 +1,123 @@
-module DNSimple #:nodoc:
-  # Represents an SSL certificate that has been purchased. The certificate
-  # must also be submitted using the #submit method before the Certificate
-  # Authority will issue a signed certificate.
-  class Certificate
-    include HTTParty
-    #debug_output $stdout
+# Represents an SSL certificate that has been purchased. The certificate
+# must also be submitted using the #submit method before the Certificate
+# Authority will issue a signed certificate.
+class DNSimple::Certificate < DNSimple::Base
+  #debug_output $stdout
 
-    # The certificate ID in DNSimple
-    attr_accessor :id
+  # The certificate ID in DNSimple
+  attr_accessor :id
 
-    attr_accessor :domain
+  attr_accessor :domain
 
-    # The subdomain on the certificate
-    attr_accessor :name
-    
-    # The private key, if DNSimple generated the Certificate Signing Request
-    attr_accessor :private_key
+  # The subdomain on the certificate
+  attr_accessor :name
 
-    # The SSL certificate, if it has been issued by the Certificate Authority
-    attr_accessor :ssl_certificate
+  # The private key, if DNSimple generated the Certificate Signing Request
+  attr_accessor :private_key
 
-    # The Certificate Signing Request
-    attr_accessor :csr
+  # The SSL certificate, if it has been issued by the Certificate Authority
+  attr_accessor :ssl_certificate
 
-    # The Certificate status
-    attr_accessor :certificate_status
-    
-    # The date the Certificate order was placed
-    attr_accessor :order_date
+  # The Certificate Signing Request
+  attr_accessor :csr
 
-    # The date the Certificate will expire
-    attr_accessor :expiration_date
+  # The Certificate status
+  attr_accessor :certificate_status
 
-    # The approver email address
-    attr_accessor :approver_email
+  # The date the Certificate order was placed
+  attr_accessor :order_date
 
-    # An array of all emails that can be used to approve the certificate
-    attr_accessor :available_approver_emails
+  # The date the Certificate will expire
+  attr_accessor :expiration_date
 
-    # When the certificate was purchased
-    attr_accessor :created_at
+  # The approver email address
+  attr_accessor :approver_email
 
-    # When the certificate was last updated
-    attr_accessor :updated_at
+  # An array of all emails that can be used to approve the certificate
+  attr_accessor :available_approver_emails
 
-    
+  # When the certificate was purchased
+  attr_accessor :created_at
 
-    #:nodoc:
-    def initialize(attributes)
-      attributes.each do |key, value|
-        m = "#{key}=".to_sym
-        self.send(m, value) if self.respond_to?(m)
-      end
-    end
-
-    # Get the fully-qualified domain name for the certificate. This is the
-    # domain.name joined with the certificate name, separated by a period.
-    def fqdn
-      [name, domain.name].delete_if { |p| p !~ DNSimple::BLANK_REGEX }.join(".")
-    end
+  # When the certificate was last updated
+  attr_accessor :updated_at
 
-    def submit(approver_email, options={})
-      raise DNSimple::Error, "Approver email is required" unless approver_email
+  # Get the fully-qualified domain name for the certificate. This is the
+  # domain.name joined with the certificate name, separated by a period.
+  def fqdn
+    [name, domain.name].delete_if { |p| p !~ DNSimple::BLANK_REGEX }.join(".")
+  end
 
-      options.merge!(DNSimple::Client.standard_options_with_credentials)
-      options.merge!(:body => {:certificate => {:approver_email => approver_email}})
+  def submit(approver_email, options={})
+    raise DNSimple::Error, "Approver email is required" unless approver_email
 
-      response = self.class.put("#{DNSimple::Client.base_uri}/domains/#{domain.name}/certificates/#{id}/submit", options) 
+    options.merge!(:body => {:certificate => {:approver_email => approver_email}})
 
-      pp response if DNSimple::Client.debug?
+    response = DNSimple::Client.put "domains/#{domain.name}/certificates/#{id}/submit", options
 
-      case response.code
-      when 200
-        return DNSimple::Certificate.new({:domain => domain}.merge(response["certificate"]))
-      when 401
-        raise DNSimple::AuthenticationFailed, "Authentication failed"
-      else
-        raise DNSimple::Error.new("Error submitting certificate: #{response["errors"]}")
-      end
+    case response.code
+    when 200
+      return DNSimple::Certificate.new({:domain => domain}.merge(response["certificate"]))
+    else
+      raise DNSimple::Error.new("Error submitting certificate: #{response["errors"]}")
     end
+  end
 
-    # Purchase a certificate under the given domain with the given name. The 
-    # name will be appended to the domain name, and thus should only be the 
-    # subdomain part.
-    #
-    # Example: DNSimple::Certificate.purchase(domain, 'www', contact)
-    #
-    # Please note that by invoking this method DNSimple will immediately charge
-    # your credit card on file at DNSimple for the full certificate price.
-    #
-    # For wildcard certificates an asterisk must appear in the name.
-    #
-    # Example: DNSimple::Certificate.purchase(domain, '*', contact)
-    def self.purchase(domain, name, contact, options={})
-      certificate_hash = {
-        :name => name,
-        :contact_id => contact.id
-      }
-
-      options.merge!(DNSimple::Client.standard_options_with_credentials)
-      options.merge!({:body => {:certificate => certificate_hash}})
-      
-      response = self.post("#{DNSimple::Client.base_uri}/domains/#{domain.name}/certificates", options) 
-
-      pp response if DNSimple::Client.debug?
-
-      case response.code
-      when 201
-        return DNSimple::Certificate.new({:domain => domain}.merge(response["certificate"]))
-      when 401
-        raise DNSimple::AuthenticationFailed, "Authentication failed"
-      when 406
-        raise DNSimple::CertificateExists.new("#{name}.#{domain.name}", response["errors"])
-      else
-        raise DNSimple::Error.new("#{name}.#{domain.name}", response["errors"])
-      end
+  # Purchase a certificate under the given domain with the given name. The
+  # name will be appended to the domain name, and thus should only be the
+  # subdomain part.
+  #
+  # Example: DNSimple::Certificate.purchase(domain, 'www', contact)
+  #
+  # Please note that by invoking this method DNSimple will immediately charge
+  # your credit card on file at DNSimple for the full certificate price.
+  #
+  # For wildcard certificates an asterisk must appear in the name.
+  #
+  # Example: DNSimple::Certificate.purchase(domain, '*', contact)
+  def self.purchase(domain, name, contact, options={})
+    certificate_hash = {
+      :name => name,
+      :contact_id => contact.id
+    }
+
+    options.merge!({:body => {:certificate => certificate_hash}})
+
+    response = DNSimple::Client.post "domains/#{domain.name}/certificates", options
+
+    case response.code
+    when 201
+      return new({:domain => domain}.merge(response["certificate"]))
+    when 406
+      raise DNSimple::CertificateExists.new("#{name}.#{domain.name}", response["errors"])
+    else
+      raise DNSimple::Error.new("#{name}.#{domain.name}", response["errors"])
     end
+  end
 
-    # Get an array of all certificates for the given domain.
-    def self.all(domain, options={})
-      options.merge!(DNSimple::Client.standard_options_with_credentials)
-
-      response = self.get("#{DNSimple::Client.base_uri}/domains/#{domain.name}/certificates", options) 
-
-      pp response if DNSimple::Client.debug?
+  # Get an array of all certificates for the given domain.
+  def self.all(domain, options={})
+    response = DNSimple::Client.get "domains/#{domain.name}/certificates", options
 
-      case response.code
-      when 200
-        response.map { |r| DNSimple::Certificate.new({:domain => domain}.merge(r["certificate"])) }
-      when 401
-        raise DNSimple::AuthenticationFailed, "Authentication failed"
-      else
-        raise DNSimple::Error.new("List certificates error: #{response["errors"]}")
-      end
+    case response.code
+    when 200
+      response.map { |r| new({:domain => domain}.merge(r["certificate"])) }
+    else
+      raise DNSimple::Error.new("List certificates error: #{response["errors"]}")
     end
+  end
 
-    # Find a specific certificate for the given domain.
-    def self.find(domain, certificate_id, options={})
-      options.merge!(DNSimple::Client.standard_options_with_credentials)
-
-      response = self.get("#{DNSimple::Client.base_uri}/domains/#{domain.name}/certificates/#{certificate_id}", options) 
-
-      pp response if DNSimple::Client.debug?
-
-      case response.code
-      when 200
-        DNSimple::Certificate.new({:domain => domain}.merge(response["certificate"]))
-      when 401
-        raise DNSimple::AuthenticationFailed, "Authentication failed"
-      when 404
-        raise DNSimple::CertificateNotFound, "Could not find certificate #{certificate_id} for domain #{domain.name}"
-      else
-        raise DNSimple::Error.new("Find certificate error: #{response["errors"]}")
-      end
+  # Find a specific certificate for the given domain.
+  def self.find(domain, certificate_id, options={})
+    response = DNSimple::Client.get "domains/#{domain.name}/certificates/#{certificate_id}", options
+
+    case response.code
+    when 200
+      new({:domain => domain}.merge(response["certificate"]))
+    when 404
+      raise DNSimple::CertificateNotFound, "Could not find certificate #{certificate_id} for domain #{domain.name}"
+    else
+      raise DNSimple::Error.new("Find certificate error: #{response["errors"]}")
     end
   end
 end