dwolla-ruby 2.6.1 → 2.6.2

data/lib/dwolla/oauth.rb

@@ -1,76 +1,76 @@
-module Dwolla
-  class OAuth
-    def self.get_auth_url(redirect_uri=nil, scope=Dwolla::scope)
-      raise AuthenticationError.new('No Api Key Provided.') unless Dwolla::api_key
-
-      params = {
-          :scope => scope,
-          :response_type => 'code',
-          :client_id => Dwolla::api_key
-      }
-
-      params['redirect_uri'] = redirect_uri unless redirect_uri.nil?
-
-      uri = Addressable::URI.new
-      uri.query_values = params
-
-      if Dwolla::debug and Dwolla::sandbox
-        puts "[DWOLLA SANDBOX MODE OPERATION]"
-      end
-
-      return auth_url + '?' + uri.query
-    end
-
-    def self.get_token(code=nil, redirect_uri=nil)
-      raise MissingParameterError.new('No Code Provided.') if code.nil?
-
-      params = {
-          :grant_type => 'authorization_code',
-          :code => code
-      }
-
-      # I realize this is ugly, but the unit tests fail
-      # if the key is accessed["like_this"] because the
-      # hash is compared with "quotes" and not :like_this.
-
-      # It may very well be my Ruby version
-      # TODO: Revisit this
-      (params = params.merge({:redirect_uri => redirect_uri})) unless redirect_uri.nil?
-
-      resp = Dwolla.request(:get, token_url, params, {}, false, false, true)
-
-      # TODO: Revisit this to make it more unit test friendly, fails ['error_description'] due to
-      # key not existing, same on L58
-      return "No data received." unless resp.is_a?(Hash)
-      raise APIError.new(resp['error_description']) unless resp.has_key?('access_token') and resp.has_key?('refresh_token')
-
-      return resp
-    end
-
-    def self.refresh_auth(refresh_token=nil)
-      raise MissingParameterError.new('No Refresh Token Provided') if refresh_token.nil?
-
-      params = {
-          :grant_type => 'refresh_token',
-          :refresh_token => refresh_token
-      }
-
-      resp = Dwolla.request(:get, token_url, params, {}, false, false, true)
-
-      return "No data received." unless resp.is_a?(Hash)
-      raise APIError.new(resp['error_description']) unless resp.has_key?('access_token') and resp.has_key?('refresh_token')
-
-      return resp
-    end
-
-    private
-
-    def self.auth_url
-      Dwolla.hostname + '/oauth/v2/authenticate'
-    end
-
-    def self.token_url
-      Dwolla.hostname + '/oauth/v2/token'
-    end
-  end
+module Dwolla
+  class OAuth
+    def self.get_auth_url(redirect_uri=nil, scope=Dwolla::scope)
+      raise AuthenticationError.new('No Api Key Provided.') unless Dwolla::api_key
+
+      params = {
+          :scope => scope,
+          :response_type => 'code',
+          :client_id => Dwolla::api_key
+      }
+
+      params['redirect_uri'] = redirect_uri unless redirect_uri.nil?
+
+      uri = Addressable::URI.new
+      uri.query_values = params
+
+      if Dwolla::debug and Dwolla::sandbox
+        puts "[DWOLLA SANDBOX MODE OPERATION]"
+      end
+
+      return auth_url + '?' + uri.query
+    end
+
+    def self.get_token(code=nil, redirect_uri=nil)
+      raise MissingParameterError.new('No Code Provided.') if code.nil?
+
+      params = {
+          :grant_type => 'authorization_code',
+          :code => code
+      }
+
+      # I realize this is ugly, but the unit tests fail
+      # if the key is accessed["like_this"] because the
+      # hash is compared with "quotes" and not :like_this.
+
+      # It may very well be my Ruby version
+      # TODO: Revisit this
+      (params = params.merge({:redirect_uri => redirect_uri})) unless redirect_uri.nil?
+
+      resp = Dwolla.request(:get, token_url, params, {}, false, false, true)
+
+      # TODO: Revisit this to make it more unit test friendly, fails ['error_description'] due to
+      # key not existing, same on L58
+      return "No data received." unless resp.is_a?(Hash)
+      raise APIError.new(resp['error_description']) unless resp.has_key?('access_token') and resp.has_key?('refresh_token')
+
+      return resp
+    end
+
+    def self.refresh_auth(refresh_token=nil)
+      raise MissingParameterError.new('No Refresh Token Provided') if refresh_token.nil?
+
+      params = {
+          :grant_type => 'refresh_token',
+          :refresh_token => refresh_token
+      }
+
+      resp = Dwolla.request(:get, token_url, params, {}, false, false, true)
+
+      return "No data received." unless resp.is_a?(Hash)
+      raise APIError.new(resp['error_description']) unless resp.has_key?('access_token') and resp.has_key?('refresh_token')
+
+      return resp
+    end
+
+    private
+
+    def self.auth_url
+      Dwolla.hostname + '/oauth/v2/authenticate'
+    end
+
+    def self.token_url
+      Dwolla.hostname + '/oauth/v2/token'
+    end
+  end
 end

