quickmail 0.6.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0829afb630932ce655a92f13edb125a2a9c6abb097183d3ddbd0b2be21e498cf'
-  data.tar.gz: 373e1b61509bb49c2bd165624a5758722d13256fb1978f787a9d9ab7dd31a3ad
+  metadata.gz: c05c7a45239126a6acdebdfba05733a4187fbaf8f4b030f002ab79cbbc772bca
+  data.tar.gz: 9fb9f4a7360c4ff6de3657b8f06d815a3b274fee93b715c49dd43fb54bcdad02
 SHA512:
-  metadata.gz: 1f74891d7e649ba5c1d02a13283468261a02aae36b6498c81a68c972260b1849e7fc35e4cea246ef1b22982c517c6e580d443de62f1b6e3a4985e7998c78b7b8
-  data.tar.gz: 565fc9cbad3706ce10cad5ded26b557a86c385136a3f119bbd9f3cdac05ff9dc1b28d6e31511e6c4084957e2c8b7f1c7e7688d182716f91a5e35994eec11fe1a
+  metadata.gz: 2ee895eeb81d1260998d3c4a821ce7aa53c1884af5a1d4f3714249551744f0542eb9598919a5b13ecc9d89c1c81ff7d0d5d32830dc42e971c76973ae21b3f5e7
+  data.tar.gz: 1f34ce8be3946005cd170de33ab51592cf2bb0f5e231a80e809afaf60e3efee95e3c044caa0ff40e2c20a324714a3ed3140117ad38a01c2e2e9c9916054cd6f6

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(
@@ -42,13 +42,16 @@ 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 = {})
       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

@@ -5,20 +5,20 @@ module Quickmail
 
     class << self
       def oauth(payload = {})
-        RestClient::Request.new({
+        response = 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,
               response_body: response.to_str
             )
           end
-          response
+          JSON.parse(response.body)
         end
       end
     end

data/lib/quickmail/version.rb

@@ -1,3 +1,3 @@
 module Quickmail
-  VERSION = "0.6.0"
+  VERSION = "0.11.0"
 end

metadata

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