biovision-poll 0.1.180917.0 → 0.2.200324.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e673d23a9adf4f6fd8b9a31e41d117bc29cd0821a687e4b5a650f83cbe400035
-  data.tar.gz: dca9cfa8d1ab77d328e39ee1930b4a24112f0dca08695a45d8a22ad13239216a
+  metadata.gz: 3e28e8495e436c2f955aba432356fbea9112fec0496e039ec8098ac4ce892740
+  data.tar.gz: c3216e389c001b74779453256aaba57c0f8b9c8fa47a67af463f892fe7d2a11a
 SHA512:
-  metadata.gz: 2b2e12f2d66ab1451ec17c5b5190a85a5f993b59bede884793e5cff0b37435dae42fa28844e5fc23c288e41ab0b22b1adb14f953b94bfbb77b5be06852b0e338
-  data.tar.gz: acde6ad3f720aedec127251e1a0e78824240220ff70fefcd554c57beb990eab5a1b98e0f5b6e541f98be3a0c5985d8a1621738e9690c8f518da3e4a344441208
+  metadata.gz: ba371cfdaaacdb94fe3c5816e6cda59ce155b3ee35570d8da7b4a5163330c8a81424c5dc037c434ef7f4aa6df4b1c51ab2f7e4a1713f0c354e346d936f97422d
+  data.tar.gz: f1c16c57a3bc5b7ed105725125244064f13946b8622264194116d571d1912f7b972d4bb420e3d96dc9e085e76d54e810d197bb1d5019cbfb47dfd7277bdbddd7

data/app/controllers/admin/poll_answers_controller.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Administrative part of hanlding poll answers
 class Admin::PollAnswersController < AdminController
   include ToggleableEntity
   include EntityPriority
@@ -11,14 +14,12 @@ class Admin::PollAnswersController < AdminController
 
   private
 
-  def restrict_access
-    require_privilege_group :poll_managers
+  def component_class
+    Biovision::Components::PollsComponent
   end
 
   def set_entity
     @entity = PollAnswer.find_by(id: params[:id])
-    if @entity.nil?
-      handle_http_404('Cannot find poll answer')
-    end
+    handle_http_404('Cannot find poll answer') if @entity.nil?
   end
 end

data/app/controllers/admin/poll_questions_controller.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Administrative part for hanlding poll questions
 class Admin::PollQuestionsController < AdminController
   include ToggleableEntity
   include EntityPriority
@@ -10,14 +13,12 @@ class Admin::PollQuestionsController < AdminController
 
   private
 
-  def restrict_access
-    require_privilege_group :poll_managers
+  def component_class
+    Biovision::Components::PollsComponent
   end
 
   def set_entity
     @entity = PollQuestion.find_by(id: params[:id])
-    if @entity.nil?
-      handle_http_404('Cannot find poll question')
-    end
+    handle_http_404('Cannot find poll question') if @entity.nil?
   end
 end

data/app/controllers/admin/polls_controller.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
+# Administrative part of handling polls
 class Admin::PollsController < AdminController
   include ToggleableEntity
   
-  before_action :set_entity, except: [:index]
+  before_action :set_entity, except: :index
 
   # get /admin/polls
   def index
@@ -37,14 +40,12 @@ class Admin::PollsController < AdminController
 
   private
 
-  def restrict_access
-    require_privilege_group :poll_managers
+  def component_class
+    Biovision::Components::PollsComponent
   end
 
   def set_entity
     @entity = Poll.find_by(id: params[:id])
-    if @entity.nil?
-      handle_http_404('Cannot find poll')
-    end
+    handle_http_404('Cannot find poll') if @entity.nil?
   end
 end

data/app/controllers/poll_answers_controller.rb

@@ -1,5 +1,15 @@
+# frozen_string_literal: true
+
+# Editing poll answers
 class PollAnswersController < AdminController
