dnsimple-ruby 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c40f147d4747a607ca8ae3cfb8bb1f99830513d9
-  data.tar.gz: 5d72dcfc3d7332887eec729b7d9122b51cc3fafb
+  metadata.gz: 42638c92a4155646824236ba7c5d871d0136cc3a
+  data.tar.gz: 9eebdc4564923bb72dcb799dd03742b624755114
 SHA512:
-  metadata.gz: 268b16e76b613c51ba2da2f51c5955d54f3ca4437acfef0232a5b4718d69b805420a5dc9851ca4d72fff1e594c3c3c4d91abab15aea138ffbbafdab9c37e34be
-  data.tar.gz: eb197c1b3b13de5a44075bba53585a2ed2c9cfb884cb63ba916b0cb7f52e14ed41aec1d1022b28a0c8c565ff5ff0178760fbe2102ab71934bbc39315c3e09538
+  metadata.gz: b9531a98f22ece8e9be835d779e59a71a461a3f4c13844b5a15096b25b2c8d8a178833cfc3e0b6f91e5ca95cf28cf9ef3ca52b9060636ed2c4168a88360c1a3a
+  data.tar.gz: e56b752ffa7824a98ba16b475d8293226475d5851e234c7c5ef3e82a902abccf26816f3d382c147b30fa031f1840e96e10667913718514fc23e2fa4e8682cb30

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+#### Release 1.7.0
+
+- NEW: Add support for Domain-based authentication (GH-40, GH-46). Thanks @dwradcliffe and @samsonasu.
+
 #### Release 1.6.0
 
 - NEW: Add support for 2FA (GH-44)

data/lib/dnsimple/client.rb

@@ -7,6 +7,7 @@ module DNSimple
     DEFAULT_BASE_URI = "https://api.dnsimple.com/"
     HEADER_2FA_STRICT = "X-DNSimple-2FA-Strict"
     HEADER_API_TOKEN = "X-DNSimple-Token"
+    HEADER_DOMAIN_API_TOKEN = "X-DNSimple-Domain-Token"
     HEADER_OTP_TOKEN = "X-DNSimple-OTP"
     HEADER_EXCHANGE_TOKEN = "X-DNSimple-OTP-Token"
 
@@ -15,7 +16,7 @@ module DNSimple
       #   Defaults to false.
       attr_accessor :debug
 
-      attr_accessor :username, :password, :exchange_token, :api_token
+      attr_accessor :username, :password, :exchange_token, :api_token, :domain_api_token
     end
 
     # Gets the qualified API base uri.
@@ -51,6 +52,7 @@ module DNSimple
         self.password       = credentials['password']
         self.exchange_token = credentials['exchange_token']
         self.api_token      = credentials['api_token']
+        self.domain_api_token = credentials['domain_api_token']
         self.base_uri       = credentials['site']       if credentials['site']
         self.base_uri       = credentials['base_uri']   if credentials['base_uri']
         @http_proxy = { :addr => credentials['proxy_addr'], :port => credentials['proxy_port'] } if credentials['proxy_addr'] || credentials['proxy_port']
@@ -63,7 +65,7 @@ module DNSimple
     end
 
     def self.credentials_loaded?
-      (@credentials_loaded ||= false) or (username and (password or api_token))
+      (@credentials_loaded ||= false) or domain_api_token or (username and (password or api_token))
     end
 
     def self.base_options
@@ -83,6 +85,8 @@ module DNSimple
         options[:basic_auth] = { :username => exchange_token, :password => "x-2fa-basic" }
       elsif password
         options[:basic_auth] = { :username => username, :password => password }
+      elsif domain_api_token
+        options[:headers][HEADER_DOMAIN_API_TOKEN] = domain_api_token
       elsif api_token
         options[:headers][HEADER_API_TOKEN] = "#{username}:#{api_token}"
       else

data/lib/dnsimple/version.rb

@@ -1,3 +1,3 @@
 module DNSimple
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 end

data/spec/dnsimple/client_spec.rb

@@ -30,7 +30,7 @@ describe DNSimple::Client do
 
   describe ".request" do
     before do
-      [:username, :password, :exchange_token, :api_token].each do |attribute|
+      [:username, :password, :exchange_token, :api_token, :domain_api_token].each do |attribute|
         described_class.send("#{attribute}=", nil)
       end
     end
@@ -47,6 +47,17 @@ describe DNSimple::Client do
       described_class.request(:get, '/domains', {})
     end
 
+    it "uses header authentication if there's a domain api token provided" do
+      described_class.domain_api_token  = 'domaintoken'
+      described_class.base_uri   = 'https://api.example.com/'
+
+      HTTParty.expects(:get).
+        with('https://api.example.com/domains', has_entries(:headers => has_entries({ 'X-DNSimple-Domain-Token' => 'domaintoken' }))).
+        returns(response)
+
+      described_class.request(:get, '/domains', {})
+    end
+
     it "uses header authentication if there's an api token provided" do
       described_class.username   = 'user'
       described_class.api_token  = 'token'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dnsimple-ruby
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Anthony Eden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-20 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty