decidim-core 0.0.3 → 0.0.5

data/app/mailers/decidim/application_mailer.rb

@@ -3,9 +3,9 @@ module Decidim
   # Main application mailer configuration. Inherit from this to create new
   # mailers.
   class ApplicationMailer < ActionMailer::Base
-    include Roadie::Rails::Automatic
+    include LocalisedMailer
 
     default from: Decidim.config.mailer_sender
-    layout "mailer"
+    layout "decidim/mailer"
   end
 end

data/app/mailers/decidim/decidim_devise_mailer.rb

@@ -4,7 +4,6 @@ module Decidim
   # each role and use a localised version.
   class DecidimDeviseMailer < Devise::Mailer
     include LocalisedMailer
-    include Roadie::Rails::Automatic
 
     layout "decidim/mailer"
 

data/app/mailers/decidim/newsletter_mailer.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+module Decidim
+  class NewsletterMailer < ApplicationMailer
+    add_template_helper Decidim::TranslationsHelper
+
+    def newsletter(user, newsletter)
+      @organization = user.organization
+      @newsletter = newsletter
+
+      with_user(user) do
+        @subject = parse_interpolations(@newsletter.subject[I18n.locale.to_s], user)
+        @body = parse_interpolations(@newsletter.body[I18n.locale.to_s], user)
+
+        mail(to: "#{user.name} <#{user.email}>", subject: @subject)
+      end
+    end
+
+    private
+
+    def parse_interpolations(content, user)
+      content.gsub("%{name}", user.name)
+    end
+  end
+end

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

@@ -11,6 +11,8 @@ module Decidim
         can :read, :public_pages
         can :manage, :locales
 
+        can :read, Feature, &:published?
+
         can :manage, User do |other|
           other == user
         end

data/app/models/decidim/feature.rb

@@ -15,6 +15,29 @@ module Decidim
 
     after_initialize :default_values
 
+    # Public: Filters the features that are published and, therefore, visible by
+    # the end user.
+    #
+    # Returns an ActiveRecord::Relation.
+    def self.published
+      where.not(published_at: nil)
+    end
+
+    # Public: Filters the features that are unpublished and, therefore, not visible
+    # by the end user.
+    #
+    # Returns an ActiveRecord::Relation.
+    def self.unpublished
+      where(published_at: nil)
+    end
+
+    # Public: Finds out wether this feature is published.
+    #
+    # Returns true if published, false otherwise.
+    def published?
+      published_at.present?
+    end
+
     # Public: Finds the manifest this feature is associated to.
     #
     # Returns a FeatureManifest.
@@ -51,6 +74,13 @@ module Decidim
       end
     end
 
+    def active_step_settings
+      active_step = participatory_process.active_step
+      return nil unless active_step
+
+      step_settings.fetch(active_step.id.to_s)
+    end
+
     private
 
     def serialize_settings(schema, value)

data/app/models/decidim/newsletter.rb

@@ -0,0 +1,24 @@
+module Decidim
+  # This model holds all the data needed to send a newsletter.
+  class Newsletter < ApplicationRecord
+    belongs_to :author, class_name: User
+    belongs_to :organization
+
+    validates :subject, :body, presence: true
+    validate :author_belongs_to_organization
+
+    # Returns true if this newsletter was already sent.
+    #
+    # Returns a Boolean.
+    def sent?
+      sent_at.present?
+    end
+
+    private
+
+    def author_belongs_to_organization
+      return if !author || !organization
+      errors.add(:author, :invalid) unless author.organization == organization
+    end
+  end
+end

data/app/models/decidim/organization.rb

@@ -13,6 +13,8 @@ module Decidim
     validates :name, :host, uniqueness: true
 
     mount_uploader :homepage_image, Decidim::HomepageImageUploader
+    mount_uploader :official_img_header, Decidim::OfficialImageHeaderUploader
+    mount_uploader :official_img_footer, Decidim::OfficialImageFooterUploader
     mount_uploader :logo, Decidim::OrganizationLogoUploader
     mount_uploader :favicon, Decidim::OrganizationFaviconUploader
 

data/app/models/decidim/user.rb

@@ -14,13 +14,14 @@ module Decidim
     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
 
-    ROLES = %w(admin moderator official).freeze
+    ROLES = %w(admin moderator collaborator official).freeze
 
     validates :organization, :name, presence: true
     validates :locale, inclusion: { in: I18n.available_locales.map(&:to_s) }, allow_blank: true
     validates :tos_agreement, acceptance: true, allow_nil: false, on: :create
-    validate :all_roles_are_valid
     validates :avatar, file_size: { less_than_or_equal_to: 5.megabytes }
+    validates :email, uniqueness: { scope: :organization }
+    validate :all_roles_are_valid
     mount_uploader :avatar, Decidim::AvatarUploader
 
     # Public: Allows customizing the invitation instruction email content when

data/app/queries/decidim/highlighted_participatory_processes.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+module Decidim
+  # This query adds some scopes so the processes are ready to be showed in a
+  # public view.
+  class HighlightedParticipatoryProcesses < Rectify::Query
+    def query
+      Decidim::ParticipatoryProcess.order("promoted DESC").includes(:active_step).order("decidim_participatory_process_steps.end_date ASC").limit(8)
+    end
+  end
+end

