decidim-core 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eba11b2c48395aa9194428d085bede3ceddc066
-  data.tar.gz: 64377d579d64f932000db763f1eddb834b827569
+  metadata.gz: 8f13f38a692e1e440b837466cfef145041b4731a
+  data.tar.gz: 23544d83481adcedf009ee8696d6d3369b900fd3
 SHA512:
-  metadata.gz: 68ef82ba758d77eac53a22010784d39af4ee4ca28a732596609a3f5d203d4bb45c7c4a5ea1377945340f125e9aae743a6dfc59a89a7105e6843e70eec06e316c
-  data.tar.gz: '0485336b9f027af626642657de541ad421e6c6c160699ec7d669a30d655fea485c221a6efcc2b6cca47bd2ebf65ae0c0de985a723738f560b5f29eab2e6d70a3'
+  metadata.gz: 6dcf4943c0d07fd5293b1b3a2114b98bfcda43ac5980b9904f26050310d2a2ae9b673ba20cb07ac33696fcdabce843d6b0b0b51bcb9e952078ae716ff88748ff
+  data.tar.gz: 47108ee568bbdd48e9a7d2f1ea6f0161edb7c5d76d27d20faa02166ca5dbcdad3036b1f96d7b549de9b9a0171132bce460f2452898d252228685ba9b8e22fc3b

data/app/assets/stylesheets/decidim/extras/_add_comments.scss

@@ -0,0 +1,9 @@
+.add-comment {
+  .remaining-character-count {
+    border: 0;
+    color: $body-font-color;
+    padding: 0.85em 1em;
+    vertical-align: middle;
+    display: inline-block;
+  }
+}

data/app/assets/stylesheets/decidim/extras/_label-required.scss

@@ -0,0 +1,3 @@
+.label-required {
+  margin-left: 5px;
+}

data/app/assets/stylesheets/decidim/extras/_reference.scss

@@ -0,0 +1,3 @@
+  .reference--text-left {
+    text-align: left;
+  }

data/app/assets/stylesheets/decidim/extras/_social_icons_mini.scss

@@ -0,0 +1,10 @@
+.button--social--mini {
+  padding: 0;
+  display: inline-block;
+  min-width: 0;
+  .button--social__icon {
+    border: 0;
+    padding: 0.85em 0;
+    margin-right: 0;
+  }
+}

data/app/commands/decidim/invite_user.rb

@@ -36,7 +36,7 @@ module Decidim
     end
 
     def invite_user