data/lib/dwolla/offsite_gateway.rb

@@ -1,154 +1,154 @@
-module Dwolla
-    class OffsiteGateway
-        @products = []
-        @discount = 0
-        @tax = 0
-        @shipping = 0
-        @notes = nil
-        @facilitator_amount = nil
-        @test_mode = false
-        @allow_funding_sources = true
-        @additional_funding_sources = true
-        @order_id = nil
-
-        def self.clear_session
-            @products = []
-            @discount = 0
-            @tax = 0
-            @shipping = 0
-            @notes = nil
-            @facilitator_amount = nil
-            @test_mode = false
-            @allow_funding_sources = true
-            @additional_funding_sources = true
-            @order_id = nil
-        end
-
-        class << self
-            attr_writer :tax
-            attr_writer :shipping
-            attr_writer :notes
-            attr_writer :order_id
-            attr_writer :redirect
-            attr_writer :callback
-            attr_writer :test_mode
-            attr_writer :allow_funding_sources
-            attr_writer :additional_funding_sources
-            attr_writer :facilitator_amount
-        end
-
-        def self.add_product(name=nil, description=nil, price=nil, quantity=1)
-            @products.push({
-                :name => name,
-                :description => description,
-                :price => price,
-                :quantity => quantity
-            })
-        end
-
-        def self.set_customer_info(first_name=nil, last_name=nil, email=nil, city=nil, state=nil, zip=nil)
-            @customerInfo = {
-                :firstName => first_name,
-                :lastName => last_name,
-                :email => email,
-                :city => city,
-                :state => state,
-                :zip => zip
-            }
-        end
-
-        def self.discount=(discount)
-            @discount = -(discount.abs)
-        end
-
-        def self.get_checkout_url(destinationId)
-            params = {
-                :key => Dwolla::api_key,
-                :secret => Dwolla::api_secret,
-                :allowFundingSources => @allow_funding_sources,
-                :additionalFundingSources => @additional_funding_sources,
-                :test => @test_mode,
-                :callback => @callback,
-                :redirect => @redirect,
-                :orderId => @order_id,
-                :notes => @notes,
-                :purchaseOrder => {
-                    :customerInfo => @customerInfo,
-                    :destinationId => destinationId,
-                    :orderItems => @products,
-                    :facilitatorAmount => @facilitator_amount,
-                    :discount => @discount,
-                    :shipping => @shipping,
-                    :tax => @tax,
-                    :total => self.calculate_total
-                }
-            }
-
-            resp = Dwolla.request(:post, request_url, params, {}, false, false, true)
-
-            return "No data received." unless resp.is_a?(Hash)
-            raise APIError.new(resp['Message']) unless resp.has_key?('Result') and resp['Result'] == 'Success'
-
-            return checkout_url + resp['CheckoutId']
-        end
-
-        def self.read_callback(body)
-            data = JSON.load(body)
-
-            verify_callback_signature(data['Signature'], data['CheckoutId'], data['Amount'])
-
-            return data
-        end
-
-        def self.validate_webhook(signature, body)
-            verify_webhook_signature(signature, body)
-        end
-
-        private
-
-        def self.verify_callback_signature(candidate=nil, checkout_id=nil, amount=nil)
-            key = "#{checkout_id}&#{amount}"
-            digest  = OpenSSL::Digest::Digest.new('sha1')
-            signature = OpenSSL::HMAC.hexdigest(digest, Dwolla::api_secret, key)
-
-            raise APIError.new("Invalid callback signature (#{candidate} vs #{signature})") unless candidate == signature
-        end
-
-        def self.verify_webhook_signature(candidate=nil, body=nil)
-            digest  = OpenSSL::Digest::Digest.new('sha1')
-            signature = OpenSSL::HMAC.hexdigest(digest, Dwolla::api_secret, body)
-
-            raise APIError.new("Invalid Webhook signature (#{candidate} vs #{signature})") unless candidate == signature
-        end
-
-        def self.request_url
-            if Dwolla::sandbox
-                return 'https://uat.dwolla.com/payment/request'
-            else
-                return 'https://www.dwolla.com/payment/request'
-            end
-        end
-
-        def self.checkout_url
-            if Dwolla::sandbox
-                return 'https://uat.dwolla.com/payment/request'
-            else
-                return 'https://www.dwolla.com/payment/request'
-            end
-        end
-
-        def self.calculate_total
-            total = 0.0
-
-            @products.each { |product|
-                total += product[:price] * product[:quantity]
-            }
-
-            total += @shipping
-            total += @tax
-            total += @discount
-
-            return total.round(2)
-        end
-    end
-end
+module Dwolla
+    class OffsiteGateway
+        @products = []
+        @discount = 0
+        @tax = 0
+        @shipping = 0
+        @notes = nil
+        @facilitator_amount = nil
+        @test_mode = false
+        @allow_funding_sources = true
+        @additional_funding_sources = true
+        @order_id = nil
+
+        def self.clear_session
+            @products = []
+            @discount = 0
+            @tax = 0
+            @shipping = 0
+            @notes = nil
+            @facilitator_amount = nil
+            @test_mode = false
+            @allow_funding_sources = true
+            @additional_funding_sources = true
+            @order_id = nil
+        end
+
+        class << self
+            attr_writer :tax
+            attr_writer :shipping
+            attr_writer :notes
+            attr_writer :order_id
+            attr_writer :redirect
+            attr_writer :callback
+            attr_writer :test_mode
+            attr_writer :allow_funding_sources
+            attr_writer :additional_funding_sources
+            attr_writer :facilitator_amount
+        end
+
+        def self.add_product(name=nil, description=nil, price=nil, quantity=1)
+            @products.push({
+                :name => name,
+                :description => description,
+                :price => price,
+                :quantity => quantity
+            })
+        end
+
+        def self.set_customer_info(first_name=nil, last_name=nil, email=nil, city=nil, state=nil, zip=nil)
+            @customerInfo = {
+                :firstName => first_name,
+                :lastName => last_name,
+                :email => email,
+                :city => city,
+                :state => state,
+                :zip => zip
+            }
+        end
+
+        def self.discount=(discount)
+            @discount = -(discount.abs)
+        end
+
+        def self.get_checkout_url(destinationId)
+            params = {
+                :key => Dwolla::api_key,
+                :secret => Dwolla::api_secret,
+                :allowFundingSources => @allow_funding_sources,
+                :additionalFundingSources => @additional_funding_sources,
+                :test => @test_mode,
+                :callback => @callback,
+                :redirect => @redirect,
+                :orderId => @order_id,
+                :notes => @notes,
+                :purchaseOrder => {
+                    :customerInfo => @customerInfo,
+                    :destinationId => destinationId,
+                    :orderItems => @products,
+                    :facilitatorAmount => @facilitator_amount,
+                    :discount => @discount,
+                    :shipping => @shipping,
+                    :tax => @tax,
+                    :total => self.calculate_total
+                }
+            }
+
+            resp = Dwolla.request(:post, request_url, params, {}, false, false, true)
+
+            return "No data received." unless resp.is_a?(Hash)
+            raise APIError.new(resp['Message']) unless resp.has_key?('Result') and resp['Result'] == 'Success'
+
+            return checkout_url + resp['CheckoutId']
+        end
+
+        def self.read_callback(body)
+            data = JSON.load(body)
+
+            verify_callback_signature(data['Signature'], data['CheckoutId'], data['Amount'])
+
+            return data
+        end
+
+        def self.validate_webhook(signature, body)
+            verify_webhook_signature(signature, body)
+        end
+
+        private
+
+        def self.verify_callback_signature(candidate=nil, checkout_id=nil, amount=nil)
+            key = "#{checkout_id}&#{amount}"
+            digest  = OpenSSL::Digest::Digest.new('sha1')
+            signature = OpenSSL::HMAC.hexdigest(digest, Dwolla::api_secret, key)
+
+            raise APIError.new("Invalid callback signature (#{candidate} vs #{signature})") unless candidate == signature
+        end
+
+        def self.verify_webhook_signature(candidate=nil, body=nil)
+            digest  = OpenSSL::Digest::Digest.new('sha1')
+            signature = OpenSSL::HMAC.hexdigest(digest, Dwolla::api_secret, body)
+
+            raise APIError.new("Invalid Webhook signature (#{candidate} vs #{signature})") unless candidate == signature
+        end
+
+        def self.request_url
+            if Dwolla::sandbox
+                return 'https://uat.dwolla.com/payment/request'
+            else
+                return 'https://www.dwolla.com/payment/request'
+            end
+        end
+
+        def self.checkout_url
+            if Dwolla::sandbox
+                return 'https://uat.dwolla.com/payment/checkout/'
+            else
+                return 'https://www.dwolla.com/payment/checkout/'
+            end
+        end
+
+        def self.calculate_total
+            total = 0.0
+
+            @products.each { |product|
+                total += product[:price] * product[:quantity]
+            }
+
+            total += @shipping
+            total += @tax
+            total += @discount
+
+            return total.round(2)
+        end
+    end
+end