ruby-ecomm-client 1.0.0 → 1.1.0

data/fixtures/vcr_cassettes/{upgrade → request_change/manager/upgrade}/unknown/target_tree_id.yml

@@ -1,42 +1,42 @@
 --- 
-recorded_with: VCR 2.8.0
 http_interactions: 
 - request: 
     method: post
     uri: http://bonsai.dev.glbt1.gdg/bonsai/bonsaimanager/service.asmx
     body: 
-      string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="#Bonsai"><env:Body><tns:ChangeAccountRequest><tns:RenewalPFID>0</tns:RenewalPFID><tns:IDType>ORION</tns:IDType><tns:ItemRequestXml>&lt;itemRequest/&gt;</tns:ItemRequestXml><tns:AccountChangeXml>&lt;ClientChange TreeID='73223' ShopperID='255528'/&gt;</tns:AccountChangeXml><tns:RenewalPeriods>0</tns:RenewalPeriods><tns:ResourceType>outright</tns:ResourceType><tns:ResourceID>e1dd6ab9-b072-11e3-9aad-005056953ce3</tns:ResourceID></tns:ChangeAccountRequest></env:Body></env:Envelope>
+      string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:tns="#Bonsai" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"><env:Body><tns:ChangeAccountRequest><tns:ItemRequestXml>&lt;itemRequest/&gt;</tns:ItemRequestXml><tns:AccountChangeXml>&lt;ClientChange TreeID='73223' ShopperID='922411'/&gt;</tns:AccountChangeXml><tns:RenewalPFID>0</tns:RenewalPFID><tns:IDType>ORION</tns:IDType><tns:ResourceType>outright</tns:ResourceType><tns:RenewalPeriods>0</tns:RenewalPeriods><tns:ResourceID>10e16f14-b606-11e3-a45e-0050569575d8</tns:ResourceID></tns:ChangeAccountRequest></env:Body></env:Envelope>
     headers: 
-      soapaction: 
-      - "\"#Bonsai/ChangeAccountRequest\""
-      accept: 
-      - "*/*"
-      content-length: 
-      - "697"
       content-type: 
       - text/xml;charset=UTF-8
+      content-length: 
+      - "697"
+      accept: 
+      - "*/*"
+      soapaction: 
+      - "\"#Bonsai/ChangeAccountRequest\""
   response: 
     status: 
       code: 200
       message: OK
     headers: 
+      content-type: 
+      - text/xml; charset=utf-8
+      content-length: 
+      - "411"
       x-aspnet-version: 
       - 4.0.30319
+      cache-control: 
+      - private, max-age=0
       server: 
       - Microsoft-IIS/7.0
+      date: 
+      - Fri, 28 Mar 2014 00:22:36 GMT
       connection: 
       - close
-      date: 
-      - Wed, 26 Mar 2014 03:26:23 GMT
-      cache-control: 
-      - private, max-age=0
-      content-length: 
-      - "411"
       x-powered-by: 
       - ASP.NET
-      content-type: 
-      - text/xml; charset=utf-8
     body: 
       string: <?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body><ChangeAccountRequestResponse xmlns="#Bonsai"><ChangeAccountRequestResult>-1</ChangeAccountRequestResult><ResultCode>-999</ResultCode></ChangeAccountRequestResponse></soap:Body></soap:Envelope>
     http_version: "1.1"
-  recorded_at: Wed, 26 Mar 2014 03:26:24 GMT
+  recorded_at: Fri, 28 Mar 2014 00:22:39 GMT
+recorded_with: VCR 2.8.0

data/fixtures/vcr_cassettes/transitions/default/unknown/source_tree_id.yml

@@ -4,14 +4,14 @@ http_interactions:
     method: post
     uri: http://bonsai.dev.glbt1.gdg/bonsai/bonsaimanager/service.asmx
     body: 
-      string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:tns="#Bonsai"><env:Body><tns:GetAccountXml><tns:TreeID>87563</tns:TreeID><tns:IDType>ORION</tns:IDType><tns:ResourceType>outright</tns:ResourceType><tns:ResourceID>e1dd6ab9-b072-11e3-9aad-005056953ce3</tns:ResourceID><tns:PrivateLabelID>1</tns:PrivateLabelID></tns:GetAccountXml></env:Body></env:Envelope>
+      string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:tns="#Bonsai" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"><env:Body><tns:GetAccountXml><tns:IDType>ORION</tns:IDType><tns:PrivateLabelID>1</tns:PrivateLabelID><tns:ResourceType>outright</tns:ResourceType><tns:TreeID>87563</tns:TreeID><tns:ResourceID>10e16f14-b606-11e3-a45e-0050569575d8</tns:ResourceID></tns:GetAccountXml></env:Body></env:Envelope>
     headers: 
