effective_polls 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2a4120a9cd2b5fbc37b308c90a3a7be20ce79fb037397a6636ddfdbac3d282c
-  data.tar.gz: 56b216f17de807b939d873abd94a4e01d51d4db0e87b3b70cc10c7a3c29e9b61
+  metadata.gz: e014f4462a07752d6e06f332934f392c6b396c0f7f6279501f11036005d627fa
+  data.tar.gz: a108863da8039d6aa608d10aa043fef580b435c5c8dff564d382e69120338027
 SHA512:
-  metadata.gz: 9578aa8b280568129a0f6e08e50bd7d468bcf1b437ad4cdbbd33674f6b16e9d84cea00dde23c054619d31f4d04f83d8aa44d66dc1a891f514c93e6a5243db300
-  data.tar.gz: c70422cee9227111893240ba47d54f7779fb65a5a3abd5f8e9c19aaa71756abf46b1a08b28749774a4dc97287e561281ffeefc3c073ca44c8f31373bfda558d7
+  metadata.gz: e790818639b367c3357f162ff66ee9f795242e337f01d79bab869d0fd63da2b6a9b7b82b097793149f8e1576460253945535161d5e982023e471fa7f3c47b431
+  data.tar.gz: 7197c7a2dcec5fb46a781e5979998ed9602e2dda492f9c885b1f8b3b0be28dc9796255b0e7a9f9a7ccf42b3a4ced34f6e61b81d32fc8fa8cb41699b4fe13d196

data/app/mailers/effective/polls_mailer.rb

@@ -2,7 +2,7 @@ module Effective
   class PollsMailer < EffectivePolls.parent_mailer_class
 
     include EffectiveMailer
-    include EffectiveEmailTemplatesMailer if EffectivePolls.use_effective_email_templates
+    include EffectiveEmailTemplatesMailer
 
     def poll_upcoming_reminder(poll_notification, user)
       @assigns = effective_email_templates_assigns(poll_notification, user)
@@ -70,7 +70,6 @@ module Effective
       raise('expected poll to be persisted') unless poll&.persisted?
 
       {
-        subject: poll_notification.subject,
         available_date: poll.available_date,
         title: poll.title,
         url: effective_polls.poll_url(poll),

data/app/models/effective/poll_notification.rb

@@ -72,10 +72,8 @@ module Effective
     validates :subject, presence: true
     validates :body, presence: true
 
-    with_options(if: -> { EffectivePolls.use_effective_email_templates }) do
-      validates :body, liquid: true
-      validates :subject, liquid: true
-    end
+    validates :body, liquid: true
+    validates :subject, liquid: true
 
     validates :reminder, if: -> { reminder? || upcoming_reminder? || before_poll_ends? },
       presence: true, uniqueness: { scope: [:poll_id, :category], message: 'already exists' }

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

@@ -14,18 +14,15 @@
     = f.show_if :category, category do
       .my-3= render "/admin/poll_notifications/form_#{template}", f: f
       
-      = f.select :from, EffectivePolls.mailer_froms
-
-      - if f.object.category == category
+      - if f.object.category == category && f.object.persisted?
+        = f.select :from, mailer_froms_collection(), label: 'From'
         = f.text_field :subject
         = f.text_area :body, rows: 10
-
-      - elsif EffectivePolls.use_effective_email_templates == false
-        = f.text_field :subject, value: ''
-        = f.text_area :body, rows: 10, value: ''
-
       - else
         - email_template = Effective::EmailTemplate.where(template_name: template).first!
+        - from_value = email_template.from || EffectiveResources.mailer_froms.first
+
+        = f.select :from, mailer_froms_collection(), label: 'From', value: from_value
         = f.text_field :subject, value: email_template.subject
         = f.text_area :body, rows: 10, value: email_template.body
 
@@ -35,6 +32,6 @@
           - Effective::PollNotification::EMAIL_TEMPLATE_VARIABLES.each do |variable|
             %li {{ #{variable} }}
 
-        %small.text-muted Only a developer can add additional variables
+        %small.text-muted Please contact us to add additional variables
 
   = effective_submit(f)

data/config/effective_polls.rb

@@ -21,7 +21,7 @@ EffectivePolls.setup do |config|
   # config.mailer_sender = nil      # Default From value
   # config.mailer_froms = nil       # Default Froms collection
   # config.mailer_admin = nil       # Default To value for Admin correspondence
+  #
+  # We always use effective_email_templates
 
-  # Use effective email templates for event notifications
-  config.use_effective_email_templates = true
 end

data/lib/effective_polls/version.rb

@@ -1,3 +1,3 @@
 module EffectivePolls
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

data/lib/effective_polls.rb

@@ -8,7 +8,7 @@ module EffectivePolls
   def self.config_keys
     [
       :layout,
-      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_froms, :mailer_admin, :mailer_subject, :use_effective_email_templates
+      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_froms, :mailer_admin, :mailer_subject
     ]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_polls
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-25 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: effective_resources
+  name: effective_email_templates
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: wicked
+  name: effective_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: wicked
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,13 +95,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: effective_test_bot
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: effective_email_templates
+  name: effective_test_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="