decidim-core 0.23.1 → 0.23.2

data/db/seeds.rb

@@ -16,6 +16,9 @@ if !Rails.env.production? || ENV["SEED"]
     table.tr("_", "/").classify.safe_constantize
   end.compact.each(&:reset_column_information)
 
+  smtp_label = Faker::Twitter.unique.screen_name
+  smtp_email = Faker::Internet.email
+
   organization = Decidim::Organization.first || Decidim::Organization.create!(
     name: Faker::Company.name,
     twitter_handler: Faker::Hipster.word,
@@ -24,7 +27,9 @@ if !Rails.env.production? || ENV["SEED"]
     youtube_handler: Faker::Hipster.word,
     github_handler: Faker::Hipster.word,
     smtp_settings: {
-      from: Faker::Internet.email,
+      from: "#{smtp_label} <#{smtp_email}>",
+      from_email: smtp_email,
+      from_label: smtp_label,
       user_name: Faker::Twitter.unique.screen_name,
       encrypted_password: Decidim::AttributeEncryptor.encrypt(Faker::Internet.password(8)),
       address: ENV["DECIDIM_HOST"] || "localhost",
@@ -173,7 +178,7 @@ if !Rails.env.production? || ENV["SEED"]
         email: Faker::Internet.email,
         confirmed_at: Time.current,
         extended_data: {
-          document_number: Faker::Number.number(10),
+          document_number: Faker::Number.number(10).to_s,
           phone: Faker::PhoneNumber.phone_number,
           verified_at: verified_at
         },

data/lib/decidim/core/engine.rb

@@ -28,6 +28,7 @@ require "omniauth-twitter"
 require "omniauth-google-oauth2"
 require "invisible_captcha"
 require "premailer/rails"
+require "premailer/adapter/decidim"
 require "geocoder"
 require "paper_trail"
 require "cells/rails"
@@ -507,6 +508,10 @@ module Decidim
         NOBSPW.configuration.use_ruby_grep = true
       end
 
+      initializer "decidim.premailer" do
+        Premailer::Adapter.use = :decidim
+      end
+
       config.to_prepare do
         FoundationRailsHelper::FlashHelper.send(:include, Decidim::FlashHelperExtensions)
       end

data/lib/decidim/core/test.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/core/test/shared_examples/acts_as_author_examples"
+require "decidim/core/test/shared_examples/admin_log_presenter_examples"
 require "decidim/core/test/shared_examples/authorable"
 require "decidim/core/test/shared_examples/coauthorable"
 require "decidim/core/test/shared_examples/publicable"
@@ -13,6 +14,7 @@ require "decidim/core/test/shared_examples/has_scope"
 require "decidim/core/test/shared_examples/has_category"
 require "decidim/core/test/shared_examples/has_reference"
 require "decidim/core/test/shared_examples/comments_examples"
+require "decidim/core/test/shared_examples/counts_commentators_as_newsletter_participants"
 require "decidim/core/test/shared_examples/announcements_examples"
 require "decidim/core/test/shared_examples/process_announcements_examples"
 require "decidim/core/test/shared_examples/reportable"

data/lib/decidim/core/test/shared_examples/admin_log_presenter_examples.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples "present admin log entry" do
+  subject(:presenter) { described_class.new(action_log, helper) }
+
+  let(:organization) { create(:organization) }
+  let(:user) { create(:user, organization: organization) }
+  let(:action) { "create" }
+  let(:action_log) do
+    create(
+      :action_log,
+      user: user,
+      action: action,
+      resource: admin_log_resource
+    )
+  end
+
+  before do
+    helper.extend(Decidim::ApplicationHelper)
+    helper.extend(Decidim::TranslationsHelper)
+  end
+
+  describe "#present" do
+    subject { presenter.present }
+
+    context "when the logged action is one that shows diff and the action log does not have an associated version" do
+      it "returns an empty diff" do
+        expect(subject).not_to include("class=\"logs__log__diff\"")
+      end
+    end
+  end
+end

data/lib/decidim/core/test/shared_examples/counts_commentators_as_newsletter_participants.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples_for "counts commentators as newsletter participants" do
+  # non participant commentator (comments into other spaces)
+  let!(:non_participant) { create(:user, :confirmed, newsletter_notifications_at: Time.current, organization: component_out_of_newsletter.organization) }
+  # expects resource_out_of_newsletter to belong to a space which has NOT been selected in the newsletter
+  let!(:outlier_comment) { create(:comment, author: non_participant, commentable: resource_out_of_newsletter) }
+
+  let(:commentators_ids) { [] }
+  let(:recipients_ids) { author_ids + commentators_ids }
+
+  context "without commentators" do
+    it "returns zero participants" do
+      expect(subject).to match_array(recipients_ids)
+    end
+  end
+
+  context "with commentators, counts commentators in the current space" do
+    # participant commentator
+    let!(:commentator_participant) { create(:user, :confirmed, newsletter_notifications_at: Time.current, organization: organization) }
+    # expects resource_in_newsletter to belong to a space selected in the newsletter
+    let!(:comment_in_newsletter) { create(:comment, author: commentator_participant, commentable: resource_in_newsletter) }
+    let(:commentators_ids) { [commentator_participant.id] }
+
+    it "returns only commenters in the selected spaces" do
+      expect(subject).to match_array(recipients_ids)
+    end
+  end
+end

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.23.1"
+      "0.23.2"
     end
   end
 end

data/lib/decidim/form_builder.rb

@@ -405,11 +405,12 @@ module Decidim
     def upload(attribute, options = {})
       self.multipart = true
       options[:optional] = options[:optional].nil? ? true : options[:optional]
-      alt_text = label_for(attribute)
+      label_text = options[:label] || label_for(attribute)
+      alt_text = label_text
 
       file = object.send attribute
       template = ""
-      template += label(attribute, label_for(attribute) + required_for_attribute(attribute))
+      template += label(attribute, label_text + required_for_attribute(attribute))
       template += upload_help(attribute, options)
       template += @template.file_field @object_name, attribute
 

data/lib/decidim/has_private_users.rb

@@ -37,7 +37,7 @@ module Decidim
         return true unless private_space?
         return false unless user
 
-        users.include?(user)
+        participatory_space_private_users.exists?(decidim_user_id: user.id)
       end
 
       def self.public_spaces

data/lib/decidim/newsletter_participant.rb

@@ -9,10 +9,8 @@ module Decidim
 
     included do
       # Returns a User collection Participants
-      # This is the default, if you want, you can overwrite in each Class to be export.
-      def self.newsletter_participant_ids(_component)
-        nil
-      end
+      # Behaves as an abstract method, you must overwrite it in each includer class.
+      def self.newsletter_participant_ids(_component); end
     end
   end
 end

data/lib/decidim/paddable.rb

@@ -64,10 +64,17 @@ module Decidim
       end
 
       def pad_id
-        @pad_id ||= [
-          reference,
-          Digest::MD5.hexdigest("#{id}-#{Rails.application.secrets.secret_key_base}")
-        ].join("-").slice(0, 50)
+        @pad_id ||= [reference, token].join("-").slice(0, 50)
+      end
+
+      # compatibilize with old versions if no salt available (less secure)
+      def token
+        if defined?(salt) && salt.present?
+          tokenizer = Decidim::Tokenizer.new(salt: salt)
+          return tokenizer.hex_digest(id)
+        end
+
+        Digest::MD5.hexdigest("#{id}-#{Rails.application.secrets.secret_key_base}")
       end
 
       def build_pad_url(id)

data/lib/premailer/adapter/decidim.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class Premailer
+  module Adapter
+    # Decidim adapter for Premailer
+    module Decidim
+      include ::Premailer::Adapter::Nokogiri
+
+      # Converts the HTML document to a format suitable for plain-text e-mail.
+      #
+      # If present, uses the <body> element as its base; otherwise uses the whole document.
+      #
+      # Customized for Decidim in order to strip the inline <style> tags away
+      # from the plain text body.
+      #
+      # @return [String] a plain text.
+      def to_plain_text
+        html_src = begin
+                     @doc.at("body").inner_html
+                   rescue StandardError
+                     ""
+                   end
+
+        html_src = @doc.to_html unless html_src && html_src.present?
+
+        # remove style tags and content
+        html_src.gsub!(%r{<style.*?/style>}m, "")
+
+        convert_to_text(html_src, @options[:line_length], @html_encoding)
+      end
+    end
+  end
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.23.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -844,28 +844,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.23.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.23.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.23.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.23.2
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1235,8 +1235,8 @@ files:
 - app/cells/decidim/tags/show.erb
 - app/cells/decidim/tags_cell.rb
 - app/cells/decidim/tos_page/announcement.erb
+- app/cells/decidim/tos_page/form.erb
 - app/cells/decidim/tos_page/refuse_btn_modal.erb
-- app/cells/decidim/tos_page/sticky_form.erb
 - app/cells/decidim/tos_page_cell.rb
 - app/cells/decidim/translation_bar/show.erb
 - app/cells/decidim/translation_bar_cell.rb
@@ -1642,6 +1642,7 @@ files:
 - app/queries/decidim/user_groups/member_memberships.rb
 - app/resolvers/decidim/core/metric_resolver.rb
 - app/resolvers/decidim/hashtags_resolver.rb
+- app/scrubbers/decidim/newsletter_scrubber.rb
 - app/scrubbers/decidim/user_input_scrubber.rb
 - app/serializers/decidim/exporters/participatory_space_components_serializer.rb
 - app/serializers/decidim/exporters/serializer.rb
@@ -1663,6 +1664,7 @@ files:
 - app/services/decidim/resource_search.rb
 - app/services/decidim/settings_change.rb
 - app/services/decidim/static_map_generator.rb
+- app/services/decidim/tokenizer.rb
 - app/services/decidim/traceability.rb
 - app/services/decidim/zip_stream/zip_stream_writer.rb
 - app/types/decidim/core/amendment_type.rb
@@ -1971,12 +1973,14 @@ files:
 - config/locales/pt.yml
 - config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/si-LK.yml
 - config/locales/sk-SK.yml
 - config/locales/sk.yml
 - config/locales/sl.yml
 - config/locales/so-SO.yml
 - config/locales/sr-CS.yml
 - config/locales/sv.yml
+- config/locales/sw-KE.yml
 - config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -2210,6 +2214,7 @@ files:
 - lib/decidim/core/test.rb
 - lib/decidim/core/test/factories.rb
 - lib/decidim/core/test/shared_examples/acts_as_author_examples.rb
+- lib/decidim/core/test/shared_examples/admin_log_presenter_examples.rb
 - lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb
 - lib/decidim/core/test/shared_examples/amendable/accept_amendment_examples.rb
 - lib/decidim/core/test/shared_examples/amendable/amendment_accepted_event_examples.rb
@@ -2236,6 +2241,7 @@ files:
 - lib/decidim/core/test/shared_examples/coauthorable_interface_examples.rb
 - lib/decidim/core/test/shared_examples/comments_examples.rb
 - lib/decidim/core/test/shared_examples/component_type.rb
+- lib/decidim/core/test/shared_examples/counts_commentators_as_newsletter_participants.rb
 - lib/decidim/core/test/shared_examples/edit_link_shared_examples.rb
 - lib/decidim/core/test/shared_examples/embed_resource_examples.rb
 - lib/decidim/core/test/shared_examples/endorsable_interface_examples.rb
@@ -2408,6 +2414,7 @@ files:
 - lib/decidim/view_model.rb
 - lib/devise/models/decidim_newsletterable.rb
 - lib/devise/models/decidim_validatable.rb
+- lib/premailer/adapter/decidim.rb
 - lib/tasks/decidim_data_portability_tasks.rake
 - lib/tasks/decidim_locales_tasks.rake
 - lib/tasks/decidim_metrics_tasks.rake
@@ -2481,7 +2488,7 @@ homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -2497,7 +2504,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: The core of the Decidim framework.
 test_files: []

data/app/cells/decidim/tos_page/sticky_form.erb

@@ -1,29 +0,0 @@
-<div data-sticky-container class="cell-sticky">
-  <div class="sticky"
-        data-sticky
-        data-stick-to="bottom"
-        data-margin-bottom="0"
-        data-top-anchor="sticky-top-stop:top"
-        data-btm-anchor="sticky-btm-stop:top"
-        data-sticky-on="small">
-    <article class="card">
-      <div class="card__content">
-        <div class="card__header">
-          <h5 class="card__title text-center">
-            <%= t("form.legend", scope: "decidim.pages.terms_and_conditions") %>
-          </h5>
-        </div>
-
-        <div class="row column flex-center">
-          <%= cell "decidim/tos_page", :refuse_btn_modal %>
-
-          <%= button_to decidim.accept_tos_path, method: :put, class: "button button--nomargin small" do %>
-            <%= t("form.agreement", scope: "decidim.pages.terms_and_conditions") %>
-          <% end %>
-        </div>
-      </div>
-    </article>
-  </div>
-</div>
-
-<div id="sticky-btm-stop"></div>