-      accept: 
-      - "*/*"
-      content-length: 
-      - "516"
       content-type: 
       - text/xml;charset=UTF-8
+      content-length: 
+      - "516"
+      accept: 
+      - "*/*"
       soapaction: 
       - "\"#Bonsai/GetAccountXml\""
   response: 
@@ -19,24 +19,24 @@ http_interactions:
       code: 200
       message: OK
     headers: 
-      connection: 
-      - close
+      content-type: 
+      - text/xml; charset=utf-8
+      content-length: 
+      - "338"
       x-aspnet-version: 
       - 4.0.30319
       cache-control: 
       - private, max-age=0
-      content-length: 
-      - "338"
       server: 
       - Microsoft-IIS/7.0
       date: 
-      - Wed, 26 Mar 2014 03:23:44 GMT
-      content-type: 
-      - text/xml; charset=utf-8
+      - Fri, 28 Mar 2014 00:22:32 GMT
+      connection: 
+      - close
       x-powered-by: 
       - ASP.NET
     body: 
       string: <?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body><GetAccountXmlResponse xmlns="#Bonsai"><ResultCode>-999</ResultCode></GetAccountXmlResponse></soap:Body></soap:Envelope>
     http_version: "1.1"
-  recorded_at: Wed, 26 Mar 2014 03:23:44 GMT
+  recorded_at: Fri, 28 Mar 2014 00:22:35 GMT
 recorded_with: VCR 2.8.0

data/fixtures/vcr_cassettes/transitions/many.yml

@@ -4,14 +4,14 @@ http_interactions:
     method: post
     uri: http://bonsai.dev.glbt1.gdg/bonsai/bonsaimanager/service.asmx
     body: 
-      string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:tns="#Bonsai"><env:Body><tns:GetAccountXml><tns:TreeID>1735</tns:TreeID><tns:IDType>ORION</tns:IDType><tns:ResourceType>outright</tns:ResourceType><tns:ResourceID>e1dd6ab9-b072-11e3-9aad-005056953ce3</tns:ResourceID><tns:PrivateLabelID>1</tns:PrivateLabelID></tns:GetAccountXml></env:Body></env:Envelope>
+      string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:tns="#Bonsai" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"><env:Body><tns:GetAccountXml><tns:IDType>ORION</tns:IDType><tns:PrivateLabelID>1</tns:PrivateLabelID><tns:ResourceType>outright</tns:ResourceType><tns:TreeID>1735</tns:TreeID><tns:ResourceID>10e16f14-b606-11e3-a45e-0050569575d8</tns:ResourceID></tns:GetAccountXml></env:Body></env:Envelope>
     headers: 
-      accept: 
-      - "*/*"
-      content-length: 
-      - "515"
       content-type: 
       - text/xml;charset=UTF-8
+      content-length: 
+      - "515"
+      accept: 
+      - "*/*"
       soapaction: 
       - "\"#Bonsai/GetAccountXml\""
   response: 
@@ -19,24 +19,24 @@ http_interactions:
       code: 200
       message: OK
     headers: 
-      connection: 
-      - close
+      content-type: 
+      - text/xml; charset=utf-8
+      content-length: 
+      - "1626"
       x-aspnet-version: 
       - 4.0.30319
       cache-control: 
       - private, max-age=0
-      content-length: 
-      - "1626"
       server: 
       - Microsoft-IIS/7.0
       date: 
-      - Wed, 26 Mar 2014 03:23:44 GMT
-      content-type: 
-      - text/xml; charset=utf-8
+      - Fri, 28 Mar 2014 00:22:33 GMT
+      connection: 
+      - close
       x-powered-by: 
       - ASP.NET
     body: 
-      string: <?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body><GetAccountXmlResponse xmlns="#Bonsai"><ResultCode>0</ResultCode><AccountXml><Bonsai><Bonsai PrivateLabelID="1" ResourceID="e1dd6ab9-b072-11e3-9aad-005056953ce3" IsPastDue="False" IsFree="False" CurrentTreeID="1735" CurrentUnifiedProductID="2701" xmlns=""><Tree TreeID="1735" NodeID="1735" UnifiedProductID="2701" IsFree="False"><Transition NodeName="Outright - Monthly Plus" UnifiedProductID="2697" TreeID="1734" IsFree="False" NodeID="1734" /><Transition NodeName="Outright - Annual Plus 1 year" UnifiedProductID="2699" TreeID="1736" IsFree="False" NodeID="1736" /><Transition NodeName="Outright - Annual Plus 2 years" UnifiedProductID="2703" TreeID="1737" IsFree="False" NodeID="1737" /><Transition NodeName="Outright - Annual Plus 3 years" UnifiedProductID="2705" TreeID="1738" IsFree="False" NodeID="1738" /><Transition NodeName="Outright - Annual Plus 4 years" UnifiedProductID="2707" TreeID="1739" IsFree="False" NodeID="1739" /><Transition NodeName="Outright - Annual Plus 5 years" UnifiedProductID="2709" TreeID="1740" IsFree="False" NodeID="1740" /><FilteredTransitions /><Prepaid><Item Name="Prepaid Previous Tax - Outright" CategoryName="Prepaid Previous Tax" CategoryID="49" MinQty="1" MaxQty="-1" MinDuration="1" MaxDuration="-1" IsQuantityBased="False" Increment="1" UnifiedProductID="2711" /></Prepaid></Tree></Bonsai></Bonsai></AccountXml></GetAccountXmlResponse></soap:Body></soap:Envelope>
+      string: <?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body><GetAccountXmlResponse xmlns="#Bonsai"><ResultCode>0</ResultCode><AccountXml><Bonsai><Bonsai PrivateLabelID="1" ResourceID="10e16f14-b606-11e3-a45e-0050569575d8" IsPastDue="False" IsFree="False" CurrentTreeID="1735" CurrentUnifiedProductID="2701" xmlns=""><Tree TreeID="1735" NodeID="1735" UnifiedProductID="2701" IsFree="False"><Transition NodeName="Outright - Monthly Plus" UnifiedProductID="2697" TreeID="1734" IsFree="False" NodeID="1734" /><Transition NodeName="Outright - Annual Plus 1 year" UnifiedProductID="2699" TreeID="1736" IsFree="False" NodeID="1736" /><Transition NodeName="Outright - Annual Plus 2 years" UnifiedProductID="2703" TreeID="1737" IsFree="False" NodeID="1737" /><Transition NodeName="Outright - Annual Plus 3 years" UnifiedProductID="2705" TreeID="1738" IsFree="False" NodeID="1738" /><Transition NodeName="Outright - Annual Plus 4 years" UnifiedProductID="2707" TreeID="1739" IsFree="False" NodeID="1739" /><Transition NodeName="Outright - Annual Plus 5 years" UnifiedProductID="2709" TreeID="1740" IsFree="False" NodeID="1740" /><FilteredTransitions /><Prepaid><Item Name="Prepaid Previous Tax - Outright" CategoryName="Prepaid Previous Tax" CategoryID="49" MinQty="1" MaxQty="-1" MinDuration="1" MaxDuration="-1" IsQuantityBased="False" Increment="1" UnifiedProductID="2711" /></Prepaid></Tree></Bonsai></Bonsai></AccountXml></GetAccountXmlResponse></soap:Body></soap:Envelope>
     http_version: "1.1"
-  recorded_at: Wed, 26 Mar 2014 03:23:45 GMT
+  recorded_at: Fri, 28 Mar 2014 00:22:36 GMT
 recorded_with: VCR 2.8.0

data/fixtures/vcr_cassettes/transitions/one.yml

@@ -4,14 +4,14 @@ http_interactions:
     method: post
     uri: http://bonsai.dev.glbt1.gdg/bonsai/bonsaimanager/service.asmx
     body: 
-      string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:tns="#Bonsai"><env:Body><tns:GetAccountXml><tns:TreeID>1734</tns:TreeID><tns:IDType>ORION</tns:IDType><tns:ResourceType>outright</tns:ResourceType><tns:ResourceID>e1dd6ab9-b072-11e3-9aad-005056953ce3</tns:ResourceID><tns:PrivateLabelID>1</tns:PrivateLabelID></tns:GetAccountXml></env:Body></env:Envelope>
+      string: <?xml version="1.0" encoding="UTF-8"?><env:Envelope xmlns:tns="#Bonsai" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"><env:Body><tns:GetAccountXml><tns:IDType>ORION</tns:IDType><tns:PrivateLabelID>1</tns:PrivateLabelID><tns:ResourceType>outright</tns:ResourceType><tns:TreeID>1734</tns:TreeID><tns:ResourceID>10e16f14-b606-11e3-a45e-0050569575d8</tns:ResourceID></tns:GetAccountXml></env:Body></env:Envelope>
     headers: 
-      accept: 
-      - "*/*"
-      content-length: 
-      - "515"
       content-type: 
       - text/xml;charset=UTF-8
+      content-length: 
+      - "515"
+      accept: 
+      - "*/*"
       soapaction: 
       - "\"#Bonsai/GetAccountXml\""
   response: 
@@ -19,24 +19,24 @@ http_interactions:
       code: 200
       message: OK
     headers: 
-      connection: 
-      - close
+      content-type: 
+      - text/xml; charset=utf-8
+      content-length: 
+      - "768"
       x-aspnet-version: 
       - 4.0.30319
       cache-control: 
       - private, max-age=0
-      content-length: 
-      - "768"
       server: 
       - Microsoft-IIS/7.0
       date: 
-      - Wed, 26 Mar 2014 03:23:44 GMT
-      content-type: 
-      - text/xml; charset=utf-8
+      - Fri, 28 Mar 2014 00:22:33 GMT
+      connection: 
+      - close
       x-powered-by: 
       - ASP.NET
     body: 
-      string: <?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body><GetAccountXmlResponse xmlns="#Bonsai"><ResultCode>0</ResultCode><AccountXml><Bonsai><Bonsai PrivateLabelID="1" ResourceID="e1dd6ab9-b072-11e3-9aad-005056953ce3" IsPastDue="False" IsFree="False" CurrentTreeID="1735" CurrentUnifiedProductID="2701" xmlns=""><Tree TreeID="1734" NodeID="1734" UnifiedProductID="2697" IsFree="False"><Transition NodeName="Outright - Free" UnifiedProductID="2701" TreeID="1735" IsFree="False" NodeID="1735" /><FilteredTransitions /></Tree></Bonsai></Bonsai></AccountXml></GetAccountXmlResponse></soap:Body></soap:Envelope>
+      string: <?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body><GetAccountXmlResponse xmlns="#Bonsai"><ResultCode>0</ResultCode><AccountXml><Bonsai><Bonsai PrivateLabelID="1" ResourceID="10e16f14-b606-11e3-a45e-0050569575d8" IsPastDue="False" IsFree="False" CurrentTreeID="1735" CurrentUnifiedProductID="2701" xmlns=""><Tree TreeID="1734" NodeID="1734" UnifiedProductID="2697" IsFree="False"><Transition NodeName="Outright - Free" UnifiedProductID="2701" TreeID="1735" IsFree="False" NodeID="1735" /><FilteredTransitions /></Tree></Bonsai></Bonsai></AccountXml></GetAccountXmlResponse></soap:Body></soap:Envelope>
     http_version: "1.1"
-  recorded_at: Wed, 26 Mar 2014 03:23:45 GMT
+  recorded_at: Fri, 28 Mar 2014 00:22:36 GMT
 recorded_with: VCR 2.8.0

data/lib/ruby-ecomm-client/client.rb

@@ -21,6 +21,8 @@ module RubyEcommClient
       :qa => 'https://bonsaipurchase.test.glbt1.gdg/BonsaiPurchase/Service.asmx'
     }
 
+    HOST_NAME = `hostname`.chomp
+
     ID_TYPE = 'ORION'
 
     WSDL_MANAGER = 'manager.wsdl'
@@ -72,30 +74,16 @@ module RubyEcommClient
       transitions.is_a?(Array) ? transitions : [transitions]
     end
 
-    def upgrade(target_tree_id)
+    def request_change(target_tree_id, client_ip = '127.0.0.1')
       raise ArgumentError.new('target_tree_id must be specified') if blank?(target_tree_id)
 
