From 72d3fed46f059810e6e12f2a1ce3ced47ed9f4ad Mon Sep 17 00:00:00 2001 From: "John H. Lin" Date: Mon, 23 Mar 2015 15:52:50 -0700 Subject: [PATCH 1/2] Removed explicit receiver from order methods --- lib/softlayer/VirtualServerUpgradeOrder.rb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/softlayer/VirtualServerUpgradeOrder.rb b/lib/softlayer/VirtualServerUpgradeOrder.rb index 9c56da2..3d03c2d 100644 --- a/lib/softlayer/VirtualServerUpgradeOrder.rb +++ b/lib/softlayer/VirtualServerUpgradeOrder.rb @@ -51,10 +51,9 @@ def initialize(virtual_server) # def verify() if has_order_items? - order_object = self.order_object - order_object = yield order_object if block_given? - - @virtual_server.softlayer_client[:Product_Order].verifyOrder(order_object) + order_obj = order_object + order_obj = yield order_object if block_given? + @virtual_server.softlayer_client[:Product_Order].verifyOrder(order_obj) end end @@ -67,8 +66,8 @@ def verify() # def place_order!() if has_order_items? - order_object = self.order_object - order_object = yield order_object if block_given? + order_obj = order_object + order_obj = yield order_object if block_given? @virtual_server.softlayer_client[:Product_Order].placeOrder(order_object) end @@ -113,7 +112,7 @@ def _item_prices_in_category(which_category) # and whose capacity matches the value given. Returns the item_price or nil # def _item_price_with_capacity(which_category, capacity) - self._item_prices_in_category(which_category).find { |item_price| item_price['item']['capacity'].to_i == capacity} + _item_prices_in_category(which_category).find { |item_price| item_price['item']['capacity'].to_i == capacity} end ## From bd690a50a77313e7f07d0f66e98444ceee074dc1 Mon Sep 17 00:00:00 2001 From: "John H. Lin" Date: Tue, 24 Mar 2015 12:07:06 -0700 Subject: [PATCH 2/2] Renaming order_object in verify and place_order! methods --- lib/softlayer/VirtualServerUpgradeOrder.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/softlayer/VirtualServerUpgradeOrder.rb b/lib/softlayer/VirtualServerUpgradeOrder.rb index 3d03c2d..c6f9c41 100644 --- a/lib/softlayer/VirtualServerUpgradeOrder.rb +++ b/lib/softlayer/VirtualServerUpgradeOrder.rb @@ -51,9 +51,9 @@ def initialize(virtual_server) # def verify() if has_order_items? - order_obj = order_object - order_obj = yield order_object if block_given? - @virtual_server.softlayer_client[:Product_Order].verifyOrder(order_obj) + order_template = order_object + order_template = yield order_object if block_given? + @virtual_server.softlayer_client[:Product_Order].verifyOrder(order_template) end end @@ -66,10 +66,10 @@ def verify() # def place_order!() if has_order_items? - order_obj = order_object - order_obj = yield order_object if block_given? + order_template = order_object + order_template = yield order_object if block_given? - @virtual_server.softlayer_client[:Product_Order].placeOrder(order_object) + @virtual_server.softlayer_client[:Product_Order].placeOrder(order_template) end end