effective_polls 0.1.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75f0f5786c67293ac7c6e5d8758334fe217c3d2b6361185ec36a8792fe751eaf
-  data.tar.gz: '08c11bd2988f3cf8c8ab81b3ffaa2fda3d445b7460004cd25d329ba984a81db5'
+  metadata.gz: '092395996d087f516aca9b5aa9f42e170c56702b0dd9c7c7479332cb18a0c2c7'
+  data.tar.gz: 316a9df7d201ed389316f1cc11c5a77310038957520bdaf711666bfcf867ed7a
 SHA512:
-  metadata.gz: acfb2e71deb5da69bb9f37ccc6889cb93aee01624854e37537cadae80c19f49569fbc1d63080ca32c343595158e99a75833a9393efd1d9c311408151e2b4392d
-  data.tar.gz: 1adb90d91b12bed10d2eb7260080487eac8e5e2c689f171b0032a8dce139e4ddd7fe1e3f1a779826032cef0234b8b0fd1f7247c125e0c0a0c97364ac56c87056
+  metadata.gz: d4f8a181881338bd4f274194770d82fb632f0456910d1df843ec404025d4eaceb219fca21215e70d44c278a6f1791dff199fbab9b3cd2f6e88fadc6498fbfa7a
+  data.tar.gz: 7dae7c572c9236edcae987f7d3a4e1afce6cd65557890a82c81797b7a7d12816157020d0966379c3f70322d08ffdc7a0bde593c755ffe824153e3a97a4be3a4f

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2021 Code and Effect Inc.
+Copyright 2023 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -10,7 +10,7 @@ Works with action_text for content bodies, and active_storage for file uploads.
 
 ## Getting Started
 
-This requires Rails 6+ and Twitter Bootstrap 4 and just works with Devise.
+This requires Rails 6 and Twitter Bootstrap 4 and just works with Devise.
 
 Please first install the [effective_datatables](https://github.com/code-and-effect/effective_datatables) gem.
 
@@ -19,7 +19,7 @@ Please download and install the [Twitter Bootstrap4](http://getbootstrap.com)
 Add to your Gemfile:
 
 ```ruby
-gem 'haml-rails' # or try using gem 'hamlit-rails'
+gem 'haml'
 gem 'effective_polls'
 ```
 

data/Rakefile

@@ -1,27 +1,13 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'EffectivePolls'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require "bundler/setup"
 
 APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
-load 'rails/tasks/engine.rake'
+load "rails/tasks/engine.rake"
 
-load 'rails/tasks/statistics.rake'
+load "rails/tasks/statistics.rake"
 
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 
-require 'rake/testtask'
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'

data/app/controllers/admin/poll_notifications_controller.rb

@@ -1,9 +1,7 @@
 module Admin
   class PollNotificationsController < ApplicationController
-    layout EffectivePolls.layout[:admin]
-
     before_action(:authenticate_user!) if defined?(Devise)
-    before_action { EffectivePolls.authorize!(self, :admin, :effective_polls) }
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_polls) }
 
     include Effective::CrudController
 

data/app/controllers/admin/poll_questions_controller.rb

@@ -1,9 +1,7 @@
 module Admin
   class PollQuestionsController < ApplicationController
-    layout EffectivePolls.layout[:admin]
-
     before_action(:authenticate_user!) if defined?(Devise)
-    before_action { EffectivePolls.authorize!(self, :admin, :effective_polls) }
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_polls) }
 
     include Effective::CrudController
 

data/app/controllers/admin/polls_controller.rb

@@ -1,15 +1,13 @@
 module Admin
   class PollsController < ApplicationController
-    layout EffectivePolls.layout[:admin]
-
     before_action(:authenticate_user!) if defined?(Devise)
-    before_action { EffectivePolls.authorize!(self, :admin, :effective_polls) }
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_polls) }
 
     include Effective::CrudController
 
     def results
       @poll = Effective::Poll.find(params[:id])
-      EffectivePolls.authorize!(self, :results, @poll)
+      EffectiveResources.authorize!(self, :results, @poll)
 
       @datatable = Admin::EffectivePollResultsDatatable.new(poll_token: @poll.token)
       @page_title = "#{@poll} Results"

data/app/controllers/effective/ballots_controller.rb