-  before_action :set_entity, only: [:edit, :update, :destroy]
+  before_action :set_entity, only: %i[edit update destroy]
+
+  # post /poll_answers/check
+  def check
+    @entity = PollAnswer.instance_for_check(params[:entity_id], entity_parameters)
+
+    render 'shared/forms/check'
+  end
 
   # post /poll_answers
   def create
@@ -26,23 +36,19 @@ class PollAnswersController < AdminController
 
   # delete /poll_answers/:id
   def destroy
-    if @entity.destroy
-      flash[:notice] = t('poll_answers.destroy.success')
-    end
+    flash[:notice] = t('.success') if @entity.destroy
     redirect_to(admin_poll_question_path(id: @entity.poll_question_id))
   end
 
   protected
 
-  def restrict_access
-    require_privilege_group :poll_managers
+  def component_class
+    Biovision::Components::PollsComponent
   end
 
   def set_entity
     @entity = PollAnswer.find_by(id: params[:id])
-    if @entity.nil?
-      handle_http_404('Cannot find poll answer')
-    end
+    handle_http_404('Cannot find poll answer') if @entity.nil?
   end
 
   def entity_parameters

data/app/controllers/poll_questions_controller.rb

@@ -1,5 +1,15 @@
+# frozen_string_literal: true
+
+# Managing poll questions
 class PollQuestionsController < AdminController
-  before_action :set_entity, only: [:edit, :update, :destroy]
+  before_action :set_entity, only: %i[edit update destroy]
+
+  # post /poll_questions/check
+  def check
+    @entity = PollQuestion.instance_for_check(params[:entity_id], entity_parameters)
+
+    render 'shared/forms/check'
+  end
 
   # post /poll_questions
   def create
@@ -26,23 +36,19 @@ class PollQuestionsController < AdminController
 
   # delete /poll_questions/:id
   def destroy
-    if @entity.destroy
-      flash[:notice] = t('poll_questions.destroy.success')
-    end
+    flash[:notice] = t('.success') if @entity.destroy
     redirect_to(admin_poll_path(id: @entity.poll_id))
   end
 
   protected
 
-  def restrict_access
-    require_privilege_group :poll_managers
+  def component_class
+    Biovision::Components::PollsComponent
   end
 
   def set_entity
     @entity = PollQuestion.find_by(id: params[:id])
-    if @entity.nil?
-      handle_http_404('Cannot find poll question')
-    end
+    handle_http_404('Cannot find poll question') if @entity.nil?
   end
 
   def entity_parameters

data/app/controllers/polls_controller.rb

@@ -1,8 +1,18 @@
+# frozen_string_literal: true
+
+# Displaying and editing polls
 class PollsController < ApplicationController
-  before_action :restrict_access, except: [:index, :show, :results, :answer]
-  before_action :set_entity, except: [:index, :new, :create]
-  
-  layout 'admin', except: [:index, :show, :results]
+  before_action :restrict_access, except: %i[index show results answer]
+  before_action :set_entity, except: %i[check index new create]
+
+  layout 'admin', except: %i[check index show results]
+
+  # post /polls/check
+  def check
+    @entity = Poll.instance_for_check(params[:entity_id], entity_parameters)
+
+    render 'shared/forms/check'
+  end
 
   # get /polls
   def index
@@ -26,9 +36,7 @@ class PollsController < ApplicationController
 
   # get /polls/:id
   def show
-    unless @entity.visible_to?(current_user)
-      redirect_to polls_path
-    end
+    redirect_to polls_path unless @entity.visible_to?(current_user)
   end
 
   # get /polls/:id/edit
@@ -46,17 +54,15 @@ class PollsController < ApplicationController
 
   # delete /polls/:id
   def destroy
-    if @entity.destroy
-      flash[:notice] = t('polls.destroy.success')
-    end
+    flash[:notice] = t('.success') if @entity.destroy
     redirect_to(admin_polls_path)
   end
 
   # post /polls/:id/results
   def answer
-    @entity.process_answers(current_user, params.require(:answer))
+    @entity.process_answers(current_user, params.require(:answer), owner_for_entity(true), visitor_slug)
 
-    redirect_to root_path(id: @entity.id)
+    redirect_to results_poll_path(id: @entity.id)
   end
 
   # get /polls/:id/results
@@ -66,15 +72,18 @@ class PollsController < ApplicationController
 
   protected
 
+  def component_class
+    Biovision::Components::PollsComponent
+  end
+
   def restrict_access
-    require_privilege_group :poll_managers
+    error = 'Managing polls is not allowed for current user'
+    handle_http_401(error) unless component_handler.allow?
   end
 
   def set_entity
     @entity = Poll.find_by(id: params[:id])
-    if @entity.nil?
-      handle_http_404('Cannot find poll')
-    end
+    handle_http_404('Cannot find poll') if @entity.nil?
   end
 
   def entity_parameters

data/app/helpers/polls_helper.rb

@@ -1,42 +1,32 @@
+# frozen_string_literal: true
+
+# Helper methods for polls component
 module PollsHelper
   # @param [Poll] entity
-  def admin_poll_link(entity)
-    link_to(entity.name, admin_poll_path(id: entity.id))
+  # @param [String] text
+  # @param [Hash] options
+  def admin_poll_link(entity, text = entity.name, options = {})
+    link_to(text, admin_poll_path(id: entity.id), options)
   end
 
   # @param [PollQuestion] entity
-  def admin_poll_question_link(entity)
-    link_to(entity.text, admin_poll_question_path(id: entity.id))
+  # @param [String] text
+  # @param [Hash] options
+  def admin_poll_question_link(entity, text = entity.text, options = {})
+    link_to(text, admin_poll_question_path(id: entity.id), options)
   end
 
   # @param [PollAnswer] entity
-  def admin_poll_answer_link(entity)
-    link_to(entity.text, admin_poll_answer_path(id: entity.id))
-  end
-
-  # @param [Poll] entity
-  def poll_link(entity)
-    link_to(entity.name, poll_path(id: entity.id))
-  end
-
-  # @param [Poll] entity
-  def poll_image_medium(entity)
-    return '' if entity.image.blank?
-    versions = "#{entity.image.medium_2x.url} 2x"
-    image_tag(entity.image.medium.url, alt: entity.name, srcset: versions)
-  end
-
-  # @param [Poll] entity
-  def poll_image_small(entity)
-    return '' if entity.image.blank?
-    versions = "#{entity.image.medium.url} 2x"
-    image_tag(entity.image.small.url, alt: entity.name, srcset: versions)
+  # @param [String] text
+  # @param [Hash] options
+  def admin_poll_answer_link(entity, text = entity.text, options = {})
+    link_to(text, admin_poll_answer_path(id: entity.id), options)
   end
 
   # @param [Poll] entity
-  def poll_image_preview(entity)
-    return '' if entity.image.blank?
-    versions = "#{entity.image.preview_2x.url} 2x"
-    image_tag(entity.image.preview.url, alt: entity.name, srcset: versions)
+  # @param [String] text
+  # @param [Hash] options
+  def poll_link(entity, text = entity.name, options = {})
+    link_to(text, poll_path(id: entity.id), options)
   end
 end

data/app/models/poll.rb

@@ -1,49 +1,78 @@
+# frozen_string_literal: true
+
+# Poll
+# 
+# Attributes:
+#   active [boolean]
+#   agent_id [Agent], optional
+#   allow_comments [Boolean]
+#   anonymous_votes [boolean]
+#   comments_count [integer]
+#   created_at [DateTime]
+#   data [jsonb]
+#   description [string], optional
+#   end_date [date], optional
+#   exclusive [boolean]
+#   ip [inet]
+#   language_id [Language], optional
+#   name [string]
+#   open_results [boolean]
+#   poll_questions_count [integer]
+#   pollable_id [integer], optional
+#   pollable_type [string], optional
+#   show_on_homepage [boolean]
+#   simple_image_id [SimpleImage], optional
+#   updated_at [DateTime]
+#   user_id [User]
+#   uuid [uuid]
+#   visible [boolean]
 class Poll < ApplicationRecord
