decidim-core 0.0.8.1 → 0.1.0

data/app/models/decidim/organization.rb

@@ -4,7 +4,7 @@ module Decidim
   # installation we can find many organizations and each of them can start
   # their own participatory processes.
   class Organization < ApplicationRecord
-    SOCIAL_HANDLERS = [:twitter, :facebook, :instagram, :youtube, :github]
+    SOCIAL_HANDLERS = [:twitter, :facebook, :instagram, :youtube, :github].freeze
 
     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

data/app/models/decidim/participatory_process.rb

@@ -83,7 +83,7 @@ module Decidim
     end
 
     def hashtag
-      attributes["hashtag"].to_s.gsub("#", "")
+      attributes["hashtag"].to_s.delete("#")
     end
   end
 end

data/app/models/decidim/user.rb

@@ -9,7 +9,7 @@ module Decidim
     devise :invitable, :database_authenticatable, :registerable, :confirmable,
            :recoverable, :rememberable, :trackable, :decidim_validatable,
            :omniauthable, omniauth_providers: [:facebook, :twitter, :google_oauth2],
-           request_keys: [:env], reset_password_keys: [:decidim_organization_id, :email]
+                          request_keys: [:env], reset_password_keys: [:decidim_organization_id, :email]
 
     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

data/app/presenters/decidim/home_stats_presenter.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+module Decidim
+  # A presenter to render statistics in the homepage.
+  class HomeStatsPresenter < Rectify::Presenter
+    attribute :organization, Decidim::Organization
+
+    # Public: Render a collection of primary stats.
+    def highlighted
+      highlighted_stats = Decidim.stats.only([:users_count, :processes_count]).with_context(organization).map { |name, data| [name, data] }
+      highlighted_stats = highlighted_stats.concat(global_stats(priority: StatsRegistry::HIGH_PRIORITY))
+      highlighted_stats = highlighted_stats.concat(feature_stats(priority: StatsRegistry::HIGH_PRIORITY))
+      highlighted_stats = highlighted_stats.reject(&:empty?)
+
+      safe_join(
+        highlighted_stats.in_groups_of(2, false).map do |stats|
+          content_tag :div, class: "home-pam__highlight" do
+            safe_join(
+              stats.map do |name, data|
+                render_stats_data(name, data)
+              end
+            )
+          end
+        end
+      )
+    end
+
+    # Public: Render a collection of stats that are not primary.
+    def not_highlighted
+      not_highlighted_stats = global_stats(priority: StatsRegistry::MEDIUM_PRIORITY)
+      not_highlighted_stats = not_highlighted_stats.concat(feature_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
+      not_highlighted_stats = not_highlighted_stats.reject(&:empty?)
+
+      safe_join(
+        not_highlighted_stats.in_groups_of(3, false).map do |stats|
+          content_tag :div, class: "home-pam__lowlight" do
+            safe_join(
+              stats.map do |name, data|
+                render_stats_data(name, data)
+              end
+            )
+          end
+        end
+      )
+    end
+
+    private
+
+    def global_stats(conditions)
+      Decidim.stats.except([:users_count, :processes_count])
+             .filter(conditions)
+             .with_context(published_features)
+             .map { |name, data| [name, data] }
+    end
+
+    def feature_stats(conditions)
+      Decidim.feature_manifests.map do |feature|
+        feature.stats.filter(conditions).with_context(published_features).map { |name, data| [name, data] }.flatten
+      end
+    end
+
+    def render_stats_data(name, data)
+      content_tag :div, "", class: "home-pam__data" do
+        safe_join([
+                    content_tag(:h4, I18n.t(name, scope: "pages.home.statistics"), class: "home-pam__title"),
+                    content_tag(:span, " #{data}", class: "home-pam__number #{name}")
+                  ])
+      end
+    end
+
+    def published_features
+      @published_features ||= Feature.where(participatory_process: organization.participatory_processes.published)
+    end
+  end
+end

data/app/queries/decidim/stats_users_count.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+module Decidim
+  # This query counts registered users from a collection of organizations
+  # in an optional interval of time.
+  class StatsUsersCount < Rectify::Query
+    def self.for(organization, start_at = nil, end_at = nil)
+      new(organization, start_at, end_at).query
+    end
+
+    def initialize(organization, start_at = nil, end_at = nil)
+      @organization = organization
+      @start_at = start_at
+      @end_at = end_at
+    end
+
+    def query
+      users = Decidim::User.where(organization: @organization)
+      users = users.where("created_at >= ?", @start_at) if @start_at.present?
+      users = users.where("created_at <= ?", @end_at) if @end_at.present?
+      users = users.where.not(confirmed_at: nil)
+      users.count
+    end
+  end
+end

data/app/services/decidim/public_processes.rb

@@ -3,7 +3,6 @@ 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
@@ -32,7 +31,10 @@ module Decidim
     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")
+      @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

data/app/services/decidim/resource_search.rb

@@ -40,7 +40,7 @@ module Decidim
     # `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 }
+      clean_scope_ids = [scope_id].flatten.map { |id| id == "global" ? nil : id }
       query.where(decidim_scope_id: clean_scope_ids)
     end
 

data/app/services/decidim/static_map_generator.rb

@@ -35,11 +35,9 @@ module Decidim
         app_code: Decidim.geocoder.fetch(:here_app_code)
       }
 
