jellyfish-notification 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ca67009e7fc8630306f3a9a003a0e42b906f8ca
-  data.tar.gz: c23de5a583f4808f8250bf2daed3045d20e0ddc2
+  metadata.gz: 69953c5b2d8d951a37f838374ec9ae5bf9472ffb
+  data.tar.gz: e41a785b08bd66392cce3d2eb47d3f3bf2949264
 SHA512:
-  metadata.gz: b9b0d8f1fae0661c8ad5924e50dce15b23513c6e156ad8b1a2474de857af43c495ed6d57ddf68bb2a09f222c29f1777f4d059ed41f872618244e36c41db552d9
-  data.tar.gz: 71bdc46c0248e93f739af96c06e61e074b9b4467ebc873e6ac25ecc9f93ac2ffa8957f8a1943bc632e58052bc5149b6e3d3e5ffaf40d8ce4cdb8c522c5d2e696
+  metadata.gz: a9e717b1a375f4ac578e540f0ac9cf8095483ebd161a2d72a7ca10e8e4d1dd05d777ff30bd0e7dcde05b1991d233b47bc76e0a0ae357f1d862ec45028535af33
+  data.tar.gz: b9cf0d187ae6b762754c0d5608d732b4c2da068ae8b5646b75cdf88fd03a8bf31bd7c4bbb95e0e1f970d47100ec0ad09fbcd08c1a424763ce69a5802c031f252

data/README.md

@@ -1,5 +1,7 @@
 Jellyfish Notification
 =======