+  include Checkable
   include HasOwner
+  include HasSimpleImage
+  include HasUuid
   include Toggleable
 
-  PER_PAGE          = 10
   NAME_LIMIT        = 140
   DESCRIPTION_LIMIT = 255
 
-  toggleable %i[active anonymous_votes open_results show_on_homepage visible exclusive]
-
-  mount_uploader :image, PollImageUploader
+  toggleable %i[active anonymous_votes open_results show_on_homepage exclusive visible]
 
   belongs_to :user
   belongs_to :agent, optional: true
-  belongs_to :region, optional: true if Gem.loaded_specs.key?('biovision-regions')
   belongs_to :pollable, polymorphic: true, optional: true
   has_many :poll_questions, dependent: :delete_all
   has_many :poll_users, dependent: :delete_all
 
   validates_presence_of :name
-  validates_length_of :name, maximum: NAME_LIMIT
   validates_length_of :description, maximum: DESCRIPTION_LIMIT
+  validates_length_of :name, maximum: NAME_LIMIT
 
   scope :recent, -> { order('id desc') }
   scope :visible, -> { where(visible: true) }
-  scope :active, -> { visible.where('active = true and (end_date is null or (date(end_date) >= date(now())))') }
+  scope :active, -> { where('active = true and (end_date is null or (date(end_date) >= date(now())))') }
+  scope :list_for_visitors, -> { active.visible.recent }
+  scope :list_for_administration, -> { recent }
 
   # @param [Integer] page
   def self.page_for_administration(page = 1)
-    recent.page(page).per(PER_PAGE)
+    list_for_administration.page(page)
   end
 
   # @param [Integer] page
   def self.page_for_visitors(page = 1)
-    visible.recent.page(page).per(PER_PAGE)
+    list_for_visitors.page(page)
   end
 
   def self.entity_parameters
-    Poll.toggleable_attributes + %i(image name description end_date)
+    Poll.toggleable_attributes + %i[description end_date name simple_image_id]
   end
 
   # @param [User] user
   def editable_by?(user)
     return false if user.nil?
-    privilege = :chief_poll_manager
-    owned_by?(user) || UserPrivilege.user_has_privilege?(user, privilege)
+
+    owned_by?(user)
   end
 
   # @param [User] user
@@ -54,6 +83,7 @@ class Poll < ApplicationRecord
   # @param [User] user
   def votable_by?(user)
     return false if user.nil? || voted?(user)
+
     if exclusive?
       includes?(user)
     # elsif anonymous_votes?
@@ -72,10 +102,6 @@ class Poll < ApplicationRecord
     open_results? || editable_by?(user)
   end
 
-  def regional?
-    !region_id.nil?
-  end
-
   # @param [User] user
   def includes?(user)
     poll_users.owned_by(user).exists?
@@ -97,18 +123,24 @@ class Poll < ApplicationRecord
 
   # @param [User] user
   # @param [Hash] answers
-  def process_answers(user, answers)
+  # @param [Hash] tracking
+  # @param [String] slug
+  def process_answers(user, answers, tracking, slug)
     return unless votable_by?(user)
+
     answers.each do |question_id, answer_ids|
       question = PollQuestion.find_by(id: question_id)
       next if question.nil? || question.poll_id != id
+
       if question.multiple_choice?
         answers = question.poll_answers.where(id: answer_ids)
       else
         answers = question.poll_answers.where(id: answer_ids.first)
       end
+
       answers.each do |answer|
-        PollVote.create(poll_answer: answer, user: user)
+        tracking[:slug] = slug
+        answer.poll_votes.create(tracking)
       end
     end
   end