-      uri = URI.parse(Decidim.geocoder.fetch(:static_map_url)).tap do |uri|
+      URI.parse(Decidim.geocoder.fetch(:static_map_url)).tap do |uri|
         uri.query = URI.encode_www_form params
       end
-
-      uri
     end
 
     def organization

data/app/uploaders/decidim/image_uploader.rb

@@ -27,7 +27,7 @@ module Decidim
 
     def validate_size
       manipulate! do |image|
-        validation_error!(I18n.t("carrierwave.errors.image_too_big")) if image.size > 10.megabytes
+        validation_error!(I18n.t("carrierwave.errors.image_too_big")) if image.size > Decidim.maximum_attachment_size
         image
       end
     end

data/app/views/decidim/export_mailer/export.html.erb

@@ -0,0 +1 @@
+<%= t(".ready") %>

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

@@ -1,28 +1,17 @@
-<div class="column">
-  <article class="card card--process">
-    <%= link_to participatory_process_path(model), class: "card__link" do %>
-      <div class="card__image-top"
-           style="background-image:url(<%= model.hero_image.url %>)"></div>
+<% content_for(:header, "false") %>
+<% content_for(:title, translated_attribute(model.title)) %>
+<p class="card__desc"><%== html_truncate(translated_attribute(model.short_description), length: 630, separator: '...') %></p>
+<% content_for(:footer) do %>
+  <div class="card__support">
+    <% if model.active_step %>
+      <span class="card--process__small">
+        <%= t(".active_step", scope: "layouts") %>
+        <strong><%= translated_attribute model.active_step.title %></strong>
+      </span>
     <% end %>
-    <div class="card__content">
-      <%= link_to participatory_process_path(model), class: "card__link" do %>
-        <h4 class="card__title"><%= translated_attribute model.title %></h4>
-      <% end %>
-      <p class="card__desc"><%== html_truncate(translated_attribute(model.short_description), length: 630, separator: '...') %></p>
-    </div>
-    <div class="card__footer">
-      <div class="card__support">
-        <% if model.active_step %>
-          <span class="card--process__small">
-            <%= t(".active_step", scope: "layouts") %>
-            <strong><%= translated_attribute model.active_step.title %></strong>
-          </span>
-        <% end %>
-        <span class="card--process__small"></span>
-        <%= link_to participatory_process_path(model), class: "card__button button small" do %>
-          <%= t(".take_part", scope: "layouts") %>
-        <% end %>
-      </div>
-    </div>
-  </article>
-</div>
+    <span class="card--process__small"></span>
+    <%= link_to participatory_process_path(model), class: "card__button button small" do %>
+      <%= t(".take_part", scope: "layouts") %>
+    <% end %>
+  </div>
+<% end %>

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

@@ -20,49 +20,49 @@
       <div class="card extra definition-data">
         <% if translated_attribute(current_participatory_process.meta_scope).present? %>
           <div class="definition-data__item scope">
-            <span class="definition-data__title"><%= t(".scope") =%></span>
+            <span class="definition-data__title"><%= t(".scope") %></span>
               <%== translated_attribute(current_participatory_process.meta_scope) %>
           </div>
         <% end %>
 
         <% if current_participatory_process.end_date.present? %>
           <div class="definition-data__item end-date">
-            <span class="definition-data__title"><%= t(".end_date")=%></span>
+            <span class="definition-data__title"><%= t(".end_date") %></span>
               <%== l(current_participatory_process.end_date, format: :long) %>
           </div>
         <% end %>
 
         <% if translated_attribute(current_participatory_process.developer_group).present? %>
           <div class="definition-data__item developer-group">
-            <span class="definition-data__title"><%= t(".developer_group") =%></span>
+            <span class="definition-data__title"><%= t(".developer_group") %></span>
               <%== translated_attribute(current_participatory_process.developer_group) %>
           </div>
         <% end %>
 
         <% if translated_attribute(current_participatory_process.local_area).present? %>
           <div class="definition-data__item local_area">
-            <span class="definition-data__title"><%= t(".local_area") =%></span>
+            <span class="definition-data__title"><%= t(".local_area") %></span>
               <%== translated_attribute(current_participatory_process.local_area) %>
           </div>
         <% end %>
 
          <% if translated_attribute(current_participatory_process.target).present? %>
           <div class="definition-data__item target">
-            <span class="definition-data__title"><%= t(".target") =%></span>
+            <span class="definition-data__title"><%= t(".target") %></span>
               <%== translated_attribute(current_participatory_process.target) %>
           </div>
         <% end %>
 
          <% if translated_attribute(current_participatory_process.participatory_scope).present? %>
           <div class="definition-data__item participatory_scope">
-            <span class="definition-data__title"><%= t(".participatory_scope") =%></span>
+            <span class="definition-data__title"><%= t(".participatory_scope") %></span>
               <%== translated_attribute(current_participatory_process.participatory_scope) %>
           </div>
         <% end %>
 
         <% if translated_attribute(current_participatory_process.participatory_structure).present? %>
           <div class="definition-data__item participatory_structure">
-            <span class="definition-data__title"><%= t(".participatory_structure") =%></span>
+            <span class="definition-data__title"><%= t(".participatory_structure") %></span>
               <%== translated_attribute(current_participatory_process.participatory_structure) %>
           </div>
         <% end %>

data/app/views/decidim/widgets/show.js.erb

@@ -1,22 +1,32 @@
 /* eslint-disable no-var, prefer-template */
-var iframe = document.createElement('iframe');
+(function () {
+  var iframe = document.createElement('iframe');
+  var scripts = document.getElementsByTagName('script');
+  var me = null;
 
-iframe.src = "<%= iframe_url %>";
-iframe.frameBorder = "0"
-iframe.scrolling = "no";
-iframe.style.visibility = 'hidden';
-iframe.style.height = "10px";
-iframe.onload = function () {
-  iframe.contentWindow.postMessage({ type: "GET_HEIGHT" }, "*");
-}
+  if (document.currentScript) {
+    me = document.currentScript;
+  } else {
+    me = scripts[scripts.length - 1];
+  }
+
+  iframe.src = "<%= iframe_url %>";
+  iframe.frameBorder = "0"
+  iframe.scrolling = "no";
+  iframe.style.visibility = 'hidden';
+  iframe.style.height = "10px";
+  iframe.onload = function () {
+    iframe.contentWindow.postMessage({ type: "GET_HEIGHT" }, "*");
+  }
 
-document.body.appendChild(iframe);
+  me.insertAdjacentElement('afterend', iframe);
 
-window.addEventListener("message", function (event) {
-  var height = event.data.height;
+  window.addEventListener("message", function (event) {
+    var height = event.data.height;
 
-  if (event.data.type === "SET_HEIGHT") {
-    iframe.style.height = height + "px";
-    iframe.style.visibility = 'visible';
-  }
-});
+    if (event.data.type === "SET_HEIGHT") {
+      iframe.style.height = height + "px";
+      iframe.style.visibility = 'visible';
+    }
+  });
+}());

data/app/views/layouts/decidim/widget.html.erb

@@ -3,15 +3,67 @@
   <head>
     <title><%= decidim_page_title %></title>
     <%= csrf_meta_tags %>
-    <%= stylesheet_link_tag    'decidim/widget' %>
+    <%= stylesheet_link_tag    'application' %>
     <%= javascript_include_tag 'application' %>
   </head>
 
-  <body>
-    <%= yield %>
+  <body class="widget">
+    <% if content_for(:header) == "false" %>
+    <% elsif content_for?(:header) %>
+      <%= content_for(:header) %>
+    <% else %>
+      <div class="participatory-process">
+        <%= link_to translated_attribute(current_participatory_process.title), decidim.participatory_process_path(current_participatory_process), target: "_blank" %>
+      </div>
+    <% end %>
+    <div class="row collapse">
+      <div class="column">
+
+        <article class="card">
+          <% if current_participatory_process.banner_image %>
+            <div class="card__image-top" style="background-image: url(<%= current_participatory_process.banner_image.url %>)"></div>
+          <% end %>
+
+          <div class="card__content">
+            <div class="card__header">
+              <%= link_to model do%>
+                <h5 class="card__title"><%= content_for(:title) %></h5>
+              <% end %>
+              <% if model.try(:author) %>
+                <div class="card__author author-data author-data--small">
+                  <div class="author-data__main">
+                    <div class="author author--inline">
+                      <span class="author__avatar author__avatar--small">
+                        <%= image_tag model.author_avatar_url %>
+                      </span>
+                      <span class="author__name"><%= model.author_name %></span>
+                      <%= l model.created_at, format: "%d/%m/%Y" %>
+                    </div>
+                  </div>
+                </div>
+              <% end %>
+            </div>
+            <%= yield %>
+          </div>
+          <div class="card__footer">
+            <% if content_for?(:footer) %>
+              <%= content_for(:footer) %>
+            <% else %>
+              <div class="card__support">
+                <div class="card__support__data"></div>
+                <%= link_to model, class: "card__button button small", target: "_blank" do %>
+                  <%= t('.see_more') %>
+                <% end %>
+              </div>
+            <% end %>
+          </div>
+        </article>
+      </div>
+    </div>
     <div class="organization">
       <%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %>
     </div>
+
     <%= javascript_include_tag 'decidim/widget' %>
   </body>
 </html>

data/app/views/pages/home/_statistics.html.erb

@@ -6,16 +6,8 @@
     <div class="row">
       <div class="columns small-centered mediumlarge-10 large-8">
         <div class="home-pam">
-          <div class="home-pam__highlight">
-            <div class="home-pam__data">
-              <h4 class="home-pam__title"><%= t(".users") %></h4>
-              <span class="home-pam__number users-count"><%= users.count %></span>
-            </div>
-            <div class="home-pam__data">
-              <h4 class="home-pam__title"><%= t(".processes") %></h4>
-              <span class="home-pam__number processes-count"><%= participatory_processes.count %></span>
-            </div>
-          </div>
+          <%= stats.highlighted %>
+          <%= stats.not_highlighted %>
         </div>
       </div>
     </div>

data/config/i18n-tasks.yml

@@ -104,6 +104,7 @@ ignore_unused:
   - invisible_captcha.*
   - decidim.participatory_processes.scopes.global
   - decidim.participatory_processes.participatory_process_groups.none
+  - pages.home.statistics.*
 # - 'activerecord.attributes.*'
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'

data/config/initializers/devise.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:disable Metrics/BlockLength
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 
@@ -301,13 +300,21 @@ Devise.setup do |config|
   # Add a new OmniAuth provider. Check the wiki for more information on setting
   # up on your models and hooks.
   if Rails.application.secrets.dig(:omniauth, "facebook").present?
-    config.omniauth :facebook, Rails.application.secrets.omniauth["facebook"]["app_id"], Rails.application.secrets.omniauth["facebook"]["app_secret"], scope: :email, info_fields: "name,email,verified"
+    config.omniauth :facebook,
+                    Rails.application.secrets.omniauth["facebook"]["app_id"],
+                    Rails.application.secrets.omniauth["facebook"]["app_secret"],
+                    scope: :email,
+                    info_fields: "name,email,verified"
   end
   if Rails.application.secrets.dig(:omniauth, "twitter").present?
-    config.omniauth :twitter, Rails.application.secrets.omniauth["twitter"]["api_key"], Rails.application.secrets.omniauth["twitter"]["api_secret"]
+    config.omniauth :twitter,
+                    Rails.application.secrets.omniauth["twitter"]["api_key"],
+                    Rails.application.secrets.omniauth["twitter"]["api_secret"]
   end
   if Rails.application.secrets.dig(:omniauth, "google_oauth2").present?
-    config.omniauth :google_oauth2, Rails.application.secrets.omniauth["google_oauth2"]["client_id"], Rails.application.secrets.omniauth["google_oauth2"]["client_secret"]
+    config.omniauth :google_oauth2,
+                    Rails.application.secrets.omniauth["google_oauth2"]["client_id"],
+                    Rails.application.secrets.omniauth["google_oauth2"]["client_secret"]
   end
 
   # ==> Warden configuration