@@ -1,8 +1,7 @@
 module Effective
   class BallotsController < ApplicationController
-    layout EffectivePolls.layout[:polls]
-
     before_action(:authenticate_user!) if defined?(Devise)
+
     include Effective::WizardController
 
     resource_scope do

data/app/controllers/effective/polls_controller.rb

@@ -4,7 +4,8 @@ module Effective
 
     def show
       poll = Effective::Poll.find(params[:id])
-      EffectivePolls.authorize!(self, :show, poll)
+
+      EffectiveResources.authorize!(self, :show, poll)
 
       ballot = Effective::Ballot.where(poll: poll, user: current_user).first
 

data/app/mailers/effective/polls_mailer.rb

@@ -1,6 +1,8 @@
 module Effective
-  class PollsMailer < EffectivePolls.mailer_class
-    layout EffectivePolls.mailer[:layout].presence || 'effective_polls_mailer_layout'
+  class PollsMailer < EffectivePolls.parent_mailer_class
+
+    include EffectiveMailer
+    include EffectiveEmailTemplatesMailer if EffectivePolls.use_effective_email_templates
 
     def poll_upcoming_reminder(poll_notification, user)
       @assigns = effective_email_templates_assigns(poll_notification, user)
@@ -68,6 +70,7 @@ 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/config/effective_polls.rb

@@ -1,40 +1,7 @@
 EffectivePolls.setup do |config|
-  config.polls_table_name = :polls
-  config.poll_notifications_table_name = :poll_notifications
-  config.poll_questions_table_name = :poll_questions
-  config.poll_question_options_table_name = :poll_question_options
-  config.ballots_table_name = :ballots
-  config.ballot_responses_table_name = :ballot_responses
-  config.ballot_response_options_table_name = :ballot_response_options
-
-  # Authorization Method
-  #
-  # This method is called by all controller actions with the appropriate action and resource
-  # If it raises an exception or returns false, an Effective::AccessDenied Error will be raised
-  #
-  # Use via Proc:
-  # Proc.new { |controller, action, resource| authorize!(action, resource) }       # CanCan
-  # Proc.new { |controller, action, resource| can?(action, resource) }             # CanCan with skip_authorization_check
-  # Proc.new { |controller, action, resource| authorize "#{action}?", resource }   # Pundit
-  # Proc.new { |controller, action, resource| current_user.is?(:admin) }           # Custom logic
-  #
-  # Use via Boolean:
-  # config.authorization_method = true  # Always authorized
-  # config.authorization_method = false # Always unauthorized
-  #
-  # Use via Method (probably in your application_controller.rb):
-  # config.authorization_method = :my_authorization_method
-  # def my_authorization_method(resource, action)
-  #   true
-  # end
-  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) }
-
   # Layout Settings
   # Configure the Layout per controller, or all at once
-  config.layout = {
-    polls: 'application',
-    admin: 'admin'
-  }
+  # config.layout = { application: 'application', admin: 'admin' }
 
   # Audience Scope Collection
   #
@@ -51,14 +18,19 @@ EffectivePolls.setup do |config|
   # Schedule rake effective_polls:notify to run every 10 minutes
   # to send out email poll notifications
   #
-  config.mailer = {
-    layout: 'effective_polls_mailer_layout',
-    default_from: 'no-reply@example.com'
-  }
-
-  # Will work with effective_email_templates gem:
-  # - The poll notifications email content will be preopulated based off the template
-  # - Uses a EmailTemplatesMailer mailer instead of ActionMailer::Base
-  config.use_effective_email_templates = false
+  # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
+  #
+  # Configure the class responsible to send e-mails.
+  # config.mailer = 'Effective::EventsMailer'
+  #
+  # Override effective_resource mailer defaults
+  #
+  # config.parent_mailer = nil      # The parent class responsible for sending emails
+  # config.deliver_method = nil     # The deliver method, deliver_later or deliver_now
+  # config.mailer_layout = nil      # Default mailer layout
+  # config.mailer_sender = nil      # Default From value
+  # config.mailer_admin = nil       # Default To value for Admin correspondence
 
+  # Use effective email templates for event notifications
+  config.use_effective_email_templates = true
 end

data/db/migrate/{01_create_effective_polls.rb.erb → 101_create_effective_polls.rb}

