dwolla-ruby 2.4.1 → 2.4.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2NiYzA1ZmVmMzllNmZkMzIwOGZiM2ZlM2ZhODUxZWE4YjEzY2ZkZQ==
+    MDFlZTc3ODI4YmRhYmNlODZmMTE3YzI5Y2RkYzMzY2IxNzRmYjc4ZQ==
   data.tar.gz: !binary |-
-    NjhjMWY4ZGRkMmQxNmQ0NDFkOTY5M2NmODIyZGNmZWNiMzY2OTk4ZQ==
+    YmIyNzNlOTI0YjI5Y2E1MmQ3NjUwNTU0OTY3OTE0ODllYjIyYjc0Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2E0ZjFlZTc2NTczNWJmNTBmMDZiMDcwMTgwMmZlZDY3YzlkMzI2YjNkYWJi
-    YjI0ZDU4MDVmYmZmZTdhZDc4NGIxMTc2ZWM4YWZkMWQxODY4YTdhM2NhMjIw
-    MzZmNGNlZDM3YmFhOTgxNjc5NGY0ZmVkZjZmNmJlMTZlNjhlZTQ=
+    OGU5YjQ0NmZhZTlmZTBkOTlhYTIwOTU3YmI5MmIxYzFlODlkOWQzYjhlNjll
+    OTcyNGQwYTVlMGFhY2MzYjAwMWMzODQyMWFhMDNmNDliN2M5YmE0OGYyY2Zl
+    NDU3ZGVhNTJhOTk0YTliM2M0MzM0OGQ2NjRjNDZmNjQ5ZjlhMjI=
   data.tar.gz: !binary |-
-    ZWVjNWMxMTQxMTRiNGIyNjQ5MGQ3NDliYmE4OWM0YjA2OTZlMjc5YjY3ZDgw
-    MjZkZTAyYjNmMTFmOTZiMTYwYThiYTMyYTBiYzczZTJkMTVkYTc3OGRmZjUy
-    NzE4NTkyYTgwNjI4ZGFkYWNmNTlmN2EyN2UwOTNjMWJkMzY1MDc=
+    ZGUzMjNlZTRjMjI2YWQ2MmJiYjAwN2FkNTAzYmY2Zjg0ZmM2Mjc1NmU1YzNj
+    ODU3ODhmMzNlZTFjMjQ1MzBkNTNlNDllZTQ0YmU4NDk3MmFhMmRlMzNkNTkx
+    YzBlYWVkMWRlZWEzZWE4MTFkZTA1MTlkNjQyOTA1Zjk5MWExYzQ=

data/README.md

@@ -32,6 +32,10 @@ This repo includes various usage examples, including:
 
 ## Changelog
 
+2.4.2
+
+* Fix OAuth token override
+
 2.4.1
 
 * Show raw response on debug mode

data/lib/dwolla.rb

@@ -109,19 +109,21 @@ module Dwolla
     end
 
     def self.request(method, url, params={}, headers={}, oauth=true, parse_response=true, custom_url=false)
-        # if oauth is nil, assume default
-        if oauth.nil?
-            oauth = true
-        elsif not oauth.is_a?(TrueClass)
-            params[:oauth_token] = oauth
-        end
+        # if oauth is nil, assume default [true]
+        oauth = true if oauth.nil?
 
         # figure out which auth to use
         if oauth and not params[:oauth_token]
-            raise AuthenticationError.new('No OAuth Token Provided.') unless token
-            params = {
-                :oauth_token => token
-            }.merge(params)
+            if not oauth.is_a?(TrueClass) # was token passed in the oauth param?
+                params = {
+                    :oauth_token => oauth
+                }.merge(params)
+            else
+                raise AuthenticationError.new('No OAuth Token Provided.') unless token
+                params = {
+                    :oauth_token => token
+                }.merge(params)
+            end
         elsif oauth and params[:oauth_token]
             raise AuthenticationError.new('No OAuth Token Provided.') unless params[:oauth_token]
         else not oauth

data/lib/dwolla/version.rb

@@ -1,3 +1,3 @@
 module Dwolla
-  VERSION = "2.4.1"
+  VERSION = "2.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dwolla-ruby
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Michael Schonfeld