decidim-core 0.6.8 → 0.7.0

data/app/controllers/decidim/authorizations_controller.rb

@@ -4,15 +4,15 @@ module Decidim
   # This controller allows users to create and destroy their authorizations. It
   # shouldn't be necessary to expand it to add new authorization schemes.
   class AuthorizationsController < Decidim::ApplicationController
-    helper_method :handler, :handlers, :stored_location
+    helper_method :handler, :handlers
     before_action :valid_handler, only: [:new, :create]
 
     include Decidim::UserProfile
     helper Decidim::DecidimFormHelper
+    helper Decidim::CtaButtonHelper
     helper Decidim::AuthorizationFormHelper
 
     layout "layouts/decidim/user_profile", only: [:index]
-    skip_before_action :store_current_location
 
     def new; end
 
@@ -34,7 +34,7 @@ module Decidim
       AuthorizeUser.call(handler) do
         on(:ok) do
           flash[:notice] = t("authorizations.create.success", scope: "decidim")
-          redirect_to params[:redirect_url] || stored_location_for(current_user) || authorizations_path
+          redirect_to params[:redirect_url] || authorizations_path
         end
 
         on(:invalid) do
@@ -44,16 +44,10 @@ module Decidim
       end
     end
 
-    def handler
-      @handler ||= AuthorizationHandler.handler_for(handler_name, handler_params)
-    end
-
     protected
 
-    def stored_location
-      location = stored_location_for(current_user)
-      store_location_for(current_user, location)
-      location
+    def handler
+      @handler ||= AuthorizationHandler.handler_for(handler_name, handler_params)
     end
 
     def handler_params
@@ -73,10 +67,6 @@ module Decidim
       redirect_to(authorizations_path) && (return false)
     end
 
-    def only_one_handler?
-      redirect_to(action: :new, handler: available_handlers.first.handler_name) && return if available_handlers.length == 1
-    end
-
     def handlers
       @handlers ||= available_authorization_handlers.reject do |handler|
         authorized_handlers.include?(handler.handler_name)

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

@@ -16,13 +16,13 @@ module Decidim
       # invitation. Using the param `invite_redirect` we can redirect the user
       # to a custom path after it has accepted the invitation.
       def after_accept_path_for(resource)
-        params[:invite_redirect] || after_sign_in_path_for(resource)
+        params[:invite_redirect] || super
       end
 
       # When a managed user accepts the invitation is promoted to non-managed user.
       def accept_resource
         resource = resource_class.accept_invitation!(update_resource_params)
-        resource.update_attribute(:managed, false) if resource.managed?
+        resource.update_attributes!(managed: false) if resource.managed?
         resource
       end
     end

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

@@ -44,21 +44,13 @@ module Decidim
       end
 
       def after_sign_in_path_for(user)
-        if !pending_redirect?(user) && first_login_and_not_authorized?(user)
+        if first_login_and_not_authorized?(user)
           authorizations_path
         else
           super
         end
       end
 
-      # Calling the `stored_location_for` method removes the key, so in order
-      # to check if there's any pending redirect after login I need to call
-      # this method and use the value to set a pending redirect. This is the
-      # only way to do this without checking the session directly.
-      def pending_redirect?(user)
-        store_location_for(user, stored_location_for(user))
-      end
-
       def first_login_and_not_authorized?(user)
         user.is_a?(User) && user.sign_in_count == 1 && Decidim.authorization_handlers.any?
       end

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

@@ -48,7 +48,7 @@ module Decidim
       private
 
       def terms_and_conditions_page
-        @terms_and_conditions_page ||= Decidim::StaticPage.find_by_slug("terms-and-conditions")
+        @terms_and_conditions_page ||= Decidim::StaticPage.find_by(slug: "terms-and-conditions")
       end
 
       protected

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

@@ -12,14 +12,6 @@ module Decidim
         super
       end
 
-      # Calling the `stored_location_for` method removes the key, so in order
-      # to check if there's any pending redirect after login I need to call
-      # this method and use the value to set a pending redirect. This is the
-      # only way to do this without checking the session directly.
-      def pending_redirect?(user)
-        store_location_for(user, stored_location_for(user))
-      end
-
       def first_login_and_not_authorized?(user)
         user.is_a?(User) && user.sign_in_count == 1 && current_organization.available_authorizations.any?
       end

