decidim-core 0.2.0 → 0.3.0

data/app/helpers/decidim/omniauth_helper.rb

@@ -5,7 +5,7 @@ module Decidim
   module OmniauthHelper
     # Public: returns true if the social provider is enabled
     def social_provider_enabled?(provider)
-      Rails.application.secrets.dig(:omniauth, provider.to_s, "enabled")
+      Rails.application.secrets.dig(:omniauth, provider.to_sym, :enabled)
     end
 
     # Public: returns true if any provider is enabled

data/app/helpers/decidim/resource_helper.rb

@@ -3,28 +3,6 @@
 module Decidim
   # A Helper to render and link to resources.
   module ResourceHelper
-    # Builds the path to a resource. Useful when linking to a resource from
-    # another engine.
-    #
-    # resource - An object that is a valid resource exposed by some feature.
-    # options - An optional hash of options to pass to the Rails router
-    #
-    # Returns a String.
-    def decidim_resource_path(resource, options = {})
-      _decidim_resource_route(resource, "path", options)
-    end
-
-    # Builds the url to a resource. Useful when linking to a resource from
-    # another engine.
-    #
-    # resource - An object that is a valid resource exposed by some feature.
-    # options - An optional hash of options to pass to the Rails router
-    #
-    # Returns a String.
-    def decidim_resource_url(resource, options = {})
-      _decidim_resource_route(resource, "url", options.merge(host: resource.organization.host))
-    end
-
     # Renders a collection of linked resources for a resource.
     #
     # resource  - The resource to get the links from.
@@ -87,20 +65,9 @@ module Decidim
       [["", t("all", scope: "decidim.filters.linked_classes")]] + linked_classes_for(klass)
     end
 
-    # Private: Build the route to a given resource.
-    #
-    # Returns a String.
-    def _decidim_resource_route(resource, route_type, options)
-      manifest = resource.class.resource_manifest
-      engine = manifest.feature_manifest.engine
-
-      url_params = {
-        id: resource.id,
-        feature_id: resource.feature.id,
-        participatory_process_id: resource.feature.participatory_process.id
-      }
-
-      engine.routes.url_helpers.send("#{manifest.route_name}_#{route_type}", url_params.merge(options))
+    # Returns an instance of ResourceLocatorPresenter with the given resource
+    def resource_locator(resource)
+      ResourceLocatorPresenter.new(resource)
     end
   end
 end

data/app/mailers/decidim/reported_mailer.rb

@@ -5,11 +5,12 @@ module Decidim
   class ReportedMailer < Decidim::ApplicationMailer
     helper Decidim::ResourceHelper
 
-    helper_method :reported_content
+    helper_method :reported_content_url
 
     def report(user, report)
       with_user(user) do
         @report = report
+        @participatory_process = @report.moderation.participatory_process
         @organization = user.organization
         @user = user
         subject = I18n.t("report.subject", scope: "decidim.reported_mailer")
@@ -20,6 +21,7 @@ module Decidim
     def hide(user, report)
       with_user(user) do
         @report = report
+        @participatory_process = @report.moderation.participatory_process
         @organization = user.organization
         @user = user
         subject = I18n.t("hide.subject", scope: "decidim.reported_mailer")
@@ -29,8 +31,8 @@ module Decidim
 
     private
 
-    def reported_content
-      @reported_content ||= @report.moderation.reportable.reported_content
+    def reported_content_url
+      @reported_content_url ||= @report.moderation.reportable.reported_content_url
     end
   end
 end

data/app/models/decidim/attachment.rb

@@ -6,7 +6,7 @@ module Decidim
   class Attachment < ApplicationRecord
     belongs_to :attached_to, polymorphic: true
 
-    validates :file, :attached_to, :content_type, presence: true
+    validates :file, :content_type, presence: true
     validates :file, file_size: { less_than_or_equal_to: ->(_attachment) { Decidim.maximum_attachment_size } }
     mount_uploader :file, Decidim::AttachmentUploader
 

data/app/models/decidim/authorization.rb

