dwolla-ruby 2.3.0 → 2.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWIzOTYzOTkyM2QxMjljZDVhYTFhMWJjYzY0ZThlYWY5MGE4YjY0Mg==
+    MDI4NTM0MGViMDNlNDc3OTA5NGJmZmU4M2M2NGI5ZTMwMmJkYzQzYw==
   data.tar.gz: !binary |-
-    OTEzZDJjMDExNTA5ZmZjMDlkOGE0OTJjZjgyZTg0YjQwMjk1ZjVhNA==
+    OTM4Y2IzNGI0ZTk5N2U3ZDY3ZTNmNWNlMjZkYzE5OGEyNWM1NzczMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDk3MmVkMGM4NmQzNDRkYjRiMjhiODk1ZTVjMmE5OTAyMGEyOTkyOGU4OGZi
-    YzA2MzBhNTczYjUwNzMzYTJhODE0MThmZjNjMjU3Y2EzMzFkZGFkZjE1NjI5
-    MDIzZjllN2JiMTYzMzE4MmU4MDhiYjVjNzgyNDk5ZjI5OGIyMjQ=
+    MTNjNTE5YzJkMzAzMGQ5NjM2MzkyNjM3YzM1Mzg0NDEzZTQ3NzhiYjg2ZWM1
+    ZDYxZTZlYzUyOWEzYzQ4MGViMDE5ZTQzNWEzNDQ4ZDRmNTQ2OTM5MDRjMDAy
+    YThlYjgzOTkxZGYyZTQ2OTFiZjYxNjJiM2EwOTMxZWIzNDZiMTk=
   data.tar.gz: !binary |-
-    MTg0N2JkZjFjODIwYWM2YWM3YzUyMjM3ZGEzZTIyYTA1NzQ1MmMyZGIxNTk0
-    ZTk3Y2ZmODc0NGU0YmY5NjkyZWEzODIzZjc3MmNiYWZiM2RjMDg0ODEyYjU0
-    ZWNlN2M3YWNkMWFlYTVjNjFjZDdiNGM4YmRhOGE4NGM0YzczNDQ=
+    ZDk2YWM5MmM1NWI0NGYwNjg0NTIyMDZlY2UwNDM1MDE4MDRjOGI0NzkyYzA4
+    YThiODljYTBhODc0MmQ1MzNhOTlkYzRjMDdkMWEwZTg5OTBkZjZiZGNmMjlh
+    OWI3ODA4MTEyZDNhOTlmYmZkYThmYjM2ZDZmNzk5Y2RiM2U5ODA=

data/README.md

