decidim-core 0.0.8.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3668d75cf2fd8dbfe3c88982c0a7aa8593a75cb4
-  data.tar.gz: acc926a4029093ffe432873e2098a147873dc478
+  metadata.gz: abd55b4bc86a454e483127b15d235ed2a056e718
+  data.tar.gz: 4d29c9e66aea8a4c43110cda9b6487310d5c8429
 SHA512:
-  metadata.gz: 3a06d36ae7005c0e40ead54624635638e0c5f21a07049a68ab35f050d79fe96dc4be797c18065cc6abef48422feb397aa745549a0bb2c9d5964b3a1cd1d85a43
-  data.tar.gz: 75ebe0193d06c570996545553101d291d77727e4c53bd5944d8845214cd7f68f66a9907e83c1ffe9961ae2d65c9722e0c062cb37c9b9c13da1655230cd99bf74
+  metadata.gz: a2e6c3415e64aa2e6430062cfca573d1aef0e28dc42d04ff7dec6332e7018b20672d9e76c1efd95974c5d6f1f362655515c3fa96d5d813364e178b0dc1f259cf
+  data.tar.gz: df609842f94d94b53b37c5611988c853f710453bc5e2a98b46bd370c39879a867f9764c5ee3adf1ecbff4614030a20d7e22ce614fa19eafdc3d64962cb8d6158

data/app/assets/config/decidim_core_manifest.js

@@ -6,5 +6,4 @@
 //= link decidim/map.js
 //= link decidim/map.css
 //= link_directory ../../../vendor/assets/javascripts/datepicker-locales
-//= link decidim/widget.css
 //= link decidim/widget.js

data/app/assets/javascripts/decidim/form_filter.component.js.es6

@@ -9,6 +9,7 @@
   class FormFilterComponent {
     constructor($form) {
       this.$form = $form;
+      this.id = this.$form.attr('id') || this._getUID();
       this.mounted = false;
 
       this._onFormChange = this._onFormChange.bind(this);
@@ -24,7 +25,7 @@
       if (this.mounted) {
         this.mounted = false;
         this.$form.off('change', 'input, select', this._onFormChange);
-        exports.Decidim.History.unregisterCallback(`filters-${this.$form.attr('id')}`)
+        exports.Decidim.History.unregisterCallback(`filters-${this.id}`)
       }
     }
 
@@ -37,7 +38,7 @@
       if (this.$form.length > 0 && !this.mounted) {
         this.mounted = true;
         this.$form.on('change', 'input, select', this._onFormChange);
-        exports.Decidim.History.registerCallback(`filters-${this.$form.attr('id')}`, () => {
+        exports.Decidim.History.registerCallback(`filters-${this.id}`, () => {
           this._onPopState();
         });
       }
@@ -187,6 +188,15 @@
 
       exports.Decidim.History.pushState(newUrl);
     }
+
+    /**
+     * Generates a unique identifier for the form.
+     * @private
+     * @returns {String} - Returns a unique identifier
+     */
+    _getUID() {
+      return `filter-form-${new Date().setUTCMilliseconds()}-${Math.floor(Math.random() * 10000000)}`;
+    }
   }
 
   exports.Decidim = exports.Decidim || {};

data/app/assets/stylesheets/decidim/_decidim.scss

@@ -1,4 +1,3 @@
-//@import compass
 @import "variables";
 @import "utils/*";
 
@@ -7,4 +6,4 @@
 
 @import "modules/modules";
 @import "layouts/*";
-@import "extras/*";
+@import "extras/*";

data/app/assets/stylesheets/decidim/extras/_embed.scss

@@ -9,3 +9,24 @@
     overflow-y: auto;
   }
 }
+
+$widget-padding: 8px;
+
+body.widget {
+  background: #fff;
+  padding: $widget-padding;
+  margin: 0;
+
+  .participatory-process{
+    margin-bottom: $widget-padding;
+  }
+
+  .card {
+    margin: 0;
+  }
+
+  .organization {
+    margin-top: $widget-padding;
+    text-align: right;
+  }
+}

data/app/assets/stylesheets/decidim/modules/_cards.scss

@@ -73,8 +73,8 @@ $datetime-bg: $primary;
   font-weight: 800;
   letter-spacing: .05em;
   color: $muted;
