decidim-initiatives 0.9.1 → 0.11.0.pre1

data/app/controllers/decidim/initiatives/admin/{feature_permissions_controller.rb → component_permissions_controller.rb}

@@ -3,9 +3,9 @@
 module Decidim
   module Initiatives
     module Admin
-      # Controller that allows managing the Initiative's Feature
+      # Controller that allows managing the Initiative's Component
       # permissions in the admin panel.
-      class FeaturePermissionsController < Decidim::Admin::FeaturePermissionsController
+      class ComponentPermissionsController < Decidim::Admin::ComponentPermissionsController
         include InitiativeAdmin
       end
     end

data/app/controllers/decidim/initiatives/admin/components_controller.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      # Controller that allows managing the Initiative's Components in the
+      # admin panel.
+      class ComponentsController < Decidim::Admin::ComponentsController
+        layout "decidim/admin/initiative"
+
+        include NeedsInitiative
+      end
+    end
+  end
+end

data/app/controllers/decidim/initiatives/admin/initiatives_controller.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     module Admin
-      require 'csv'
+      require "csv"
 
       # Controller used to manage the initiatives
       class InitiativesController < Decidim::Initiatives::Admin::ApplicationController
@@ -12,7 +12,6 @@ module Decidim
 
         helper Decidim::Initiatives::InitiativeHelper
         helper Decidim::Initiatives::CreateInitiativeHelper
-        helper Decidim::Initiatives::PartialTranslationsHelper
 
         # GET /admin/initiatives
         def index
@@ -45,7 +44,7 @@ module Decidim
                     initiative: current_initiative
                   )
 
-          render layout: 'decidim/admin/initiative'
+          render layout: "decidim/admin/initiative"
         end
 
         # PUT /admin/initiatives/:id
@@ -58,13 +57,13 @@ module Decidim
 
           UpdateInitiative.call(current_initiative, @form, current_user) do
             on(:ok) do |initiative|
-              flash[:notice] = I18n.t('initiatives.update.success', scope: 'decidim.initiatives.admin')
+              flash[:notice] = I18n.t("initiatives.update.success", scope: "decidim.initiatives.admin")
               redirect_to edit_initiative_path(initiative)
             end
 
             on(:invalid) do
-              flash.now[:alert] = I18n.t('initiatives.update.error',  scope: 'decidim.initiatives.admin')
-              render :edit, layout: 'decidim/admin/initiative'
+              flash.now[:alert] = I18n.t("initiatives.update.error", scope: "decidim.initiatives.admin")
+              render :edit, layout: "decidim/admin/initiative"
             end
           end
         end
@@ -72,15 +71,23 @@ module Decidim
         # POST /admin/initiatives/:id/publish
         def publish
           authorize! :publish, current_initiative
-          current_initiative.publish!
-          redirect_to decidim_admin_initiatives.initiatives_path
+
+          PublishInitiative.call(current_initiative, current_user) do
+            on(:ok) do
+              redirect_to decidim_admin_initiatives.initiatives_path
+            end
+          end
         end
 
         # DELETE /admin/initiatives/:id/unpublish
         def unpublish
           authorize! :unpublish, current_initiative
-          current_initiative.unpublish!
-          redirect_to decidim_admin_initiatives.initiatives_path
+
+          UnpublishInitiative.call(current_initiative, current_user) do
+            on(:ok) do
+              redirect_to decidim_admin_initiatives.initiatives_path
+            end
+          end
         end
 
         # DELETE /admin/initiatives/:id/discard
@@ -107,13 +114,17 @@ module Decidim
         # GET /admin/initiatives/:id/send_to_technical_validation
         def send_to_technical_validation
           authorize! :send_to_technical_validation, current_initiative
-          current_initiative.validating!
-          redirect_to edit_initiative_path(current_initiative), flash: {
-            notice: I18n.t(
-              '.success',
-              scope: %w[decidim initiatives admin initiatives edit]
-            )
-          }
+
+          SendInitiativeToTechnicalValidation.call(current_initiative, current_user) do
+            on(:ok) do
+              redirect_to edit_initiative_path(current_initiative), flash: {
+                notice: I18n.t(
+                  "success",
+                  scope: %w(decidim initiatives admin initiatives edit)
+                )
+              }
+            end
+          end
         end
 
         # GET /admin/initiatives/:id/export_votes
@@ -128,7 +139,7 @@ module Decidim
           end
 
           respond_to do |format|
-            format.csv { send_data csv_data, file_name: 'votes.csv' }
+            format.csv { send_data csv_data, file_name: "votes.csv" }
           end
         end
       end

