sendgrid_notification 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90775898ca7fc2946047128eedcdddce10254fdf
-  data.tar.gz: f1ac7c958212d54a465c8f22af4cda0dcd587e1f
+  metadata.gz: 5a6289282bff591ae77653ea3172ce498e80c001
+  data.tar.gz: ff5e384e4a9c50789108192cbb043db1833dd584
 SHA512:
-  metadata.gz: 900f013823a5951052e7c113080d84b03a7381ddf61362fff59227543631c2a222e4e49d2db9f91bb21798368cf427679d5c15240284319cbd962d79b647ef29
-  data.tar.gz: 9b91afb7880024fc55f2edf5cdf65d0520441a5cba56af5733507b7de3b3e8c3673b58d77fd600a42bc3af6c503d0a0cf37c4a684d8c8157dbe64a6cc9694a30
+  metadata.gz: abf8bdbfba44a15bf27270f45a2dfc888f08ba41d3ffdd25fe0417885b2ed474df233aacb5d1692258103d585eaef631300a6d4a2a17a713217283781a077d53
+  data.tar.gz: daa00bc9ebff0b4dd783d0d3e8e8e181ed0278978429268729f224af6eea998612fa7abf345de08e1cb85317e48b5d773ac2db292cc4237a458d189d4acb23c4

data/app/jobs/sendgrid_notification/sendmail_job.rb

@@ -1,11 +1,11 @@
 module SendgridNotification
-  class SendmailJob < ActiveJob::Base
+  class SendmailJob < ApplicationJob
     queue_as :sendmail
 
     MailerClass = Rails.application.config.sendgrid_notification.mailer.constantize
 
     def perform(to, notification_mail, params)
-      MailerClass.new.sendmail(to, notification_mail, params)
+      MailerClass.new(params).sendmail(to, notification_mail, params)
     end
   end
 end

data/app/models/sendgrid_notification/base_mailer.rb

@@ -0,0 +1,23 @@
+module SendgridNotification
+  class BaseMailer
+    attr_reader :from, :from_name
+
+    def initialize(params = {})
+      _params = params.with_indifferent_access
+      @from      = _params.fetch(:mail_from) { Rails.application.config.sendgrid_notification.mail_from }
+      @from_name = _params.fetch(:mail_from_name) { Rails.application.config.sendgrid_notification.mail_from_name }
+    end
+
+    def sendmail(to, notification_mail, params = {})
+      raise NotImplementedError, "you should implement #{self.class}##{__method__}"
+    end
+
+    def last_result
+      raise NotImplementedError, "you should implement #{self.class}##{__method__}"
+    end
+
+    def last_result_success?
+      raise NotImplementedError, "you should implement #{self.class}##{__method__}"
+    end
+  end
+end

data/app/models/sendgrid_notification/null_mailer.rb

@@ -1,21 +1,14 @@
-require 'sendgrid-ruby'
-
 module SendgridNotification
-  class NullMailer
+  class NullMailer < BaseMailer
     prepend MailRecordable
-
     Result = Struct.new(:from, :to, :subject, :body, :sent_at)
 
     @@results = []
     cattr_reader :results
 
-    def initialize
-      @from = Rails.application.config.sendgrid_notification.mail_from
-    end
-
     def sendmail(to, notification_mail, params = {})
       body = notification_mail.apply(params)
-      results << Result.new(@from, to, notification_mail.subject, body, Time.now)
+      results << Result.new(from, to, notification_mail.subject, body, Time.now)
     end
 
     def last_result

data/app/models/sendgrid_notification/sendgrid_client.rb

@@ -28,7 +28,7 @@ module SendgridNotification
       end
 
       def body
-        raw.try(:body) ? JSON.parse(raw.body) : ''
+        JSON.parse(raw.body) rescue {}
       end
 
       delegate :headers, to: :raw

data/app/models/sendgrid_notification/sendgrid_mailer.rb

@@ -1,16 +1,8 @@
-require 'sendgrid-ruby'
-
 module SendgridNotification
-  class SendgridMailer
+  class SendgridMailer < BaseMailer
     prepend MailRecordable
-
     class Error < StandardError; end
 
-    def initialize
-      @from = Rails.application.config.sendgrid_notification.mail_from
-      @from_name = Rails.application.config.sendgrid_notification.mail_from_name
-    end
-
     def sendmail(to, notification_mail, params = {})
       body = notification_mail.apply(params)
       _sendmail(to, notification_mail, body)
@@ -34,8 +26,8 @@ module SendgridNotification
 
     def _sendmail(to, notification_mail, body)
       sendgrid_client.mail_send(
-        from: @from,
-        from_name: @from_name,
+        from: from,
+        from_name: from_name,
         to: to,
         subject: notification_mail.subject,
         body: body

data/lib/sendgrid_notification/version.rb

@@ -1,3 +1,3 @@
 module SendgridNotification
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid_notification
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - HORII Keima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -141,6 +141,7 @@ files:
 - app/jobs/sendgrid_notification/sendmail_job.rb
 - app/mailers/sendgrid_notification/application_mailer.rb
 - app/models/sendgrid_notification/application_record.rb
+- app/models/sendgrid_notification/base_mailer.rb
 - app/models/sendgrid_notification/mail_history.rb
 - app/models/sendgrid_notification/mail_recordable.rb
 - app/models/sendgrid_notification/notification_mail.rb
@@ -179,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: notification mail sender via sendgrid API