effective_polls 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f66e30b255f3552e0c56f6c7b6b4fa7958360f4a6b59cd77d30e829105444491
-  data.tar.gz: 8950bced702e1ca99e324449238156880b3659a542838fb761fe1291d492109d
+  metadata.gz: d41a8e03b1472d6bab3f7b4dd41b667aa039baa63196fc43d486fefcc12808df
+  data.tar.gz: 7ebae168fb97dc5f7669d28aaab5531875e6f49f6dd9b8680d71d604640dc508
 SHA512:
-  metadata.gz: 83401587a66ec82a26a108575e90c9e7cfea3ad0fdfebce30179d31ef392467ba6549bdfdcbe51ee56e3a009dc1232eaf2f03ade8e6454bebd5c5002e1b3d8b4
-  data.tar.gz: 1f208285019d5b8cec81fa03a53c0106ac86119206549589049e3eeaec51d49726dceb9e624a1fd0fbbcba1bff030b66936d260c97fde61e42f8742651d7d310
+  metadata.gz: '031615950f4ad6e1cfc44d08282d950f5b01a874a2257638a5cb30c8ad9ecc7866b9bee8b5345ba93025548c5b73ed138ee5dba6c7648688723beccd01fb12f1'
+  data.tar.gz: 52b6cba435bbd0f0d05ae3d4250a85623185dba7a4aa11990e5ee419555b9fa0119e59989c8bfc8af4c26cdf1a1ca6e2d117cea515d662d6b1d974d81af39e7c

data/app/datatables/admin/effective_poll_notifications_datatable.rb

@@ -23,6 +23,8 @@ class Admin::EffectivePollNotificationsDatatable < Effective::Datatable
         Effective::PollNotification::UPCOMING_REMINDERS.invert[poll_notification.reminder]
       when 'Reminder'
         Effective::PollNotification::REMINDERS.invert[poll_notification.reminder]
+      when 'Before poll ends'
+        Effective::PollNotification::UPCOMING_REMINDERS.invert[poll_notification.reminder]
       else
         raise('unexpected category')
       end

data/app/mailers/effective/polls_mailer.rb

@@ -35,6 +35,17 @@ module Effective
       )
     end
 
+    def poll_before_poll_ends(poll_notification, user)
+      @assigns = effective_email_templates_assigns(poll_notification, user)
+
+      mail(
+        to: user.email,
+        from: poll_notification.from,
+        body: poll_notification.body,
+        subject: poll_notification.subject
+      )
+    end
+
     def poll_when_poll_ends(poll_notification, user)
       @assigns = effective_email_templates_assigns(poll_notification, user)
 