@@ -13,7 +13,7 @@ module Decidim
   class Authorization < ApplicationRecord
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User", inverse_of: :authorizations
 
-    validates :name, :user, :handler, presence: true
+    validates :name, :handler, presence: true
     validates :name, uniqueness: { scope: :decidim_user_id }
 
     # The handler that created this authorization.

data/app/models/decidim/categorization.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  class Categorization < ApplicationRecord
+    belongs_to :category, foreign_key: :decidim_category_id
+    belongs_to :categorizable, polymorphic: true
+  end
+end

data/app/models/decidim/category.rb

@@ -6,10 +6,11 @@ module Decidim
   class Category < ApplicationRecord
     belongs_to :participatory_process, foreign_key: "decidim_participatory_process_id", class_name: "Decidim::ParticipatoryProcess", inverse_of: :categories
     has_many :subcategories, foreign_key: "parent_id", class_name: "Decidim::Category", dependent: :destroy, inverse_of: :parent
-    belongs_to :parent, class_name: "Decidim::Category", foreign_key: "parent_id", inverse_of: :subcategories
+    belongs_to :parent, class_name: "Decidim::Category", foreign_key: "parent_id", inverse_of: :subcategories, optional: true
+    has_many :categorizations, foreign_key: "decidim_category_id", class_name: "Decidim::Categorization", dependent: :destroy
 
     validate :forbid_deep_nesting
-    before_save :subcategories_have_same_process
+    before_validation :subcategories_have_same_process
 
     # Scope to return only the first-class categories, that is, those that are
     # not subcategories.
@@ -19,6 +20,10 @@ module Decidim
       where(parent_id: nil)
     end
 
+    def unused?
+      categorizations.empty?
+    end
+
     private
 
     def forbid_deep_nesting

data/app/models/decidim/feature.rb

@@ -2,16 +2,14 @@
 
 module Decidim
   # A Feature represents a self-contained group of functionalities usually
-  # defined via a FeatureManifest and its Components. It's meant to be able to
-  # provide a single feature that spans over several steps, each one with its component.
+  # defined via a FeatureManifest. It's meant to be able to provide a single
+  # feature that spans over several steps.
   class Feature < ApplicationRecord
     belongs_to :participatory_process, foreign_key: "decidim_participatory_process_id"
     has_one :organization, through: :participatory_process
     has_many :categories, through: :participatory_process
     has_many :scopes, through: :organization
 
-    validates :participatory_process, presence: true
-
     default_scope { order(arel_table[:weight].asc) }
 
     after_initialize :default_values
@@ -32,7 +30,7 @@ module Decidim
       where(published_at: nil)
     end
 
-    # Public: Finds out wether this feature is published.
+    # Public: Finds out whether this feature is published.
     #
     # Returns true if published, false otherwise.
     def published?

data/app/models/decidim/identity.rb

@@ -6,7 +6,6 @@ module Decidim
     belongs_to :user, foreign_key: :decidim_user_id, class_name: "Decidim::User"
     belongs_to :organization, foreign_key: :decidim_organization_id, class_name: "Decidim::Organization"
 
-    validates :user, presence: true
     validates :provider, presence: true
     validates :uid, presence: true, uniqueness: { scope: [:provider, :organization] }
 

data/app/models/decidim/moderation.rb

@@ -7,8 +7,6 @@ module Decidim
     belongs_to :participatory_process, foreign_key: "decidim_participatory_process_id", class_name: "Decidim::ParticipatoryProcess"
     has_many :reports, foreign_key: "decidim_moderation_id", class_name: "Decidim::Report"
 
-    validates :reportable, :participatory_process, presence: true
-
     delegate :feature, :organization, to: :reportable
   end
 end

data/app/models/decidim/participatory_process.rb

@@ -16,10 +16,12 @@ module Decidim
     belongs_to :participatory_process_group,
                foreign_key: "decidim_participatory_process_group_id",
                class_name: "Decidim::ParticipatoryProcessGroup",
-               inverse_of: :participatory_processes
+               inverse_of: :participatory_processes,
+               optional: true
     belongs_to :scope,
                foreign_key: "decidim_scope_id",
-               class_name: "Decidim::Scope"
+               class_name: "Decidim::Scope",
+               optional: true
     has_many :steps,
              -> { order(position: :asc) },
              foreign_key: "decidim_participatory_process_id",

data/app/models/decidim/report.rb

@@ -8,7 +8,7 @@ module Decidim
     belongs_to :moderation, foreign_key: "decidim_moderation_id", class_name: "Decidim::Moderation"
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
 
-    validates :moderation, :user, :reason, presence: true
+    validates :reason, presence: true
     validates :user, uniqueness: { scope: :decidim_moderation_id }
     validates :reason, inclusion: { in: REASONS }
     validate :user_and_moderation_same_organization

data/app/models/decidim/resource_link.rb

@@ -12,8 +12,7 @@ module Decidim
     belongs_to :from, polymorphic: true
     belongs_to :to, polymorphic: true
 
-    validates :from, :to, :name, presence: true
-    validates :name, uniqueness: { scope: [:from, :to] }
+    validates :name, presence: true, uniqueness: { scope: [:from, :to] }
 
     validate :same_organization
 

data/app/models/decidim/static_page.rb

@@ -10,8 +10,7 @@ module Decidim
   class StaticPage < ApplicationRecord
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization", inverse_of: :static_pages
 
-    validates :slug, :organization, presence: true
-    validates :slug, uniqueness: { scope: :organization }
+    validates :slug, presence: true, uniqueness: { scope: :organization }
 
     # These pages will be created by default when registering an organization
     # and cannot be deleted.

data/app/models/decidim/user.rb

@@ -15,16 +15,16 @@ module Decidim
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization"
     has_many :authorizations, foreign_key: "decidim_user_id", class_name: "Decidim::Authorization", inverse_of: :user
     has_many :identities, foreign_key: "decidim_user_id", class_name: "Decidim::Identity"
-    has_many :user_groups, through: :memberships, class_name: "Decidim::UserGroup", foreign_key: :decidim_user_group_id
     has_many :memberships, class_name: "Decidim::UserGroupMembership", foreign_key: :decidim_user_id
+    has_many :user_groups, through: :memberships, class_name: "Decidim::UserGroup", foreign_key: :decidim_user_group_id
 
     ROLES = %w(admin moderator collaborator official).freeze
 
-    validates :organization, :name, presence: true
+    validates :name, presence: true, unless: -> { deleted? }
     validates :locale, inclusion: { in: I18n.available_locales.map(&:to_s) }, 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 :email, uniqueness: { scope: :organization }
+    validates :email, uniqueness: { scope: :organization }, unless: -> { deleted? }
     validate :all_roles_are_valid
     mount_uploader :avatar, Decidim::AvatarUploader
 
@@ -55,6 +55,11 @@ module Decidim
       super || I18n.t("decidim.anonymous_user")
     end
 
+    # Check if the user account has been deleted or not
+    def deleted?
+      deleted_at.present?
+    end
+
     # Check if the user exists with the given email and the current organization
     #
     # warden_conditions - A hash with the authentication conditions
@@ -69,6 +74,14 @@ module Decidim
       ).first
     end
 
+    protected
+
+    # Overrides devise email required validation.
+    # If the user has been deleted the email field is not required anymore.
+    def email_required?
+      !deleted?
+    end
+
     private
 
     def all_roles_are_valid

data/app/models/decidim/user_group.rb

@@ -3,11 +3,13 @@
 module Decidim
   # A UserGroup is an organization of citizens
   class UserGroup < ApplicationRecord
-    has_many :users, through: :memberships, class_name: "Decidim::User", foreign_key: :decidim_user_id
+    belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization"
+
     has_many :memberships, class_name: "Decidim::UserGroupMembership", foreign_key: :decidim_user_group_id
+    has_many :users, through: :memberships, class_name: "Decidim::User", foreign_key: :decidim_user_id
 
