quickmail 0.12.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba3bb590c0e78fdc175145e62566e44fc6a5691a5e24d6e01bc13222e03dc0ea
-  data.tar.gz: bc8ad9dea2a71303bcc1c24de649675d3a37a71b7eb410e7113cd9c6a67e6ee5
+  metadata.gz: 7c230f03c9c4a768d9c56d94a37396841d47015b79aaf6ef96b1e46e79d3773e
+  data.tar.gz: 97a992b510201d1473f053d46d9b6909d41af62bd2c3aa9ccacb272d2d9e0fb3
 SHA512:
-  metadata.gz: 7c050950c1f376f2144320dd1d314e1c4391c246ac449ecd0187311be007b44e097eb03533ca10f3b14255c102d810e12a21ec5c8d8bd842c1dbfe028060eeae
-  data.tar.gz: 582985ea8b3fad010ff5da94be4edb935ee0669023bf85d33e38c1ef4f801fbdfe47363e15a84ef0724accc993f8c0f21c106a174a067f17abb427d0688703b4
+  metadata.gz: 82f88eab0bcf157a92427aa8f9e32f91b7741e2087b22dad758b100f2122fa0ac25eac92005748054f4aa954bb9571e74b8b5e21a84a0acb8fb6a92a0ba6cb5c
+  data.tar.gz: a50a4901fea7de01cdd1bc3a3ddc393043a2bdd9e4218aed6a964a6f07866cd343fa2628853c930ae731efeb870e5e326603754c3447b136384195ccb34b4ecb

data/lib/quickmail.rb

@@ -3,6 +3,7 @@
 require 'rest-client'
 
 require 'quickmail/authentication'
+require 'quickmail/inventory'
 require 'quickmail/order'
 require 'quickmail/tracking'
 
@@ -46,15 +47,13 @@ module Quickmail
     end
 
     def api_base
-      Quickmail.test_mode ? "https://quickmailonline.com.au/api/test" : "https://quickmailonline.com.au/api/"
+      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,19 +61,21 @@ 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,
-                                payload: payload,
+                                url: url,
+                                payload: payload.to_json,
                                 headers: headers
                               }).execute do |response, request, result|
-        if response.code != 200
+        if response.code != 201 || response.code != 200
           raise ApiRequestError.new(
             response_code: response.code,
             response_headers: response.headers,

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.12.0"
+  VERSION = "0.17.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.12.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Tom Dallimore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 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