quickmail 0.4.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35118afcf14f6b0d12429305f1befbf9d636fc339ac6428797e8e69b628b5c49
-  data.tar.gz: '08cb795c83fcc712514371a73ca44d67fb015af680b734d30f1160798d104768'
+  metadata.gz: 672837930a7b8f7312ccd8845761fe5e9d7db28bda156e913fd0880cc8c8da9f
+  data.tar.gz: 6ec1e7fd28578317984605b72e067e305b1fa22d94a7baedbc725a31ca30e531
 SHA512:
-  metadata.gz: e869398ab8d318089d7fc5ba0b2ef74b9f6bb9ced895fd08dd7198ed7b704a3bc25df7d6ce255ca143b68f9345bf8a841c8ebaf56e4cf5404248ca2ebb100a71
-  data.tar.gz: 72c211e74e91a6e3bf5bd390e809e7a96f4c4f39d0eeae61d4854a00f0426c656ac84e3878e337ac1eac079e4084a22e6d5a6e46792957c19a896404f379b82e
+  metadata.gz: 4e707d689dc88ee66de7bfa5b9055e8a66c60aa3649e7a4425df2d8f2d0008fd9defc5cd42989cbad4846ec3ffab712ae9c26815f473a67e5979d675d1263de3
+  data.tar.gz: fad1200dd04b9008f36c5f78a50e18ff504b9fe1585a14863d98c4791f01505d03c697331a367006a8a7db3f83f3b19c4ee19da7e48e38eb49f5d4f7c54ef300

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
 
@@ -28,6 +26,9 @@ module Quickmail
   end
 
   class << self
+
+    attr_writer :access_token, :api_version, :test_mode, :api_base
+
     def access_token
       defined? @access_token and @access_token or raise(
         ConfigurationError, "Quickmail access token not configured"
@@ -41,15 +42,19 @@ module Quickmail
     end
 
     def test_mode
-      @test_mode
+      @test_mode.nil? ? false : @test_mode
     end
 
-    attr_writer :access_token, :api_version, :test_mode
+    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 = Quickmail.access_token
+      ss_access_token = params[: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"
       )
@@ -57,16 +62,16 @@ module Quickmail
         ArgumentError, "Request resource has not been specified"
       )
       if method == :get
-        headers = {accept: :json, content_type: :json, access_token: ss_access_token}.merge({params: params})
+        headers = {accept: :json, content_type: :json, Authorization: "Bearer #{ss_access_token}"}.merge({params: params})
         payload = nil
       else
-        headers = {accept: :json, content_type: :json, access_token: ss_access_token}
+        headers = {accept: :json, content_type: :json, Authorization: "Bearer #{ss_access_token}"}
         payload = params
       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,8 +7,8 @@ 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

data/lib/quickmail/version.rb

@@ -1,3 +1,3 @@
 module Quickmail
-  VERSION = "0.4.0"
+  VERSION = "0.9.0"
 end

data/test/dummy/config/initializers/quickmail.rb

@@ -1,3 +1,2 @@
-Quickmail.access_token = '9d5a864d104b49a293d3ff2601ac89b4'
 Quickmail.api_version = 'v1'
 Quickmail.test_mode = true

metadata

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