-      result = client_manager.call(:change_account_request, :message => {
-        'ResourceID' => @resource_id,
-        'ResourceType' => @resource_type,
-        'IDType' => ID_TYPE,
-        'AccountChangeXml' => "<ClientChange TreeID='#{target_tree_id}' ShopperID='#{@shopper_id}'/>",
-        'RenewalPFID' => 0,
-        'RenewalPeriods' => 0,
-        'ItemRequestXml' => '<itemRequest/>'
-      })
-      response = convert_response(result.body[:change_account_request_response])
-      if response[:result_code] == 0
-        response[:change_account_request_result]
+      if express_checkout?
+        request_change_via_express(target_tree_id, client_ip)
       else
-        raise RubyEcommError.new(response[:result_code], response[:change_account_request_result])
+        request_change_via_manager(target_tree_id)
       end
     end
 
-    def downgrade(target_tree_id = 0)
-      upgrade(target_tree_id)
-    end
-
     private
 
     def blank?(value)
@@ -111,6 +99,8 @@ module RubyEcommClient
       globals.log false
       globals.logger Rails.logger if defined?(Rails)
       globals.namespace '#Bonsai'
+      globals.open_timeout 15
+      globals.read_timeout 15
     end
 
     def client_manager
@@ -139,9 +129,59 @@ module RubyEcommClient
         globals.wsdl "#{wsdl_path}#{WSDL_PURCHASE}"
         globals.endpoint ENDPOINTS_PURCHASE[Client.environment]
 
-        globals.ssl_verify_mode = :none
-        globals.ssl_cert_file = 'config/client.crt'
-        globals.ssl_cert_key_file = 'config/client.key'
+        globals.ssl_verify_mode :none
+        ssl_cert_file = "config/environments/#{Client.environment}/client.crt"
+        globals.ssl_cert_file ssl_cert_file if File.exists?(ssl_cert_file)
+        ssl_cert_key_file = "config/environments/#{Client.environment}/client.key"
+        globals.ssl_cert_key_file ssl_cert_key_file if File.exists?(ssl_cert_key_file)
+      end
+    end
+
+    def request_change_via_express(target_tree_id, client_ip = '127.0.0.1')
+      raise ArgumentError.new('target_tree_id must be specified') if blank?(target_tree_id)
+
+      result = client_purchase.call(:purchase_change_account_request, :message => {
+        'ResourceID' => @resource_id,
+        'ResourceType' => @resource_type,
+        'IDType' => ID_TYPE,
+        'AccountPurchaseChangeXml' => "<ClientChange TreeID='#{target_tree_id}' ShopperID='#{@shopper_id}' TransactionCurrency='USD' RequestingApp='outright' RequestingAppHost='#{HOST_NAME}' ClientAddr='#{client_ip}' EnteredBy='customer' OrderSource='Online' RedirectToBasket='false' EstimateOnly='false' SendConfirmEmail='false'/>",
+        'RenewalPFID' => 0,
+        'RenewalPeriods' => 0,
+        'ItemRequestXml' => '<itemRequest/>'
+      })
+      response = convert_response(result.body[:purchase_change_account_request_response])
+      if response[:result_code] == 0
+        {
+          :used_express_checkout => true,
+          :request_result => response[:purchase_change_account_request_result],
+          :error => response[:error],
+          :order_xml => response[:order_xml]
+        }
+      else
+        raise RubyEcommError.new(response[:result_code], response[:change_account_request_result])
+      end
+    end
+
+    def request_change_via_manager(target_tree_id)
+      raise ArgumentError.new('target_tree_id must be specified') if blank?(target_tree_id)
+
+      result = client_manager.call(:change_account_request, :message => {
+        'ResourceID' => @resource_id,
+        'ResourceType' => @resource_type,
+        'IDType' => ID_TYPE,
+        'AccountChangeXml' => "<ClientChange TreeID='#{target_tree_id}' ShopperID='#{@shopper_id}'/>",
+        'RenewalPFID' => 0,
+        'RenewalPeriods' => 0,
+        'ItemRequestXml' => '<itemRequest/>'
+      })
+      response = convert_response(result.body[:change_account_request_response])
+      if response[:result_code] == 0
+        {
+          :used_express_checkout => false,
+          :request_result => response[:change_account_request_result]
+        }
+      else
+        raise RubyEcommError.new(response[:result_code], response[:change_account_request_result])
       end
     end
   end

data/lib/ruby-ecomm-client/version.rb

