sendable_rails 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8d50a75f166eadfbd955b0036f6267889f39613
-  data.tar.gz: 8af4aa8d5308bf41f8e4e277e51a004a214d5ebd
+  metadata.gz: 8e7a7b7072278d02807d8013a0b7968f0b45a800
+  data.tar.gz: ecd2478ca8c0e4311d25ec1bdf37aaf4b12bcdf8
 SHA512:
-  metadata.gz: 5ea541928c19560789624d4528a30b8018106dcd756ea5ff6e4de6a4ffb197fd7a63cf38fe9f8e5d1d98d20fe3f582d77cb8be95a73f67e72db233d44dfc6dd4
-  data.tar.gz: 37fe0658e9f719e594380b8ed0f5452cfbc39e3d3bc37fe2bcec9cdb26642367a5d458b5902c18f3c0fbe2e06000160e2ecd5414a6153783ed8aee0b8e6f60a0
+  metadata.gz: 3d803428c4deaf0a5b7ffabc18cdcc629a8fe9915957b12792a553640d759637584e4276c2ef42aa9ab35fce0efddb97eda55819ac45f222d30cf8f3365ab9fe
+  data.tar.gz: e015e31307e7315adb04529350e71f1bbcb9875cbce68ac784024814e1e079ceca7760a7f3ad0963f35e07a813f947c2722303c57d813fdf4f4d7ff44a9308cb

data/lib/sendable_rails/action_mailer_ext.rb

@@ -1,56 +1,20 @@
-require 'net/http'
-require 'uri'
-require 'json'
+require 'sendable'
 
 module SendableRails
-  module ActionMailerExt
-    def collect_responses(headers)
-      if sendable = headers.delete(:sendable)
-        project_id = SendableRails.config.project_id
-        api_key = SendableRails.config.api_key
-
-        uri = URI("https://api.sendable.io/v1/project/#{project_id}/template/#{sendable[:template_id]}/render")
-
-        assigns = {}
-        instance_variables.each do |key|
-          if match = key.to_s.match(/@([^\_]+)/)
-            assigns[match[1]] = instance_variable_get(match[0])
-          end
-        end
-
-        params = {
-          assigns: assigns,
-        }
-
-        headers = {
-          'Authorization': "ApiKey #{api_key}",
-        }
-
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
-
-        request = Net::HTTP::Post.new(uri.request_uri, headers)
-        request.set_form_data(params)
-        response = http.request(request)
-
-        email = JSON.parse(response.body)
-
-        formats = []
-
-        if (email['html'])
-          formats << { content_type: 'text/html', body: email['html'] }
+  module ActionMailerWithSendable
+    def sendable_mail(params = {})
+      template_id = params.delete(:template_id)
+
+      assigns = {}
+      instance_variables.each do |key|
+        if match = key.to_s.match(/@([^\_]+)/)
+          assigns[match[1]] = instance_variable_get(match[0])
         end
-
-        if (email['plain'])
-          formats << { content_type: 'text/plain', body: email['text'] }
-        end
-
-        formats
-      else
-        super
       end
+
+      Sendable.client.email(template_id, params.merge(assigns: assigns))
     end
   end
 end
 
-ActionMailer::Base.send(:prepend, SendableRails::ActionMailerExt)
+ActionMailer::Base.send(:prepend, SendableRails::ActionMailerWithSendable)

data/lib/sendable_rails/railtie.rb

@@ -1,9 +1,11 @@
+require 'sendable'
+
 module SendableRails
   class Railtie < Rails::Railtie
     config.sendable = ActiveSupport::OrderedOptions.new
 
     initializer "sendable.configure" do |app|
-      SendableRails.config do |config|
+      Sendable.config do |config|
         if app.config.sendable[:project_id]
           config.project_id = app.config.sendable[:project_id]
         end

data/lib/sendable_rails/version.rb

@@ -1,3 +1,3 @@
 module SendableRails
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/sendable_rails.rb

@@ -2,40 +2,4 @@ require "sendable_rails/action_mailer_ext"
 require "sendable_rails/railtie"
 
 module SendableRails
-  class << self
-    attr_accessor :config
-  end
-
-  def self.config
-    @config ||= Config.new
-
-    if block_given?
-      yield @config
-    else
-      @config
-    end
-  end
-
-  class Config
-    attr_accessor :project_id
-    attr_accessor :api_key
-
-    def initialize
-      set_defaults
-    end
-
-    def set_defaults
-      if ENV.has_key?("SENDABLE_PROJECT_ID")
-        @project_id = ENV["SENDABLE_PROJECT_ID"]
-      else
-        @project_id = nil
-      end
-
-      if ENV.has_key?("SENDABLE_API_KEY")
-        @api_key = ENV["SENDABLE_API_KEY"]
-      else
-        @api_key = ""
-      end
-    end
-  end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sendable_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Umair Siddique
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sendable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement