quickmail 0.15.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f105fb0222200735dd0c66b017ee131279a0d944f337ebfd4dc8b6c10bfbb988
-  data.tar.gz: 6d46c1f55a99ea3acbdc76c3e2bf7c1d36be3e1273c74922212201b6dba42715
+  metadata.gz: 1abec61f6b98a08d2ccd8743660b55f03cbd4735e5b000d148c4900814932c06
+  data.tar.gz: 47c43cab421d5afdf91ad493c543b1519e12097a8c57abe000fb5ce52e2db1f6
 SHA512:
-  metadata.gz: 0bb4f20af5572609514767c9ca5295dd2581e5876a76a377b9dc44e0044e966bbae57e56daf49da360c1296c2cab188a2a9614e9830b86976d2368d68718d887
-  data.tar.gz: 382094d66f2ca2e011bd378973da58537360be6ca169c23dc826290abbb80ed5feb88fc5dfb27e5c3254b29ad9f6a295f903c9cff001110cb6782cabacf94ad3
+  metadata.gz: 54cb255cbc3e235e986e15da684591620665ad2a8d375c7f6131f2cb5508caf6ce2d558fb6fc408f26dcebf4f70cbbd3dfd8a476d48eedf5ef6d9bca0e667d2a
+  data.tar.gz: a79daeb4098bc59ec53d5fd378bc2c60b9ef1e27b5a19eb670a030c8b0a56b72bc999054f7c9277c057af9dc8f2c894cf92b5b1e991082585e1c117e7acfa3f1

data/lib/quickmail.rb

@@ -50,7 +50,7 @@ module Quickmail
       Quickmail.test_mode ? "https://quickmailonline.com.au/api/test/" : "https://quickmailonline.com.au/api/"
     end
 
-    def request(method, resource, params = {}, access_token=nil)
+    def request(method, resource, params = {}, access_token = nil)
       ss_access_token = access_token || Quickmail.access_token
       ss_api_version = Quickmail.api_version
 
@@ -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

@@ -6,19 +6,13 @@ 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|
-          if response.code != 200
-            raise ApiRequestError.new(
-              response_code: response.code,
-              response_headers: response.headers,
-              response_body: response.to_str
-            )
-          end
-          response
+                                  method: :post,
+                                  url: Quickmail.api_base + '/token',
+                                  payload: payload,
+                                  headers: {content_type: "application/x-www-form-urlencoded"}
+                                }).execute do |response, request, result|
+          str_response = response.to_str
+          str_response.blank? ? '' : JSON.parse(str_response)
         end
       end
     end

data/lib/quickmail/inventory.rb

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

data/lib/quickmail/order.rb

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

data/lib/quickmail/tracking.rb

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

data/lib/quickmail/version.rb

@@ -1,3 +1,3 @@
 module Quickmail
-  VERSION = "0.15.0"
+  VERSION = "0.20.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.15.0
+  version: 0.20.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