dnsimple-ruby 1.3.1 → 1.3.2

data/.gitignore

@@ -1,3 +1,4 @@
 pkg
 rdoc
 turbulence
+.rvmrc

data/lib/dnsimple/client.rb

@@ -59,10 +59,10 @@ class DNSimple::Client
   def self.load_credentials(path=config_path)
     begin
       credentials = YAML.load(File.new(File.expand_path(path)))
-      self.username  = credentials['username']
-      self.password  = credentials['password']
-      self.api_token = credentials['api_token']
-      self.base_uri  = credentials['site']
+      self.username  ||= credentials['username']
+      self.password  ||= credentials['password']
+      self.api_token ||= credentials['api_token']
+      self.base_uri  ||= credentials['site']
       self.http_proxy = { :addr => credentials['proxy_addr'], :port => credentials['proxy_port'] }
       @credentials_loaded = true
       "Credentials loaded from #{path}"
@@ -80,10 +80,15 @@ class DNSimple::Client
     options = {
                 :format => :json, 
                 :headers => {'Accept' => 'application/json'}, 
-                :http_proxyaddr => self.http_proxy[:addr], 
-                :http_proxyport => self.http_proxy[:port] 
               }
 
+    if http_proxy
+      options.merge!(
+        :http_proxyaddr => self.http_proxy[:addr],
+        :http_proxyport => self.http_proxy[:port]
+      )
+    end
+
     if password
       options[:basic_auth] = {:username => username, :password => password}
     elsif api_token

data/lib/dnsimple/version.rb

@@ -1,3 +1,3 @@
 module DNSimple
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dnsimple-ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty