databasedotcom 1.0.1 → 1.0.2

data/lib/databasedotcom/client.rb

@@ -84,10 +84,12 @@ module Databasedotcom
     #
     # Raises SalesForceError if an error occurs
     def authenticate(options = nil)
-      if (options[:username] && options[:password])
+      if user_and_pass?(options)
         req = Net::HTTP.new(self.host, 443)
         req.use_ssl=true
-        path = "/services/oauth2/token?grant_type=password&client_id=#{self.client_id}&client_secret=#{client_secret}&username=#{options[:username]}&password=#{options[:password]}"
+        user = self.username || options[:username]
+        pass = self.password || options[:password]
+        path = "/services/oauth2/token?grant_type=password&client_id=#{self.client_id}&client_secret=#{client_secret}&username=#{user}&password=#{pass}"
         log_request("https://#{self.host}/#{path}")
         result = req.post(path, "")
         log_response(result)
@@ -417,5 +419,9 @@ module Databasedotcom
     def key_from_label(label)
       label.gsub(' ', '_')
     end
+
+    def user_and_pass?(options)
+      (self.username && self.password) || (options && options[:username] && options[:password])
+    end
   end
 end

data/lib/databasedotcom/version.rb

@@ -1,3 +1,3 @@
 module Databasedotcom
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: databasedotcom
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Glenn Gillen, Danny Burkes & Richard Zhao