-  align-self: flex-start;
   display: flex;
+  align-self: flex-start;
   align-items: center;
   .icon{
     width: 14px;

data/app/assets/stylesheets/decidim/modules/_icons.scss

@@ -29,4 +29,4 @@ a:hover .icon--action{
   margin-bottom: -2px;
   width: 12px;
   height: 12px;
-}
+}

data/app/commands/decidim/create_registration.rb

@@ -21,7 +21,7 @@ module Decidim
 
       transaction do
         create_user
-        create_user_group if form.is_user_group?
+        create_user_group if form.user_group?
       end
 
       broadcast(:ok, @user)

data/app/commands/decidim/invite_user.rb

@@ -36,14 +36,13 @@ module Decidim
 
     def invite_user
       @user = Decidim::User.create(
-        {
-          name: form.name,
-          email: form.email.downcase,
-          organization: form.organization,
-          roles: form.roles,
-          comments_notifications: true,
-          replies_notifications: true
-        })
+        name: form.name,
+        email: form.email.downcase,
+        organization: form.organization,
+        roles: form.roles,
+        comments_notifications: true,
+        replies_notifications: true
+      )
       @user.invite!(
         form.invited_by,
         invitation_instructions: form.invitation_instructions

data/app/controllers/concerns/decidim/filter_resource.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:disable Metrics/BlockLength
 require "active_support/concern"
 
 module Decidim
@@ -16,11 +15,11 @@ module Decidim
       end
 
       def method_missing(method_name, *_arguments)
-        @filter.present? && @filter.key?(method_name) ? @filter[method_name] : super
+        @filter.present? && @filter.has_key?(method_name) ? @filter[method_name] : super
       end
 
       def respond_to_missing?(method_name, include_private = false)
-        @filter.present? && @filter.key?(method_name) || super
+        @filter.present? && @filter.has_key?(method_name) || super
       end
     end
 

data/app/controllers/concerns/decidim/payload_info.rb

@@ -16,7 +16,7 @@ module Decidim
         payload[:referer] = request.referer.to_s
         payload[:request_id] = request.uuid
         payload[:user_agent] = request.user_agent
-        payload[:xhr] = request.xhr? ? 'true' : 'false'
+        payload[:xhr] = request.xhr? ? "true" : "false"
       end
     end
   end

data/app/controllers/decidim/authorizations_controller.rb

@@ -49,10 +49,6 @@ module Decidim
       @handler ||= AuthorizationHandler.handler_for(handler_name, handler_params)
     end
 
-    def handlers
-      @handlers ||= Decidim.authorization_handlers
-    end
-
     protected
 
     def stored_location

data/app/controllers/decidim/pages_controller.rb

@@ -11,7 +11,7 @@ module Decidim
 
     authorize_resource :public_pages, class: false
     delegate :page, to: :page_finder
-    helper_method :page, :promoted_participatory_processes, :highlighted_participatory_processes, :participatory_processes, :users
+    helper_method :page, :promoted_participatory_processes, :highlighted_participatory_processes, :stats
 
     def index
       @pages = current_organization.static_pages.all.to_a.sort do |a, b|
@@ -23,21 +23,18 @@ module Decidim
       @page_finder ||= Decidim::PageFinder.new(params[:id], current_organization)
     end
 
-    def users
-      @users ||= Decidim::User.where(organization: current_organization)
-    end
-
-    # This should be deleted once the statistics are done properly.
-    def participatory_processes
-      @processes ||= OrganizationParticipatoryProcesses.new(current_organization) | PublicParticipatoryProcesses.new
-    end
-
     def promoted_participatory_processes
-      @promoted_processes ||= participatory_processes | PromotedParticipatoryProcesses.new
+      @promoted_processes ||= OrganizationParticipatoryProcesses.new(current_organization) | PublicParticipatoryProcesses.new | PromotedParticipatoryProcesses.new
     end
 
     def highlighted_participatory_processes
       @promoted_processes ||= OrganizationParticipatoryProcesses.new(current_organization) | HighlightedParticipatoryProcesses.new
     end
+
+    private
+
+    def stats
+      @stats ||= HomeStatsPresenter.new(organization: current_organization)
+    end
   end
 end

data/app/controllers/decidim/participatory_process_groups_controller.rb

@@ -14,7 +14,7 @@ module Decidim
     def participatory_processes
       @participatory_processes ||= group.participatory_processes.published
     end
-    alias_method :collection, :participatory_processes
+    alias collection participatory_processes
 
     def group
       Decidim::ParticipatoryProcessGroup.find(params[:id])

data/app/controllers/decidim/participatory_process_widgets_controller.rb

@@ -10,6 +10,10 @@ module Decidim
       @model ||= ParticipatoryProcess.find(params[:participatory_process_id])
     end
 
+    def current_participatory_process
+      model
+    end
+
     def iframe_url
       @iframe_url ||= participatory_process_participatory_process_widget_url(model)
     end

data/app/controllers/decidim/widgets_controller.rb

@@ -3,12 +3,12 @@
 module Decidim
   class WidgetsController < Decidim::ApplicationController
     skip_authorization_check only: :show
-    skip_before_filter :verify_authenticity_token
+    skip_before_action :verify_authenticity_token
     after_action :allow_iframe, only: :show
 
-    layout 'decidim/widget'
+    layout "decidim/widget"
 
-    helper_method :iframe_url
+    helper_method :model, :iframe_url, :current_participatory_process
 
     def show
       respond_to do |format|
@@ -19,6 +19,10 @@ module Decidim
 
     private
 
+    def current_participatory_process
+      @current_participatory_process ||= model.feature.participatory_process
+    end
+
     def iframe_url
       raise NotImplementedError
     end

data/app/forms/decidim/registration_form.rb

@@ -23,13 +23,13 @@ module Decidim
     validates :password, presence: true, confirmation: true, length: { in: Decidim::User.password_length }
     validates :tos_agreement, allow_nil: false, acceptance: true
 
-    validates :user_group_name, presence: true, if: :is_user_group?
-    validates :user_group_document_number, presence: true, if: :is_user_group?
-    validates :user_group_phone, presence: true, if: :is_user_group?
+    validates :user_group_name, presence: true, if: :user_group?
+    validates :user_group_document_number, presence: true, if: :user_group?
+    validates :user_group_phone, presence: true, if: :user_group?
 
     validate :email_unique_in_organization
 
-    def is_user_group?
+    def user_group?
       sign_up_as == "user_group"
     end
 

data/app/helpers/decidim/layout_helper.rb

@@ -44,7 +44,7 @@ module Decidim
       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}"
+        content_tag :use, nil, "xlink:href" => "#{asset_path("decidim/icons.svg")}#icon-#{name}"
       end
     end
 

data/app/helpers/decidim/map_helper.rb

@@ -9,32 +9,32 @@ module Decidim
     # options - An optional hash of options (default: { zoom: 17 })
     #           * zoom: A number to represent the zoom value of the map
     def static_map_link(resource, options = {})
-      if resource.geocoded?
-        zoom = options[:zoom] || 17
-        latitude = resource.latitude
-        longitude = resource.longitude
+      return unless resource.geocoded?
 
-        map_url = "https://www.openstreetmap.org/?mlat=#{latitude}&mlon=#{longitude}#map=#{zoom}/#{latitude}/#{longitude}"
+      zoom = options[:zoom] || 17
+      latitude = resource.latitude
+      longitude = resource.longitude
 
-        link_to map_url, target: "_blank" do
-          image_tag decidim.static_map_path(sgid: resource.to_sgid.to_s)
-        end
+      map_url = "https://www.openstreetmap.org/?mlat=#{latitude}&mlon=#{longitude}#map=#{zoom}/#{latitude}/#{longitude}"
+
+      link_to map_url, target: "_blank" do
+        image_tag decidim.static_map_path(sgid: resource.to_sgid.to_s)
       end
     end
 
-    def dynamic_map_for(markers_data, &block)
-      if Decidim.geocoder.present?
-        map_html_options = {
-          class: "google-map",
-          id: "map",
-          "data-markers-data" => markers_data.to_json,
-          "data-here-app-id" => Decidim.geocoder[:here_app_id],
-          "data-here-app-code" => Decidim.geocoder[:here_app_code]
-        }
-        content = capture { block.call }
-        content_tag :div, class: "row column" do
-          content_tag(:div, "", map_html_options) + content
-        end
+    def dynamic_map_for(markers_data)
+      return unless Decidim.geocoder.present?
+
+      map_html_options = {
+        class: "google-map",
+        id: "map",
+        "data-markers-data" => markers_data.to_json,
+        "data-here-app-id" => Decidim.geocoder[:here_app_id],
+        "data-here-app-code" => Decidim.geocoder[:here_app_code]
+      }
+      content = capture { yield }
+      content_tag :div, class: "row column" do
+        content_tag(:div, "", map_html_options) + content
       end
     end
   end

data/app/helpers/decidim/resource_helper.rb

@@ -65,8 +65,8 @@ module Decidim
     def linked_classes_for(klass)
       return [] unless klass.respond_to?(:linked_classes_for)
 
-      klass.linked_classes_for(current_feature).map do |klass|
-        [klass.underscore, t(klass.demodulize.downcase, scope: "decidim.filters.linked_classes")]
+      klass.linked_classes_for(current_feature).map do |k|
+        [k.underscore, t(k.demodulize.downcase, scope: "decidim.filters.linked_classes")]
       end
     end
 
@@ -91,7 +91,7 @@ module Decidim
     # Returns a String.
     def _decidim_resource_route(resource, route_type, options)
       manifest = resource.class.resource_manifest
-      engine = send(manifest.mounted_engine_name)
+      engine = manifest.feature_manifest.engine
 
       url_params = {
         id: resource.id,
@@ -99,7 +99,7 @@ module Decidim
         participatory_process_id: resource.feature.participatory_process.id
       }
 
-      engine.send("#{manifest.route_name}_#{route_type}", url_params.merge(options))
+      engine.routes.url_helpers.send("#{manifest.route_name}_#{route_type}", url_params.merge(options))
     end
   end
 end

data/app/helpers/decidim/widget_urls_helper.rb

@@ -2,8 +2,8 @@
 module Decidim
   module WidgetUrlsHelper
     def embed_modal_for(url)
-      js_embed_code = "#{content_tag(:script, '', src: url)}"
-      embed_code = "#{content_tag(:noscript, content_tag(:iframe, '', src: url.gsub(".js", ".html"), frameborder: 0, scrolling: "vertical"))}"
+      js_embed_code = String.new(content_tag(:script, "", src: url))
+      embed_code = String.new(content_tag(:noscript, content_tag(:iframe, "", src: url.gsub(".js", ".html"), frameborder: 0, scrolling: "vertical")))
       render partial: "decidim/shared/embed_modal", locals: { js_embed_code: js_embed_code, embed_code: embed_code }
     end
   end

data/app/mailers/decidim/export_mailer.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+module Decidim
+  # This mailer sends a notification email containing the export as an
+  # attachment.
+  class ExportMailer < ApplicationMailer
+    # Public: Sends a notification email with the result of an export in a
+    # zipped file.
+    #
+    # user        - The user to be notified.
+    # name        - The name of the export.
+    # export_data - The data containing the result of the export.
+    #
+    # Returns nothing.
+    def export(user, name, export_data)
+      @user = user
+      @organization = user.organization
+
+      original_file_name = "#{name}.#{export_data.extension}"
+
+      attachments["#{name}.zip"] = FileZipper.new(
+        original_file_name, export_data.read
+      ).zip
+
+      with_user(user) do
+        mail(to: "#{user.name} <#{user.email}>", subject: I18n.t("decidim.export_mailer.subject", name: original_file_name))
+      end
+    end
+  end
+end

data/app/middleware/decidim/current_organization.rb

@@ -24,7 +24,7 @@ module Decidim
 
         location = new_location_for(env, organization.host)
 
-        [301, { "Location" => location, 'Content-Type' => 'text/html', 'Content-Length' => '0'}, []]
+        [301, { "Location" => location, "Content-Type" => "text/html", "Content-Length" => "0" }, []]
       end
     end
 

data/app/models/decidim/feature.rb

@@ -81,6 +81,11 @@ module Decidim
       step_settings.fetch(active_step.id.to_s)
     end
 
+    # Public: Returns the value of the registered primary stat.
+    def primary_stat
+      @primary_stat ||= manifest.stats.filter(primary: true).with_context([self]).map { |name, value| [name, value] }.first&.last
+    end
+
     private
 
     def serialize_settings(schema, value)