dwolla-ruby 2.4.4 → 2.4.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Njc2MjU0ZjBjNjU0OTBjYTlkZjdiZGZjZmQyZDk5ZGU1YTI1OTZhNg==
+    YmUyYzdjOTYwMGM4NmMzZmZhZTQ5M2NjY2Y0MzVlNmNmM2FhYTQwNQ==
   data.tar.gz: !binary |-
-    NjRjYWY1Y2I1NmQwMDFiNmQ1NzVmODgyNjY0MWFhNWM2NmNiNzc0Yw==
+    ZDI1YWVkZTMwNzUzZmI4N2Q3NmY5MGUwMzMyYWE3NzMyZmJmNjczNQ==
 SHA512:
   metadata.gz: !binary |-
-    NGRiMjQyZDlkNWNkMDBhM2ZiZjFiNzE0NTFmYjYwMjliYjk4NTQyZTllY2Y4
-    ZWExNjk2YWJlOTZkNTQwZDUyNmZjMDJlYjY0NWZkYWRlMGQ3ZjE2YzkyOGFj
-    NmZhNDhlMWNhYjIxODU4OTJkYzgzYWIzODA5MzhiYzcxZTNlZGE=
+    ODdmZmEwMDU1ZDEyZWI5MzQxNDczYmNmY2U5YTU1ZDQzZWM1ZTFjMmEzNDUw
+    YmRjZjQwNzI5N2QyMThjMTE4MThlZmUxODYwMjExNWU2YjAyNDg1ODI4MTUz
+    MTcyMTY5Y2RkMWZhYTU1YWJmYTdjMmVjZDI1NzdkYWI0MDA0ZGY=
   data.tar.gz: !binary |-
-    ZDkyNDc1MmQ2YTJjMTQ5MmM1NWY0OTcyYTI3MmRhMjVjZmU5ODc5MGZkYTRk
-    ZmI4Yjg5YzEzZmMzMDQwZjYxNTA4MjUzOTM3ZDJkYWJiNDk5MzhmZjQ3MzFj
-    ZDhjOTJjY2RhMWIxNjkwZmU4ZGIwNmE5NjY3MGVkMWM4MGM5NGQ=
+    YzM4NjEyYzc4NjNjYzA1YzExNzUwMjMyN2NhY2MwYTgxNGYxYmI1NzBmMmU5
+    NjZmZGJkZDg3NDE4MTRkNWEyYjljNTU1NmEyODU2Yjg1MWJjYTk0MWFhOTk0
+    NDgyNGJjZTc3N2E0MGEyNjM5YWUxYjIyMzc4ZWY1NzM2Nzg2NWI=

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.4.4
+2.4.5
 
 ## Requirements
 - [Ruby](http://www.ruby-lang.org/)
@@ -32,6 +32,11 @@ This repo includes various usage examples, including:
 
 ## Changelog
 
+2.4.5 [merge pull request by [dustMason0](https://github.com/dustMason)]
+
+* Fix floating point calculation errors
+* Refactor the offsite gateway class
+
 2.4.4
 
 * Globalize the OAuth scope variable

data/lib/dwolla/offsite_gateway.rb

@@ -5,10 +5,10 @@ module Dwolla
         @tax = 0
         @shipping = 0
         @notes = nil
-        @facilitatorAmount = nil
-        @testMode = false
-        @allowFundingSources = true
-        @orderId = nil
+        @facilitator_amount = nil
+        @test_mode = false
+        @allow_funding_sources = true
+        @order_id = nil
 
         def self.clear_session
             @products = []
@@ -16,10 +16,22 @@ module Dwolla
             @tax = 0
             @shipping = 0
             @notes = nil
-            @facilitatorAmount = nil
-            @testMode = false
-            @allowFundingSources = true
-            @orderId = nil
+            @facilitator_amount = nil
+            @test_mode = false
+            @allow_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 :facilitator_amount
         end
 
         def self.add_product(name=nil, description=nil, price=nil, quantity=1)
@@ -46,47 +58,21 @@ module Dwolla
             @discount = -(discount.abs)
         end
 
-        def self.tax=(tax)
-            @tax = tax
-        end
-
-        def self.shipping=(shipping)
-            @shipping = shipping
-        end
-
-        def self.notes=(notes)
-            @notes = notes
-        end
-
-        def self.order_id=(order_id)
-            @orderId = order_id
-        end
-
-        def self.redirect=(redirect)
-            @redirect = redirect
-        end
-
-        def self.callback=(callback)
-            @callback = callback
-        end
-
-        def self.test=(test)
-            @testMode = test
-        end
-
         def self.get_checkout_url(destinationId)
             params = {
                 :key => Dwolla::api_key,
                 :secret => Dwolla::api_secret,
-                :allowFundingSources => @allowFundingSources,
-                :test => @testMode,
+                :allowFundingSources => @allow_funding_sources,
+                :test => @test_mode,
                 :callback => @callback,
                 :redirect => @redirect,
-                :orderId => @orderId,
+                :orderId => @order_id,
+                :notes => @notes,
                 :purchaseOrder => {
                     :customerInfo => @customerInfo,
                     :destinationId => destinationId,
                     :orderItems => @products,
+                    :facilitatorAmount => @facilitator_amount,
                     :discount => @discount,
                     :shipping => @shipping,
                     :tax => @tax,
@@ -94,6 +80,8 @@ module Dwolla
                 }
             }
 
+            pp params
+
             resp = Dwolla.request(:post, request_url, params, {}, false, false, true)
             raise APIError.new(resp['Message']) unless resp['Result'] == 'Success'
 
@@ -138,7 +126,7 @@ module Dwolla
         end
 
         def self.calculate_total
-            total = 0
+            total = 0.0
 
             @products.each { |product|
                 total += product[:price] * product[:quantity]
@@ -148,7 +136,7 @@ module Dwolla
             total += @tax
             total += @discount
 
-            return total
+            return total.round(2)
         end
     end
 end

data/lib/dwolla/version.rb

@@ -1,3 +1,3 @@
 module Dwolla
-  VERSION = "2.4.4"
+  VERSION = "2.4.5"
 end

metadata

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