decidim-debates 0.10.1 → 0.11.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37c9964db5c710ebcc15aecbcad4be999246a1c27642fc6226ee246acb487e99
-  data.tar.gz: 2c1dc1fd5fb5ecfc063f4854c0757c6d8bf9241b6be990ca218b9e1792be4419
+  metadata.gz: 0da7649f21a90cd8b25affec2d754b336c6eefeaecf6784162c2930193a885d1
+  data.tar.gz: 0c3b6d55d55d5f888f221497240e206f75e388ca0c33f4bbca360f4ce615c8c8
 SHA512:
-  metadata.gz: 7b09efb6a8b2e9022a055ef7420810ad30cfcccc551ae5384dcd05d080faf412d89e14f1c839bd81cea8a7dd3d0423fbd498f4802b6e91e5ee77b93ed733eb54
-  data.tar.gz: 257e300b383f1f9d55466b6e57a91f634a8183eda216abefa0511b9545a3342572fa1b4efd7b20041ea10c76d58684467ffa0db0d91a0f4133f0c2759b519fb0
+  metadata.gz: 283a66424e943e8b05f4d99c74d9b76bbef4c21c268ceb802db46540d2cdf43feffed606c2ff5750a633ecaf4ab01b8a3964624c252108f64a4417f11b9700c6
+  data.tar.gz: cf39b4d1c8ecd09294daa0c17345a8c11189b55c70533233042273e8cef52e3a4e451a551c12fe0bbc461fa2b32fc9e77b3896d30c2116b1980e99146a0f4520

data/app/commands/decidim/debates/admin/create_debate.rb

@@ -38,7 +38,7 @@ module Decidim
             instructions: form.instructions,
             end_time: form.end_time,
             start_time: form.start_time,
-            feature: form.current_feature
+            component: form.current_component
           )
         end
 
@@ -47,7 +47,7 @@ module Decidim
             event: "decidim.events.debates.debate_created",
             event_class: Decidim::Debates::CreateDebateEvent,
             resource: debate,
-            recipient_ids: form.current_feature.participatory_space.followers.pluck(:id),
+            recipient_ids: form.current_component.participatory_space.followers.pluck(:id),
             extra: {
               type: "participatory_space"
             }

data/app/commands/decidim/debates/create_debate.rb

@@ -27,7 +27,7 @@ module Decidim
       attr_reader :debate, :form
 
       def organization
-        @organization = form.current_feature.organization
+        @organization = form.current_component.organization
       end
 
       def i18n_field(field)
@@ -43,7 +43,7 @@ module Decidim
           category: form.category,
           title: i18n_field(form.title),
           description: i18n_field(form.description),
-          feature: form.current_feature
+          component: form.current_component
         )
       end
 

data/app/controllers/decidim/debates/admin/application_controller.rb

@@ -6,9 +6,9 @@ module Decidim
       # This controller is the abstract class from which all other controllers of
       # this engine inherit.
       #
-      # Note that it inherits from `Decidim::Features::BaseController`, which
+      # Note that it inherits from `Decidim::Components::BaseController`, which
       # override its layout and provide all kinds of useful methods.
-      class ApplicationController < Decidim::Admin::Features::BaseController
+      class ApplicationController < Decidim::Admin::Components::BaseController
       end
     end
   end

data/app/controllers/decidim/debates/admin/debates_controller.rb

@@ -12,7 +12,7 @@ module Decidim
         end
 
         def create
-          @form = form(Decidim::Debates::Admin::DebateForm).from_params(params, current_feature: current_feature)
+          @form = form(Decidim::Debates::Admin::DebateForm).from_params(params, current_component: current_component)
 
           CreateDebate.call(@form) do
             on(:ok) do
@@ -34,7 +34,7 @@ module Decidim
 
         def update
           authorize! :edit, debate
-          @form = form(DebateForm).from_params(params, current_feature: current_feature)
+          @form = form(DebateForm).from_params(params, current_component: current_component)
 
           UpdateDebate.call(@form, debate) do
             on(:ok) do
@@ -61,7 +61,7 @@ module Decidim
         private
 
         def debates
-          @debates ||= Debate.where(feature: current_feature)
+          @debates ||= Debate.where(component: current_component)
         end
 
         def debate

data/app/controllers/decidim/debates/application_controller.rb

@@ -7,7 +7,7 @@ module Decidim
     #
     # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
-    class ApplicationController < Decidim::Features::BaseController
+    class ApplicationController < Decidim::Components::BaseController
     end
   end
 end