@@ -1,6 +1,6 @@
 class CreateEffectivePolls < ActiveRecord::Migration[6.0]
   def change
-    create_table <%= @polls_table_name %> do |t|
+    create_table :polls do |t|
       t.string :title
 
       t.string :token
@@ -14,8 +14,8 @@ class CreateEffectivePolls < ActiveRecord::Migration[6.0]
       t.datetime :created_at
     end
 
-    create_table <%= @poll_notifications_table_name %> do |t|
-      t.references :poll
+    create_table :poll_notifications do |t|
+      t.integer :poll_id
 
       t.string :category
       t.integer :reminder
@@ -31,8 +31,8 @@ class CreateEffectivePolls < ActiveRecord::Migration[6.0]
       t.datetime :created_at
     end
 
-    create_table <%= @poll_questions_table_name %> do |t|
-      t.references :poll
+    create_table :poll_questions do |t|
+      t.integer :poll_id
 
       t.string :title
       t.string :category
@@ -44,8 +44,8 @@ class CreateEffectivePolls < ActiveRecord::Migration[6.0]
       t.datetime :created_at
     end
 
-    create_table <%= @poll_question_options_table_name %> do |t|
-      t.references :poll_question
+    create_table :poll_question_options do |t|
+      t.integer :poll_question_id
 
       t.string :title
       t.integer :position
@@ -54,9 +54,9 @@ class CreateEffectivePolls < ActiveRecord::Migration[6.0]
       t.datetime :created_at
     end
 
-    create_table <%= @ballots_table_name %> do |t|
-      t.references :poll
-      t.references :user
+    create_table :ballots do |t|
+      t.integer :poll_id
+      t.integer :user_id
 
       t.string :token
       t.text :wizard_steps
@@ -66,10 +66,10 @@ class CreateEffectivePolls < ActiveRecord::Migration[6.0]
       t.datetime :created_at
     end
 
-    create_table <%= @ballot_responses_table_name %> do |t|
-      t.references :ballot
-      t.references :poll
-      t.references :poll_question
+    create_table :ballot_responses do |t|
+      t.integer :ballot_id
+      t.integer :poll_id
+      t.integer :poll_question_id
 
       t.date :date
       t.string :email
@@ -81,9 +81,9 @@ class CreateEffectivePolls < ActiveRecord::Migration[6.0]
       t.datetime :created_at
     end
 
-    create_table <%= @ballot_response_options_table_name %> do |t|
-      t.references :ballot_response
-      t.references :poll_question_option
+    create_table :ballot_response_options do |t|
+      t.integer  :ballot_response_id
+      t.integer :poll_question_option_id
 
       t.datetime :updated_at
       t.datetime :created_at

data/db/seeds.rb

@@ -0,0 +1,35 @@
+puts "Running effective_polls seeds"
+
+Effective::Poll.all.each { |poll| poll.destroy! }
+
+Effective::Ballot.delete_all
+
+def build_effective_poll
+  poll = Effective::Poll.new(
+    title: 'Effective Poll',
+    start_at: (Time.zone.now + 1.day).beginning_of_day,
+    end_at: (Time.zone.now + 1.day).end_of_day,
+    audience: 'All Users'
+  )
+
+  build_poll_question(poll, Effective::PollQuestion::CATEGORIES)
+
+  poll.save!
+  poll
+end
+
+def build_poll_question(poll, category)
+  questions = Array(category).map.with_index do |category, index|
+    question = poll.poll_questions.build(title: "#{category} Question ##{index+1}", category: category)
+
+    if question.poll_question_option?
+      question.poll_question_options.build(title: 'Option A')
+      question.poll_question_options.build(title: 'Option B')
+      question.poll_question_options.build(title: 'Option C')
+    end
+  end
+
+  questions.length == 1 ? questions.first : questions
+end
+
+build_effective_poll()

data/lib/effective_polls/version.rb

@@ -1,3 +1,3 @@
 module EffectivePolls
-  VERSION = '0.1.6'
+  VERSION = '0.3.0'
 end

data/lib/effective_polls.rb

@@ -4,52 +4,20 @@ require 'effective_polls/engine'
 require 'effective_polls/version'
 
 module EffectivePolls
-  mattr_accessor :polls_table_name
-  mattr_accessor :poll_notifications_table_name
-  mattr_accessor :poll_questions_table_name
-  mattr_accessor :poll_question_options_table_name
-  mattr_accessor :ballots_table_name
-  mattr_accessor :ballot_responses_table_name
-  mattr_accessor :ballot_response_options_table_name
 
-  mattr_accessor :authorization_method
-
-  mattr_accessor :layout
-
-  mattr_accessor :audience_user_scopes
-
-  # Hashes of configs
-  mattr_accessor :use_effective_email_templates
-  mattr_accessor :mailer
-
-  def self.setup
-    yield self
+  def self.config_keys
+    [
+      :polls_table_name, :poll_notifications_table_name, :poll_questions_table_name, :poll_question_options_table_name,
+      :ballots_table_name, :ballot_responses_table_name, :ballot_response_options_table_name,
+      :layout, :audience_user_scopes,
+      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject, :use_effective_email_templates
+    ]
   end
 
-  def self.authorized?(controller, action, resource)
-    @_exceptions ||= [Effective::AccessDenied, (CanCan::AccessDenied if defined?(CanCan)), (Pundit::NotAuthorizedError if defined?(Pundit))].compact
-
-    return !!authorization_method unless authorization_method.respond_to?(:call)
-    controller = controller.controller if controller.respond_to?(:controller)
-
-    begin
-      !!(controller || self).instance_exec((controller || self), action, resource, &authorization_method)
-    rescue *@_exceptions
-      false
-    end
-  end
-
-  def self.authorize!(controller, action, resource)
-    raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
-  end
+  include EffectiveGem
 
   def self.mailer_class
-    if use_effective_email_templates
-      require 'effective_email_templates'
-      Effective::EmailTemplatesMailer
-    else
-      ActionMailer::Base
-    end
+    mailer&.constantize || Effective::PollsMailer
   end
 
 end

data/lib/generators/effective_polls/install_generator.rb

@@ -20,15 +20,7 @@ module EffectivePolls
       end
 
       def create_migration_file
-        @polls_table_name = ':' + EffectivePolls.polls_table_name.to_s
-        @poll_questions_table_name = ':' + EffectivePolls.poll_questions_table_name.to_s
-        @poll_notifications_table_name = ':' + EffectivePolls.poll_notifications_table_name.to_s
-        @poll_question_options_table_name = ':' + EffectivePolls.poll_question_options_table_name.to_s
-        @ballots_table_name = ':' + EffectivePolls.ballots_table_name.to_s
-        @ballot_responses_table_name  = ':' + EffectivePolls.ballot_responses_table_name.to_s
-        @ballot_response_options_table_name  = ':' + EffectivePolls.ballot_response_options_table_name.to_s
-
-        migration_template ('../' * 3) + 'db/migrate/01_create_effective_polls.rb.erb', 'db/migrate/create_effective_polls.rb'
+        migration_template ('../' * 3) + 'db/migrate/101_create_effective_polls.rb', 'db/migrate/create_effective_polls.rb'
       end
 
       def copy_mailer_preview

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_polls
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 6.0.0
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: effective_bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: effective_bootstrap
+  name: effective_datatables
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: effective_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,21 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: effective_datatables
+  name: wicked
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: effective_resources
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,6 +94,118 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_test_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_email_templates
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_developer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: Online polls and user voting.
 email:
 - info@codeandeffect.com
@@ -176,10 +302,10 @@ files:
 - app/views/effective/polls_mailer/poll_upcoming_reminder.liquid
 - app/views/effective/polls_mailer/poll_when_poll_ends.liquid
 - app/views/effective/polls_mailer/poll_when_poll_starts.liquid
-- app/views/layouts/effective_polls_mailer_layout.html.haml
 - config/effective_polls.rb
 - config/routes.rb
-- db/migrate/01_create_effective_polls.rb.erb
+- db/migrate/101_create_effective_polls.rb
+- db/seeds.rb
 - lib/effective_polls.rb
 - lib/effective_polls/engine.rb
 - lib/effective_polls/version.rb
@@ -205,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Online polls and user voting.

data/app/views/layouts/effective_polls_mailer_layout.html.haml

@@ -1,7 +0,0 @@
-!!!
-%html{style: 'background: #fff;'}
-  %head
-    %meta{:content => 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type'}
-
-  %body{style: 'background: #fff;'}
-    = yield