quickmail 0.16.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d48c9432f16fc04fa14d4c866e65bddfb3c5e554b6dd3ffb667c151253558243
-  data.tar.gz: 7257bf315c3f83936b17e33b1667a57894e066e25e1652ccd08f66769af5a04a
+  metadata.gz: 7bd379504354d4410da853cb88a2156fcda08f354fc50199a0249efb9fd791f5
+  data.tar.gz: 169283a47980e04cc3af07833dae01d271bdb2134baa82c2782e5e302807c25e
 SHA512:
-  metadata.gz: 92b26f443a69706cd4224f267a384b685792051277ffa8d2f444f9650ae96b9cc5d033bc2fcf5d6a074f84704fa54a1ccbf9c0462c7e2d5f69adeaaef08bb91f
-  data.tar.gz: 3a137bbe5a1ecb07018a13590d2e18d521594721a15ac84b7d9e203e60e313aa04a3d7857ac6ac2f7bc4916f385647cc29d9df87d413a73ac3017b9e2b793d2d
+  metadata.gz: d12eeb0238f657f7fa68f453fb9f48755d1d6b313e29b8f61c595ab8eb967bbfd212a1ca51b66536c4d9523d34214012cb0e5aea2e7c36c2a2b7a4db1f994b20
+  data.tar.gz: d4f695e879950a32120d8bc158cfac9c2c9bcdcb69f090c66f66249b12d98cf54e09f6e2b74232eb335898441e9f89fb444b778a4b171407e9adbeab797e02fb

data/lib/quickmail.rb

@@ -47,7 +47,7 @@ module Quickmail
     end
 
     def api_base
-      Quickmail.test_mode ? "https://quickmailonline.com.au/api/test/" : "https://quickmailonline.com.au/api/"
+      Quickmail.test_mode ? "https://getquickmail.com/api/test/" : "https://getquickmail.com/api/"
     end
 
     def request(method, resource, params = {}, access_token = nil)
@@ -61,27 +61,22 @@ module Quickmail
         ArgumentError, "Request resource has not been specified"
       )
       if method == :get
-        headers = {accept: :json, content_type: :json, Authorization: "Bearer #{ss_access_token}"}.merge({params: params})
+        url = Quickmail.api_base + ss_api_version + '/' + resource + '?' + params
         payload = nil
-      else
         headers = {accept: :json, content_type: :json, Authorization: "Bearer #{ss_access_token}"}
+      else
+        url = Quickmail.api_base + ss_api_version + '/' + resource
         payload = params
+        headers = {accept: :json, content_type: :json, Authorization: "Bearer #{ss_access_token}"}
       end
       RestClient::Request.new({
                                 method: method,
-                                url: Quickmail.api_base + ss_api_version + '/' + resource,
+                                url: url,
                                 payload: payload.to_json,
                                 headers: headers
                               }).execute do |response, request, result|
-        if response.code != 201 || response.code != 200
-          raise ApiRequestError.new(
-            response_code: response.code,
-            response_headers: response.headers,
-            response_body: response.to_str
-          )
-        end
-        str_response = response.to_str
-        str_response.blank? ? '' : JSON.parse(str_response)
+          str_response = response.to_str
+          str_response.blank? ? '' : JSON.parse(str_response)
       end
     end
 

data/lib/quickmail/authentication.rb

@@ -11,14 +11,8 @@ module Quickmail
                                   payload: payload,
                                   headers: {content_type: "application/x-www-form-urlencoded"}
                                 }).execute do |response, request, result|
-          if response.code != 200
-            raise ApiRequestError.new(
-              response_code: response.code,
-              response_headers: response.headers,
-              response_body: response.to_str
-            )
-          end
-          response
+          str_response = response.to_str
+          str_response.blank? ? '' : JSON.parse(str_response)
         end
       end
     end

data/lib/quickmail/version.rb

@@ -1,3 +1,3 @@
 module Quickmail
-  VERSION = "0.16.0"
+  VERSION = "0.21.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickmail
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Tom Dallimore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -102,7 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper for the Quickmail 3PL fulfillment company API