From e79bd67bd4fcdf707b45983e034d0cf8a1f71d2d Mon Sep 17 00:00:00 2001
From: Velimir Lesikov <velimirles@gmail.com>
Date: Wed, 11 Dec 2019 11:41:08 -0800
Subject: [PATCH] Separate HTTP request for a Hubspot::Forms object

Separate the  HTTP request so the caller can optionally use the HTTParty object that is returned.
That way there is access to the HTTPParty request methods
The returned object can retrieve and record the response for compliance/other purpose:
=> Ex: |> request = hubspot_form_object.submit_http_request
=>       |> request.request # Save this if neededs
---
 lib/hubspot/form.rb           | 14 +++++++++--
 spec/lib/hubspot/form_spec.rb | 45 +++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/lib/hubspot/form.rb b/lib/hubspot/form.rb
index e67e41d0..637ebf12 100644
--- a/lib/hubspot/form.rb
+++ b/lib/hubspot/form.rb
@@ -63,8 +63,18 @@ def fields(opts={})
 
     # {https://developers.hubspot.com/docs/methods/forms/submit_form}
     def submit(opts={})
-      response = Hubspot::FormsConnection.submit(SUBMIT_DATA_PATH, params: { form_guid: @guid }, body: opts)
-      [204, 302, 200].include?(response.code)
+      [204, 302, 200].include?(http_request(opts).code)
+    end
+
+    #
+    # Separate the  HTTP request so the caller can optionally use
+    # the HTTParty object that is returned.
+    # That way there is access to the HTTPParty request methods
+    # The returned object can retrieve and record the response for compliance/other purpose:
+    # => Ex: |> request = hubspot_form_object.submit_http_request
+    # =>     |> request.request # Save this if neededs
+    def http_request(opts={})
+      Hubspot::FormsConnection.submit(SUBMIT_DATA_PATH, params: { form_guid: @guid }, body: opts)
     end
 
     # {https://developers.hubspot.com/docs/methods/forms/update_form}
diff --git a/spec/lib/hubspot/form_spec.rb b/spec/lib/hubspot/form_spec.rb
index f7f61765..2916f8da 100644
--- a/spec/lib/hubspot/form_spec.rb
+++ b/spec/lib/hubspot/form_spec.rb
@@ -186,4 +186,49 @@
       form.destroyed?.should be true
     end
   end
+
+  describe '#http_request' do
+    cassette 'form_submit_data'
+
+    let(:form) { Hubspot::Form.find('561d9ce9-bb4c-45b4-8e32-21cdeaa3a7f0') }
+
+    context 'with a valid portal id' do
+      before do
+        Hubspot.configure(hapikey: 'demo', portal_id: '62515')
+      end
+
+      it 'returns the HTTParty::Response if the form submission is successful' do
+        params = {}
+        result = form.http_request(params)
+        result.should be_an_instance_of HTTParty::Response
+        result.code.should eq 200
+      end
+    end
+
+    context 'with an invalid portal id' do
+      before do
+        Hubspot.configure(hapikey: 'demo', portal_id: 'xxxx')
+      end
+
+      it 'returns the HTTParty::Response in case of errors' do
+        params = { unknown_field: :bogus_value }
+        result = form.http_request(params)
+        result.should be_an_instance_of HTTParty::Response
+        result.code.should eq 404
+      end
+    end
+
+    context 'when initializing Hubspot::Form directly' do
+      let(:form) { Hubspot::Form.new('guid' => '561d9ce9-bb4c-45b4-8e32-21cdeaa3a7f0') }
+
+      before { Hubspot.configure(hapikey: 'demo', portal_id: '62515') }
+
+      it 'returns the HTTParty::Response if the form submission is successful' do
+        params = {}
+        result = form.http_request(params)
+        result.should be_an_instance_of HTTParty::Response
+        result.code.should eq 200
+      end
+    end
+  end
 end