data/app/controllers/decidim/debates/debates_controller.rb

@@ -20,7 +20,7 @@ module Decidim
 
       def create
         authorize! :create, Debate
-        @form = form(DebateForm).from_params(params, current_feature: current_feature)
+        @form = form(DebateForm).from_params(params, current_component: current_component)
 
         CreateDebate.call(@form) do
           on(:ok) do |debate|

data/app/forms/decidim/debates/admin/debate_form.rb

@@ -24,8 +24,8 @@ module Decidim
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
 
         def category
-          return unless current_feature
-          @category ||= current_feature.categories.where(id: decidim_category_id).first
+          return unless current_component
+          @category ||= current_component.categories.find_by(id: decidim_category_id)
         end
       end
     end

data/app/forms/decidim/debates/debate_form.rb

@@ -17,7 +17,7 @@ module Decidim
       validates :category, presence: true, if: ->(form) { form.category_id.present? }
 
       def category
-        @category ||= current_feature.categories.where(id: category_id).first
+        @category ||= current_component.categories.find_by(id: category_id)
       end
     end
   end

data/app/jobs/decidim/debates/settings_change_job.rb

@@ -3,10 +3,10 @@
 module Decidim
   module Debates
     class SettingsChangeJob < ApplicationJob
-      def perform(feature_id, previous_settings, current_settings)
+      def perform(component_id, previous_settings, current_settings)
         return if unchanged?(previous_settings, current_settings)
 
-        feature = Decidim::Feature.find(feature_id)
+        component = Decidim::Component.find(component_id)
 
         if debate_creation_enabled?(previous_settings, current_settings)
           event = "decidim.events.debates.creation_enabled"
@@ -19,8 +19,8 @@ module Decidim
         Decidim::EventsManager.publish(
           event: event,
           event_class: event_class,
-          resource: feature,
-          recipient_ids: feature.participatory_space.followers.pluck(:id)
+          resource: component,
+          recipient_ids: component.participatory_space.followers.pluck(:id)
         )
       end
 

data/app/models/decidim/debates/abilities/admin/participatory_process_moderator_ability.rb

@@ -11,7 +11,7 @@ module Decidim
             super
 
             can [:unreport, :hide], Debate do |debate|
-              can_manage_process?(debate.feature.participatory_space)
+              can_manage_process?(debate.component.participatory_space)
             end
           end
         end

data/app/models/decidim/debates/abilities/current_user_ability.rb

@@ -23,9 +23,9 @@ module Decidim
         private
 
         def authorized?(action)
-          return unless feature
+          return unless component
 
-          ActionAuthorizer.new(user, feature, action).authorize.ok?
+          ActionAuthorizer.new(user, component, action).authorize.ok?
         end
 
         def creation_enabled?
@@ -37,11 +37,11 @@ module Decidim
           context.fetch(:current_settings, nil)
         end
 
-        def feature
-          feature = context.fetch(:current_feature, nil)
-          return nil unless feature && feature.manifest.name == :debates
+        def component
+          component = context.fetch(:current_component, nil)
+          return nil unless component && component.manifest.name == :debates
 
-          feature
+          component
         end
       end
     end

data/app/models/decidim/debates/debate.rb

@@ -6,19 +6,19 @@ module Decidim
     # title, description and any other useful information to render a custom
     # debate.
     class Debate < Debates::ApplicationRecord
-      include Decidim::HasFeature
+      include Decidim::HasComponent
       include Decidim::HasCategory
       include Decidim::Resourceable
       include Decidim::Followable
       include Decidim::Comments::Commentable
-      include Decidim::ScopableFeature
+      include Decidim::ScopableComponent
       include Decidim::Authorable
       include Decidim::Reportable
       include Decidim::HasReference
       include Decidim::Traceable
       include Decidim::Loggable
 
-      feature_manifest_name "debates"
+      component_manifest_name "debates"
 
       validates :title, presence: true
 
@@ -64,7 +64,7 @@ module Decidim
 
       # Public: Overrides the `commentable?` Commentable concern method.
       def commentable?
-        feature.settings.comments_enabled?
+        component.settings.comments_enabled?
       end
 
       # Public: Overrides the `accepts_new_comments?` Commentable concern method.
@@ -95,14 +95,14 @@ module Decidim
 
       # Public: Override Commentable concern method `users_to_notify_on_comment_created`
       def users_to_notify_on_comment_created
-        return (followers | feature.participatory_space.admins).uniq if official?
+        return Decidim::User.where(id: followers).or(Decidim::User.where(id: component.participatory_space.admins)).distinct if official?
         followers
       end
 
       private
 
       def comments_blocked?
-        feature.current_settings.comments_blocked
+        component.current_settings.comments_blocked
       end
     end
   end

data/app/services/decidim/debates/debate_search.rb

@@ -3,11 +3,11 @@
 module Decidim
   module Debates
     # This class handles search and filtering of debates. Needs a
-    # `current_feature` param with a `Decidim::Feature` in order to
+    # `current_component` param with a `Decidim::Component` in order to
     # find the debates.
     class DebateSearch < ResourceSearch
       # Public: Initializes the service.
-      # feature     - A Decidim::Feature to get the debates from.
+      # component     - A Decidim::Component to get the debates from.
       # page        - The page number to paginate the results.
       # per_page    - The number of proposals to return per page.
       def initialize(options = {})

data/app/views/decidim/debates/admin/debates/_form.html.erb

@@ -4,23 +4,23 @@
   </div>
 
   <div class="card-section">
-    <div class="row column" >
+    <div class="row column">
       <%= form.translated :text_field, :title, autofocus: true %>
     </div>
 
-    <div class="row column" >
+    <div class="row column">
       <%= form.translated :editor, :description %>
     </div>
 
-    <div class="row column" >
+    <div class="row column">
       <%= form.translated :editor, :instructions %>
     </div>
 
-    <div class="row column" >
+    <div class="row column">
       <%= form.translated :editor, :information_updates %>
     </div>
 
-    <div class="row" >
+    <div class="row">
       <div class="column xlarge-6">
         <%= form.datetime_field :start_time %>
       </div>
@@ -29,7 +29,7 @@
       </div>
     </div>
 
-    <div class="row column" >
+    <div class="row column">
       <%= form.categories_select :decidim_category_id, current_participatory_space.categories, prompt: "", disable_parents: false %>
     </div>
   </div>

data/app/views/decidim/debates/admin/debates/edit.html.erb

@@ -1,5 +1,5 @@
 <%= decidim_form_for(@form, html: { class: "form edit_debate" }) do |f| %>
-  <%= render partial: 'form', object: f, locals: { title: t('.title') } %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 
   <div class="button--double form-general-submit">
     <%= f.submit t(".update") %>

data/app/views/decidim/debates/admin/debates/index.html.erb

@@ -3,7 +3,7 @@
     <h2 class="card-title">
       <%= t(".title") %>
 
-      <%= link_to t("actions.new", scope: "decidim.debates", name: t("models.debate.name", scope: "decidim.debates.admin")), new_debate_path, class: 'button tiny button--title' if can? :manage, current_feature %>
+      <%= link_to t("actions.new", scope: "decidim.debates", name: t("models.debate.name", scope: "decidim.debates.admin")), new_debate_path, class: "button tiny button--title" if can? :manage, current_component %>
     </h2>
   </div>
 
@@ -27,12 +27,12 @@
               <td>
                 <% if debate.start_time %>
                   <%= l debate.start_time, format: :long %>
-                <%  end%>
+                <% end %>
               </td>
               <td>
                 <% if debate.end_time %>
                   <%= l debate.end_time, format: :long %>
-                <%  end%>
+                <% end %>
               </td>
               <td class="table-list__actions">
                 <% if can? :update, debate %>

data/app/views/decidim/debates/admin/debates/new.html.erb

@@ -1,5 +1,5 @@
 <%= decidim_form_for(@form, html: { class: "form new_debate" }) do |f| %>
-  <%= render partial: 'form', object: f, locals: { title: t('.title') } %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 
   <div class="button--double form-general-submit">
     <%= f.submit t(".create") %>

data/app/views/decidim/debates/debates/_debate.html.erb

@@ -20,7 +20,7 @@
         <%== html_truncate(translated_attribute(debate.description), length: 630, separator: "...") %>
       </p>
       <% if debate.category.present? %>
-        <ul class="tags tags--debate" >
+        <ul class="tags tags--debate">
           <li><%= link_to translated_attribute(debate.category.name), debates_path(filter: { category_id: debate.category.id }) %></li>
         </ul>
       <% end %>
@@ -32,11 +32,11 @@
             <%= debate.comments.count %>
           </span>
           <span>
-            <%= t('.comments', count: debate.comments.count) %>
+            <%= t(".comments", count: debate.comments.count) %>
           </span>
         </div>
-        <%= link_to t('.participate'), debate_path(debate), class: "button small secondary card__button" %>
+        <%= link_to t(".participate"), debate_path(debate), class: "button small secondary card__button" %>
       </div>
     </div>
   </article>
-</div>
+</div>

data/app/views/decidim/debates/debates/_filters.html.erb

@@ -2,19 +2,19 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t('.search') %>
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search") %>
         <div class="input-group-button">
           <button type="submit" class="button button--muted">
-            <%= icon "magnifying-glass", aria_label: t('.search') %>
+            <%= icon "magnifying-glass", aria_label: t(".search") %>
           </button>
         </div>
       </div>
     </div>
   </div>
 
-  <%= form.collection_radio_buttons :origin, [["all", t('.all')], ["official", t('.official')], ["citizens", t('.citizens')]], :first, :last, legend_title: t('.origin') %>
+  <%= form.collection_radio_buttons :origin, [["all", t(".all")], ["official", t(".official")], ["citizens", t(".citizens")]], :first, :last, legend_title: t(".origin") %>
 
-  <% if current_feature.categories.any? %>
-    <%= form.categories_select :category_id, current_feature.categories, legend_title: t('.category'), disable_parents: false, label: false, prompt: t('.category_prompt') %>
+  <% if current_component.categories.any? %>
+    <%= form.categories_select :category_id, current_component.categories, legend_title: t(".category"), disable_parents: false, label: false, prompt: t(".category_prompt") %>
   <% end %>
 <% end %>

data/app/views/decidim/debates/debates/_filters_small_view.html.erb

@@ -1,7 +1,7 @@
 <div class="filters-controls hide-for-mediumlarge">
   <button data-open="filter-box" class="filters-controls__trigger">
     <%= t ".filter" %>
-    <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t('.unfold'), role: "img" %>
+    <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t(".unfold"), role: "img" %>
   </button>
 </div>
 

data/app/views/decidim/debates/debates/_share.html.erb

@@ -1,7 +1,7 @@
 <div class="text-center">
   <button class="link text-center" data-open="processShare">
     <%= t(".share") %>
-    <%= icon "share", class: "icon--after"%>
+    <%= icon "share", class: "icon--after" %>
   </button>
 </div>
 <div class="reveal" id="processShare" data-reveal>

data/app/views/decidim/debates/debates/index.html.erb

@@ -1,4 +1,4 @@
-<%= render partial: "decidim/shared/feature_announcement" %>
+<%= render partial: "decidim/shared/component_announcement" %>
 
 <div class="row columns">
   <div class="title-action">
@@ -17,7 +17,7 @@
 <div class="row">
   <div class="columns mediumlarge-4 large-3">
     <%= render partial: "filters_small_view" %>
-    <div class="card card--secondary show-for-mediumlarge" >
+    <div class="card card--secondary show-for-mediumlarge">
       <%= render partial: "filters" %>
     </div>
   </div>

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

@@ -11,16 +11,16 @@
   <div class="author-data">
     <%= render partial: "decidim/shared/author_reference", locals: { author: Decidim::Debates::DebatePresenter.new(debate).author } %>
     <div class="author-data__extra">
-      <button type="button" data-open="<%= current_user.present? ? 'flagModal' : 'loginModal' %>" title="<%= t('.report') %>" aria-controls="<%= current_user.present? ? 'flagModal' : 'loginModal' %>" aria-haspopup="true" tabindex="0">
-        <%= icon "flag", aria_label: t('.report'), class: 'icon--small' %>
+      <button type="button" data-open="<%= current_user.present? ? "flagModal" : "loginModal" %>" title="<%= t(".report") %>" aria-controls="<%= current_user.present? ? "flagModal" : "loginModal" %>" aria-haspopup="true" tabindex="0">
+        <%= icon "flag", aria_label: t(".report"), class: "icon--small" %>
       </button>
       <% unless debate.official? %>
         <%= link_to_current_or_new_conversation_with(debate.author) %>
       <% end %>
     </div>
     <% if debate.commentable? %>
-      <a href="#comments" title="<%= t('.comments') %>">
-        <%= icon "comment-square", aria_label: t('.comments'), role: "img" %> <%= debate.comments.count %>
+      <a href="#comments" title="<%= t(".comments") %>">
+        <%= icon "comment-square", aria_label: t(".comments"), role: "img" %> <%= debate.comments.count %>
       </a>
     <% end %>
   </div>