-    validates :name, presence: true
-    validates :document_number, presence: true
+    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 }
 

data/app/presenters/decidim/resource_locator_presenter.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A presenter to get the url or path from a resource.
+  class ResourceLocatorPresenter < Rectify::Presenter
+    def initialize(resource)
+      @resource = resource
+    end
+
+    # Builds the path to a resource. Useful when linking to a resource from
+    # another engine.
+    #
+    # options - An optional hash of options to pass to the Rails router
+    #
+    # Returns a String.
+    def path(options = {})
+      _route(@resource, "path", options)
+    end
+
+    # Builds the url to a resource. Useful when linking to a resource from
+    # another engine.
+    #
+    # options - An optional hash of options to pass to the Rails router
+    #
+    # Returns a String.
+    def url(options = {})
+      _route(@resource, "url", options.merge(host: @resource.organization.host))
+    end
+
+    private
+
+    # Private: Build the route to a given resource.
+    #
+    # Returns a String.
+    def _route(resource, route_type, options)
+      manifest = resource.class.resource_manifest
+      engine = manifest.feature_manifest.engine
+
+      url_params = {
+        id: resource.id,
+        feature_id: resource.feature.id,
+        participatory_process_id: resource.feature.participatory_process.id
+      }
+
+      engine.routes.url_helpers.send("#{manifest.route_name}_#{route_type}", url_params.merge(options))
+    end
+  end
+end

data/app/services/decidim/authorization_handler.rb

@@ -83,13 +83,10 @@ module Decidim
     # Returns an AuthorizationHandler descendant.
     # Returns nil when no handlers could be found.
     def self.handler_for(name, params = {})
-      handler_klass = name.classify.constantize
-
-      return unless Decidim.authorization_handlers.include?(handler_klass)
-
-      handler_klass.from_params(params || {})
-    rescue NameError
-      nil
+      return unless name
+      handler_klass = name.classify
+      return unless Decidim.authorization_handlers.map(&:to_s).include?(handler_klass)
+      handler_klass.constantize.from_params(params || {})
     end
   end
 end

data/app/services/decidim/resource_search.rb

@@ -26,7 +26,9 @@ module Decidim
 
     # Handle the category_id filter
     def search_category_id
-      query.where(decidim_category_id: category_ids)
+      query
+        .includes(:categorization)
+        .where(decidim_categorizations: { decidim_category_id: category_ids })
     end
 
     # Handles the scope_id filter. When we want to show only those that do not

data/app/uploaders/decidim/avatar_uploader.rb

@@ -8,11 +8,11 @@ module Decidim
     process :validate_dimensions
 
     version :big do
-      process resize_to_fill: [500, 500]
+      process resize_and_pad: [500, 500]
     end
 
     version :thumb do
-      process resize_to_fill: [100, 100]
+      process resize_and_pad: [100, 100]
     end
 
     def default_url(*)

data/app/uploaders/decidim/image_uploader.rb

@@ -34,7 +34,7 @@ module Decidim
     end
 
     def max_image_height_or_width
-      2000
+      3840
     end
 
     private

data/app/uploaders/decidim/official_image_footer_uploader.rb

@@ -4,10 +4,6 @@ module Decidim
   # This class deals with uploading hero images to ParticipatoryProcesses.
   class OfficialImageFooterUploader < ImageUploader
     include CarrierWave::MiniMagick
-    process resize_to_limit: [600, 180]
-
-    def max_image_height_or_width
-      600
-    end
+    process resize_to_fit: [600, 180]
   end
 end

data/app/uploaders/decidim/official_image_header_uploader.rb

@@ -4,10 +4,6 @@ module Decidim
   # This class deals with uploading hero images to ParticipatoryProcesses.
   class OfficialImageHeaderUploader < ImageUploader
     include CarrierWave::MiniMagick
-    process resize_to_limit: [160, 160]
-
-    def max_image_height_or_width
-      300
-    end
+    process resize_to_fit: [160, 160]
   end
 end