quickmail 0.13.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db43904f045e30e53acbaee6040a44cdd288f583809fe7ba49049e12794ece46
-  data.tar.gz: d1d452042594d6c6e7b279b3b26091049e137ca8cfba0d22ef293842c9ea77d1
+  metadata.gz: 7c32da1d6cf69625dac15061c22e1d25ecd2bbba5bb68cbf3a2e8e2b74e9b268
+  data.tar.gz: 2b4573f5bf66172fa863be80eb63117846e6262dde7408ebf061658990feb00b
 SHA512:
-  metadata.gz: bde69d4a4ec67bb16b3383b1ce33b1a4c2dd3fc768f00e6e89047bffe1808444b3a41ea295c4acfbc978ae0e2d052bd2bccfcaa39c3a2106588e4c65c19ee4d3
-  data.tar.gz: e49172dbf33591a4836956c58b6d766920de937e19a48d649ec2bf84b04ff6afee48f2595287840444f579e33f220a088489090296c05fbbc537417c2b470734
+  metadata.gz: 28d725bb5df5dfb1026894bcb04d382303e8cfad1f0c20345e8af75d02b9ce70c119df0171ba0183d7f8c276eb10d6b9ffd651a733faf1b6cef27c183a944a8a
+  data.tar.gz: aa81d960accd74e0508f40b8d623f59ec9580cdc090dd9733385503baec90e05df0354637c7146a20db6178c12e138450141883a80b84c596a271e5da7eee1d5

data/lib/quickmail.rb

@@ -3,6 +3,7 @@
 require 'rest-client'
 
 require 'quickmail/authentication'
+require 'quickmail/inventory'
 require 'quickmail/order'
 require 'quickmail/tracking'
 
@@ -49,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"
       )
@@ -62,27 +61,30 @@ 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
+        if response.code == 201 || response.code == 200
+          str_response = response.to_str
+          str_response.blank? ? '' : JSON.parse(str_response)
+        else
           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)
       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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Quickmail
+  class Inventory
+
+    class << self
+
+      def list(access_token = nil)
+        response = Quickmail.request(:get, 'inventory', access_token)
+
+        response
+      end
+    end
+  end
+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.13.0"
+  VERSION = "0.18.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.13.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Tom Dallimore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -35,6 +35,7 @@ files:
 - Rakefile
 - lib/quickmail.rb
 - lib/quickmail/authentication.rb
+- lib/quickmail/inventory.rb
 - lib/quickmail/order.rb
 - lib/quickmail/tracking.rb
 - lib/quickmail/version.rb