@@ -59,7 +70,7 @@ module Effective
       {
         available_date: poll.available_date,
         title: poll.title,
-        url: effective_polls.new_poll_ballot_url(poll),
+        url: effective_polls.poll_url(poll),
         user: {
           name: user.to_s,
           email: user.email

data/app/models/effective/poll_notification.rb

@@ -3,7 +3,7 @@ module Effective
     belongs_to :poll
     log_changes(to: :poll) if respond_to?(:log_changes)
 
-    CATEGORIES = ['Upcoming reminder', 'When poll starts', 'Reminder', 'When poll ends']
+    CATEGORIES = ['Upcoming reminder', 'When poll starts', 'Reminder', 'Before poll ends', 'When poll ends']
     EMAIL_TEMPLATE_VARIABLES = ['available_date', 'title', 'url', 'user.name', 'user.email']
 
     UPCOMING_REMINDERS = {
@@ -77,7 +77,7 @@ module Effective
       validates :subject, liquid: true
     end
 
-    validates :reminder, if: -> { reminder? || upcoming_reminder? },
+    validates :reminder, if: -> { reminder? || upcoming_reminder? || before_poll_ends? },
       presence: true, uniqueness: { scope: [:poll_id, :category], message: 'already exists' }
 
     def to_s
@@ -100,6 +100,10 @@ module Effective
       category == 'Reminder'
     end
 
+    def before_poll_ends?
+      category == 'Before poll ends'
+    end
+
     def poll_end?
       category == 'When poll ends'
     end
@@ -120,16 +124,18 @@ module Effective
         !poll.started? && poll.start_at < (Time.zone.now + reminder)
       when 'Reminder'
         !poll.ended? && poll.start_at < (Time.zone.now - reminder)
+      when 'Before poll ends'
+        !poll.ended? && poll.end_at.present? && poll.end_at < (Time.zone.now + reminder)
       else
         raise('unexpected category')
       end
     end
 
-    def notify!
-      return false unless notify_now?
+    def notify!(force: false)
+      return false unless (notify_now? || force)
 
       # We send to all users, except for the 'Reminder' that exclude completed users
-      users = poll.users(except_completed: (category == 'Reminder'))
+      users = poll.users(except_completed: (category == 'Reminder' || category == 'Before poll ends'))
 
       update_column(:started_at, Time.zone.now)
 

data/app/views/admin/poll_notifications/_form_poll_before_poll_ends.html.haml

@@ -0,0 +1,8 @@
+= f.select :reminder, Effective::PollNotification::UPCOMING_REMINDERS, label: false,
+  hint: "before the poll ends on #{f.object.poll&.end_at&.strftime('%F') || 'never'}."
+
+.alert.alert-warning
+  %strong Before Poll Ends
+  reminders are sent to users in the audience who have not yet completed their ballot.
+  %br
+  Use before poll ends notifications to remind people to vote.

data/app/views/effective/polls_mailer/poll_before_poll_ends.liquid

@@ -0,0 +1,13 @@
+---
+subject: 'Please submit your ballot for {{ title }}'
+from: 'admin@example.com'
+---
+Hello {{ user.name }},
+
+The {{ title }} poll is almost complete.
+
+Please remember to submit your ballot.
+
+{{ url }}
+
+Thank you

data/lib/effective_polls/version.rb

@@ -1,3 +1,3 @@
 module EffectivePolls
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_polls
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,7 +104,6 @@ files:
 - app/datatables/effective_polls_datatable.rb
 - app/helpers/effective_polls_helper.rb
 - app/mailers/effective/polls_mailer.rb
-- app/models/effective/access_denied.rb
 - app/models/effective/ballot.rb
 - app/models/effective/ballot_response.rb
 - app/models/effective/ballot_response_option.rb
@@ -113,6 +112,7 @@ files:
 - app/models/effective/poll_question.rb
 - app/models/effective/poll_question_option.rb
 - app/views/admin/poll_notifications/_form.html.haml
+- app/views/admin/poll_notifications/_form_poll_before_poll_ends.html.haml
 - app/views/admin/poll_notifications/_form_poll_reminder.html.haml
 - app/views/admin/poll_notifications/_form_poll_upcoming_reminder.html.haml
 - app/views/admin/poll_notifications/_form_poll_when_poll_ends.html.haml
@@ -171,6 +171,7 @@ files:
 - app/views/effective/poll_results/results/_select_up_to_5.html.haml
 - app/views/effective/poll_results/results/_short_answer.html.haml
 - app/views/effective/poll_results/results/_upload_file.html.haml
+- app/views/effective/polls_mailer/poll_before_poll_ends.liquid
 - app/views/effective/polls_mailer/poll_reminder.liquid
 - app/views/effective/polls_mailer/poll_upcoming_reminder.liquid
 - app/views/effective/polls_mailer/poll_when_poll_ends.liquid

data/app/models/effective/access_denied.rb

@@ -1,17 +0,0 @@
-unless defined?(Effective::AccessDenied)
-  module Effective
-    class AccessDenied < StandardError
-      attr_reader :action, :subject
-
-      def initialize(message = nil, action = nil, subject = nil)
-        @message = message
-        @action = action
-        @subject = subject
-      end
-
-      def to_s
-        @message || I18n.t(:'unauthorized.default', :default => 'Access Denied')
-      end
-    end
-  end
-end