quickmail 0.14.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6ee0fe6840bb5f7feff322bf2aec62cd13fab3e090e93b4687c48ad2e58fbf8
-  data.tar.gz: d6a0d860ae0e85057d6fd78235b11f0e2be097c71e3a92e4b0429cd8c7fe0731
+  metadata.gz: 0c1f469e415031417d44cfa070ecc7a64d60ec54f78bd225d9bd461a5b6b7c1e
+  data.tar.gz: 9158cf1ad4976074ee471f89fc65f2a372461b3f083a8950d7f5d43d266fda4f
 SHA512:
-  metadata.gz: 30e7bb4fd3afba53be729391114abc776895c878440a8995fc7fe16267b30f1f57e087a0e7f35e9828f95ea34df0607ff678bfa2134a4e15c965d0e39d8816bd
-  data.tar.gz: 21bc1f96e41d42229630dc5c761d3bc9500ec7d0b08076a063df154b96485a2cad48fdbd896625fff40af5daf43e0bb8e47342376291056b56f7461b3bc65d48
+  metadata.gz: b97dc4deaa076e5a51da088a423bf730be80c840e9d6b5204daa0e276fd948d9fea8a3157b1101e215b8f1c00681f026168444a6bea29fcc4bce924fdc8133ee
+  data.tar.gz: a407b00f0d1542e78b556d67ebdc19e4d2e4cd7ab82d602e7362482554c57e4217f3d29562b14c7ecf5b6c0788029f127e27f8b4953734f4be8e86cb76e5a8ec

data/lib/quickmail.rb

@@ -50,12 +50,10 @@ module Quickmail
       Quickmail.test_mode ? "https://quickmailonline.com.au/api/test/" : "https://quickmailonline.com.au/api/"
     end
 
-    def request(method, resource, params = {})
-      ss_access_token = params[:access_token] || Quickmail.access_token
+    def request(method, resource, params = {}, access_token = nil)
+      ss_access_token = access_token || Quickmail.access_token
       ss_api_version = Quickmail.api_version
 
-      params.except!(:access_token)
-
       defined? method or raise(
         ArgumentError, "Request method has not been specified"
       )
@@ -63,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

@@ -6,11 +6,11 @@ module Quickmail
     class << self
       def oauth(payload = {})
         RestClient::Request.new({
-            method: :post,
-            url: Quickmail.api_base + '/token',
-            payload: payload,
-            headers: {content_type: "application/x-www-form-urlencoded"}
-          }).execute do |response, request, result|
+                                  method: :post,
+                                  url: Quickmail.api_base + '/token',
+                                  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,

data/lib/quickmail/inventory.rb

@@ -5,8 +5,8 @@ module Quickmail
 
     class << self
 
-      def list
-        response = Quickmail.request(:get, 'inventory')
+      def list(access_token = nil)
+        response = Quickmail.request(:get, 'inventory', access_token)
 
         response
       end

data/lib/quickmail/order.rb

@@ -4,8 +4,8 @@ module Quickmail
   class Order
 
     class << self
-      def create(params = {})
-        response = Quickmail.request(:post, 'orders', params)
+      def create(params = {}, access_token = nil)
+        response = Quickmail.request(:post, 'orders', params, access_token)
 
         response
       end

data/lib/quickmail/tracking.rb

@@ -4,8 +4,8 @@ module Quickmail
   class Tracking
 
     class << self
-      def poll(params = {})
-        response = Quickmail.request(:get, 'tracking', params)
+      def poll(params = {}, access_token = nil)
+        response = Quickmail.request(:get, 'tracking', params, access_token)
 
         response
       end

data/lib/quickmail/version.rb

@@ -1,3 +1,3 @@
 module Quickmail
-  VERSION = "0.14.0"
+  VERSION = "0.19.0"
 end

data/test/dummy/bin/spring

@@ -8,7 +8,7 @@ unless defined?(Spring)
   require 'bundler'
 
   lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
-  spring = lockfile.specs.detect {|spec| spec.name == "spring"}
+  spring = lockfile.specs.detect { |spec| spec.name == "spring" }
   if spring
     Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
     gem 'spring', spring.version

data/test/test_helper.rb

@@ -10,7 +10,7 @@ require "rails/test_help"
 Minitest.backtrace_filter = Minitest::BacktraceFilter.new
 
 # Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 # Load fixtures from the engine
 if ActiveSupport::TestCase.respond_to?(:fixture_path=)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickmail
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Tom Dallimore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-11-30 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