dnsimple-ruby 1.2.6 → 1.3.0

data/lib/dnsimple/transfer_order.rb

@@ -1,45 +1,28 @@
-module DNSimple #:nodoc:
-  # Class representing a transfer order in DNSimple
-  class TransferOrder
-    include HTTParty
+class DNSimple::TransferOrder # Class representing a transfer order in DNSimple
+  attr_accessor :id
 
-    attr_accessor :id
+  attr_accessor :status
 
-    attr_accessor :status
+  def self.create(name, authinfo='', registrant={}, extended_attributes={}, options={})
+    body = {:domain => {:name => name}, :transfer_order => {:authinfo => authinfo}}
 
-    def initialize(attributes)
-      attributes.each do |key, value|
-        m = "#{key}=".to_sym
-        self.send(m, value) if self.respond_to?(m)
-      end
+    if registrant[:id]
+      body[:domain][:registrant_id] = registrant[:id]
+    else
+      body.merge!(:contact => Contact.resolve_attributes(registrant))
     end
 
-    def self.create(name, authinfo='', registrant={}, extended_attributes={}, options={})
-      body = {:domain => {:name => name}, :transfer_order => {:authinfo => authinfo}}
+    body.merge!(:extended_attribute => extended_attributes)
 
-      if registrant[:id]
-        body[:domain][:registrant_id] = registrant[:id]
-      else
-        body.merge!(:contact => Contact.resolve_attributes(registrant))
-      end
+    options.merge!({:body => body})
 
-      body.merge!(:extended_attribute => extended_attributes)
+    response = DNSimple::Client.post 'domain_transfers.json', options
 
-      options.merge!({:body => body})
-      options.merge!({:basic_auth => Client.credentials})
-
-      response = self.post("#{Client.base_uri}/domain_transfers.json", options)
-
-      pp response if Client.debug?
-
-      case response.code
-      when 201
-        return TransferOrder.new(response["transfer_order"])
-      when 401
-        raise RuntimeError, "Authentication failed"
-      else
-        raise DNSimple::Error.new(name, response["errors"])
-      end
+    case response.code
+    when 201
+      return new(response["transfer_order"])
+    else
+      raise DNSimple::Error.new(name, response["errors"])
     end
   end
 end

data/lib/dnsimple/user.rb

@@ -1,44 +1,30 @@
-module DNSimple
-  class User
-    include HTTParty
+class DNSimple::User < DNSimple::Base
+  attr_accessor :id
 
-    attr_accessor :id
+  attr_accessor :created_at
 
-    attr_accessor :created_at
+  attr_accessor :updated_at
 
-    attr_accessor :updated_at
+  attr_accessor :email
 
-    attr_accessor :email
+  attr_accessor :login_count
 
-    attr_accessor :login_count
+  attr_accessor :failed_login_count
 
-    attr_accessor :failed_login_count
+  attr_accessor :domain_count
 
-    attr_accessor :domain_count
+  attr_accessor :domain_limit
 
-    attr_accessor :domain_limit
+  def self.me(options={})
+    response = DNSimple::Client.get("users/me.json", options)
 
-    def initialize(attributes)
-      attributes.each do |key, value|
-        m = "#{key}=".to_sym
-        self.send(m, value) if self.respond_to?(m)
-      end
-    end
-
-    def self.me(options={})
-      options.merge!({:basic_auth => Client.credentials})
-      response = self.get("#{Client.base_uri}/users/me.json", options)
-
-      case response.code
-      when 200
-        return User.new(response["user"])
-      when 401
-        raise DNSimple::AuthenticationFailed, "Authentication failed"
-      when 404
-        raise DNSimple::UserNotFound, "Could not find user"
-      else
-        raise DNSimple::Error, "Error: #{response.code} #{response.message}"
-      end
+    case response.code
+    when 200
+      return new(response["user"])
+    when 404
+      raise DNSimple::UserNotFound, "Could not find user"
+    else
+      raise DNSimple::Error, "Error: #{response.code} #{response.message}"
     end
   end
 end

data/lib/dnsimple/version.rb

@@ -0,0 +1,3 @@
+module DNSimple
+  VERSION = '1.3.0'
+end

data/spec/commands/purchase_certificate_spec.rb

@@ -3,12 +3,24 @@ require 'dnsimple/certificate'
 require 'dnsimple/commands/purchase_certificate'
 
 describe DNSimple::Commands::PurchaseCertificate do
-  let(:out) { StringIO.new }
+  let(:out)         { StringIO.new }
   let(:domain_name) { 'example.com' }
+  let(:domain)      { stub('domain') }
+  let(:contact)     { stub('contact') }
+
   context "with one argument" do
-    xit "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])
+    before :each do
+      DNSimple::Domain.stubs(:find).returns(domain)
+      DNSimple::Contact.stubs(:find).returns(contact)
+    end
+
+    it "purchases the certificate" do
+      DNSimple::Certificate.expects(:purchase).
+        with(domain, 'certname', contact).
+        returns(stub("certificate", :fqdn => domain_name))
+
+      DNSimple::Commands::PurchaseCertificate.new(out).
+        execute([domain_name, 'certname', stub('contact id')])
     end
   end
 end

