quickmail 0.7.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 499eb9ebd584504812094a6243b5fb95495148fe158c0b76e58c1e273987b1da
-  data.tar.gz: 4f48f9687e5cb056521cf15900a90303c2e942b239e6865f1150a9515f9520d3
+  metadata.gz: ba3bb590c0e78fdc175145e62566e44fc6a5691a5e24d6e01bc13222e03dc0ea
+  data.tar.gz: bc8ad9dea2a71303bcc1c24de649675d3a37a71b7eb410e7113cd9c6a67e6ee5
 SHA512:
-  metadata.gz: 53c0bc3297b09b0d13afb88f39cb0f8b90427a6eabdbf9b0a91264add7bf4f66714de1a55d54b281296ffdbaec00fb24b3fd588f7c4fcb8c29c95b153058452b
-  data.tar.gz: 489e7bd89cf4b95c636b1489284cd4d3ac1c07ad488a9783787a91f42e9d899677761fbef743100ceafbf7fedbef6841b99188916e8732c3b4ef657266091c47
+  metadata.gz: 7c050950c1f376f2144320dd1d314e1c4391c246ac449ecd0187311be007b44e097eb03533ca10f3b14255c102d810e12a21ec5c8d8bd842c1dbfe028060eeae
+  data.tar.gz: 582985ea8b3fad010ff5da94be4edb935ee0669023bf85d33e38c1ef4f801fbdfe47363e15a84ef0724accc993f8c0f21c106a174a067f17abb427d0688703b4

data/lib/quickmail.rb

@@ -11,10 +11,10 @@ module Quickmail
   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
 
@@ -27,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(
@@ -45,10 +45,13 @@ module Quickmail
       @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 = {})
       ss_access_token = params[:access_token] || Quickmail.access_token
       ss_api_version = Quickmail.api_version
-      api_base = Quickmail.test_mode ? "https://quickmailonline.com.au/api/test"  : "https://quickmailonline.com.au/api/"
 
       params.except!(:access_token)
 
@@ -67,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.7.0"
+  VERSION = "0.12.0"
 end

metadata

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