quickmail 0.5.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4e5972b28ca802a0ca6748dee33388e1467b1d75c930be525e1d6013bc998b1
-  data.tar.gz: 1b3de7c13c847c917aa9b13806ab276f5f5d57c45d55f58e03d2f1199302119c
+  metadata.gz: 227db5a553ff13e194b8910f3bcf768c4b7daf063a0ad2b73c77bdfc14ea90f0
+  data.tar.gz: 02c3d283725fc3b54a0cbc9b417bd460ebca0933da69d1f6dfa0c42e94180d80
 SHA512:
-  metadata.gz: 0dae0a7dacdfb6e3ddaa0b6010c44f8af4b26338f96a49a0b9813fff157e69718f58f1b79d02c7e9c7c4830b3be9e8d3b1c4c333be62ae08e26fc63ed061b032
-  data.tar.gz: fc98b731ab50aba6311b68bc6ec196b0b4c4c44f2c16b0a4862175536c1384d5dd6230b788a5633b6e77701b04a2f5d17f0922fde08c4a99075434f4fb381abf
+  metadata.gz: 800528a13066e116256f8efde7bfd9b1a2a1f2119fea4841c2f1bfff0c9c78e2f061973a60b2cf587de0e1a8d8381a462f0546f6f58a65e18187485b141a0e10
+  data.tar.gz: 51c481f400717bed63577a983e5fa92449025c6eefd72e33e3392d385bf867eececf6a07af454a346b6a1dff6d5956f92fda2a37470a04afca6af63acddacc1c

data/lib/quickmail.rb

@@ -8,15 +8,13 @@ require 'quickmail/tracking'
 
 module Quickmail
 
-  API_BASE = Quickmail.test_mode ? "https://quickmailonline.com.au/api/test"  : "https://quickmailonline.com.au/api/"
-
   class QuickmailError < StandardError
   end
 
-  class AuthenticationError < QuickmailError;
-  end
-  class ConfigurationError < QuickmailError;
-  end
+  class AuthenticationError < QuickmailError; end
+
+  class ConfigurationError < QuickmailError; end
+
   class ApiRequestError < QuickmailError
     attr_reader :response_code, :response_headers, :response_body
 
@@ -29,7 +27,7 @@ module Quickmail
 
   class << self
 
-    attr_writer :access_token, :api_version, :test_mode
+    attr_writer :access_token, :api_version, :test_mode, :api_base
 
     def access_token
       defined? @access_token and @access_token or raise(
@@ -44,7 +42,11 @@ module Quickmail
     end
 
     def test_mode
-      @test_mode
+      @test_mode.nil? ? false : @test_mode
+    end
+
+    def api_base
+      Quickmail.test_mode ? "https://quickmailonline.com.au/api/test" : "https://quickmailonline.com.au/api/"
     end
 
     def request(method, resource, params = {})
@@ -68,8 +70,8 @@ module Quickmail
       end
       RestClient::Request.new({
                                 method: method,
-                                url: API_BASE + ss_api_version + '/' + resource,
-                                payload: payload ? payload.to_json : nil,
+                                url: Quickmail.api_base + ss_api_version + '/' + resource,
+                                payload: payload,
                                 headers: headers
                               }).execute do |response, request, result|
         if response.code != 200

data/lib/quickmail/authentication.rb

@@ -7,11 +7,11 @@ module Quickmail
       def oauth(payload = {})
         RestClient::Request.new({
             method: :post,
-            url: API_BASE + '/token',
-            payload: payload ? payload.to_json : nil,
+            url: Quickmail.api_base + '/token',
+            payload: payload,
             headers: {content_type: "application/x-www-form-urlencoded"}
           }).execute do |response, request, result|
-          if response.code != 201
+          if response.code != 200
             raise ApiRequestError.new(
               response_code: response.code,
               response_headers: response.headers,

data/lib/quickmail/version.rb

@@ -1,3 +1,3 @@
 module Quickmail
-  VERSION = "0.5.0"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quickmail
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Tom Dallimore