quickmail 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35118afcf14f6b0d12429305f1befbf9d636fc339ac6428797e8e69b628b5c49
-  data.tar.gz: '08cb795c83fcc712514371a73ca44d67fb015af680b734d30f1160798d104768'
+  metadata.gz: f4e5972b28ca802a0ca6748dee33388e1467b1d75c930be525e1d6013bc998b1
+  data.tar.gz: 1b3de7c13c847c917aa9b13806ab276f5f5d57c45d55f58e03d2f1199302119c
 SHA512:
-  metadata.gz: e869398ab8d318089d7fc5ba0b2ef74b9f6bb9ced895fd08dd7198ed7b704a3bc25df7d6ce255ca143b68f9345bf8a841c8ebaf56e4cf5404248ca2ebb100a71
-  data.tar.gz: 72c211e74e91a6e3bf5bd390e809e7a96f4c4f39d0eeae61d4854a00f0426c656ac84e3878e337ac1eac079e4084a22e6d5a6e46792957c19a896404f379b82e
+  metadata.gz: 0dae0a7dacdfb6e3ddaa0b6010c44f8af4b26338f96a49a0b9813fff157e69718f58f1b79d02c7e9c7c4830b3be9e8d3b1c4c333be62ae08e26fc63ed061b032
+  data.tar.gz: fc98b731ab50aba6311b68bc6ec196b0b4c4c44f2c16b0a4862175536c1384d5dd6230b788a5633b6e77701b04a2f5d17f0922fde08c4a99075434f4fb381abf

data/lib/quickmail.rb

@@ -28,6 +28,9 @@ module Quickmail
   end
 
   class << self
+
+    attr_writer :access_token, :api_version, :test_mode
+
     def access_token
       defined? @access_token and @access_token or raise(
         ConfigurationError, "Quickmail access token not configured"
@@ -44,12 +47,12 @@ module Quickmail
       @test_mode
     end
 
-    attr_writer :access_token, :api_version, :test_mode
-
     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,10 +60,10 @@ 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({

data/lib/quickmail/version.rb

@@ -1,3 +1,3 @@
 module Quickmail
-  VERSION = "0.4.0"
+  VERSION = "0.5.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.5.0
 platform: ruby
 authors:
 - Tom Dallimore