From bf35915484440ade9edc9909cd1e011a0150236b Mon Sep 17 00:00:00 2001 From: Brady Bouchard Date: Thu, 18 Aug 2016 17:17:14 -0700 Subject: [PATCH 1/3] Increment version. --- lib/srfax/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/srfax/version.rb b/lib/srfax/version.rb index 8b6389b..3e4b5c6 100644 --- a/lib/srfax/version.rb +++ b/lib/srfax/version.rb @@ -1,3 +1,3 @@ module SrFax - VERSION = '0.5.3'.freeze + VERSION = '0.5.4'.freeze end From 16a3b779fc1988bcc2d82fde3ccc66a2f46c2088 Mon Sep 17 00:00:00 2001 From: Brady Bouchard Date: Tue, 30 Aug 2016 20:32:26 -0700 Subject: [PATCH 2/3] Post variables should take precedence. --- lib/srfax.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/srfax.rb b/lib/srfax.rb index c16cb40..c9cbc3e 100644 --- a/lib/srfax.rb +++ b/lib/srfax.rb @@ -302,9 +302,9 @@ def delete_fax(descriptor, direction) # @param postVariables [String] The list of variables to apply in the POST body when executing the request. # @return [Hash] The hash payload value including a proper status. Will never return nil. def execute(postVariables) - logger.debug postVariables.merge(defaults) + logger.debug defaults.merge(postVariables) # Redirect where necessary. - res = RestClient.post(BASE_URL, postVariables.merge(defaults), { accept: :json }) + res = RestClient.post(BASE_URL, defaults.merge(postVariables), { accept: :json }) unless res.code == 200 return { 'Status' => 'Failed', 'Result' => res.body }.with_indifferent_access end From b313deb20c73c299a008e8a852a5980de20c09c4 Mon Sep 17 00:00:00 2001 From: Brady Bouchard Date: Tue, 30 Aug 2016 20:34:08 -0700 Subject: [PATCH 3/3] Version bump. --- lib/srfax/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/srfax/version.rb b/lib/srfax/version.rb index 3e4b5c6..3e6ddc7 100644 --- a/lib/srfax/version.rb +++ b/lib/srfax/version.rb @@ -1,3 +1,3 @@ module SrFax - VERSION = '0.5.4'.freeze + VERSION = '0.5.5'.freeze end