+[![Gem Version](https://badge.fury.io/rb/jellyfish-notification.svg)](http://badge.fury.io/rb/jellyfish-notification)
+
 A notification system for [Project Jellyfish] (https://github.com/projectjellyfish/api). Can be used to send email notifications to users on project create and approval or order create.
 
 #### Installation

data/lib/jellyfish_notification/jellyfish_mailer.rb

@@ -4,33 +4,30 @@ module JellyfishNotification
   class JellyfishMailer < ActionMailer::Base
     default from: ENV['JELLYFISH_SMTP_DEFAULT_SENDER']
 
-    def publish_project_create_approvers(response, recipients, projects_url)
-      # format block causes weirdness, so depending on rails conventions so templates resolve
-      @project = JSON.parse(response.body).to_h
-      @project_url = projects_url+"/#{@project['id'].to_s}"
+    def publish_project_create_confirmation(project, recipients)
+      @project = project
+      @project_url = (Rails.env != 'test') ? (Rails.application.routes.url_helpers.project_url project) : ('http://localhost:3000/api/v1/projects/' + project.id.to_s)
       recipients = ENV['JELLYFISH_SMTP_DEFAULT_RECIPIENT'] if recipients.empty?
       mail(template_path: 'jellyfish_mailer', to: recipients, subject: "Project Create Notification: #{@project['name'].to_s.upcase}") unless ENV['JELLYFISH_SMTP_DEFAULT_SENDER'].nil?
     end
 
-    def publish_project_create_confirmation(response, recipients, projects_url)
-      # format block causes weirdness, so depending on rails conventions so templates resolve
-      @project = JSON.parse(response.body).to_h
-      @project_url = projects_url+"/#{@project['id'].to_s}"
+    def publish_project_create_approvers(project, recipients)
+      @project = project
+      @project_url = (Rails.env != 'test') ? (Rails.application.routes.url_helpers.project_url project) : ('http://localhost:3000/api/v1/projects/' + project.id.to_s)
       recipients = ENV['JELLYFISH_SMTP_DEFAULT_RECIPIENT'] if recipients.empty?
       mail(template_path: 'jellyfish_mailer', to: recipients, subject: "Project Create Notification: #{@project['name'].to_s.upcase}") unless ENV['JELLYFISH_SMTP_DEFAULT_SENDER'].nil?
     end
 
-    def publish_project_approval_update(project, recipients, project_url)
-      # format block causes weirdness, so depending on rails conventions so templates resolve
+    def publish_project_approval_update(project, recipients)
       @project = project
-      @project_url = project_url
+      @project_url = (Rails.env != 'test') ? (Rails.application.routes.url_helpers.project_url project) : ('http://localhost:3000/api/v1/projects/' + project.id.to_s)
       recipients = ENV['JELLYFISH_SMTP_DEFAULT_RECIPIENT'] if recipients.empty?
       mail(template_path: 'jellyfish_mailer', to: recipients, subject: "Project Approval Notification: #{@project.name.to_s.upcase}") unless ENV['JELLYFISH_SMTP_DEFAULT_SENDER'].nil?
     end
 
-    def publish_order_create(order, recipients, orders_url)
+    def publish_order_create(order, recipients)
       @order = order
-      @order_url = orders_url+"/#{@order.id}"
+      @order_url = (Rails.env != 'test') ? (Rails.application.routes.url_helpers.order_url order) : ('http://http://localhost:3000/order-history/' + order.id.to_s)
       recipients = ENV['JELLYFISH_SMTP_DEFAULT_RECIPIENT'] if recipients.empty?
       mail(template_path: 'jellyfish_mailer', to: recipients, subject: 'Order Create Notification') unless ENV['JELLYFISH_SMTP_DEFAULT_SENDER'].nil?
     end

data/lib/jellyfish_notification/simple_listener.rb

@@ -1,31 +1,33 @@
 module JellyfishNotification
   class SimpleListener
-    # IF ENV['JELLYFISH_ASYNCHRONOUS_DELIVERY'] == 'true') THEN QUEUE WITH DELAYED JOBS ELSE DELIVER NOW
-    def publish_project_create(response, recipients, projects_url)
-      project_creator = recipients[:project_creator]
-      project_approvers = recipients[:project_approvers]
+    # IF 'JELLYFISH_ASYNCHRONOUS_DELIVERY' IS true THEN MAIL GETS ADDED TO DELAYED JOBS
+    def publish_project_create(project, current_user)
+      project_approvers = Staff.admin.pluck(:email).join(', ')
+      project_creator = current_user.email
       if ENV['JELLYFISH_ASYNCHRONOUS_DELIVERY'] == 'true'
-        JellyfishMailer.delay.publish_project_create_confirmation(response, project_creator, projects_url)
-        JellyfishMailer.delay.publish_project_create_approvers(response, project_approvers, projects_url)
+        JellyfishMailer.delay.publish_project_create_confirmation(project, project_creator)
+        JellyfishMailer.delay.publish_project_create_approvers(project, project_approvers)
       else
-        JellyfishMailer.publish_project_create_confirmation(response, project_creator, projects_url).deliver_now
-        JellyfishMailer.publish_project_create_approvers(response, project_approvers, projects_url).deliver_now
+        JellyfishMailer.publish_project_create_confirmation(project, project_creator).deliver_now
+        JellyfishMailer.publish_project_create_approvers(project, project_approvers).deliver_now
       end
     end
 
-    def publish_project_approval_update(project, recipients, project_url)
+    def publish_project_approval_update(project)
+      project_approvers = Staff.admin.pluck(:email).join(', ')
       if ENV['JELLYFISH_ASYNCHRONOUS_DELIVERY'] == 'true'
-        JellyfishMailer.delay.publish_project_approval_update(project, recipients, project_url)
+        JellyfishMailer.delay.publish_project_approval_update(project, project_approvers)
       else
-        JellyfishMailer.publish_project_approval_update(project, recipients, project_url).deliver_now
+        JellyfishMailer.publish_project_approval_update(project, project_approvers).deliver_now
       end
     end
 
-    def publish_order_create(order, recipients, orders_url)
+    def publish_order_create(order, current_user)
+      order_creator = current_user.email
       if ENV['JELLYFISH_ASYNCHRONOUS_DELIVERY'] == 'true'
-        JellyfishMailer.delay.publish_order_create(order, recipients, orders_url)
+        JellyfishMailer.delay.publish_order_create(order, order_creator)
       else
-        JellyfishMailer.publish_order_create(order, recipients, orders_url).deliver_now
+        JellyfishMailer.publish_order_create(order, order_creator).deliver_now
       end
     end
   end

data/lib/jellyfish_notification/version.rb

@@ -1,3 +1,3 @@
 module JellyfishNotification
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jellyfish-notification
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - mafernando
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails