decidim-core 0.0.5 → 0.0.6

data/app/helpers/decidim/resource_helper.rb

@@ -41,7 +41,8 @@ module Decidim
       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") +
+          i18n_name = "#{resource.class.name.demodulize.underscore}_#{resource_manifest.name}"
+          content_tag(:h3, I18n.t(i18n_name, scope: "decidim.resource_links.#{link_name}"), class: "section-heading") +
             render(partial: resource_manifest.template, locals: { resources: resources })
         end
       end)

data/app/helpers/decidim/translations_helper.rb

@@ -10,7 +10,7 @@ module Decidim
     #
     # Returns a String with the translation.
     def translated_attribute(attribute)
-      attribute.try(:[], I18n.locale.to_s)
+      attribute.try(:[], I18n.locale.to_s) || ""
     end
 
     # Public: Creates a translation for each available language in the list

data/app/mailers/decidim/reported_mailer.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+module Decidim
+  # A custom mailer for sending notifications to an admin when a report is created..
+  class ReportedMailer < Decidim::ApplicationMailer
+    helper Decidim::ResourceHelper
+
+    helper_method :reported_content
+
+    def report(user, report)
+      with_user(user) do
+        @report = report
+        @organization = user.organization
+        @user = user
+        subject = I18n.t("report.subject", scope: "decidim.reported_mailer")
+        mail(to: user.email, subject: subject)
+      end
+    end
+
+    def hide(user, report)
+      with_user(user) do
+        @report = report
+        @organization = user.organization
+        @user = user
+        subject = I18n.t("hide.subject", scope: "decidim.reported_mailer")
+        mail(to: user.email, subject: subject)
+      end
+    end
+
+    private
+
+    def reported_content
+      @reported_content ||= @report.moderation.reportable.reported_content
+    end
+  end
+end

data/app/middleware/decidim/current_organization.rb

@@ -14,15 +14,41 @@ module Decidim
     #
     # env - A Hash.
     def call(env)
-      env["decidim.current_organization"] = detect_current_organization(env)
-      @app.call(env)
+      organization = detect_current_organization(env)
+      if organization
+        env["decidim.current_organization"] = organization
+        @app.call(env)
+      else
+        organization = find_secondary_host_org(env)
+        return @app.call(env) unless organization
+
+        location = new_location_for(env, organization.host)
+
+        [301, { "Location" => location, 'Content-Type' => 'text/html', 'Content-Length' => '0'}, []]
+      end
     end
 
     private
 
     def detect_current_organization(env)
-      host = Rack::Request.new(env).host.downcase
+      host = host_for(env)
       Decidim::Organization.where(host: host).first
     end
+
+    def find_secondary_host_org(env)
+      host = host_for(env)
+      Decidim::Organization.where("? = ANY(secondary_hosts)", host).first
+    end
+
+    def host_for(env)
+      Rack::Request.new(env).host.downcase
+    end
+
+    def new_location_for(env, host)
+      request = Rack::Request.new(env)
+      url = URI(request.url)
+      url.host = host
+      url.to_s
+    end
   end
 end

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

@@ -7,6 +7,7 @@ module Decidim
       include CanCan::Ability
 
       def initialize(user, _context)
+        can :read, ParticipatoryProcessGroup
         can :read, ParticipatoryProcess, &:published?
         can :read, :public_pages
         can :manage, :locales

data/app/models/decidim/moderation.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+module Decidim
+  # A moderation belongs to a reportable and includes many reports
+  class Moderation < ApplicationRecord
+    belongs_to :reportable, foreign_key: "decidim_reportable_id", foreign_type: "decidim_reportable_type", polymorphic: true
+    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/newsletter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Decidim
   # This model holds all the data needed to send a newsletter.
   class Newsletter < ApplicationRecord

data/app/models/decidim/organization.rb

@@ -4,6 +4,7 @@ module Decidim
   # installation we can find many organizations and each of them can start
   # their own participatory processes.
   class Organization < ApplicationRecord
+    has_many :participatory_process_groups, foreign_key: "decidim_organization_id", class_name: Decidim::ParticipatoryProcessGroup, inverse_of: :organization
     has_many :participatory_processes, foreign_key: "decidim_organization_id", class_name: Decidim::ParticipatoryProcess, inverse_of: :organization
     has_many :static_pages, foreign_key: "decidim_organization_id", class_name: Decidim::StaticPage, inverse_of: :organization
     has_many :scopes, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: Decidim::Scope, inverse_of: :organization
@@ -11,6 +12,7 @@ module Decidim
     has_many :users, foreign_key: "decidim_organization_id", class_name: Decidim::User
 
     validates :name, :host, uniqueness: true
+    validates :reference_prefix, presence: true
 
     mount_uploader :homepage_image, Decidim::HomepageImageUploader
     mount_uploader :official_img_header, Decidim::OfficialImageHeaderUploader

data/app/models/decidim/participatory_process.rb

@@ -12,6 +12,13 @@ module Decidim
                foreign_key: "decidim_organization_id",
                class_name: Decidim::Organization,
                inverse_of: :participatory_processes
+    belongs_to :participatory_process_group,
+               foreign_key: "decidim_participatory_process_group_id",
+               class_name: Decidim::ParticipatoryProcessGroup,
+               inverse_of: :participatory_processes
+    belongs_to :scope,
+               foreign_key: "decidim_scope_id",
+               class_name: Decidim::Scope
     has_many :steps,
              -> { order(position: :asc) },
              foreign_key: "decidim_participatory_process_id",
@@ -74,5 +81,9 @@ module Decidim
     def documents
       @documents ||= attachments.select(&:document?)
     end
+
+    def hashtag
+      attributes["hashtag"].to_s.gsub("#", "")
+    end
   end
 end

data/app/models/decidim/participatory_process_group.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+module Decidim
+  class ParticipatoryProcessGroup < ApplicationRecord
+    has_many :participatory_processes,
+             foreign_key: "decidim_participatory_process_group_id",
+             class_name: Decidim::ParticipatoryProcess,
+             inverse_of: :participatory_process_group
+    belongs_to :organization,
+               foreign_key: "decidim_organization_id",
+               class_name: Decidim::Organization,
+               inverse_of: :participatory_process_groups
+
+    mount_uploader :hero_image, Decidim::HeroImageUploader
+  end
+end

data/app/models/decidim/participatory_process_step.rb

@@ -30,7 +30,7 @@ module Decidim
     # positioning.
     def set_position
       return if position.present?
-      return self.position = 0 if participatory_process.steps.empty?
+      return self.position = 0 if participatory_process.steps.select(&:persisted?).empty?
 
       self.position = participatory_process.steps.pluck(:position).last + 1
     end

data/app/models/decidim/report.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+module Decidim
+  # A reportable can be reported one time for each user.
+  class Report < ApplicationRecord
+    REASONS = %w(spam offensive does_not_belong).freeze
+
+    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 :user, uniqueness: { scope: :decidim_moderation_id }
+    validates :reason, inclusion: { in: REASONS }
+    validate :user_and_moderation_same_organization
+
+    private
+
+    # Private: check if the moderation and the user have the same organization
+    def user_and_moderation_same_organization
+      return if !moderation || !user
+      errors.add(:moderation, :invalid) unless user.organization == moderation.organization
+    end
+  end
+end

data/app/services/decidim/public_processes.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+module Decidim
+  # This service is in charge of gathering the ParticipatoryProcess and
+  # ParticipatoryProcessGroup that are public and should be displayed together.
+  class PublicProcesses
+
+    # Initializes the PublicProcesses
+    #
+    # organization - The current organization
+    def initialize(organization)
+      @organization = organization
+    end
+
+    # Public: The collection of published processes and groups from the given
+    # organization to be displayed at processes index.
+    #
+    # Returns an Array.
+    def collection
+      (participatory_processes + participatory_process_groups).flatten
+    end
+
+    # Public: The collection of published ParticipatoryProcess to be displayed at the
+    # process index.
+    #
+    # Returns an ActiveRecord::Relation.
+    def participatory_processes
+      @participatory_processes ||= ordered_processes.published
+    end
+
+    private
+
+    attr_reader :organization
+
+    def ordered_processes
+      @sorted_processes ||= Decidim::ParticipatoryProcess.where(organization: organization).order("promoted DESC").includes(:active_step).order("decidim_participatory_process_steps.end_date ASC")
+    end
+
+    def participatory_process_groups
+      Decidim::ParticipatoryProcessGroup.where(organization: organization)
+    end
+  end
+end

data/app/services/decidim/resource_search.rb

@@ -7,7 +7,7 @@ module Decidim
     #
     # 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 #
+    #          converted to methods by SearchLight so they can be used on filter
     #          methods. (Default {})
     def initialize(scope, options = {})
       super(options)
@@ -28,6 +28,22 @@ module Decidim
       query.where(decidim_category_id: category_ids)
     end
 
+    # Handles the scope_id filter. When we want to show only those that do not
+    # have a scope_id set, we cannot pass an empty String or nil because Searchlight
+    # will automatically filter out these params, so the method will not be used.
+    # Instead, we need to pass a fake ID and then convert it inside. In this case,
+    # in order to select those elements that do not have a scope_id set we use
+    # `"global"` as parameter, and in the method we do the needed changes to search
+    # properly.
+    #
+    # You can use the `search_organization_scopes` helper method, defined in
+    # `Decidim::OrganizationScopesHelper`, to render the collection needed for the
+    # `collection_check_boxes` form method.
+    def search_scope_id
+      clean_scope_ids = [scope_id].flatten.map{ |id| id == "global" ? nil : id }
+      query.where(decidim_scope_id: clean_scope_ids)
+    end
+
     private
 
     # Private: Creates an array of category ids.

data/app/services/decidim/static_map_generator.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+require "httparty"
+
+module Decidim
+  # This class generates a url to create a static map image for a geocoded resource
+  class StaticMapGenerator
+    def initialize(resource, options = {})
+      @resource = resource
+      @options = options
+
+      @options[:zoom] ||= 15
+      @options[:width] ||= 120
+      @options[:height] ||= 120
+    end
+
+    def data
+      return if Decidim.geocoder.nil?
+
+      Rails.cache.fetch(@resource.cache_key) do
+        request = HTTParty.get(uri, headers: { "Referer" => organization.host })
+        request.body
+      end
+    end
+
+    private
+
+    def uri
+      params = {
+        c: "#{@resource.latitude}, #{@resource.longitude}",
+        z: @options[:zoom],
+        w: @options[:width],
+        h: @options[:height],
+        f: "1",
+        app_id: Decidim.geocoder.fetch(:here_app_id),
+        app_code: Decidim.geocoder.fetch(:here_app_code)
+      }
+
+      uri = URI.parse(Decidim.geocoder.fetch(:static_map_url)).tap do |uri|
+        uri.query = URI.encode_www_form params
+      end
+
+      uri
+    end
+
+    def organization
+      @organization ||= @resource.feature.organization
+    end
+  end
+end

data/app/uploaders/decidim/application_uploader.rb

@@ -7,7 +7,10 @@ module Decidim
     # Override the directory where uploaded files will be stored.
     # This is a sensible default for uploaders that are meant to be mounted:
     def store_dir
-      "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+      default_path = "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+
+      return File.join(Decidim.base_uploads_path, default_path) if Decidim.base_uploads_path.present?
+      default_path
     end
   end
 end

data/app/uploaders/decidim/official_image_footer_uploader.rb

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

data/app/uploaders/decidim/official_image_header_uploader.rb

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

data/app/validators/geocoding_validator.rb

@@ -0,0 +1,22 @@
+# coding: utf-8
+# frozen_string_literal: true
+# This validator takes care of ensuring the validated content is
+# an existing address and computes its coordinates.
+class GeocodingValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    if Decidim.geocoder.present? && record.feature.present?
+      organization = record.feature.organization
+      Geocoder.configure(Geocoder.config.merge(http_headers: { "Referer" => organization.host }))
+      coordinates = Geocoder.coordinates(value)
+
+      if coordinates.present?
+        record.latitude = coordinates.first
+        record.longitude = coordinates.last
+      else
+        record.errors.add(attribute, :invalid)
+      end
+    else
+      record.errors.add(attribute, :invalid)
+    end
+  end
+end

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

@@ -22,7 +22,7 @@
                 </div>
               <% end %>
             <% end %>
-            <p class="text-center skip"><%= t("decidim.authorizations.skip_verification", link: link_to(t("decidim.authorizations.current_participatory_processes"), participatory_processes_path).html_safe).html_safe %>.</p>
+            <p class="text-center skip"><%= t("decidim.authorizations.skip_verification", link: link_to(t("decidim.authorizations.current_participatory_processes"), stored_location).html_safe).html_safe %>.</p>
           </div>
         </div>
       </div>

data/app/views/decidim/participatory_process_groups/_participatory_process_group.html.erb

@@ -0,0 +1,22 @@
+<div class="column">
+  <article class="card card--process">
+    <%= link_to participatory_process_group_path(participatory_process_group), class: "card__link" do %>
+      <div class="card__image-top"
+           style="background-image:url(<%= participatory_process_group.hero_image.url %>)"></div>
+    <% end %>
+    <div class="card__content">
+      <%= link_to participatory_process_group_path(participatory_process_group), class: "card__link" do %>
+        <h4 class="card__title"><%= translated_attribute participatory_process_group.name %></h4>
+      <% end %>
+      <p class="card__desc"><%== html_truncate(translated_attribute(participatory_process_group.description), length: 630, separator: '...') %></p>
+    </div>
+    <div class="card__footer">
+      <div class="card__support">
+        <span class="card--process__small"></span>
+        <%= link_to participatory_process_group_path(participatory_process_group), class: "card__button button small" do %>
+          <%= t(".browse", scope: "layouts") %>
+        <% end %>
+      </div>
+    </div>
+  </article>
+</div>