decidim-core 0.17.2 → 0.18.0

data/lib/decidim/core/test/shared_examples/amendable/amendment_accepted_event_examples.rb

@@ -37,7 +37,7 @@ shared_examples "amendment accepted event" do
   describe "notification_title" do
     it "is generated correctly" do
       expect(subject.notification_title)
-        .to include("The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> has been accepted for <a href=\"#{amendable_path}\">#{amendable_title}</a> #{amendable_type}.") # rubocop:disable Metrics/LineLength
+        .to eq("The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> has been accepted for <a href=\"#{amendable_path}\">#{amendable_title}</a>.") # rubocop:disable Metrics/LineLength
     end
   end
 end

data/lib/decidim/core/test/shared_examples/amendable/amendment_created_event_examples.rb

@@ -21,7 +21,7 @@ shared_examples "amendment created event" do
 
   describe "email_subject" do
     it "is generated correctly" do
-      expect(subject.email_subject).to eq("New amendment for #{amendable_title} from #{emendation_author_nickname}")
+      expect(subject.email_subject).to eq("New amendment for #{amendable_title}")
     end
   end
 
@@ -42,7 +42,7 @@ shared_examples "amendment created event" do
   describe "notification_title" do
     it "is generated correctly" do
       expect(subject.notification_title)
-        .to include("A <a href=\"#{emendation_path}\">new amendment</a> has been created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> for <a href=\"#{amendable_path}\">#{amendable_title}</a> #{amendable_type}.") # rubocop:disable Metrics/LineLength
+        .to eq("A new amendment has been created for <a href=\"#{amendable_path}\">#{amendable_title}</a>.")
     end
   end
 end

data/lib/decidim/core/test/shared_examples/amendable/amendment_form_examples.rb

@@ -3,7 +3,7 @@
 shared_examples "an amendment form" do
   let(:title) { "More sidewalks and less roads!" }
   let(:body) { "Everything would be better" }
-  let(:emendation_fields) do
+  let(:emendation_params) do
     {
       title: title,
       body: body

data/lib/decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples.rb

@@ -37,7 +37,7 @@ shared_examples "amendment promoted event" do
   describe "notification_title" do
     it "is generated correctly" do
       expect(subject.notification_title)
-        .to include("A <a href=\"#{emendation_path}\">rejected amendment</a> for <a href=\"#{amendable_path}\">#{amendable_title}</a> #{amendable_type} has been published as a new proposal by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a>.") # rubocop:disable Metrics/LineLength
+        .to eq("A <a href=\"#{emendation_path}\">rejected amendment</a> for <a href=\"#{amendable_path}\">#{amendable_title}</a> has been published as a new #{amendable_type} by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a>.") # rubocop:disable Metrics/LineLength
     end
   end
 end

data/lib/decidim/core/test/shared_examples/amendable/amendment_rejected_event_examples.rb

@@ -37,7 +37,7 @@ shared_examples "amendment rejected event" do
   describe "notification_title" do
     it "is generated correctly" do
       expect(subject.notification_title)
-        .to include("The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> has been rejected for <a href=\"#{amendable_path}\">#{amendable_title}</a> #{amendable_type}.") # rubocop:disable Metrics/LineLength
+        .to eq("The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> has been rejected for <a href=\"#{amendable_path}\">#{amendable_title}</a>.") # rubocop:disable Metrics/LineLength
     end
   end
 end

data/lib/decidim/core/test/shared_examples/amendable/create_amendment_examples.rb

@@ -19,7 +19,7 @@ shared_examples "create amendment" do
         .to receive(:perform_action!)
         .with(
           "publish",
-          form.amendable_type.constantize,
+          form.amendable.amendable_type.constantize,
           form.current_user,
           kind_of(Hash)
         ).and_call_original
@@ -34,9 +34,8 @@ shared_examples "create amendment" do
           event: "decidim.events.amendments.amendment_created",
           event_class: Decidim::Amendable::AmendmentCreatedEvent,
           resource: amendable,
-          followers: kind_of(Array),
-          affected_users: kind_of(Array),
-          extra: kind_of(Hash)
+          affected_users: [amendable.creator_author],
+          followers: []
         )
 
       command.call
@@ -58,21 +57,4 @@ shared_examples "create amendment" do
         .by(0)
     end
   end
-
-  context "when the emendation doens't change the amendable" do
-    let(:title) { amendable.title }
-    let(:body) { amendable.body }
-
-    it "broadcasts invalid" do
-      expect { command.call }.to broadcast(:invalid)
-    end
-
-    it "doesn't create an amendment and the emendation" do
-      expect { command.call }
-        .to change(Decidim::Amendment, :count)
-        .by(0)
-        .and change(amendable.resource_manifest.model_class_name.constantize, :count)
-        .by(0)
-    end
-  end
 end

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

@@ -98,6 +98,7 @@ shared_examples "comments" do
         visit resource_path
 
         expect(page).to have_selector(".comment__reply")
+        expect(page).not_to have_selector(".comment__additionalreply")
 
         within "#comments #comment_#{comment.id}" do
           click_button "Reply"
@@ -110,10 +111,27 @@ shared_examples "comments" do
         end
 
         expect(page).to have_selector(".comment-thread .comment--nested")
+        expect(page).to have_selector(".comment__additionalreply")
         expect(page).to have_reply_to(comment, "This is a reply")
       end
     end
 
+    context "when a comment has been moderated" do
+      let!(:parent) { create(:comment, commentable: commentable) }
+      let!(:reply) { create(:comment, commentable: parent, root_commentable: commentable) }
+
+      it "doesn't show additional reply" do
+        Decidim::Moderation.create!(reportable: reply, participatory_space: reply.participatory_space, hidden_at: 1.day.ago)
+
+        visit current_path
+
+        within "#comments #comment_#{parent.id}" do
+          expect(page).to have_selector(".comment__reply")
+          expect(page).not_to have_selector(".comment__additionalreply")
+        end
+      end
+    end
+
     describe "arguable option" do
       context "when commenting with alignment" do
         before do

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

@@ -39,7 +39,7 @@ shared_examples_for "has attachments" do
       end
 
       within "div.wrapper .images" do
-        expect(strip_tags(translated(fist_image.description, locale: :en))).to appear_before(strip_tags(translated(last_image.description, locale: :en)))
+        expect(strip_tags(translated(fist_image.title, locale: :en))).to appear_before(strip_tags(translated(last_image.title, locale: :en)))
       end
     end
   end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples_for "space cell changes button text CTA" do
+  describe "within the card footer" do
+    context "when it has no components" do
+      it "renders 'More info' in the CTA button text" do
+        expect(subject).to have_selector(".card__footer--spaces .card__button", text: "More info")
+      end
+    end
+
+    context "when it has a component" do
+      context "and it is not published" do
+        let!(:component) { create(:component, :unpublished, manifest_name: "dummy", participatory_space: model) }
+
+        it "renders 'More info' in the CTA button text" do
+          expect(subject).to have_selector(".card__footer--spaces .card__button", text: "More info")
+        end
+      end
+
+      context "and it is published" do
+        let!(:component) { create(:component, :published, manifest_name: "dummy", participatory_space: model) }
+
+        it "renders 'Take part' in the CTA button text" do
+          expect(subject).to have_selector(".card__footer--spaces .card__button", text: "Take part")
+        end
+      end
+    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.17.2"
+      "0.18.0"
     end
   end
 end

data/lib/decidim/exporters/csv.rb

@@ -15,8 +15,8 @@ module Decidim
       # provided serializer and following the previously described strategy.
       #
       # Returns an ExportData instance.
-      def export
-        data = ::CSV.generate(headers: headers, write_headers: true, col_sep: ";") do |csv|
+      def export(col_sep = Decidim.default_csv_col_sep)
+        data = ::CSV.generate(headers: headers, write_headers: true, col_sep: col_sep) do |csv|
           processed_collection.each do |resource|
             csv << headers.map { |header| resource[header] }
           end

data/lib/decidim/filter_form_builder.rb

@@ -40,8 +40,15 @@ module Decidim
       end
     end
 
+    # Wrap the areas select in a custom fieldset.
+    def areas_select(method, collection, options = {})
+      fieldset_wrapper options[:legend_title] do
+        super(method, collection, options)
+      end
+    end
+
     # Wrap the scopes picker in a custom fieldset.
-    def scopes_picker(method, options = {})
+    def scopes_picker(method, options = { checkboxes_on_top: true })
       fieldset_wrapper options[:legend_title] do
         super(method, options)
       end

data/lib/decidim/form_builder.rb

@@ -202,12 +202,44 @@ module Decidim
       select(name, @template.options_for_select(categories, selected: selected, disabled: disabled), options, html_options)
     end
 
+    # Public: Generates a select field for areas.
+    #
+    # name       - The name of the field (usually area_id)
+    # collection - A collection of areas or area_types.
+    #              If it's areas, we sort the selectable options alphabetically.
+    #
+    # Returns a String.
+    def areas_select(name, collection, options = {})
+      selectables = if collection.first.is_a?(Decidim::Area)
+                      assemblies = collection
+                                   .map { |a| [a.name[I18n.locale.to_s], a.id] }
+                                   .sort_by { |arr| arr[0] }
+
+                      @template.options_for_select(
+                        assemblies,
+                        selected: options[:selected]
+                      )
+                    else
+                      @template.option_groups_from_collection_for_select(
+                        collection,
+                        :areas,
+                        :translated_name,
+                        :id,
+                        :translated_name,
+                        selected: options[:selected]
+                      )
+                    end
+
+      select(name, selectables, options)
+    end
+
     # Public: Generates a picker field for scope selection.
     #
     # attribute     - The name of the field (usually scope_id)
     # options       - An optional Hash with options:
     # - multiple    - Multiple mode, to allow multiple scopes selection.
     # - label       - Show label?
+    # - checkboxes_on_top - Show checked picker values on top (default) or below the picker prompt
     #
     # Also it should receive a block that returns a Hash with :url and :text for each selected scope (and for null scope for prompt)
     #
@@ -225,7 +257,11 @@ module Decidim
       scopes = selected_scopes(attribute).map { |scope| [scope, yield(scope)] }
       template = ""
       template += label(attribute, label_for(attribute) + required_for_attribute(attribute)) unless options[:label] == false
-      template += @template.render("decidim/scopes/scopes_picker_input", picker_options: picker_options, prompt_params: prompt_params, scopes: scopes)
+      template += @template.render("decidim/scopes/scopes_picker_input",
+                                   picker_options: picker_options,
+                                   prompt_params: prompt_params,
+                                   scopes: scopes,
+                                   checkboxes_on_top: options[:checkboxes_on_top])
       template += error_and_help_text(attribute, options)
       template.html_safe
     end
@@ -366,11 +402,11 @@ module Decidim
       end
     end
 
-    def form_field_for(attribute)
+    def form_field_for(attribute, options = {})
       if attribute == :body
-        text_area attribute, rows: 10
+        text_area(attribute, options.merge(rows: 10))
       else
-        text_field attribute
+        text_field(attribute, options)
       end
     end
 

data/lib/decidim/has_component.rb

@@ -12,6 +12,13 @@ module Decidim
       belongs_to :component, foreign_key: "decidim_component_id", class_name: "Decidim::Component", touch: true
       delegate :organization, to: :component, allow_nil: true
       delegate :participatory_space, to: :component, allow_nil: true
+
+      def can_participate_in_space?(user)
+        return true unless participatory_space.try(:private_space?)
+        return false unless user
+
+        participatory_space.users.include?(user)
+      end
     end
 
     class_methods do

data/lib/decidim/has_private_users.rb

@@ -9,17 +9,34 @@ module Decidim
     extend ActiveSupport::Concern
 
     included do
-      has_many :participatory_space_private_users, class_name: "Decidim::ParticipatorySpacePrivateUser", as: :privatable_to, dependent: :destroy
-      has_many :users, through: :participatory_space_private_users, class_name: "Decidim::User", foreign_key: "private_user_to_id"
+      has_many :participatory_space_private_users,
+               class_name: "Decidim::ParticipatorySpacePrivateUser",
+               as: :privatable_to,
+               dependent: :destroy
+      has_many :users,
+               through: :participatory_space_private_users,
+               class_name: "Decidim::User",
+               foreign_key: "private_user_to_id"
 
-      scope :visible_for, lambda { |user|
-                            joins("LEFT JOIN decidim_participatory_space_private_users ON
-                            decidim_participatory_space_private_users.privatable_to_id = #{table_name}.id")
-                              .where("(private_space = ? and decidim_participatory_space_private_users.decidim_user_id = ?) or private_space = ? ", true, user, false).distinct
-                          }
+      def self.visible_for(user)
+        if user
+          return all if user.admin?
+
+          left_outer_joins(:participatory_space_private_users).where(
+            %(private_space = false OR
+            decidim_participatory_space_private_users.decidim_user_id = ?), user.id
+          )
+        else
+          public_spaces
+        end
+      end
 
       def self.public_spaces
-        super.where(private_space: false)
+        where(private_space: false)
+      end
+
+      def self.private_spaces
+        where(private_space: true)
       end
     end
   end

data/lib/decidim/jsonb_attributes.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # A set of convenient methods to generate dynamic jsonb objects in a way is
+  # compatilbe with Virtus and ActiveModel thus making it easy to integrate
+  # into Rails forms and similar workflows.
+  module JsonbAttributes
+    extend ActiveSupport::Concern
+
+    class_methods do
+      # Public: Mirrors Virtus `attribute` interface to define attributes in
+      # custom jsonb objects.
+      #
+      # name - Attribute's name
+      # fields - The attribute's child fields
+      #
+      # Example:
+      #   jsonb_attribute(:settings, [[:custom_setting, String], [:another_setting, Boolean])
+      #   # This will generate `custom_setting`, `custom_setting=` and
+      #   # `another_setting`, `another_setting=` and will keep them
+      #   # syncronized with a hash in `settings`:
+      #   # settings = { "custom_setting" => "demo", "another_setting" => "demo"}
+      #
+      # Returns nothing.
+      def jsonb_attribute(name, fields, *options)
+        attribute name, Hash, default: {}
+
+        fields.each do |f, type|
+          attribute f, type, *options
+          define_method f do
+            field = public_send(name) || {}
+            field[f.to_s] || field[f.to_sym]
+          end
+
+          define_method "#{f}=" do |value|
+            field = public_send(name) || {}
+            public_send("#{name}=", field.merge(f => super(value)))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/decidim/newsletter_participant.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # This concern contains the logic related to newsletter participants
+  module NewsletterParticipant
+    extend ActiveSupport::Concern
+
+    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
+    end
+  end
+end

data/lib/decidim/participable.rb

@@ -75,6 +75,15 @@ module Decidim
       def can_participate?(_user)
         true
       end
+
+      def empty_published_component?
+        components.published.empty?
+      end
+
+      def cta_button_text_key
+        return :more_info if empty_published_component?
+        :take_part
+      end
     end
 
     class_methods do

data/lib/decidim/permissions_registry.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  #
+  # Takes care of holding and accessing permissions classes for each artifact.
+  #
+  class PermissionsRegistry
+    def initialize
+      @registry = {}
+    end
+
+    # Syntactic sugar for the `chain_for` instance method.
+    def self.chain_for(artifact)
+      ::Decidim.permissions_registry.chain_for(artifact)
+    end
+
+    # Returns the registered array of permissions for the given `artifact`.
+    #
+    # +artifact+ is expected to be the class or module that declares `NeedsPermission.permission_class_chain`.
+    def chain_for(artifact)
+      @registry[artifact_to_key(artifact)]
+    end
+
+    # Registers the of `Permissions` for the given `artifact`.
+    #
+    # +artifact+ is expected to be the class or module that declares `NeedsPermission.permission_class_chain`.
+    # +permission_classes+ are subclasses of `DefaultPermissions`.
+    def register_permissions(artifact, *permission_classes)
+      @registry[artifact_to_key(artifact)] = permission_classes.dup
+    end
+
+    # Registry accepts the class or the class name of the artifact,
+    # but the registry only indexes by the name.
+    # Artifact name normalization is done here.
+    def artifact_to_key(artifact)
+      artifact.respond_to?(:name) ? artifact.name : artifact
+    end
+  end
+end