decidim-core 0.0.2 → 0.0.3

data/app/controllers/decidim/authorizations_controller.rb

@@ -7,19 +7,22 @@ module Decidim
   class AuthorizationsController < ApplicationController
     helper_method :handler, :handlers
     before_action :valid_handler, only: [:new, :create]
-    before_action :only_one_handler?, only: [:index]
 
-    def new
-      authorize! current_user, Authorization
-    end
+    include Decidim::UserProfile
+
+    layout "layouts/decidim/user_profile", only: [:index]
+
+    def new; end
 
     def index
-      authorize! current_user, Authorization
+      @authorizations = current_user.authorizations
     end
 
-    def create
-      authorize! current_user, Authorization
+    def first_login
+      redirect_to(action: :new, handler: handlers.first.handler_name) if handlers.length == 1
+    end
 
+    def create
       AuthorizeUser.call(handler) do
         on(:ok) do
           flash[:notice] = t("authorizations.create.success", scope: "decidim")
@@ -35,7 +38,7 @@ module Decidim
 
     def destroy
       @authorization = current_user.authorizations.find(params[:id])
-      authorize! current_user, @authorization
+      authorize! :destroy, @authorization
 
       @authorization.destroy
       flash[:notice] = t("authorizations.destroy.success", scope: "decidim")
@@ -72,5 +75,15 @@ module Decidim
     def only_one_handler?
       redirect_to(action: :new, handler: handlers.first.handler_name) && return if handlers.length == 1
     end
+
+    def handlers
+      @handlers ||= available_authorization_handlers.reject do |handler|
+        authorized_handlers.include?(handler.handler_name)
+      end
+    end
+
+    def authorized_handlers
+      current_user.authorizations.map(&:name)
+    end
   end
 end

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

@@ -7,6 +7,8 @@ module Decidim
       include Decidim::LocaleSwitcher
       helper Decidim::TranslationsHelper
 
+      layout "layouts/decidim/application"
+
       # We don't users to create invitations, so we just redirect them to the
       # homepage.
       def authenticate_inviter!

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

@@ -12,7 +12,7 @@ module Decidim
 
       def after_sign_in_path_for(user)
         if !pending_redirect?(user) && first_login_and_not_authorized?(user)
-          authorizations_path
+          first_login_authorizations_path
         else
           super
         end

data/app/controllers/decidim/own_user_groups_controller.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+require_dependency "decidim/application_controller"
+
+module Decidim
+  # The controller to handle managing the current user's
+  # UserGroups.
+  class OwnUserGroupsController < ApplicationController
+    include Decidim::UserProfile
+
+    def index
+      @user_groups = current_user.user_groups
+    end
+  end
+end

data/app/controllers/decidim/participatory_processes_controller.rb

@@ -11,7 +11,7 @@ module Decidim
 
     helper_method :participatory_processes, :promoted_processes
 
-    skip_after_action :verify_participatory_process , only: [:index]
+    skip_after_action :verify_participatory_process, only: [:index]
 
     def index
       authorize! :read, ParticipatoryProcess

data/app/forms/decidim/account_form.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The form object that handles the data behind updating a user's
+  # account in her profile page.
+  class AccountForm < Form
+    mimic :user
+
+    attribute :name
+    attribute :email
+    attribute :password
+    attribute :password_confirmation
+    attribute :avatar
+    attribute :remove_avatar
+
+    validates :name, presence: true
+    validates :email, presence: true
+
+    validates :password, confirmation: true
+    validates :password, length: { in: Decidim::User.password_length, allow_blank: true }
+    validates :password_confirmation, presence: true, if: :password_present
+
+    validate :unique_email
+
+    private
+
+    def password_present
+      !password.blank?
+    end
+
+    def unique_email
+      return true if Decidim::User.where(
+        organization: context.current_organization,
+        email: email
+      ).where.not(id: context.current_user.id).empty?
+
+      errors.add :email, :taken
+      false
+    end
+  end
+end

data/app/helpers/decidim/aria_selected_link_to_helper.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+module Decidim
+  # Module to add the attribute `aria-selected` to links when they are
+  # pointing to the current path. Uses the `active_link_to` gem to calculate
+  # this.
+  #
+  module AriaSelectedLinkToHelper
+    # Adds the `aria-selected` attribute to a link when it's pointing to the
+    # current path. The API is the same than the `link_to` one, and uses this
+    # helper internally.
+    #
+    # text - a String with the link text
+    # link - Where the link should point to. Accepts the same value than
+    #   `link_to` helper.
+    # options - An options Hash that will be passed to `link_to`.
+    def aria_selected_link_to(text, link, options = {})
+      link_to(
+        text,
+        link,
+        options.merge(
+          "aria-selected": is_active_link?(link, options[:aria_link_type] || :inclusive)
+        )
+      )
+    end
+  end
+end

data/app/helpers/decidim/attachments_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+module Decidim
+  # A Helper to render and link to resources.
+  module AttachmentsHelper
+    # Renders a the attachments of a model that includes the
+    # HasAttachments concern.
+    #
+    # attached_to - The model to render the attachments from.
+    #
+    # Returns nothing.
+    def attachments_for(attached_to)
+      render partial: "attachments", locals: { attached_to: attached_to }
+    end
+  end
+end

data/app/helpers/decidim/filters_helper.rb

@@ -10,12 +10,11 @@ module Decidim
     #
     # Returns the filter resource form wrapped in a div
     def filter_form_for(filter)
-      filters_container = content_tag :div, class: "filters" do
-        form_for filter, builder: FilterFormBuilder, url: url_for, as: :filter, method: :get, remote: true do |form|
+      content_tag :div, class: "filters" do
+        form_for filter, builder: FilterFormBuilder, url: url_for, as: :filter, method: :get, remote: true, html: { id: nil } do |form|
           yield form
         end
       end
-      filters_container + javascript_include_tag("decidim/filters")
     end
   end
 end

data/app/helpers/decidim/layout_helper.rb

@@ -3,10 +3,22 @@ module Decidim
   # View helpers related to the layout.
   module LayoutHelper
     def decidim_page_title
-      title = content_for(:title)
+      title = content_for(:meta_title)
       title ? "#{title} - #{current_organization.name}" : current_organization.name
     end
 
+    # Public: Generates a set of meta tags that generate the different favicon
+    # versions for an organization.
+    #
+    # Returns a safe String with the versions.
+    def favicon
+      return unless current_organization.favicon.present?
+
+      safe_join(Decidim::OrganizationFaviconUploader::SIZES.map do |version, size|
+        favicon_link_tag(current_organization.favicon.send(version).url, sizes: "#{size}x#{size}")
+      end)
+    end
+
     # Outputs an SVG-based icon.
     #
     # name    - The String with the icon name.
@@ -34,8 +46,7 @@ module Decidim
       html_properties["role"] = options[:role]
       html_properties["aria-hidden"] = options[:aria_hidden]
 
-      icon_class = (options[:remove_icon_class] ? "" : "icon")
-      html_properties["class"] = "icon--#{name} #{icon_class} #{options[:class]}"
+      html_properties["class"] = (["icon--#{name}"] + _icon_classes(options)).join(" ")
 
       content_tag :svg, html_properties do
         content_tag :use, nil, "xlink:href" => "#{asset_url("decidim/icons.svg")}#icon-#{name}"
@@ -49,11 +60,23 @@ module Decidim
     # path    - The asset's path
     #
     # Returns an <img /> tag with the SVG icon.
-    def external_icon(path)
+    def external_icon(path, options = {})
       # Ugly hack to prevent PhantomJS from freaking out with SVGs.
-      return content_tag(:span, "?", class: "external-svg", "data-src" => path) if Rails.env.test?
+      classes = _icon_classes(options) + ["external-icon"]
+      return content_tag(:span, "?", class: classes.join(" "), "data-src" => path) if Rails.env.test?
+
+      if path.split(".").last == "svg"
+        asset = Rails.application.assets_manifest.find_sources(path).first
+        asset.gsub("<svg ", "<svg class=\"#{classes.join(" ")}\" ").html_safe
+      else
+        image_tag(path, class: classes.join(" "), style: "display: none")
+      end
+    end
 
-      image_tag(path, class: "external-svg", style: "display: none")
+    def _icon_classes(options = {})
+      classes = options[:remove_icon_class] ? [] : ["icon"]
+      classes += [options[:class]]
+      classes.compact
     end
   end
 end

data/app/helpers/decidim/resource_helper.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+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.
+    #
+    # Returns a String.
+    def decidim_resource_path(resource)
+      _decidim_resource_route(resource, "path")
+    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.
+    #
+    # Returns a String.
+    def decidim_resource_url(resource)
+      _decidim_resource_route(resource, "url")
+    end
+
+    # Renders a collection of linked resources for a resource.
+    #
+    # resource  - The resource to get the links from.
+    # type      - The String type fo the resources we want to render.
+    # link_name - The String name of the link between the resources.
+    #
+    # Example to render the proposals in a meeting view:
+    #
+    #  linked_resources_for(:meeting, :proposals, "proposals_from_meeting")
+    #
+    # Returns nothing.
+    def linked_resources_for(resource, type, link_name)
+      linked_resources = resource.linked_resources(type, link_name).group_by { |linked_resource| linked_resource.class.name }
+
+      safe_join(linked_resources.map do |klass, resources|
+        resource_manifest = klass.constantize.resource_manifest
+        content_tag(:div, class: "section") do
+          content_tag(:h3, I18n.t(resource_manifest.name, scope: "decidim.resource_links.#{link_name}"), class: "section-heading") +
+            render(partial: resource_manifest.template, locals: { resources: resources })
+        end
+      end)
+    end
+
+    # Private: Build the route to a given resource.
+    #
+    # Returns a String.
+    def _decidim_resource_route(resource, route_type)
+      manifest = resource.class.resource_manifest
+      engine = send(manifest.mounted_engine_name)
+
+      url_params = {
+        id: resource.id,
+        feature_id: resource.feature.id,
+        participatory_process_id: resource.feature.participatory_process.id
+      }
+
+      engine.send("#{manifest.route_name}_#{route_type}", url_params)
+    end
+  end
+end

data/app/helpers/decidim/user_profile_helper.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+module Decidim
+  # Helpers used in controllers implementing the `Decidim::UserProfile` concern.
+  module UserProfileHelper
+    # Public: Shows a menu tab with a section. It highlights automatically bye
+    # detecting if the current path is a subset of the provided route.
+    #
+    # text - The text to show in the tab.
+    # link - The path to link to.
+    # options - Extra options.
+    #           aria_link_type - :inclusive or :exact, depending on the type of
+    #                            highlighting desired.
+    #
+    # Returns a String with the menu tab.
+    def user_profile_tab(text, link, options = {})
+      active = is_active_link?(link, (options[:aria_link_type] || :inclusive))
+
+      content_tag(:li, class: "tabs-title#{active ? " is-active" : nil}") do
+        aria_selected_link_to(text, link, options)
+      end
+    end
+  end
+end

data/app/mailers/decidim/decidim_devise_mailer.rb

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

data/app/models/decidim/abilities/everyone.rb

@@ -6,10 +6,14 @@ module Decidim
     class Everyone
       include CanCan::Ability
 
-      def initialize(_user)
+      def initialize(user, _context)
         can :read, ParticipatoryProcess, &:published?
         can :read, :public_pages
         can :manage, :locales
+
+        can :manage, User do |other|
+          other == user
+        end
       end
     end
   end

data/app/models/decidim/ability.rb

@@ -17,16 +17,15 @@ module Decidim
     # every time you change things in your ability classes.
     #
     # user - the User that needs its abilities checked.
-    def initialize(user)
+    # context - a Hash with some context related to the current request.
+    def initialize(user, context = {})
       Decidim.abilities.each do |ability|
-        merge ability.new(user)
+        merge ability.constantize.new(user, context)
       end
 
       can :manage, Authorization do |authorization|
         authorization.user == user
       end
-
-      can :read, :user_account if user
     end
   end
 end

data/app/models/decidim/{participatory_process_attachment.rb → attachment.rb}

@@ -2,11 +2,11 @@
 module Decidim
   # Attachment can be any type of document or images related to a partcipatory
   # process.
-  class ParticipatoryProcessAttachment < ApplicationRecord
-    belongs_to :participatory_process, foreign_key: "decidim_participatory_process_id", class_name: Decidim::ParticipatoryProcess, inverse_of: :attachments
+  class Attachment < ApplicationRecord
+    belongs_to :attached_to, polymorphic: true
 
-    validates :file, :participatory_process, :content_type, presence: true
-    validates :file, file_size: { less_than_or_equal_to: 10.megabytes }
+    validates :file, :attached_to, :content_type, presence: true
+    validates :file, file_size: { less_than_or_equal_to: ->(_attachment) { Decidim.maximum_attachment_size } }
     mount_uploader :file, Decidim::AttachmentUploader
 
     # Whether this attachment is a photo or not.
@@ -27,7 +27,7 @@ module Decidim
     #
     # Returns String.
     def file_type
-      file.file.extension
+      file.url&.split(".")&.last&.downcase
     end
 
     # The URL to download the file.

data/app/models/decidim/feature.rb

@@ -11,6 +11,8 @@ module Decidim
 
     validates :participatory_process, presence: true
 
+    default_scope { order(arel_table[:weight].asc) }
+
     after_initialize :default_values
 
     # Public: Finds the manifest this feature is associated to.

data/app/models/decidim/organization.rb

@@ -14,6 +14,7 @@ module Decidim
 
     mount_uploader :homepage_image, Decidim::HomepageImageUploader
     mount_uploader :logo, Decidim::OrganizationLogoUploader
+    mount_uploader :favicon, Decidim::OrganizationFaviconUploader
 
     def homepage_big_url
       homepage_image.big.url