@@ -1,3 +1,3 @@
 module RubyEcommClient
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/ruby-ecomm-client/client_spec.rb

@@ -2,12 +2,15 @@ require 'spec_helper'
 
 describe RubyEcommClient::Client do
   before do
-    @shopper_id = '255528'
-    @downgrade_tree_id = '1734'
+    use_test = [:qa, :production].include?(RubyEcommClient::Client.environment)
+
+    @shopper_id = use_test ? '255528' : '922411'
+    @low_tree_id = '1734'
+    @downgrade_tree_id = '1736'
     @current_tree_id = '1735'
-    @upgrade_tree_id = '1736'
+    @upgrade_tree_id = '1737'
     @resource_type = 'outright'
-    @resource_id = 'e1dd6ab9-b072-11e3-9aad-005056953ce3'
+    @resource_id = use_test ? 'e1dd6ab9-b072-11e3-9aad-005056953ce3' : '10e16f14-b606-11e3-a45e-0050569575d8'
 
     @client = RubyEcommClient::Client.new(@shopper_id, @resource_type, @resource_id)
   end
@@ -142,7 +145,7 @@ describe RubyEcommClient::Client do
   context '#transitions for one' do
     before do
       VCR.use_cassette('transitions/one') do
-        @transitions = @client.transitions(@downgrade_tree_id)
+        @transitions = @client.transitions(@low_tree_id)
       end
     end
 
@@ -203,95 +206,213 @@ describe RubyEcommClient::Client do
     end
   end
 
-  context '#upgrade' do
-    before do
-      VCR.use_cassette('upgrade/default') do
-        @result = @client.upgrade(@upgrade_tree_id)
-      end
-    end
-
-    it 'require target_tree_id non-nil' do
-      expect { @client.upgrade(nil) }.to raise_error(ArgumentError)
-    end
-
-    it 'require target_tree_id non-blank' do
-      expect { @client.upgrade('') }.to raise_error(ArgumentError)
-    end
-
-    it 'raise RubyEcommError for unknown resource_type' do
-      VCR.use_cassette('upgrade/unknown/resource_type') do
-        @client.resource_type = 'flugel'
-        expect { @client.upgrade(@upgrade_tree_id) }.to raise_error(RubyEcommError){|e| e.result_code.should eq(-100) }
-      end
-    end
-
-    it 'raise RubyEcommError for unknown resource_id' do
-      VCR.use_cassette('upgrade/unknown/resource_id') do
-        @client.resource_id = 'unknown'
-        expect { @client.upgrade(@upgrade_tree_id) }.to raise_error(RubyEcommError){|e| e.result_code.should eq(-304) }
-      end
-    end
-
-    it 'raise RubyEcommError for unknown target_tree_id' do
-      VCR.use_cassette('upgrade/unknown/target_tree_id') do
-        expect { @client.upgrade(73223) }.to raise_error(RubyEcommError){|e| e.result_code.should eq(-999) }
-      end
-    end
-
-    it "return no-op request_result for transition to same" do
-      VCR.use_cassette('upgrade/noop') do
-        @client.upgrade(@current_tree_id).should eq(1)
+  context '#request_change' do
+    context 'via express_checkout' do
+      before do
+        @client.stub(:express_checkout?).and_return(true)
       end
-    end
-
-    it "return success request_result for valid transition" do
-      @result.should eq(2)
-    end
-  end
 