data/app/controllers/decidim/initiatives/admin/initiatives_type_scopes_controller.rb

@@ -21,12 +21,12 @@ module Decidim
 
           CreateInitiativeTypeScope.call(@form) do
             on(:ok) do |initiative_type_scope|
-              flash[:notice] = I18n.t('decidim.initiatives.admin.initiatives_type_scopes.create.success')
+              flash[:notice] = I18n.t("decidim.initiatives.admin.initiatives_type_scopes.create.success")
               redirect_to edit_initiatives_type_path(initiative_type_scope.type)
             end
 
             on(:invalid) do
-              flash.now[:alert] = I18n.t('decidim.initiatives.admin.initiatives_type_scopes.create.error')
+              flash.now[:alert] = I18n.t("decidim.initiatives.admin.initiatives_type_scopes.create.error")
               render :new
             end
           end
@@ -45,12 +45,12 @@ module Decidim
 
           UpdateInitiativeTypeScope.call(current_initiative_type_scope, @form) do
             on(:ok) do
-              flash[:notice] = I18n.t('decidim.initiatives.admin.initiatives_type_scopes.update.success')
+              flash[:notice] = I18n.t("decidim.initiatives.admin.initiatives_type_scopes.update.success")
               redirect_to edit_initiatives_type_path(initiative_type_scope.type)
             end
 
             on(:invalid) do
-              flash.now[:alert] = I18n.t('decidim.initiatives.admin.initiatives_type_scopes.update.error')
+              flash.now[:alert] = I18n.t("decidim.initiatives.admin.initiatives_type_scopes.update.error")
               render :edit
             end
           end
@@ -62,14 +62,14 @@ module Decidim
           current_initiative_type_scope.destroy!
 
           redirect_to edit_initiatives_type_path(current_initiative_type_scope.type), flash: {
-            notice: I18n.t('decidim.initiatives.admin.initiatives_type_scopes.destroy.success')
+            notice: I18n.t("decidim.initiatives.admin.initiatives_type_scopes.destroy.success")
           }
         end
 
         private
 
         def current_initiative_type_scope
-          @initiatives_type_scope ||= InitiativesTypeScope.find(params[:id])
+          @current_initiative_type_scope ||= InitiativesTypeScope.find(params[:id])
         end
 
         def initiative_type_scope_form

data/app/controllers/decidim/initiatives/admin/initiatives_types_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_dependency 'decidim/initiatives/admin/application_controller'
+require_dependency "decidim/initiatives/admin/application_controller"
 
 module Decidim
   module Initiatives
@@ -30,12 +30,12 @@ module Decidim
 
           CreateInitiativeType.call(@form) do
             on(:ok) do |initiative_type|
-              flash[:notice] = I18n.t('decidim.initiatives.admin.initiatives_types.create.success')
+              flash[:notice] = I18n.t("decidim.initiatives.admin.initiatives_types.create.success")
               redirect_to edit_initiatives_type_path(initiative_type)
             end
 
             on(:invalid) do
-              flash.now[:alert] = I18n.t('decidim.initiatives.admin.initiatives_types.create.error')
+              flash.now[:alert] = I18n.t("decidim.initiatives.admin.initiatives_types.create.error")
               render :new
             end
           end
@@ -58,12 +58,12 @@ module Decidim
 
           UpdateInitiativeType.call(current_initiative_type, @form) do
             on(:ok) do
-              flash[:notice] = I18n.t('decidim.initiatives.admin.initiatives_types.update.success')
+              flash[:notice] = I18n.t("decidim.initiatives.admin.initiatives_types.update.success")
               redirect_to edit_initiatives_type_path(current_initiative_type)
             end
 
             on(:invalid) do
-              flash.now[:alert] = I18n.t('decidim.initiatives.admin.initiatives_types.update.error')
+              flash.now[:alert] = I18n.t("decidim.initiatives.admin.initiatives_types.update.error")
               render :edit
             end
           end
@@ -75,14 +75,14 @@ module Decidim
           current_initiative_type.destroy!
 
           redirect_to initiatives_types_path, flash: {
-            notice: I18n.t('decidim.initiatives.admin.initiatives_types.destroy.success')
+            notice: I18n.t("decidim.initiatives.admin.initiatives_types.destroy.success")
           }
         end
 
         private
 
         def current_initiative_type
-          @initiatives_type ||= InitiativesType.find(params[:id])
+          @current_initiative_type ||= InitiativesType.find(params[:id])
         end
 
         def initiative_type_form

data/app/controllers/decidim/initiatives/committee_requests_controller.rb

@@ -7,7 +7,6 @@ module Decidim
       include Decidim::Initiatives::NeedsInitiative
 
       helper Decidim::ActionAuthorizationHelper
-      helper Decidim::Initiatives::PartialTranslationsHelper
       helper InitiativeHelper
 
       include Decidim::Initiatives::ActionAuthorization
@@ -25,8 +24,8 @@ module Decidim
           on(:ok) do
             redirect_to initiatives_path, flash: {
               notice: I18n.t(
-                ".success",
-                scope: %w[decidim initiatives committee_requests spawn]
+                "success",
+                scope: %w(decidim initiatives committee_requests spawn)
               )
             }
           end

data/app/controllers/decidim/initiatives/create_initiative_controller.rb

@@ -2,18 +2,17 @@
 
 module Decidim
   module Initiatives
-    require 'wicked'
+    require "wicked"
 
     # Controller in charge of managing the create initiative wizard.
     class CreateInitiativeController < Decidim::ApplicationController
-      layout 'layouts/decidim/initiative_creation'
+      layout "layouts/decidim/initiative_creation"
 
       include Wicked::Wizard
       include Decidim::FormFactory
       include InitiativeHelper
       include TypeSelectorOptions
 
-      helper Decidim::Initiatives::PartialTranslationsHelper
       helper Decidim::Admin::IconLinkHelper
       helper InitiativeHelper
       helper_method :similar_initiatives
@@ -72,7 +71,7 @@ module Decidim
       end
 
       def promotal_committee_step(parameters)
-        if session[:initiative].key?(:id)
+        if session[:initiative].has_key?(:id)
           render_wizard
           return
         end
@@ -90,10 +89,7 @@ module Decidim
           end
 
           on(:invalid) do |initiative|
-            if initiative
-              logger.fatal "Failed creating initiative: #{initiative.errors.full_messages.join(', ')}"
-            end
-
+            logger.fatal "Failed creating initiative: #{initiative.errors.full_messages.join(", ")}" if initiative
             redirect_to previous_wizard_path(validate_form: true)
           end
         end
@@ -124,7 +120,7 @@ module Decidim
 
       def current_initiative
         initiative = session[:initiative].with_indifferent_access
-        Initiative.find(initiative[:id]) if initiative.key?(:id)
+        Initiative.find(initiative[:id]) if initiative.has_key?(:id)
       end
 
       def initiative_type

data/app/controllers/decidim/initiatives/initiative_votes_controller.rb

@@ -23,7 +23,7 @@ module Decidim
 
           on(:invalid) do
             render json: {
-              error: I18n.t('initiative_votes.create.error', scope: 'decidim.initiatives')
+              error: I18n.t("initiative_votes.create.error", scope: "decidim.initiatives")
             }, status: 422
           end
         end
@@ -45,9 +45,9 @@ module Decidim
       def ability_context
         {
           current_settings: try(:current_settings),
-          feature_settings: try(:feature_settings),
+          component_settings: try(:component_settings),
           current_organization: try(:current_organization),
-          current_feature: try(:current_feature),
+          current_component: try(:current_component),
           params: try(:params)
         }
       end

data/app/controllers/decidim/initiatives/initiatives_controller.rb

@@ -7,7 +7,6 @@ module Decidim
       include ParticipatorySpaceContext
       participatory_space_layout only: [:show]
 
-      helper Decidim::Initiatives::PartialTranslationsHelper
       helper Decidim::WidgetUrlsHelper
       helper Decidim::AttachmentsHelper
       helper Decidim::FiltersHelper

data/app/forms/decidim/initiatives/admin/initiative_form.rb

@@ -27,7 +27,7 @@ module Decidim
         validates :signature_type, presence: true
         validates :signature_start_time, presence: true, if: ->(form) { form.context.initiative.published? }
         validates :signature_end_time, presence: true, if: ->(form) { form.context.initiative.published? }