data/spec/dnsimple/client_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe DNSimple::Client do
+  before :each do
+    @username, @password, @api_token = DNSimple::Client.username,
+      DNSimple::Client.password, DNSimple::Client.api_token
+  end
+
+  after :each do
+    DNSimple::Client.username  = @username
+    DNSimple::Client.password  = @password
+    DNSimple::Client.api_token = @api_token
+  end
+
+  [:get, :post, :put, :delete].each do |method|
+    describe ".#{method}" do
+      let(:response) { stub('response', :code => 200) }
+
+      it "uses HTTP authentication if there's a password provided" do
+        DNSimple::Client.username  = 'user'
+        DNSimple::Client.password  = 'pass'
+        DNSimple::Client.api_token = nil
+
+        HTTParty.expects(method).
+          with('http://localhost:3000/domains',
+            :format => :json, :headers => {'Accept' => 'application/json'},
+            :basic_auth => {:username => 'user', :password => 'pass'}).
+          returns(response)
+
+        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'
+
+        HTTParty.expects(method).
+          with('http://localhost:3000/domains',
+            :format => :json, :headers => {'Accept' => 'application/json',
+            'X-DNSimple-Token' => 'user:token'}).
+          returns(response)
+
+        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
+
+        lambda {
+          DNSimple::Client.send(method, 'domains')
+        }.should raise_error(RuntimeError, 'A password or API token is required for all API requests.')
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
-require 'vcr'
 require 'cgi'
-require 'lib/dnsimple'
+require 'rubygems'
+require 'bundler'
+
+Bundler.require :default, :development
 
 VCR.config do |c|
   c.cassette_library_dir = 'fixtures/vcr_cassettes'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dnsimple-ruby
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 6
-  version: 1.2.6
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Anthony Eden
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-29 00:00:00 Z
+date: 2012-06-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -27,12 +27,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id001
-  name: httparty
   prerelease: false
   type: :runtime
+  name: httparty
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -41,12 +41,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id002
-  name: rake
   prerelease: false
   type: :development
+  name: aruba
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -55,28 +55,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
-  name: jeweler
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
-  version_requirements: *id004
-  name: rspec
   prerelease: false
   type: :development
+  name: cucumber
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -85,12 +69,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
-  name: mocha
   prerelease: false
   type: :development
+  name: fakeweb
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -99,12 +83,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id006
-  name: ruby-debug
   prerelease: false
   type: :development
+  name: mocha
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,40 +97,28 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
-  name: cucumber
   prerelease: false
   type: :development
+  name: rake
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 2
         - 0
-        version: "0"
-  version_requirements: *id008
-  name: aruba
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
         - 0
-        version: "0"
-  version_requirements: *id009
-  name: ruby-debug
+        version: 2.0.0
   prerelease: false
   type: :development
+  name: rspec
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -155,42 +127,16 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id010
-  name: fakeweb
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 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
+  requirement: *id008
 description: A ruby wrapper for the DNSimple API that also includes a command-line client.
-email: anthony.eden@dnsimple.com
+email: 
+- anthony.eden@dnsimple.com
 executables: 
 - dnsimple
+- dnsimple.rb
 extensions: []
 
 extra_rdoc_files: 
@@ -199,8 +145,7 @@ extra_rdoc_files:
 - README.rdoc
 - README.textile
 files: 
-- .bundle/config
-- .rvmrc
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -208,7 +153,6 @@ files:
 - README.rdoc
 - README.textile
 - Rakefile
-- VERSION
 - bin/dnsimple
 - bin/dnsimple.rb
 - dnsimple-ruby.gemspec
@@ -248,7 +192,9 @@ files:
 - 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-ruby.rb
 - lib/dnsimple.rb
+- lib/dnsimple/base.rb
 - lib/dnsimple/certificate.rb
 - lib/dnsimple/cli.rb
 - lib/dnsimple/client.rb
@@ -300,6 +246,7 @@ files:
 - lib/dnsimple/template_record.rb
 - lib/dnsimple/transfer_order.rb
 - lib/dnsimple/user.rb
+- lib/dnsimple/version.rb
 - spec/README
 - spec/certificate_spec.rb
 - spec/command_spec.rb
@@ -309,6 +256,7 @@ files:
 - spec/commands/purchase_certificate_spec.rb
 - spec/commands/submit_certificate_spec.rb
 - spec/contact_spec.rb
+- spec/dnsimple/client_spec.rb
 - spec/domain_spec.rb
 - spec/extended_attributes_spec.rb
 - spec/record_spec.rb
@@ -344,11 +292,29 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A ruby wrapper for the DNSimple API
 test_files: 
+- 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
+- spec/README
 - spec/certificate_spec.rb
 - spec/command_spec.rb
 - spec/commands/add_service_spec.rb
@@ -357,6 +323,7 @@ test_files:
 - spec/commands/purchase_certificate_spec.rb
 - spec/commands/submit_certificate_spec.rb
 - spec/contact_spec.rb
+- spec/dnsimple/client_spec.rb
 - spec/domain_spec.rb
 - spec/extended_attributes_spec.rb
 - spec/record_spec.rb