data/app/controllers/decidim/locales_controller.rb

@@ -7,7 +7,7 @@ module Decidim
 
     def create
       if current_user && params["locale"] && available_locales.include?(params["locale"])
-        current_user.update_attribute(:locale, params["locale"])
+        current_user.update_attributes!(locale: params["locale"])
       end
 
       redirect_to referer_with_new_locale
@@ -16,7 +16,7 @@ module Decidim
     private
 
     def referer_with_new_locale
-      uri = URI(request.referrer || "/")
+      uri = URI(request.referer || "/")
       query = uri.query.to_s.gsub(/locale\=[a-zA-Z\-]{2,5}/, "")
       params = URI.decode_www_form(query) << ["locale", current_locale]
       uri.query = URI.encode_www_form(params)

data/app/controllers/decidim/pages_controller.rb

@@ -12,6 +12,7 @@ module Decidim
     authorize_resource :public_pages, class: false
     delegate :page, to: :page_finder
     helper_method :page, :promoted_participatory_processes, :highlighted_participatory_processes, :stats
+    helper CtaButtonHelper
 
     def index
       @pages = current_organization.static_pages.all.to_a.sort do |a, b|

data/app/controllers/decidim/scopes_controller.rb

@@ -3,8 +3,6 @@
 module Decidim
   # Exposes the scopes text search so users can choose a scope writing its name.
   class ScopesController < Decidim::ApplicationController
-    skip_before_action :store_current_location
-
     def search
       authorize! :search, Scope
       root = Scope.where(id: params[:root], organization: current_organization).first
@@ -15,7 +13,7 @@ module Decidim
                else
                  current_organization.top_scopes
                end
-      root_option = if params[:include_root] == "true" && !params[:term].present?
+      root_option = if params[:include_root] == "true" && params[:term].blank?
                       if root
                         [{ id: root.id.to_s, text: root.name[I18n.locale.to_s] }]
                       else

data/app/forms/decidim/account_form.rb

@@ -19,14 +19,14 @@ module Decidim
     validates :password, confirmation: true
     validates :password, length: { in: Decidim::User.password_length, allow_blank: true }
     validates :password_confirmation, presence: true, if: :password_present
-    validates :avatar, file_size: { less_than_or_equal_to: ->(_record) { Decidim::User::MAXIMUM_AVATAR_FILE_SIZE } }
+    validates :avatar, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
 
     validate :unique_email
 
     private
 
     def password_present
-      !password.blank?
+      password.present?
     end
 
     def unique_email

data/app/forms/decidim/form.rb

@@ -9,8 +9,6 @@ module Decidim
              :current_feature,
              to: :context, prefix: false, allow_nil: true
 
-    def available_locales
-      current_organization&.available_locales
-    end
+    delegate :available_locales, to: :current_organization, allow_nil: true
   end
 end

data/app/forms/translatable_presence_validator.rb

@@ -12,7 +12,7 @@ class TranslatablePresenceValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, _value)
     available_locales_for(record).each do |locale|
       translated_attr = "#{attribute}_#{locale}"
-      record.errors.add(translated_attr, :blank) unless record.send(translated_attr).present?
+      record.errors.add(translated_attr, :blank) if record.send(translated_attr).blank?
     end
   end
 

data/app/helpers/decidim/cta_button_helper.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A Helper to render the Call To Action button.
+  module CtaButtonHelper
+    # Renders the Call To Action button. Link and text can be configured
+    # per organizationn.
+    def cta_button
+      button_text = translated_attribute(current_organization.cta_button_text).presence || t("pages.home.hero.participate")
+
+      link_to button_text, cta_button_path, class: "hero-cta button expanded large button--sc"
+    end
+
+    # Finds the CTA button path to reuse it in other places.
+    def cta_button_path
+      if current_organization.cta_button_path.present?
+        current_organization.cta_button_path
+      elsif Decidim::ParticipatoryProcess.where(organization: current_organization).published.any?
+        decidim_participatory_processes.participatory_processes_path
+      elsif current_user
+        decidim.account_path
+      else
+        decidim.new_user_registration_path
+      end
+    end
+  end
+end

data/app/helpers/decidim/decidim_form_helper.rb

@@ -124,5 +124,30 @@ module Decidim
     def form_field_has_error?(object, attribute)
       object.respond_to?(:errors) && object.errors[attribute].present?
     end
