clark_kent 0.10.4 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c15055012528a4868ad2f0c5c2c5755f99f36e20b5f6997a1acd7b92fa0074dd
-  data.tar.gz: 1063fac92e5307544e29fc19c2d2a57dc75c380fd84074520aef774a083ad589
+  metadata.gz: a055862b32f99723985e08f5f89b5919d4e606189db5ad144757d44f3ac3ac71
+  data.tar.gz: f1fe3d727f9d676af14d69ce17eef0ffb3b1a6273693af9671e739fbfa6ef88a
 SHA512:
-  metadata.gz: 1c4e2198c55d6379b0bb1f22577dd49d344c5a43bfec43cd48a46d5ef2b1025c1a4074814c324cde95f71d4864dd94b9b08c706be6b72adbf5c4c8287d0c376d
-  data.tar.gz: bb9bac8b03c95e7b0b8985e71dbf4c1fed6272d8f79d69ac03a8a5319124fbe1e22f2036f31d1ba17d89cc4cdefa3d841e709d154b724b503ace00c428abd7bb
+  metadata.gz: f813d2aabea50e64e02066d88b1a25751423d9f2560d45f2770d79710b6a4a1b5847e83db242bbff74b42a1b37758ac7cb27282e0ba31abce52da7bfc0911132
+  data.tar.gz: 184f74656189d0757d33b2b21ebe89bffa03985d2f54ebf209eea57585c226fb8f4f93c6e9da6dd9ccef586cc4fd236e42b9ceff8746989a1869a705db3f7e19

data/app/mailers/clark_kent/report_mailer.rb

@@ -2,18 +2,22 @@ module ClarkKent
   class ReportMailer < ActionMailer::Base
   	default from: 'reservations@invitedhome.com'
 
-  	def report_run(report_id, user_id, report_download_url)
+  	def report_run(report_id, user_id, report_accessor)
   		@report = Report.find(report_id)
-  		@user = User.find(user_id)
+  		@user = ::User.find(user_id)
   		@recipient_email = @user.email
-  		@report_download_url = report_download_url
+      if 'login_required' == ClarkKent.email_security
+        @report_filename = report_accessor
+      else
+        @report_download_url = report_accessor
+      end
   		@subject = "Your report #{@report.name} is ready"
   		mail(to: @recipient_email, subject: @subject)
   	end
 
     def report_error(report_id, user_id, error_message)
       @report = Report.find(report_id)
-      @user = User.find(user_id)
+      @user = ::User.find(user_id)
       @recipient_email = @user.email
       @error_message = error_message
       @subject = "Your report #{@report.name} has a problem"

data/app/models/clark_kent/report.rb

@@ -28,8 +28,10 @@ require 'aws-sdk-v1'
     def self.send_report_to_s3(report_id, params)
       report_class = params[:report_class].constantize if params[:report_class]
       report_class ||= ::ClarkKent::Report
+
       reportable = report_class.find(report_id)
-      report = ('ClarkKent::ReportEmail' == report_class.name) ? reportable.report : reportable
+      is_email = 'ClarkKent::ReportEmail' == report_class.name
+      report = is_email ? reportable.report : reportable
       query = reportable.get_query(params)
       row_count = reportable.get_query(params, true)
       bucket = AWS::S3::Bucket.new(ClarkKent.bucket_name)
@@ -74,7 +76,11 @@ require 'aws-sdk-v1'
         report.browser_tab_id = params[:browser_tab_id]
         report.broadcast_change
       end
-      report.report_result_url.to_s
+      if is_email && 'login_required' == ClarkKent.email_security
+        params[:report_result_name]
+      else
+        report.report_result_url.to_s
+      end
     end
 
     def viable_report_columns

data/app/models/clark_kent/report_email.rb

@@ -33,7 +33,7 @@ module ClarkKent
 
     def send_emails
       self.user_report_emails.each do |user_report_email|
-        ConeyIsland.submit(ClarkKent::ReportEmail, :send_email, instance_id: self.id, args: [user_report_email.user_id], timeout: 300, work_queue: 'boardwalk')
+        ConeyIsland.submit(ClarkKent::ReportEmail, :send_email, instance_id: self.id, args: [user_report_email.user_id], timeout: 300, work_queue: ClarkKent.work_queue)
       end
     end
 
@@ -52,10 +52,10 @@ module ClarkKent
       end
       report_download_url = ClarkKent::Report.send_report_to_s3(self.id, params)
       mail = ClarkKent::ReportMailer.report_run(self.report_id, user_id, report_download_url)
-      Sendgrid.send_message(mail)
+      mail.deliver_now
     rescue ClarkKent::ReportFilterError => e
       mail = ClarkKent::ReportMailer.report_error(self.report_id, user_id, e.message)
-      Sendgrid.send_message(mail)
+      mail.deliver_now
     end
 
     def report_filter_params

data/app/views/clark_kent/report_mailer/report_run.html.erb

@@ -1,2 +1,7 @@
-Click this link to download your report:
-<a href="<%= @report_download_url %>"><%= @report.name %></a>
+<% if @report_download_url %>
+  Click this link to download your report:
+  <a href="<%= @report_download_url %>"><%= @report.name %></a>
+<% elsif @report_filename %>
+  Your report is ready to download. Log into your Amazon S3 account and download 
+  <%= @report_filename %>.
+<% end %>

data/lib/clark_kent.rb

@@ -5,7 +5,7 @@ require 'aws-sdk-v1'
 
 module ClarkKent
   mattr_accessor  :resource_options, :user_class_name, :other_sharing_scopes, :base_controller,
-                  :custom_report_links, :current_user_method
+                  :custom_report_links, :current_user_method, :work_queue, :email_security
 
   def self.bucket_name
     @@bucket_name || "clark-kent"
@@ -20,6 +20,8 @@ module ClarkKent
     @@base_controller = base_controller_name.constantize if base_controller_name.present?
     @@custom_report_links = options[:custom_report_links] || []
     @@current_user_method = options[:current_user_method]
+    @@work_queue = options[:work_queue]
+    @@email_security = options[:email_security]
   end
 
   def self.user_class

data/lib/clark_kent/version.rb

@@ -1,3 +1,3 @@
 module ClarkKent
-  VERSION = "0.10.4"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clark_kent
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.11.0
 platform: ruby
 authors:
 - Eric Draut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails