dm_courier 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10fe83fea224d1b26c4df208777517d72a638a7c
-  data.tar.gz: 1318ae7d8ea13da752fa1408109518b2a2d22a2c
+  metadata.gz: dfdbc1f2d420916eef7963050d984d38726fe68b
+  data.tar.gz: 749be002590592385f752bd6d07fb54c8345f906
 SHA512:
-  metadata.gz: 3e54a9a4929567aa5c11a0797456a669c148d60c6ffd2a7bbe52b2c427a448c69d8e4fb1c9c61ddb326d656984ed6e4cae9148d3fe0aa8f3a1c0e8dcd0434bb6
-  data.tar.gz: b38ff365a4af8517981e661e5343894fc0c570a2446514ce46eaf4479ddc9fa1c0a2833d098fb8d61c28f77aba81d8836e26d2a038fd1b36577d071711ea7331
+  metadata.gz: 05df60f0fe26d7fe9e4059dd846e7bd8a524b6cd6ccf3efa5f7da2f1df52962e70ed53a6c112f76262f9c8037ca196456efc1343e187a9ebde325b6e0892fd1b
+  data.tar.gz: 189dbd35a88579d3e86df8f25cb26751bf89b1457320a965120012ac12eecaf23ed93b3a7d794d3fee3eb375b69f1698e000591824189a4b0569a5369f402cc1

data/.ruby-gemset

@@ -0,0 +1 @@
+dm-courier

data/.ruby-version

@@ -1 +1 @@
-2.2.0
+2.3.0

data/lib/dm_courier/message_helper.rb

@@ -1,4 +1,5 @@
 require "base64"
+require "json"
 
 module DMCourier
   module Services
@@ -23,6 +24,10 @@ module DMCourier
         from.address if from_address
       end
 
+      def metadata
+        JSON.parse(mail[:metadata].value) if mail[:metadata]
+      end
+
       def from_name
         from.display_name if from_address
       end

data/lib/dm_courier/services/sparkpost.rb

@@ -1,8 +1,8 @@
-require "sparkpost"
+require "simple_spark"
 require "base64"
 
-require "monkey_patch/sparkpost/request"
 require "dm_courier/message_helper"
+require "monkey_patch/sparkpost/client"
 
 module DMCourier
   module Services
@@ -22,10 +22,9 @@ module DMCourier
       end
 
       def deliver!
-        sparkpost = ::SparkPost::Client.new(api_key)
-        transmission = sparkpost.transmission
+        sparkpost = ::SimpleSpark::Client.new(api_key: api_key)
 
-        transmission.send(:request, transmission.endpoint, api_key, sparkpost_message)
+        sparkpost.transmissions.create(sparkpost_message)
       end
 
       def sparkpost_message
@@ -54,6 +53,7 @@ module DMCourier
         message[:content][:text] = text_part if text_part
 
         message[:recipients] = recipients
+        message[:metadata] = metadata
 
         message[:content][:attachments] = regular_attachments if attachments?(inline: false)
         message[:content][:inline_images] = inline_attachments if attachments?(inline: true)

data/lib/dm_courier/version.rb

@@ -1,3 +1,3 @@
 module DMCourier
-  VERSION = "0.1.3".freeze
+  VERSION = "0.1.4".freeze
 end

data/lib/monkey_patch/sparkpost/client.rb

@@ -0,0 +1,41 @@
+require "rubygems"
+require "json"
+require "logger"
+require "net/http"
+require "json"
+
+module SimpleSpark
+  class Client
+    def call(opts)
+      method = opts[:method]
+      path = opts[:path]
+      body_values = opts[:body_values] || {}
+      query_params = opts[:query_values] || {}
+      extract_results = opts[:extract_results].nil? ? true : opts[:extract_results]
+
+      path = "#{@base_path}#{path}"
+      params = { path: path, headers: headers }
+      params[:body] = JSON.generate(body_values) unless body_values.empty?
+      params[:query] = query_params unless query_params.empty?
+
+      if @debug
+        logger.debug("Calling #{method}")
+        logger.debug(params)
+      end
+
+      response = @session.send(method.to_s, params)
+
+      if @debug
+        logger.debug("Response #{response.status}")
+        logger.debug(response)
+      end
+
+      fail Exceptions::GatewayTimeoutExceeded, "Received 504 from SparkPost API" if response.status == 504
+
+      process_response(response, extract_results)
+
+    rescue Excon::Errors::Timeout
+      raise Exceptions::GatewayTimeoutExceeded
+    end
+  end
+end

data/rails_courier.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_rubygems_version = ">= 2.4.5"
 
   spec.add_dependency "mandrill-api", "~> 1.0.53"
-  spec.add_dependency "sparkpost", "~> 0.1.2"
+  spec.add_dependency "simple_spark", "~> 1.0.2"
   spec.add_dependency "sendgrid-ruby", "~> 1.1.6"
   spec.add_dependency "http", "0.9.8"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dm_courier
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jaison Erick
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mandrill-api
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.53
 - !ruby/object:Gem::Dependency
-  name: sparkpost
+  name: simple_spark
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: sendgrid-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +189,7 @@ files:
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
+- ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
@@ -207,6 +208,7 @@ files:
 - lib/dm_courier/services/sendgrid.rb
 - lib/dm_courier/services/sparkpost.rb
 - lib/dm_courier/version.rb
+- lib/monkey_patch/sparkpost/client.rb
 - lib/monkey_patch/sparkpost/request.rb
 - rails_courier.gemspec
 homepage: http://github.com/sumoners/dm_courier
@@ -229,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.4.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A delivery method that abstract the most common email delivery APIs