+
+    # Helper method to show how slugs will look like. Intended to be used in forms
+    # together with some JavaScript code. More precisely, this will most probably
+    # show in help texts in forms. The space slug is surrounded with a `span` so
+    # the slug can be updated via JavaScript with the input value.
+    #
+    # prepend_path - a path to prepend to the slug, without final slash
+    # value - the initial value of the slug field, so that edit forms have a value
+    #
+    # Returns an HTML-safe String.
+    def decidim_form_slug_url(prepend_path = "", value = "")
+      prepend_slug_path = if prepend_path.present?
+                            "/#{prepend_path}/"
+                          else
+                            "/"
+                          end
+      content_tag(:span, class: "slug-url") do
+        [
+          request.protocol,
+          request.host_with_port,
+          prepend_slug_path
+        ].join("").html_safe +
+          content_tag(:span, value, class: "slug-url-value")
+      end
+    end
   end
 end

data/app/helpers/decidim/layout_helper.rb

@@ -8,7 +8,7 @@ module Decidim
     #
     # Returns a safe String with the versions.
     def favicon
-      return unless current_organization.favicon.present?
+      return if current_organization.favicon.blank?
 
       safe_join(Decidim::OrganizationFaviconUploader::SIZES.map do |version, size|
         favicon_link_tag(current_organization.favicon.send(version).url, sizes: "#{size}x#{size}")

data/app/helpers/decidim/map_helper.rb

@@ -24,7 +24,7 @@ module Decidim
     end
 
     def dynamic_map_for(markers_data)
-      return unless Decidim.geocoder.present?
+      return if Decidim.geocoder.blank?
 
       map_html_options = {
         class: "google-map",

data/app/helpers/decidim/meta_tags_helper.rb

@@ -34,7 +34,7 @@ module Decidim
     # Returns an Array of Strings.
     def add_decidim_page_title(title)
       @decidim_page_title ||= []
-      return @decidim_page_title unless title.present?
+      return @decidim_page_title if title.blank?
       @decidim_page_title << title
     end
 

data/app/helpers/decidim/omniauth_helper.rb

@@ -20,5 +20,12 @@ module Decidim
     def normalize_provider_name(provider)
       provider.to_s.split("_").first
     end
+
+    # Public: icon for omniauth buttons
+    def oauth_icon(provider)
+      name = provider == :developer ? "phone" : normalize_provider_name(provider)
+
+      icon(name)
+    end
   end
 end

data/app/helpers/decidim/scopes_helper.rb

@@ -9,7 +9,7 @@ module Decidim
     #
     # Returns boolean.
     def has_visible_scopes?(resource)
-      current_participatory_space.scopes_enabled? && !current_participatory_space.scope.present? && resource.scope.present?
+      current_participatory_space.scopes_enabled? && current_participatory_space.scope.blank? && resource.scope.present?
     end
   end
 end

data/app/mailers/decidim/decidim_devise_mailer.rb

@@ -17,6 +17,7 @@ module Decidim
       with_user(user) do
         @token = token
         @organization = user.organization
+        @opts = opts
 
         if opts[:invitation_instructions]
           opts[:subject] = I18n.t("devise.mailer.#{opts[:invitation_instructions]}.subject", organization: user.organization.name)

data/app/models/decidim/attachment.rb

@@ -34,9 +34,7 @@ module Decidim
     # The URL to download the file.
     #
     # Returns String.
-    def url
-      file.url
-    end
+    delegate :url, to: :file
 
     # The URL to download the thumbnail of the file. Only works with images.
     #

data/app/models/decidim/authorization.rb

@@ -13,14 +13,14 @@ module Decidim
   class Authorization < ApplicationRecord
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User", inverse_of: :authorizations
 
-    validates :name, :handler, presence: true
     validates :name, uniqueness: { scope: :decidim_user_id }
 
-    # The handler that created this authorization.
-    #
-    # Returns an instance that inherits from Decidim::AuthorizationHandler.
-    def handler
-      @handler ||= AuthorizationHandler.handler_for(name, metadata)
+    validate :active_handler?
+
+    private
+
+    def active_handler?
+      AuthorizationHandler.active_handler?(name)
     end
   end
 end

data/app/models/decidim/category.rb

@@ -28,7 +28,7 @@ module Decidim
 
     def forbid_deep_nesting
       return unless parent
-      return unless parent.parent.present?
+      return if parent.parent.blank?
 
       errors.add(:parent_id, :nesting_too_deep)
     end

data/app/models/decidim/feature.rb

@@ -46,7 +46,7 @@ module Decidim
       {
         host: organization.host,
         feature_id: id,
-        participatory_space.foreign_key.to_sym => participatory_space.id
+        "#{participatory_space.underscored_name}_slug".to_sym => participatory_space.slug
       }
     end
 

data/app/models/decidim/scope.rb

@@ -56,7 +56,8 @@ module Decidim
     private
 
     def forbid_cycles
-      errors.add(:parent_id, :cycle_detected) if parent && parent.part_of.include?(id)
+      return unless parent
+      errors.add(:parent_id, :cycle_detected) if parent.part_of.include?(id)
     end
 
     def create_part_of

data/app/models/decidim/user.rb

@@ -5,12 +5,12 @@ require_dependency "devise/models/decidim_validatable"
 module Decidim
   # A User is a citizen that wants to join the platform to participate.
   class User < ApplicationRecord
-    MAXIMUM_AVATAR_FILE_SIZE = 5.megabytes
+    OMNIAUTH_PROVIDERS = [:facebook, :twitter, :google_oauth2, (:developer if Rails.env.development?)].compact
     ROLES = %w(admin user_manager).freeze
 
     devise :invitable, :database_authenticatable, :registerable, :confirmable,
            :recoverable, :rememberable, :trackable, :decidim_validatable,
-           :omniauthable, omniauth_providers: [:facebook, :twitter, :google_oauth2],
+           :omniauthable, omniauth_providers: OMNIAUTH_PROVIDERS,
                           request_keys: [:env], reset_password_keys: [:decidim_organization_id, :email]
 
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization"
@@ -24,7 +24,7 @@ module Decidim
     validates :name, presence: true, unless: -> { deleted? }
     validates :locale, inclusion: { in: :available_locales }, allow_blank: true
     validates :tos_agreement, acceptance: true, allow_nil: false, on: :create
-    validates :avatar, file_size: { less_than_or_equal_to: MAXIMUM_AVATAR_FILE_SIZE }
+    validates :avatar, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
     validates :email, uniqueness: { scope: :organization }, unless: -> { deleted? || managed? }
     validate :all_roles_are_valid
 
@@ -106,7 +106,7 @@ module Decidim
     end
 
     def all_roles_are_valid
-      errors.add(:roles, :invalid) unless roles.all? { |role| ROLES.include?(role) }
+      errors.add(:roles, :invalid) unless roles.compact.all? { |role| ROLES.include?(role) }
     end
 
     def available_locales

data/app/models/decidim/user_group.rb

@@ -11,7 +11,7 @@ module Decidim
     validates :name, presence: true, uniqueness: { scope: :decidim_organization_id }
     validates :document_number, presence: true, uniqueness: { scope: :decidim_organization_id }
     validates :phone, presence: true
-    validates :avatar, file_size: { less_than_or_equal_to: 5.megabytes }
+    validates :avatar, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
 
     validate :correct_state
 

data/app/services/decidim/action_authorizer.rb

@@ -31,9 +31,9 @@ module Decidim
 
       return status(:ok) unless authorization_handler_name
 
-      return status(:missing, handler: authorization_handler_name) unless authorization
-      return status(:invalid, handler: authorization_handler_name, fields: unmatched_fields) if unmatched_fields.any?
-      return status(:incomplete, handler: authorization_handler_name, fields: missing_fields) if missing_fields.any?
+      return status(:missing) unless authorization
+      return status(:invalid, fields: unmatched_fields) if unmatched_fields.any?
+      return status(:incomplete, fields: missing_fields) if missing_fields.any?
 
       status(:ok)
     end
@@ -48,10 +48,12 @@ module Decidim
 
     def authorization
       return nil unless user
-      return nil unless permission["authorization_handler_name"]
 
-      @authorization ||= user.authorizations.to_a.find do |authorization|
-        authorization.name == permission.fetch("authorization_handler_name")
+      handler = permission["authorization_handler_name"]
+      return nil unless handler
+
+      @authorization ||= user.authorizations.find do |authorization|
+        authorization.name == handler
       end
     end