voltron-notify 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98bac0d7281f37ea5c0dfbf728f6701699c4b85b
-  data.tar.gz: 913ef565e6f2b5678d5f3c0bd37a78658e3b6664
+  metadata.gz: ee6f4cf0e055127232f8ea6dc0bc719592e1ee0b
+  data.tar.gz: 8f6163ec33b58958a9e35d718accef4aedfb2a58
 SHA512:
-  metadata.gz: 0c33fbbaed37d2bb9e4539546e9f7046b3e538c59c62211fdab0ca8ac1fb10ec0b56b5b7e8d60f62391b24741437b6e15269a122ea84a998782580d3381767a8
-  data.tar.gz: 5c181238a194d6b8c29d848e972837e8781041704ae2e50a5f51761d7f5f5b68377ba1568aa310e2b381c631acc97d92c33a8ad910c460b18b4fdb3f9e9165b1
+  metadata.gz: fa78b9f193772a252ec4969c6861ef6c6d296b0f722cc289baf02d1009024d5bcd5c55bd6f9c20fe6bf6e8270883575dd3a54471639d1146e4ded3827cfdfd82
+  data.tar.gz: 05f5cc27b664ce2cba50017fe181265a112cb8d8ac094fa3f6b2c033246f0a0abc62a1c353a28311e2654fcd3e2fe1e2a41f251deb911e3370b05ebd03521ad2

data/Gemfile

@@ -2,4 +2,5 @@ source 'https://rubygems.org'
 source 'http://gem.minow.io'
 
 # Specify your gem's dependencies in voltron-notify.gemspec
-gemspec
+gem 'colorize'
+gemspec

data/app/controllers/voltron/notification_controller.rb

@@ -0,0 +1,21 @@
+class Voltron::NotificationController < ApplicationController
+
+  skip_before_action :verify_authenticity_token
+
+  def update
+    if Voltron::Notification::SmsNotification.exists?(sid: params[:MessageSid])
+      sms = Voltron::Notification::SmsNotification.find_by(sid: params[:MessageSid])
+      update_params = { status: params[:MessageStatus], error_code: params[:ErrorCode] }.compact
+      if sms.update(update_params)
+        head :ok
+      else
+        Voltron.log "(SID: #{params[:MessageSid]}) " + sms.errors.full_messages.join(""), "Notification Update", :light_yellow
+        head :unprocessable_entity
+      end
+    else
+      Voltron.log "SMS Notification with id #{params[:MessageSid]} not found.", "Notification Update", :light_yellow
+      head :not_found
+    end
+  end
+
+end

data/app/models/voltron/notification.rb

@@ -11,11 +11,11 @@ module Voltron
 
     before_validation :validate
 
-    PERMITTED_ATTRIBUTES = [:to, :from]
+    PERMITTED_ATTRIBUTES = [:to, :from, :template]
 
     def email(subject, **args, &block)
       # Get the remaining args as params, that will eventually become assigns in the mailer template
-      params = { subject: subject, notifyable.class.name.downcase => notifyable }.merge(**args)
+      params = { subject: subject, notifyable.class.name.downcase => notifyable }.compact.merge(**args)
 
       # Build the options hash from the provided arguments
       options = { subject: subject }.merge(**args.select { |k,v| PERMITTED_ATTRIBUTES.include?(k.to_sym) })

data/app/models/voltron/notification/email_notification.rb

@@ -74,6 +74,12 @@ class Voltron::Notification::EmailNotification < ActiveRecord::Base
     @mailer_arguments = *args
   end
 
+  def template(fullpath)
+    parts = fullpath.split("/")
+    self.template_name = parts.pop.sub(/\.(html|text)\..*$/, "")
+    self.template_path = parts.join("/")
+  end
+
   # TODO: Move this to actual validates_* methods
   def error_messages
     output = []
@@ -91,8 +97,8 @@ class Voltron::Notification::EmailNotification < ActiveRecord::Base
     def mail
       # If no mailer arguments, use default order of arguments as defined in Voltron::NotificationMailer.notify
       if @mailer_arguments.blank?
-        @request << { to: to, from: from, subject: subject }.compact.merge(vars: vars, attachments: attachments)
-        mailer.send method, { to: to, from: from, subject: subject }.compact, vars, attachments
+        @request << { to: to, from: from, subject: subject, template_path: template_path, template_name: template_name }.compact.merge(vars: vars, attachments: attachments)
+        mailer.send method, { to: to, from: from, subject: subject, template_path: template_path, template_name: template_name }.compact, vars, attachments
       else
         @request << @mailer_arguments.compact
         mailer.send method, *@mailer_arguments.compact

data/app/models/voltron/notification/sms_notification.rb

@@ -2,6 +2,8 @@ require "twilio-ruby"
 
 class Voltron::Notification::SmsNotification < ActiveRecord::Base
 
+  include Rails.application.routes.url_helpers
+
   has_many :attachments
 
   belongs_to :notification