-      @user = Decidim::User.create(
+      @user = Decidim::User.new(
         name: form.name,
         email: form.email.downcase,
         organization: form.organization,

data/app/commands/decidim/update_account.rb

@@ -21,7 +21,6 @@ module Decidim
 
       if @user.valid?
         @user.save!
-        @form.remove_avatar = false
         broadcast(:ok, @user.unconfirmed_email.present?)
       else
         if @user.errors.has_key? :avatar
@@ -39,11 +38,8 @@ module Decidim
     end
 
     def update_avatar
-      if @form.avatar
-        @user.avatar = @form.avatar
-      elsif @form.remove_avatar
-        @user.remove_avatar = true
-      end
+      @user.avatar = @form.avatar
+      @user.remove_avatar = @form.remove_avatar
     end
 
     def update_password

data/app/constraints/decidim/current_feature.rb

@@ -11,36 +11,29 @@ module Decidim
       @manifest = manifest
     end
 
-    # Public: Injects the current feature into the environment.
+    # Public: Matches the request against a feature and injects it into the
+    #         environment.
     #
-    # request - The request that holds the current feature relevant
-    #           information.
+    # request - The request that holds the current feature relevant information.
     #
-    # Returns nothing.
+    # Returns a true if the request matched, false otherwise
     def matches?(request)
       env = request.env
-      params = request.params
 
-      organization = env["decidim.current_organization"]
+      return false unless CurrentParticipatoryProcess.new.matches?(request)
 
-      @participatory_process = request.env["decidim.current_participatory_process"] ||
-                               organization.participatory_processes.find_by_id(params["participatory_process_id"])
+      @participatory_process = env["decidim.current_participatory_process"]
 
-      env["decidim.current_participatory_process"] ||= @participatory_process
-
-      feature = detect_current_feature(params)
-
-      return false unless feature
-
-      env["decidim.current_feature"] ||= feature
-      true
+      current_feature(env, request.params) ? true : false
     end
 
     private
 
-    def detect_current_feature(params)
-      return nil unless params["feature_id"]
+    def current_feature(env, params)
+      env["decidim.current_feature"] ||= detect_current_feature(params)
+    end
 
+    def detect_current_feature(params)
       @participatory_process.features.find do |feature|
         params["feature_id"] == feature.id.to_s && feature.manifest_name == @manifest.name.to_s
       end

data/app/constraints/decidim/current_participatory_process.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class infers the current participatory process we're scoped to by
+  # looking at the request parameters and the organization in the request
+  # environment, and injects it into the environment.
+  class CurrentParticipatoryProcess
+    # Public: Matches the request against a participatory process and injects it
+    #         into the environment.
+    #
+    # request - The request that holds the participatory process relevant
+    #           information.
+    #
+    # Returns a true if the request matched, false otherwise
+    def matches?(request)
+      env = request.env
+
+      @organization = env["decidim.current_organization"]
+      return false unless @organization
+
+      current_participatory_process(env, request.params) ? true : false
+    end
+
+    private
+
+    def current_participatory_process(env, params)
+      env["decidim.current_participatory_process"] ||=
+        detect_current_participatory_process(params)
+    end
+
+    def detect_current_participatory_process(params)
+      @organization.participatory_processes.find_by_id(params["participatory_process_id"])
+    end
+  end
+end

data/app/controllers/concerns/decidim/devise_controllers.rb

@@ -22,6 +22,7 @@ module Decidim
       helper Decidim::ReplaceButtonsHelper
       helper Decidim::LayoutHelper
       helper Decidim::MenuHelper
+      helper Decidim::OmniauthHelper
 
       layout "layouts/decidim/application"
     end

data/app/controllers/concerns/decidim/locale_switcher.rb

@@ -46,14 +46,14 @@ module Decidim
       #
       # Returns an Array of Strings.
       def available_locales
-        @available_locales ||= current_organization.available_locales.map(&:to_s)
+        @available_locales ||= current_organization.available_locales
       end
 
       # The default locale of this organization.
       #
       # Returns a String with the default locale.
       def default_locale
-        @default_locale ||= current_organization.default_locale
+        @default_locale ||= (current_organization || Decidim).public_send(:default_locale)
       end
     end
   end

data/app/controllers/concerns/decidim/needs_authorization.rb

@@ -30,8 +30,7 @@ module Decidim
           current_settings: try(:current_settings),
           feature_settings: try(:feature_settings),
           current_organization: try(:current_organization),
-          current_feature: try(:current_feature),
-          current_participatory_process: try(:current_participatory_process)
+          current_feature: try(:current_feature)
         }
       end
 

data/app/controllers/concerns/decidim/needs_organization.rb

@@ -22,9 +22,8 @@ module Decidim
 
       private
 
-      # Raises a 404 if no organization is present.
       def verify_organization
-        raise ActionController::RoutingError, "Not Found" unless current_organization
+        redirect_to decidim_system.root_path unless current_organization
       end
     end
   end

data/app/controllers/concerns/decidim/needs_participatory_process.rb

@@ -1,19 +1,28 @@
 # frozen_string_literal: true
 
-require "active_support/concern"
-
 module Decidim
   # This module, when injected into a controller, ensures there's a
   # Participatory Process available and deducts it from the context.
   module NeedsParticipatoryProcess
-    extend ActiveSupport::Concern
+    def self.enhance_controller(instance_or_module)
+      instance_or_module.class_eval do
+        helper_method :current_participatory_process
+      end
+    end
 
-    include NeedsOrganization
+    def self.extended(base)
+      base.extend NeedsOrganization, InstanceMethods
 
-    included do
-      after_action :verify_participatory_process
-      helper_method :current_participatory_process
+      enhance_controller(base)
+    end
+
+    def self.included(base)
+      base.include NeedsOrganization, InstanceMethods
+
+      enhance_controller(base)
+    end
 
+    module InstanceMethods
       # Public: Finds the current Participatory Process given this controller's
       # context.
       #
@@ -24,13 +33,13 @@ module Decidim
 
       private
 
-      def verify_participatory_process
-        raise ActionController::RoutingError, "Participatory process not found." unless current_participatory_process
+      def ability_context
+        super.merge(current_participatory_process: current_participatory_process)
       end
 
       def detect_participatory_process
         request.env["current_participatory_process"] ||
-          current_organization.participatory_processes.find_by(id: params[:participatory_process_id] || params[:id])
+          current_organization.participatory_processes.find(params[:participatory_process_id] || params[:id])
       end
     end
   end

data/app/controllers/decidim/account_controller.rb

@@ -15,25 +15,25 @@ module Decidim
 
     def update
       authorize! :update, current_user
-      @account = form(AccountForm).from_params(params)
+      @account = form(AccountForm).from_params(account_params)
 
       UpdateAccount.call(current_user, @account) do
         on(:ok) do |email_is_unconfirmed|
-          flash.now[:notice] = if email_is_unconfirmed
-                                 t("account.update.success_with_email_confirmation", scope: "decidim")
-                               else
-                                 t("account.update.success", scope: "decidim")
-                               end
+          flash[:notice] = if email_is_unconfirmed
+                             t("account.update.success_with_email_confirmation", scope: "decidim")
+                           else
+                             t("account.update.success", scope: "decidim")
+                           end
 
           bypass_sign_in(current_user)
+          redirect_to account_path
         end
 
         on(:invalid) do
-          flash.now[:alert] = t("account.update.error", scope: "decidim")
+          flash[:alert] = t("account.update.error", scope: "decidim")
+          render action: :show
         end
       end
-
-      render action: :show
     end
 
     def delete
@@ -64,5 +64,9 @@ module Decidim
     def authorizations
       @authorizations ||= current_user.authorizations
     end
+
+    def account_params
+      { avatar: current_user.avatar }.merge(params[:user].to_unsafe_h)
+    end
   end
 end

data/app/controllers/decidim/application_controller.rb

@@ -3,8 +3,8 @@
 module Decidim
   # The main application controller that inherits from Rails.
   class ApplicationController < ::DecidimController
-    include Decidim::NeedsOrganization
-    include Decidim::LocaleSwitcher
+    include NeedsOrganization
+    include LocaleSwitcher
     include NeedsAuthorization
     include PayloadInfo
 
@@ -16,6 +16,7 @@ module Decidim
     helper Decidim::CookiesHelper
     helper Decidim::AriaSelectedLinkToHelper
     helper Decidim::MenuHelper
+    helper Decidim::FeaturePathHelper
 
     # Saves the location before loading each page so we can return to the
     # right page. If we're on a devise page, we don't want to store that as the
@@ -28,8 +29,6 @@ module Decidim
 
     layout "layouts/decidim/application"
 
-    rescue_from ActiveRecord::RecordNotFound, with: :redirect_to_404
-
     private
 
     def store_current_location
@@ -46,9 +45,5 @@ module Decidim
     def add_vary_header
       response.headers["Vary"] = "Accept"
     end
-
-    def redirect_to_404
-      raise ActionController::RoutingError, "Not Found"
-    end
   end
 end

data/app/controllers/decidim/devise/registrations_controller.rb

@@ -8,7 +8,6 @@ module Decidim
       include FormFactory
       include Decidim::DeviseControllers
 
-      helper Decidim::OmniauthHelper
       helper_method :terms_and_conditions_page
 
       before_action :configure_permitted_parameters

data/app/controllers/decidim/devise/sessions_controller.rb

@@ -5,7 +5,6 @@ module Decidim
     # Custom Devise SessionsController to avoid namespace problems.
     class SessionsController < ::Devise::SessionsController
       include Decidim::DeviseControllers
-      helper Decidim::OmniauthHelper
 
       def after_sign_in_path_for(user)
         return first_login_authorizations_path if first_login_and_not_authorized?(user) &&

data/app/controllers/decidim/errors_controller.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ErrorsController < ApplicationController
+    skip_authorization_check
+
+    def not_found
+      render status: :not_found
+    end
+
+    def internal_server_error
+      render status: :internal_server_error
+    end
+  end
+end

data/app/controllers/decidim/features/base_controller.rb

@@ -16,6 +16,7 @@ module Decidim
       helper Decidim::FeatureReferenceHelper
       helper Decidim::TranslationsHelper
       helper Decidim::ParticipatoryProcessHelper
+      helper Decidim::IconHelper
       helper Decidim::ResourceHelper
       helper Decidim::OrganizationScopesHelper
       helper Decidim::ActionAuthorizationHelper

data/app/controllers/decidim/participatory_process_groups_controller.rb

@@ -6,6 +6,8 @@ module Decidim
   class ParticipatoryProcessGroupsController < ApplicationController
     helper_method :participatory_processes, :group, :collection
 
+    before_action :set_group
+
     def show
       authorize! :read, ParticipatoryProcessGroup
     end
@@ -17,8 +19,10 @@ module Decidim
     end
     alias collection participatory_processes
 
-    def group
-      Decidim::ParticipatoryProcessGroup.find(params[:id])
+    def set_group
+      @group = Decidim::ParticipatoryProcessGroup.find(params[:id])
     end
+
+    attr_reader :group
   end
 end

data/app/controllers/decidim/participatory_process_steps_controller.rb

@@ -11,6 +11,7 @@ module Decidim
     include NeedsParticipatoryProcess
 
     helper Decidim::ParticipatoryProcessHelper
+    helper Decidim::IconHelper
 
     def index
       authorize! :read, ParticipatoryProcess

data/app/controllers/decidim/participatory_processes_controller.rb

@@ -6,15 +6,15 @@ module Decidim
   # A controller that holds the logic to show ParticipatoryProcesses in a
   # public layout.
   class ParticipatoryProcessesController < ApplicationController
-    include NeedsParticipatoryProcess
-
     layout "layouts/decidim/participatory_process", only: [:show]
 
-    skip_after_action :verify_participatory_process, only: [:index]
+    before_action -> { extend(NeedsParticipatoryProcess) }, only: [:show]
 
     helper Decidim::AttachmentsHelper
     helper Decidim::ParticipatoryProcessHelper
+    helper Decidim::IconHelper
     helper Decidim::WidgetUrlsHelper
+
     helper_method :collection, :promoted_participatory_processes, :participatory_processes
 
     def index