-        validates :signature_end_time, date: { after: :signature_start_time }, if: ->(form) {
+        validates :signature_end_time, date: { after: :signature_start_time }, if: lambda { |form|
           form.signature_start_time.present? && form.signature_end_time.present?
         }
 

data/app/forms/decidim/initiatives/admin/initiative_type_scope_form.rb

@@ -12,7 +12,8 @@ module Decidim
         attribute :decidim_scopes_id, Integer
 
         validates :decidim_scopes_id, presence: true
-        validates :supports_required, presence: true,
+        validates :supports_required,
+                  presence: true,
                   numericality: {
                     only_integer: true,
                     greater_than: 0
@@ -20,4 +21,4 @@ module Decidim
       end
     end
   end
-end
+end

data/app/helpers/decidim/initiatives/create_initiative_helper.rb

@@ -13,7 +13,7 @@ module Decidim
           options << [
             I18n.t(
               type,
-              scope: %w[activemodel attributes initiative signature_type_values]
+              scope: %w(activemodel attributes initiative signature_type_values)
             ), type
           ]
         end
@@ -24,9 +24,9 @@ module Decidim
         [
           [
             I18n.t(
-              'online',
-              scope: %w[activemodel attributes initiative signature_type_values]
-            ), 'online'
+              "online",
+              scope: %w(activemodel attributes initiative signature_type_values)
+            ), "online"
           ]
         ]
       end
@@ -35,9 +35,9 @@ module Decidim
         [
           [
             I18n.t(
-              'offline',
-              scope: %w[activemodel attributes initiative signature_type_values]
-            ), 'offline'
+              "offline",
+              scope: %w(activemodel attributes initiative signature_type_values)
+            ), "offline"
           ]
         ]
       end

data/app/helpers/decidim/initiatives/initiative_helper.rb

@@ -11,8 +11,8 @@ module Decidim
       #
       # Returns a String.
       def state_badge_css_class(initiative)
-        return 'success' if initiative.accepted?
-        'warning'
+        return "success" if initiative.accepted?
+        "warning"
       end
 
       # Public: The state of an initiative in a way a human can understand.
@@ -21,8 +21,8 @@ module Decidim
       #
       # Returns a String.
       def humanize_state(initiative)
-        I18n.t(initiative.accepted? ? 'accepted': 'expired',
-               scope: 'decidim.initiatives.states',
+        I18n.t(initiative.accepted? ? "accepted" : "expired",
+               scope: "decidim.initiatives.states",
                default: :expired)
       end
 
@@ -33,42 +33,49 @@ module Decidim
       #
       # Returns a String
       def humanize_admin_state(state)
-        I18n.t(state, scope: 'decidim.initiatives.admin_states', default: :created)
+        I18n.t(state, scope: "decidim.initiatives.admin_states", default: :created)
       end
 
       def popularity_tag(initiative)
-        popularity_class = ''
+        content_tag(:div, class: "extra__popularity popularity #{popularity_class(initiative)}".strip) do
+          5.times do
+            concat(content_tag(:span, class: "popularity__item") {})
+          end
 
-        if initiative.percentage.positive? && initiative.percentage < 40
-          popularity_class = 'popularity--level1'
+          concat(content_tag(:span, class: "popularity__desc") do
+            I18n.t("decidim.initiatives.initiatives.vote_cabin.supports_required",
+                   total_supports: initiative.scoped_type.supports_required)
+          end)
         end
+      end
 
-        if initiative.percentage >= 40 && initiative.percentage < 60
-          popularity_class = 'popularity--level2'
-        end
+      def popularity_class(initiative)
+        return "popularity--level1" if popularity_level1?(initiative)
+        return "popularity--level2" if popularity_level2?(initiative)
+        return "popularity--level3" if popularity_level3?(initiative)
+        return "popularity--level4" if popularity_level4?(initiative)
+        return "popularity--level5" if popularity_level5?(initiative)
+        ""
+      end
 
-        if initiative.percentage >= 60 && initiative.percentage < 80
-          popularity_class = 'popularity--level3'
-        end
+      def popularity_level1?(initiative)
+        initiative.percentage.positive? && initiative.percentage < 40
+      end
 
-        if initiative.percentage >= 80 && initiative.percentage < 100
-          popularity_class = 'popularity--level4'
-        end
+      def popularity_level2?(initiative)
+        initiative.percentage >= 40 && initiative.percentage < 60
+      end
 
-        if initiative.percentage >= 100
-          popularity_class = 'popularity--level5'
-        end
+      def popularity_level3?(initiative)
+        initiative.percentage >= 60 && initiative.percentage < 80
+      end
 
-        content_tag(:div, class: "extra__popularity popularity #{popularity_class}".strip) do
-          5.times do
-            concat(content_tag(:span, class: 'popularity__item') {})
-          end
+      def popularity_level4?(initiative)
+        initiative.percentage >= 80 && initiative.percentage < 100
+      end
 
-          concat(content_tag(:span, class: 'popularity__desc') do
-            I18n.t('decidim.initiatives.initiatives.vote_cabin.supports_required',
-                   total_supports: initiative.scoped_type.supports_required)
-          end)
-        end
+      def popularity_level5?(initiative)
+        initiative.percentage >= 100
       end
     end
   end