@@ -4,7 +4,7 @@
 [![Build Status](https://travis-ci.org/Dwolla/dwolla-ruby.png?branch=master)](https://travis-ci.org/Dwolla/dwolla-ruby)
 
 ## Version
-2.3.0
+2.4.0
 
 ## Requirements
 - [Ruby](http://www.ruby-lang.org/)
@@ -32,6 +32,10 @@ This repo includes various usage examples, including:
 
 ## Changelog
 
+2.4.0
+
+* Added support for inline passage of OAuth tokens
+
 2.3.0
 
 * Add support for "sandbox" / UAT mode

data/examples/oauth.rb

@@ -14,7 +14,7 @@ Dwolla::api_secret = @api_secret
 # Constants...
 redirect_uri = 'http://localhost:4567/oauth_return'
 
-# STEP 1: 
+# STEP 1:
 #   Create an authentication URL
 #   that the user will be redirected to
 get '/' do
@@ -23,7 +23,7 @@ get '/' do
 end
 
 
-# STEP 2: 
+# STEP 2:
 #   Exchange the temporary code given
 #   to us in the querystring, for
 #   a never-expiring OAuth access token

data/examples/transactions.rb

@@ -28,3 +28,11 @@ pp Dwolla::Transactions.get
 # EXAMPLE 4:
 #   Get details about a certain Transaction
 pp Dwolla::Transactions.get(transactionId)
+
+# EXAMPLE 4:
+#   Get details about a certain Transaction
+#   using the API key & secret
+Dwolla::token = ''
+Dwolla::api_key = @api_key
+Dwolla::api_secret = @api_secret
+pp Dwolla::Transactions.get(transactionId, {}, false)

data/lib/dwolla/balance.rb

@@ -1,9 +1,9 @@
 module Dwolla
     class Balance
-        def self.get
+        def self.get(token=nil)
             url = balance_url
 
-            Dwolla.request(:get, url)
+            Dwolla.request(:get, url, {}, {}, token)
         end
 
         private

data/lib/dwolla/contacts.rb

@@ -1,9 +1,9 @@
 module Dwolla
     class Contacts
-        def self.get(filters={})
+        def self.get(filters={}, token=nil)
             url = contacts_url
 
-            Dwolla.request(:get, url, filters)
+            Dwolla.request(:get, url, filters, {}, token)
         end
 
 

data/lib/dwolla/funding_sources.rb

@@ -1,14 +1,14 @@
 module Dwolla
     class FundingSources
-        def self.get(id=nil)
+        def self.get(id=nil, token=nil)
             url = funding_sources_url
 
             url += id.to_s unless id.nil?
 
-            Dwolla.request(:get, url)
+            Dwolla.request(:get, url, {}, {}, token)
         end
 
-        def self.withdraw(id=nil, params={})
+        def self.withdraw(id=nil, params={}, token=nil)
             raise MissingParameterError.new('No Funding Source ID Provided.') if id.nil?
             raise MissingParameterError.new('No PIN Provided.') unless params[:pin]
             raise MissingParameterError.new('No Amount Provided.') unless params[:amount]
@@ -16,10 +16,10 @@ module Dwolla
             url = funding_sources_url
             url += id.to_s + '/withdraw'
 
-            Dwolla.request(:post, url, params)
+            Dwolla.request(:post, url, params, {}, token)
         end
 
-        def self.deposit(id=nil, params={})
+        def self.deposit(id=nil, params={}, token=nil)
             raise MissingParameterError.new('No Funding Source ID Provided.') if id.nil?
             raise MissingParameterError.new('No PIN Provided.') unless params[:pin]
             raise MissingParameterError.new('No Amount Provided.') unless params[:amount]
@@ -27,10 +27,10 @@ module Dwolla
             url = funding_sources_url
             url += id.to_s + '/deposit'
 
-            Dwolla.request(:post, url, params)
+            Dwolla.request(:post, url, params, {}, token)
         end
 
-        def self.add(params={})
+        def self.add(params={}, token=nil)
             raise MissingParameterError.new('No Account Number Provided.') unless params[:account_number]
             raise MissingParameterError.new('No Routing Number (ABA) Provided.') unless params[:routing_number]
             raise MissingParameterError.new('No Account Type Provided.') unless params[:account_type]
@@ -38,10 +38,10 @@ module Dwolla
 
             url = funding_sources_url
 
-            Dwolla.request(:post, url, params)
+            Dwolla.request(:post, url, params, {}, token)
         end
 
-        def self.verify(id=nil, params={})
+        def self.verify(id=nil, params={}, token=nil)
             raise MissingParameterError.new('No Funding Source ID Provided.') if id.nil?
             raise MissingParameterError.new('No Deposit 1 Amount Provided.') unless params[:deposit1]
             raise MissingParameterError.new('No Deposit 2 Amount Provided.') unless params[:deposit2]
@@ -49,7 +49,7 @@ module Dwolla
             url = funding_sources_url
             url += id.to_s + '/verify'
 
-            Dwolla.request(:post, url, params)
+            Dwolla.request(:post, url, params, {}, token)
         end
 
         class << self

data/lib/dwolla/requests.rb

@@ -1,6 +1,6 @@
 module Dwolla
     class Requests
-        def self.get(id=nil, filters={})
+        def self.get(id=nil, filters={}, token=nil)
             url = requests_url
 
             if id.is_a?(Hash)
@@ -12,33 +12,33 @@ module Dwolla
 
             url += id.to_s unless id.nil?
 
-            Dwolla.request(:get, url, filters)
+            Dwolla.request(:get, url, filters, {}, token)
         end
 
-        def self.delete(id=nil)
+        def self.delete(id=nil, token=nil)
             raise MissingParameterError.new('No Request ID Provided.') if id.nil?
 
             url = requests_url + id.to_s + '/cancel'
 
-            Dwolla.request(:post, url)
+            Dwolla.request(:post, url, {}, {}, token)
         end
 
-        def self.create(params={})
+        def self.create(params={}, token=nil)
             raise MissingParameterError.new('No Source ID Provided.') unless params[:sourceId]
             raise MissingParameterError.new('No Amount Provided.') unless params[:amount]
 
             url = requests_url
 
-            Dwolla.request(:post, url, params)
+            Dwolla.request(:post, url, params, {}, token)
         end
 
-        def self.fulfill(id=nil, params={})
+        def self.fulfill(id=nil, params={}, token=nil)
             raise MissingParameterError.new('No Request ID Provided.') if id.nil?
             raise MissingParameterError.new('No PIN Provided.') unless params[:pin]
 
             url = requests_url + id.to_s + '/fulfill'
 
-            Dwolla.request(:post, url, params)
+            Dwolla.request(:post, url, params, {}, token)
         end
 
         class << self

data/lib/dwolla/transactions.rb

@@ -1,6 +1,6 @@
 module Dwolla
     class Transactions
-        def self.get(id=nil, filters={})
+        def self.get(id=nil, filters={}, token=nil)
             url = transactions_url
 
             if id.is_a?(Hash)
@@ -12,23 +12,23 @@ module Dwolla
 
             url += id.to_s unless id.nil?
 
-            Dwolla.request(:get, url, filters)
+            Dwolla.request(:get, url, filters, {}, token)
         end
 
-        def self.stats(filters={})
+        def self.stats(filters={}, token=nil)
             url = transactions_url + 'stats'
 
-            Dwolla.request(:get, url, filters)
+            Dwolla.request(:get, url, filters, {}, token)
         end
 
-        def self.create(params={})
+        def self.create(params={}, token=nil)
             raise MissingParameterError.new('No PIN Provided.') unless params[:pin]
             raise MissingParameterError.new('No Destination ID Provided.') unless params[:destinationId]
             raise MissingParameterError.new('No Amount Provided.') unless params[:amount]
 
             url = transactions_url + 'send'
 
-            Dwolla.request(:post, url, params)
+            Dwolla.request(:post, url, params, {}, token)
         end
 
         def self.guest_send(params={})
@@ -57,4 +57,4 @@ module Dwolla
             return '/transactions/'
         end
     end
-end
+end

data/lib/dwolla/users.rb

@@ -1,24 +1,24 @@
 module Dwolla
     class Users
-        def self.get(id=nil)
+        def self.get(id=nil, token=nil)
             url = users_url
 
             unless id.nil?
                 url += id.to_s
                 @oauth = false
             else
-                @oauth = true
+                @oauth = token.nil? ? true : token
             end
 
             Dwolla.request(:get, url, {}, {}, @oauth)
         end
 
-        def self.me
+        def self.me(token=nil)
             # I'm not using the 'alias_method' fn
             # because the .me method should not
             # honor any parameters (i.e. User IDs)
             # passed to it
-            self.get
+            self.get(nil, token)
         end
 
         def self.nearby(filters={})

data/lib/dwolla/version.rb

@@ -1,3 +1,3 @@
 module Dwolla
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

data/lib/dwolla.rb

@@ -107,6 +107,14 @@ 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
+
+        # figure out which auth to use
         if oauth and not params[:oauth_token]
             raise AuthenticationError.new('No OAuth Token Provided.') unless token
             params = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dwolla-ruby
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Michael Schonfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client