data/app/queries/decidim/promoted_participatory_processes.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+module Decidim
+  # This query filters processes so only promoted ones are returned.
+  class PromotedParticipatoryProcesses < Rectify::Query
+    def query
+      Decidim::ParticipatoryProcess.promoted
+    end
+  end
+end

data/app/queries/decidim/public_participatory_processes.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+module Decidim
+  # This query adds some scopes so the processes are ready to be showed in a
+  # public view.
+  class PublicParticipatoryProcesses < Rectify::Query
+    def query
+      Decidim::ParticipatoryProcess.order("promoted DESC").includes(:active_step).order("decidim_participatory_process_steps.end_date ASC")
+    end
+  end
+end

data/app/services/decidim/action_authorizer.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+module Decidim
+  # This class is used to authorize a user against an action in the context of a
+  # feature.
+  class ActionAuthorizer
+    include Wisper::Publisher
+
+    # Initializes the ActionAuthorizer.
+    #
+    # user    - The user to authorize against.
+    # feature - The feature to authenticate against.
+    # action  - The action to authenticate.
+    def initialize(user, feature, action)
+      @user = user
+      @feature = feature
+      @action = action.to_s if action
+    end
+
+    # Public: Broadcasts different events given the status of the authentication.
+    #
+    # Broadcasts:
+    #   failed       - When no valid authorization can be found.
+    #   unauthorized - When an authorization was found, but didn't match the credentials.
+    #   incomplete   - An authorization was found, but lacks some required fields. User
+    #                  should re-authenticate.
+    #
+    # Returns nil.
+    def authorize
+      raise AuthorizationError, "Missing data" unless feature && action
+
+      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?
+
+      status(:ok)
+    end
+
+    private
+
+    def status(status_code, data = {})
+      AuthorizationStatus.new(status_code, authorization_handler_name, data)
+    end
+
+    attr_reader :user, :feature, :action
+
+    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")
+      end
+    end
+
+    def unmatched_fields
+      (permission_options.keys & authorization.metadata.to_h.keys).each_with_object({}) do |field, unmatched|
+        unmatched[field] = permission_options[field] if authorization.metadata[field] != permission_options[field]
+        unmatched
+      end
+    end
+
+    def missing_fields
+      permission_options.keys.each_with_object([]) do |field, missing|
+        missing << field if authorization.metadata[field].blank?
+        missing
+      end
+    end
+
+    def permission_options
+      permission["options"] || {}
+    end
+
+    def authorization_handler_name
+      permission&.fetch("authorization_handler_name", nil)
+    end
+
+    def permission
+      return nil unless feature
+      return nil unless action
+
+      @permission ||= feature.permissions&.fetch(action, nil)
+    end
+
+    class AuthorizationStatus
+      attr_reader :code, :handler_name, :data
+
+      def initialize(code, handler_name, data)
+        @code = code.to_sym
+        @handler_name = handler_name
+        @data = data.symbolize_keys
+      end
+
+      def ok?
+        @code == :ok
+      end
+    end
+
+    class AuthorizationError < StandardError; end
+  end
+end

data/app/services/decidim/resource_search.rb

@@ -5,7 +5,7 @@ module Decidim
   class ResourceSearch < Searchlight::Search
     # Initialize the Searchlight::Search base class with the options provided.
     #
-    # scope - The scope used to create the base query
+    # scope   - The scope used to create the base query
     # options - A hash of options to modify the search. These options will be
     #          converted to methods by SearchLight so they can be used on filter #
     #          methods. (Default {})

data/app/uploaders/decidim/official_image_footer_uploader.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module Decidim
+  # This class deals with uploading hero images to ParticipatoryProcesses.
+  class OfficialImageFooterUploader < ImageUploader
+    include CarrierWave::MiniMagick
+    process resize_to_limit: [300, 90]
+
+    def max_image_height_or_width
+      300
+    end
+  end
+end

data/app/uploaders/decidim/official_image_header_uploader.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module Decidim
+  # This class deals with uploading hero images to ParticipatoryProcesses.
+  class OfficialImageHeaderUploader < ImageUploader
+    include CarrierWave::MiniMagick
+    process resize_to_limit: [80, 80]
+
+    def max_image_height_or_width
+      300
+    end
+  end
+end

data/app/validators/etiquette_validator.rb

@@ -0,0 +1,42 @@
+# coding: utf-8
+# frozen_string_literal: true
+# This validator takes care of ensuring the validated content is
+# respectful, doesn't use caps, and overall is meaningful.
+class EtiquetteValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    return if value.blank?
+
+    validate_caps(record, attribute, value)
+    validate_marks(record, attribute, value)
+    validate_long_words(record, attribute, value)
+    validate_caps_first(record, attribute, value)
+    validate_length(record, attribute, value)
+  end
+
+  private
+
+  def validate_caps(record, attribute, value)
+    return if value.scan(/[A-Z]/).length < value.length / 3
+    record.errors.add(attribute, options[:message] || :too_much_caps)
+  end
+
+  def validate_marks(record, attribute, value)
+    return if value.scan(/[!?¡¿]{2,}/).empty?
+    record.errors.add(attribute, options[:message] || :too_many_marks)
+  end
+
+  def validate_long_words(record, attribute, value)
+    return if value.scan(/[A-z]{30,}/).empty?
+    record.errors.add(attribute, options[:message] || :long_words)
+  end
+
+  def validate_caps_first(record, attribute, value)
+    return if value.scan(/^[a-z]{1}/).empty?
+    record.errors.add(attribute, options[:message] || :must_start_with_caps)
+  end
+
+  def validate_length(record, attribute, value)
+    return if value.length > 15
+    record.errors.add(attribute, options[:message] || :too_short)
+  end
+end

data/app/views/decidim/account/show.html.erb

@@ -1,5 +1,5 @@
 <div class="row">
-  <%= form_for(@account, url: account_path, method: :put, class: "user-form") do |f| %>
+  <%= decidim_form_for(@account, url: account_path, method: :put, class: "user-form") do |f| %>
     <div class="columns large-4">
       <%= image_tag current_user.avatar.big.url, width: "100%" %>
       <%= f.file_field :avatar, label: false %>

data/app/views/decidim/authorizations/index.html.erb

@@ -8,14 +8,14 @@
               <%= icon "lock-unlocked", class: "card--list__icon" %>
               <div>
                 <h5 class="card--list__heading">
-                  <%= t(authorization.name, scope: "decidim.authorization_handlers") %>
+                  <%= t("#{authorization.name}.name", scope: "decidim.authorization_handlers") %>
                 </h5>
                 <span class="text-small"><%= l(authorization.created_at, format: :long) %></span>
               </div>
             </div>
             <div class="card--list__data">
-              <%= link_to authorization, method: :delete, class: "card--list__data__icon", data: { confirm: t(".authorization_confirm_destroy") } do %>
-                <%= icon "circle-x" %>
+              <%= link_to new_authorization_path(handler: authorization.name), class: "card--list__data__icon" do %>
+                <%= icon "reload" %>
               <% end %>
             </div>
           </div>
@@ -32,7 +32,7 @@
               </a>
               <div>
                 <h5 class="card--list__heading">
-                  <%= link_to t(handler.handler_name, scope: "decidim.authorization_handlers"), new_authorization_path(handler: handler.handler_name) %>
+                  <%= link_to t("#{handler.handler_name}.name", scope: "decidim.authorization_handlers"), new_authorization_path(handler: handler.handler_name) %>
                 </h5>
               </div>
             </div>

data/app/views/decidim/authorizations/new.html.erb

@@ -2,7 +2,7 @@
   <div class="row collapse">
     <div class="row collapse">
       <div class="columns large-8 large-centered text-center page-title">
-        <h1><%= t(".authorize_with", authorizer: t(handler.handler_name, scope: "decidim.authorization_handlers")) %></h1>
+        <h1><%= t(".authorize_with", authorizer: t("#{handler.handler_name}.name", scope: "decidim.authorization_handlers")) %></h1>
       </div>
     </div>
 
@@ -10,7 +10,7 @@
       <div class="columns large-6 medium-centered">
         <div class="card">
           <div class="card__content">
-            <%= authorization_form_for(handler) do |form| %>
+            <%= authorization_form_for(handler, url: authorizations_path(redirect_url: params[:redirect_url])) do |form| %>
               <%= form.error_for(:base) %>
 
               <% if lookup_context.exists?(handler.to_partial_path, [], true) %>

data/app/views/decidim/cookie_policy/accept.js.erb

@@ -0,0 +1,3 @@
+const $cookieWarning = $('.cookie-warning');
+
+$cookieWarning.hide();

data/app/views/decidim/devise/confirmations/new.html.erb

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t("devise.confirmations.new.resend_confirmation_instructions")) %>
+
 <main class="wrapper">
 <div class="row collapse">
   <div class="row collapse">
@@ -10,7 +12,7 @@
     <div class="columns medium-7 large-5 medium-centered">
       <div class="card">
         <div class="card__content">
-          <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: "register-form new_user" }) do |f| %>
+          <%= decidim_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: "register-form new_user" }) do |f| %>
             <%= devise_error_messages! %>
 
             <div class="field">

data/app/views/decidim/devise/invitations/edit.html.erb

@@ -10,7 +10,7 @@
     <div class="columns medium-7 large-5 medium-centered">
       <div class="card">
         <div class="card__content">
-          <%= form_for resource, as: resource_name, url: invitation_path(resource_name, invite_redirect: params[:invite_redirect]), html: { method: :put, class: "register-form new_user" } do |f| %>
+          <%= decidim_form_for resource, as: resource_name, url: invitation_path(resource_name, invite_redirect: params[:invite_redirect]), html: { method: :put, class: "register-form new_user" } do |f| %>
             <%= f.hidden_field :invitation_token %>
 
             <% if f.object.class.require_password_on_accepting %>