@@ -12,7 +14,7 @@ class Voltron::Notification::SmsNotification < ActiveRecord::Base
 
   after_create :deliver_later, if: :use_queue?
 
-  include Rails.application.routes.url_helpers
+  validates :status, presence: false, inclusion: { in: %w( queued failed sent delivered undelivered ), message: "must be one of: queued, failed, sent, delivered, undelivered" }, on: :update
 
   def setup
     @request = []
@@ -40,8 +42,8 @@ class Voltron::Notification::SmsNotification < ActiveRecord::Base
       # We are before_create so we can just set the attribute values, it will be saved after this
       self.request_json = @request.to_json
       self.response_json = @response.to_json
-      self.sid = @response.first[:sid]
-      self.status = @response.first[:status]
+      self.sid = response.first[:sid]
+      self.status = response.first[:status]
     end
   end
 
@@ -51,14 +53,14 @@ class Voltron::Notification::SmsNotification < ActiveRecord::Base
     # If sending more than 1 attachment, iterate through all but one attachment and send each without a body...
     if all_attachments.count > 1
       begin
-        client.messages.create({ from: from_formatted, to: to_formatted, media_url: all_attachments.shift }.compact)
+        client.messages.create({ from: from_formatted, to: to_formatted, media_url: all_attachments.shift, status_callback: try(:update_voltron_notification_url, host: Voltron.config.base_url) }.compact)
         @request << Rack::Utils.parse_nested_query(client.last_request.body)
         @response << JSON.parse(client.last_response.body)
       end until all_attachments.count == 1
     end
 
     # ... Then send the last attachment (if any) with the actual text body. This way we're not sending multiple SMS's with same body
-    client.messages.create({ from: from_formatted, to: to_formatted, body: message, media_url: all_attachments.shift }.compact)
+    client.messages.create({ from: from_formatted, to: to_formatted, body: message, media_url: all_attachments.shift, status_callback: try(:update_voltron_notification_url, host: Voltron.config.base_url) }.compact)
     @request << Rack::Utils.parse_nested_query(client.last_request.body)
     @response << JSON.parse(client.last_response.body)
     after_deliver

data/lib/generators/templates/db/migrate/create_voltron_notification_email_notifications.rb

@@ -4,6 +4,8 @@ class CreateVoltronNotificationEmailNotifications < ActiveRecord::Migration
       t.string :to
       t.string :from
       t.string :subject
+      t.string :template_path
+      t.string :template_name
       t.string :mailer_class
       t.string :mailer_method
       t.text :request_json

data/lib/generators/templates/db/migrate/create_voltron_notification_sms_notifications.rb

@@ -9,8 +9,11 @@ class CreateVoltronNotificationSmsNotifications < ActiveRecord::Migration
       t.integer :notification_id
       t.string :status
       t.string :sid
+      t.string :error_code
 
       t.timestamps null: false
     end
+
+    add_index :voltron_notification_sms_notifications, :sid, unique: true
   end
 end

data/lib/voltron/notify.rb

@@ -1,5 +1,6 @@
 require "voltron"
 require "voltron/notify/version"
+require "voltron/notify/action_dispatch/routes"
 require "voltron/config/notify"
 
 module Voltron

data/lib/voltron/notify/action_dispatch/routes.rb

@@ -0,0 +1,14 @@
+module Voltron
+  module Notify
+    module Routes
+
+      def allow_notification_update(options={})
+        path = (options[:path] || "/notification/update").gsub(/(^[\s\/]+)|([\s\/]+$)/, '')
+        controller = (options[:controller] || "voltron/notification")
+        action = (options[:action] || "update")
+        post path, to: "#{controller}##{action}", as: :update_voltron_notification
+      end
+
+    end
+  end
+end

data/lib/voltron/notify/engine.rb

@@ -6,6 +6,7 @@ module Voltron
 
       initializer "voltron.notify.initialize" do
         ::ActiveRecord::Base.send :extend, ::Voltron::Notify
+        ::ActionDispatch::Routing::Mapper.send :include, ::Voltron::Notify::Routes
       end
     end
   end

data/lib/voltron/notify/version.rb

@@ -1,5 +1,5 @@
 module Voltron
   module Notify
-    VERSION = "0.1.5".freeze
+    VERSION = "0.1.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voltron-notify
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Eric Hainer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -185,6 +185,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/controllers/voltron/notification_controller.rb
 - app/jobs/voltron/sms_job.rb
 - app/mailers/voltron/notification_mailer.rb
 - app/models/voltron/notification.rb
@@ -201,6 +202,7 @@ files:
 - lib/generators/voltron/notify/install_generator.rb
 - lib/voltron/config/notify.rb
 - lib/voltron/notify.rb
+- lib/voltron/notify/action_dispatch/routes.rb
 - lib/voltron/notify/engine.rb
 - lib/voltron/notify/version.rb
 - voltron-notify.gemspec