-  context '#downgrade' do
-    before do
-      VCR.use_cassette('downgrade/default') do
-        @result = @client.downgrade(@downgrade_tree_id)
+      context 'upgrade' do
+        before do
+          VCR.use_cassette('request_change/express/upgrade/default') do
+            @result = @client.request_change(@upgrade_tree_id)
+          end
+        end
+
+        it 'require target_tree_id non-nil' do
+          expect { @client.request_change(nil) }.to raise_error(ArgumentError)
+        end
+
+        it 'require target_tree_id non-blank' do
+          expect { @client.request_change('') }.to raise_error(ArgumentError)
+        end
+
+        it 'raise RubyEcommError for unknown resource_type' do
+          VCR.use_cassette('request_change/express/upgrade/unknown/resource_type') do
+            @client.resource_type = 'flugel'
+            expect { @client.request_change(@upgrade_tree_id) }.to raise_error(RubyEcommError) { |e| e.result_code.should eq(-100) }
+          end
+        end
+
+        it 'raise RubyEcommError for unknown resource_id' do
+          VCR.use_cassette('request_change/express/upgrade/unknown/resource_id') do
+            @client.resource_id = 'unknown'
+            expect { @client.request_change(@upgrade_tree_id) }.to raise_error(RubyEcommError) { |e| e.result_code.should eq(-304) }
+          end
+        end
+
+        it 'raise RubyEcommError for unknown target_tree_id' do
+          VCR.use_cassette('request_change/express/upgrade/unknown/target_tree_id') do
+            expect { @client.request_change(73223) }.to raise_error(RubyEcommError) { |e| e.result_code.should eq(-999) }
+          end
+        end
+
+        it "return no-op request_result for transition to same" do
+          VCR.use_cassette('request_change/express/upgrade/noop') do
+            result = @client.request_change(@current_tree_id)
+            result[:request_result].should eq(1)
+            result[:used_express_checkout].should eq(true)
+          end
+        end
+
+        it "return success request_result for valid transition" do
+          @result[:request_result].should eq(0)
+          @result[:used_express_checkout].should eq(true)
+        end
       end
-    end
-
-    it 'require target_tree_id non-nil' do
-      expect { @client.downgrade(nil) }.to raise_error(ArgumentError)
-    end
 
-    it 'require target_tree_id non-blank' do
-      expect { @client.downgrade('') }.to raise_error(ArgumentError)
-    end
-
-    it 'raise RubyEcommError for unknown resource_type' do
-      VCR.use_cassette('downgrade/unknown/resource_type') do
-        @client.resource_type = 'flugel'
-        expect { @client.downgrade(@downgrade_tree_id) }.to raise_error(RubyEcommError){|e| e.result_code.should eq(-100) }
+      context 'downgrade' do
+        before do
+          VCR.use_cassette('request_change/express/downgrade/default') do
+            @result = @client.request_change(@downgrade_tree_id)
+          end
+        end
+
+        it 'require target_tree_id non-nil' do
+          expect { @client.request_change(nil) }.to raise_error(ArgumentError)
+        end
+
+        it 'require target_tree_id non-blank' do
+          expect { @client.request_change('') }.to raise_error(ArgumentError)
+        end
+
+        it 'raise RubyEcommError for unknown resource_type' do
+          VCR.use_cassette('request_change/express/downgrade/unknown/resource_type') do
+            @client.resource_type = 'flugel'
+            expect { @client.request_change(@downgrade_tree_id) }.to raise_error(RubyEcommError) { |e| e.result_code.should eq(-100) }
+          end
+        end
+
+        it 'raise RubyEcommError for unknown resource_id' do
+          VCR.use_cassette('request_change/express/downgrade/unknown/resource_id') do
+            @client.resource_id = 'unknown'
+            expect { @client.request_change(@downgrade_tree_id) }.to raise_error(RubyEcommError) { |e| e.result_code.should eq(-304) }
+          end
+        end
+
+        it 'raise RubyEcommError for unknown target_tree_id' do
+          VCR.use_cassette('request_change/express/downgrade/unknown/target_tree_id') do
+            expect { @client.request_change(73541) }.to raise_error(RubyEcommError) { |e| e.result_code.should eq(-999) }
+          end
+        end
+
+        it "return no-op request_result for transition to same" do
+          VCR.use_cassette('request_change/express/downgrade/noop') do
+            result = @client.request_change(@current_tree_id)
+            result[:request_result].should eq(1)
+            result[:used_express_checkout].should eq(true)
+          end
+        end
+
+        it "return success request_result for valid transition" do
+          @result[:request_result].should eq(0)
+          @result[:used_express_checkout].should eq(true)
+        end
       end
     end
 
-    it 'raise RubyEcommError for unknown resource_id' do
-      VCR.use_cassette('downgrade/unknown/resource_id') do
-        @client.resource_id = 'unknown'
-        expect { @client.downgrade(@downgrade_tree_id) }.to raise_error(RubyEcommError){|e| e.result_code.should eq(-304) }
+    context 'via manager' do
+      before do
+        @client.stub(:express_checkout?).and_return(false)
       end
-    end
 
-    it 'raise RubyEcommError for unknown target_tree_id' do
-      VCR.use_cassette('downgrade/unknown/target_tree_id') do
-        expect { @client.downgrade(73541) }.to raise_error(RubyEcommError){|e| e.result_code.should eq(-999) }
+      context 'upgrade' do
+        before do
+          VCR.use_cassette('request_change/manager/upgrade/default') do
+            @result = @client.request_change(@upgrade_tree_id)
+          end
+        end
+
+        it 'require target_tree_id non-nil' do
+          expect { @client.request_change(nil) }.to raise_error(ArgumentError)
+        end
+
+        it 'require target_tree_id non-blank' do
+          expect { @client.request_change('') }.to raise_error(ArgumentError)
+        end
+
+        it 'raise RubyEcommError for unknown resource_type' do
+          VCR.use_cassette('request_change/manager/upgrade/unknown/resource_type') do
+            @client.resource_type = 'flugel'
+            expect { @client.request_change(@upgrade_tree_id) }.to raise_error(RubyEcommError) { |e| e.result_code.should eq(-100) }
+          end
+        end
+
+        it 'raise RubyEcommError for unknown resource_id' do
+          VCR.use_cassette('request_change/manager/upgrade/unknown/resource_id') do
+            @client.resource_id = 'unknown'
+            expect { @client.request_change(@upgrade_tree_id) }.to raise_error(RubyEcommError) { |e| e.result_code.should eq(-304) }
+          end
+        end
+
+        it 'raise RubyEcommError for unknown target_tree_id' do
+          VCR.use_cassette('request_change/manager/upgrade/unknown/target_tree_id') do
+            expect { @client.request_change(73223) }.to raise_error(RubyEcommError) { |e| e.result_code.should eq(-999) }
+          end
+        end
+
+        it "return no-op request_result for transition to same" do
+          VCR.use_cassette('request_change/manager/upgrade/noop') do
+            result = @client.request_change(@current_tree_id)
+            result[:request_result].should eq(1)
+            result[:used_express_checkout].should eq(false)
+          end
+        end
+
+        it "return success request_result for valid transition" do
+          @result[:request_result].should eq(2)
+          @result[:used_express_checkout].should eq(false)
+        end
       end
-    end
 
-    it "return no-op request_result for transition to same" do
-      VCR.use_cassette('downgrade/noop') do
-        @client.downgrade(@current_tree_id).should eq(1)
+      context 'downgrade' do
+        before do
+          VCR.use_cassette('request_change/manager/downgrade/default') do
+            @result = @client.request_change(@downgrade_tree_id)
+          end
+        end
+
+        it 'require target_tree_id non-nil' do
+          expect { @client.request_change(nil) }.to raise_error(ArgumentError)
+        end
+
+        it 'require target_tree_id non-blank' do
+          expect { @client.request_change('') }.to raise_error(ArgumentError)
+        end
+
+        it 'raise RubyEcommError for unknown resource_type' do
+          VCR.use_cassette('request_change/manager/downgrade/unknown/resource_type') do
+            @client.resource_type = 'flugel'
+            expect { @client.request_change(@downgrade_tree_id) }.to raise_error(RubyEcommError) { |e| e.result_code.should eq(-100) }
+          end
+        end
+
+        it 'raise RubyEcommError for unknown resource_id' do
+          VCR.use_cassette('request_change/manager/downgrade/unknown/resource_id') do
+            @client.resource_id = 'unknown'
+            expect { @client.request_change(@downgrade_tree_id) }.to raise_error(RubyEcommError) { |e| e.result_code.should eq(-304) }
+          end
+        end
+
+        it 'raise RubyEcommError for unknown target_tree_id' do
+          VCR.use_cassette('request_change/manager/downgrade/unknown/target_tree_id') do
+            expect { @client.request_change(73541) }.to raise_error(RubyEcommError) { |e| e.result_code.should eq(-999) }
+          end
+        end
+
+        it "return no-op request_result for transition to same" do
+          VCR.use_cassette('request_change/manager/downgrade/noop') do
+            result = @client.request_change(@current_tree_id)
+            result[:request_result].should eq(1)
+            result[:used_express_checkout].should eq(false)
+          end
+        end
+
+        it "return success request_result for valid transition" do
+          @result[:request_result].should eq(2)
+          @result[:used_express_checkout].should eq(false)
+        end
       end
     end
-
-    it "return success request_result for valid transition" do
-      @result.should eq(2)
-    end
   end
 end