quickmail 0.14.0 → 0.19.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a6ee0fe6840bb5f7feff322bf2aec62cd13fab3e090e93b4687c48ad2e58fbf8
4
- data.tar.gz: d6a0d860ae0e85057d6fd78235b11f0e2be097c71e3a92e4b0429cd8c7fe0731
3
+ metadata.gz: 0c1f469e415031417d44cfa070ecc7a64d60ec54f78bd225d9bd461a5b6b7c1e
4
+ data.tar.gz: 9158cf1ad4976074ee471f89fc65f2a372461b3f083a8950d7f5d43d266fda4f
5
5
  SHA512:
6
- metadata.gz: 30e7bb4fd3afba53be729391114abc776895c878440a8995fc7fe16267b30f1f57e087a0e7f35e9828f95ea34df0607ff678bfa2134a4e15c965d0e39d8816bd
7
- data.tar.gz: 21bc1f96e41d42229630dc5c761d3bc9500ec7d0b08076a063df154b96485a2cad48fdbd896625fff40af5daf43e0bb8e47342376291056b56f7461b3bc65d48
6
+ metadata.gz: b97dc4deaa076e5a51da088a423bf730be80c840e9d6b5204daa0e276fd948d9fea8a3157b1101e215b8f1c00681f026168444a6bea29fcc4bce924fdc8133ee
7
+ data.tar.gz: a407b00f0d1542e78b556d67ebdc19e4d2e4cd7ab82d602e7362482554c57e4217f3d29562b14c7ecf5b6c0788029f127e27f8b4953734f4be8e86cb76e5a8ec
@@ -50,12 +50,10 @@ module Quickmail
50
50
  Quickmail.test_mode ? "https://quickmailonline.com.au/api/test/" : "https://quickmailonline.com.au/api/"
51
51
  end
52
52
 
53
- def request(method, resource, params = {})
54
- ss_access_token = params[:access_token] || Quickmail.access_token
53
+ def request(method, resource, params = {}, access_token = nil)
54
+ ss_access_token = access_token || Quickmail.access_token
55
55
  ss_api_version = Quickmail.api_version
56
56
 
57
- params.except!(:access_token)
58
-
59
57
  defined? method or raise(
60
58
  ArgumentError, "Request method has not been specified"
61
59
  )
@@ -63,27 +61,22 @@ module Quickmail
63
61
  ArgumentError, "Request resource has not been specified"
64
62
  )
65
63
  if method == :get
66
- headers = {accept: :json, content_type: :json, Authorization: "Bearer #{ss_access_token}"}.merge({params: params})
64
+ url = Quickmail.api_base + ss_api_version + '/' + resource + '?' + params
67
65
  payload = nil
68
- else
69
66
  headers = {accept: :json, content_type: :json, Authorization: "Bearer #{ss_access_token}"}
67
+ else
68
+ url = Quickmail.api_base + ss_api_version + '/' + resource
70
69
  payload = params
70
+ headers = {accept: :json, content_type: :json, Authorization: "Bearer #{ss_access_token}"}
71
71
  end
72
72
  RestClient::Request.new({
73
73
  method: method,
74
- url: Quickmail.api_base + ss_api_version + '/' + resource,
74
+ url: url,
75
75
  payload: payload.to_json,
76
76
  headers: headers
77
77
  }).execute do |response, request, result|
78
- if response.code != 201 || response.code != 200
79
- raise ApiRequestError.new(
80
- response_code: response.code,
81
- response_headers: response.headers,
82
- response_body: response.to_str
83
- )
84
- end
85
- str_response = response.to_str
86
- str_response.blank? ? '' : JSON.parse(str_response)
78
+ str_response = response.to_str
79
+ str_response.blank? ? '' : JSON.parse(str_response)
87
80
  end
88
81
  end
89
82
 
@@ -6,11 +6,11 @@ module Quickmail
6
6
  class << self
7
7
  def oauth(payload = {})
8
8
  RestClient::Request.new({
9
- method: :post,
10
- url: Quickmail.api_base + '/token',
11
- payload: payload,
12
- headers: {content_type: "application/x-www-form-urlencoded"}
13
- }).execute do |response, request, result|
9
+ method: :post,
10
+ url: Quickmail.api_base + '/token',
11
+ payload: payload,
12
+ headers: {content_type: "application/x-www-form-urlencoded"}
13
+ }).execute do |response, request, result|
14
14
  if response.code != 200
15
15
  raise ApiRequestError.new(
16
16
  response_code: response.code,
@@ -5,8 +5,8 @@ module Quickmail
5
5
 
6
6
  class << self
7
7
 
8
- def list
9
- response = Quickmail.request(:get, 'inventory')
8
+ def list(access_token = nil)
9
+ response = Quickmail.request(:get, 'inventory', access_token)
10
10
 
11
11
  response
12
12
  end
@@ -4,8 +4,8 @@ module Quickmail
4
4
  class Order
5
5
 
6
6
  class << self
7
- def create(params = {})
8
- response = Quickmail.request(:post, 'orders', params)
7
+ def create(params = {}, access_token = nil)
8
+ response = Quickmail.request(:post, 'orders', params, access_token)
9
9
 
10
10
  response
11
11
  end
@@ -4,8 +4,8 @@ module Quickmail
4
4
  class Tracking
5
5
 
6
6
  class << self
7
- def poll(params = {})
8
- response = Quickmail.request(:get, 'tracking', params)
7
+ def poll(params = {}, access_token = nil)
8
+ response = Quickmail.request(:get, 'tracking', params, access_token)
9
9
 
10
10
  response
11
11
  end
@@ -1,3 +1,3 @@
1
1
  module Quickmail
2
- VERSION = "0.14.0"
2
+ VERSION = "0.19.0"
3
3
  end
@@ -8,7 +8,7 @@ unless defined?(Spring)
8
8
  require 'bundler'
9
9
 
10
10
  lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
11
- spring = lockfile.specs.detect {|spec| spec.name == "spring"}
11
+ spring = lockfile.specs.detect { |spec| spec.name == "spring" }
12
12
  if spring
13
13
  Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
14
14
  gem 'spring', spring.version
@@ -10,7 +10,7 @@ require "rails/test_help"
10
10
  Minitest.backtrace_filter = Minitest::BacktraceFilter.new
11
11
 
12
12
  # Load support files
13
- Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
13
+ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
14
14
 
15
15
  # Load fixtures from the engine
16
16
  if ActiveSupport::TestCase.respond_to?(:fixture_path=)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: quickmail
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.14.0
4
+ version: 0.19.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tom Dallimore
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-05-20 00:00:00.000000000 Z
11
+ date: 2020-11-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rest-client
@@ -102,7 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  requirements: []
105
- rubygems_version: 3.1.2
105
+ rubyforge_project:
106
+ rubygems_version: 2.7.6.2
106
107
  signing_key:
107
108
  specification_version: 4
108
109
  summary: A Ruby wrapper for the Quickmail 3PL fulfillment company API