decidim-debates 0.28.2 → 0.29.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc225a06710d3f62e1d7e78c90c80106db14169a07b090515b165becf5548cb8
-  data.tar.gz: dc7740a978e83c189848d92642b2478571d48abf2613b9b22db38c59b07fc924
+  metadata.gz: a949fe9f6dc4fe6f3554ec71c9039a3126573bbe17e92abf662d0aba33bf1790
+  data.tar.gz: c6bc45679856e1759135352bb78ea8e9401a22fce2386c6a28ad6dbd376fcb13
 SHA512:
-  metadata.gz: aa534652134cdf5c6e1e9dcd6f0ddc82ed814707a201406090e10174d29f393b1f5472d667d0f8be74d6f5d90ee7d8f0454bf460a9183cc55a8a82172f6eb5d8
-  data.tar.gz: b63bd359841719ebbaad98ea758181e3e7ebb5382dbed08e82315e01f9299b391a75512d11221deb31f39f00a9c9ffdab74540f2bf3f1f04a35598ee00126472
+  metadata.gz: 0be328dbe0deb9e6ad8bda5d15e95c02f9b73c9131104fac316fbdb02f6f7adc409fb6377e3ad2c247a33988664754fbdca6d60161ebb88c08698adcd987ee50
+  data.tar.gz: 698c3ae06ad7b2b72db4dcc22f46afe255c9354ec34ec34f29e29af8f33eff8391cb470a9a2699e39fc71289ada2512d5ba01ce50d72ae234054aa63fe02fe99

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

@@ -4,49 +4,14 @@ module Decidim
   module Debates
     module Admin
       # A command with all the business logic when an admin closes a debate.
-      class CloseDebate < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # form         - A form object with the params.
-        def initialize(form)
-          @form = form
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid, together with the debate.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          close_debate
-          broadcast(:ok, debate)
-        end
-
+      class CloseDebate < Decidim::Debates::CloseDebate
         private
 
-        attr_reader :form
-
-        def close_debate
-          @debate = Decidim.traceability.perform_action!(
-            :close,
-            form.debate,
-            form.current_user
-          ) do
-            form.debate.update!(
-              conclusions: form.conclusions,
-              closed_at: form.closed_at
-            )
-          end
-
-          Decidim::EventsManager.publish(
-            event: "decidim.events.debates.debate_closed",
-            event_class: Decidim::Debates::CloseDebateEvent,
-            resource: debate,
-            followers: debate.followers
-          )
+        def attributes
+          {
+            conclusions: form.conclusions,
+            closed_at: form.closed_at
+          }
         end
       end
     end

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

@@ -5,59 +5,33 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Debate from the admin
       # panel.
-      class CreateDebate < Decidim::Command
-        def initialize(form)
-          @form = form
-        end
-
-        # Creates the debate if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if form.invalid?
+      class CreateDebate < Decidim::Commands::CreateResource
+        fetch_form_attributes :category, :component, :information_updates, :instructions, :scope, :start_time, :end_time, :comments_enabled
 
-          transaction do
-            create_debate
-            send_notification_to_space_followers
-          end
-          broadcast(:ok)
-        end
+        protected
 
-        private
+        def resource_class = Decidim::Debates::Debate
 
-        attr_reader :debate, :form
+        def extra_params = { visibility: "all" }
 
-        def create_debate
+        def attributes
           parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
           parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
-          params = {
-            category: form.category,
-            title: parsed_title,
-            description: parsed_description,
-            information_updates: form.information_updates,
-            instructions: form.instructions,
-            end_time: (form.end_time if form.finite),
-            start_time: (form.start_time if form.finite),
-            scope: form.scope,
-            component: form.current_component,
-            author: form.current_organization,
-            comments_enabled: form.comments_enabled
-          }
-
-          @debate = Decidim.traceability.create!(
-            Debate,
-            form.current_user,
-            params,
-            visibility: "all"
-          )
+          super.merge({
+                        author: form.current_organization,
+                        title: parsed_title,
+                        description: parsed_description,
+                        end_time: (form.end_time if form.finite),
+                        start_time: (form.start_time if form.finite)
+                      })
         end
 
-        def send_notification_to_space_followers
+        def run_after_hooks
           Decidim::EventsManager.publish(
             event: "decidim.events.debates.debate_created",
             event_class: Decidim::Debates::CreateDebateEvent,
-            resource: debate,
-            followers: form.current_component.participatory_space.followers,
+            resource:,
+            followers: form.component.participatory_space.followers,
             extra: {
               type: "participatory_space"
             }

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

@@ -5,47 +5,19 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Debate from the admin
       # panel.
-      class UpdateDebate < Decidim::Command
-        # Initializes a UpdateDebate Command.
-        #
-        # form - The form from which to get the data.
-        # debate - The current instance of the page to be updated.
-        def initialize(form, debate)
-          @form = form
-          @debate = debate
-        end
-
-        # Updates the debate if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          update_debate
-          broadcast(:ok)
-        end
+      class UpdateDebate < Decidim::Commands::UpdateResource
+        fetch_form_attributes :category, :information_updates, :instructions, :scope, :start_time, :end_time, :comments_enabled
 
         private
 
-        attr_reader :debate, :form
-
-        def update_debate
+        def attributes
           parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
           parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
 
-          Decidim.traceability.update!(
-            debate,
-            form.current_user,
-            category: form.category,
-            title: parsed_title,
-            description: parsed_description,
-            information_updates: form.information_updates,
-            instructions: form.instructions,
-            end_time: form.end_time,
-            start_time: form.start_time,
-            scope: form.scope,
-            comments_enabled: form.comments_enabled
-          )
+          super.merge({
+                        title: parsed_title,
+                        description: parsed_description
+                      })
         end
       end
     end

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

@@ -4,33 +4,30 @@ module Decidim
   module Debates
     # This command is executed when the user creates a Debate from the public
     # views.
-    class CreateDebate < Decidim::Command
-      def initialize(form)
-        @form = form
-      end
+    class CreateDebate < Decidim::Commands::CreateResource
+      fetch_form_attributes :category, :scope
+
+      private
 
-      # Creates the debate if valid.
-      #
-      # Broadcasts :ok if successful, :invalid otherwise.
-      def call
-        return broadcast(:invalid) if form.invalid?
+      def resource_class = Decidim::Debates::Debate
 
+      def extra_params = { visibility: "public-only" }
+
+      def create_resource
         with_events(with_transaction: true) do
-          create_debate
+          super
         end
+      end
+
+      def run_after_hooks
         send_notification_to_author_followers
         send_notification_to_space_followers
         follow_debate
-        broadcast(:ok, debate)
       end
 
-      private
-
-      attr_reader :debate, :form
-
       def event_arguments
         {
-          resource: debate,
+          resource:,
           extra: {
             event_author: form.current_user,
             locale:
@@ -38,37 +35,25 @@ module Decidim
         }
       end
 
-      def create_debate
+      def attributes
         parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
         parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
-        params = {
-          author: form.current_user,
-          decidim_user_group_id: form.user_group_id,
-          category: form.category,
-          title: {
-            I18n.locale => parsed_title
-          },
-          description: {
-            I18n.locale => parsed_description
-          },
-          scope: form.scope,
-          component: form.current_component
-        }
 
-        @debate = Decidim.traceability.create!(
-          Debate,
-          form.current_user,
-          params,
-          visibility: "public-only"
-        )
+        super.merge({
+                      author: form.current_user,
+                      decidim_user_group_id: form.user_group_id,
+                      title: { I18n.locale => parsed_title },
+                      description: { I18n.locale => parsed_description },
+                      component: form.current_component
+                    })
       end
 
       def send_notification_to_author_followers
         Decidim::EventsManager.publish(
           event: "decidim.events.debates.debate_created",
           event_class: Decidim::Debates::CreateDebateEvent,
-          resource: debate,
-          followers: debate.author.followers,
+          resource:,
+          followers: resource.author.followers,
           extra: {
             type: "user"
           }
@@ -79,8 +64,8 @@ module Decidim
         Decidim::EventsManager.publish(
           event: "decidim.events.debates.debate_created",
           event_class: Decidim::Debates::CreateDebateEvent,
-          resource: debate,
-          followers: debate.participatory_space.followers,
+          resource:,
+          followers: resource.participatory_space.followers,
           extra: {
             type: "participatory_space"
           }
@@ -89,9 +74,9 @@ module Decidim
 
       def follow_debate
         follow_form = Decidim::FollowForm
-                      .from_params(followable_gid: debate.to_signed_global_id.to_s)
-                      .with_context(current_user: debate.author)
-        Decidim::CreateFollow.call(follow_form, debate.author)
+                      .from_params(followable_gid: resource.to_signed_global_id.to_s)
+                      .with_context(current_user: resource.author)
+        Decidim::CreateFollow.call(follow_form)
       end
     end
   end

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

@@ -3,38 +3,20 @@
 module Decidim
   module Debates
     # A command with all the business logic when a user updates a debate.
-    class UpdateDebate < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # form         - A form object with the params.
-      def initialize(form)
-        @form = form
-      end
+    class UpdateDebate < Decidim::Commands::UpdateResource
+      fetch_form_attributes :category, :scope
 
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid, together with the debate.
-      # - :invalid if the form was not valid and we could not proceed.
-      #
-      # Returns nothing.
-      def call
-        return broadcast(:invalid) if form.invalid?
-        return broadcast(:invalid) unless form.debate.editable_by?(form.current_user)
+      private
 
+      def update_resource
         with_events(with_transaction: true) do
-          update_debate
+          super
         end
-
-        broadcast(:ok, @debate)
       end
 
-      private
-
-      attr_reader :form
-
       def event_arguments
         {
-          resource: @debate,
+          resource:,
           extra: {
             event_author: form.current_user,
             locale:
@@ -42,28 +24,16 @@ module Decidim
         }
       end
 
-      def update_debate
-        @debate = Decidim.traceability.update!(
-          @form.debate,
-          @form.current_user,
-          attributes,
-          visibility: "public-only"
-        )
-      end
+      def extra_params = { visibility: "public-only" }
 
       def attributes
         parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
         parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
-        {
-          category: form.category,
-          title: {
-            I18n.locale => parsed_title
-          },
-          description: {
-            I18n.locale => parsed_description
-          },
-          scope: form.scope
-        }
+
+        super.merge({
+                      title: { I18n.locale => parsed_title },
+                      description: { I18n.locale => parsed_description }
+                    })
       end
     end
   end

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

@@ -54,7 +54,7 @@ module Decidim
 
         @form = form(DebateForm).from_params(params)
 
-        UpdateDebate.call(@form) do
+        UpdateDebate.call(@form, debate) do
           on(:ok) do |debate|
             flash[:notice] = I18n.t("debates.update.success", scope: "decidim.debates")
             redirect_to Decidim::ResourceLocatorPresenter.new(debate).path

data/app/events/decidim/debates/create_debate_event.rb

@@ -7,7 +7,7 @@ module Decidim
     #
     # "user" - The event is being sent to the followers of the debate
     #          author
-    # "participatory_space" - The event is being sento to the followers
+    # "participatory_space" - The event is being sent to the followers
     #                         of the event's participatory space.
     class CreateDebateEvent < Decidim::Events::SimpleEvent
       include Decidim::Events::AuthorEvent

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

@@ -43,7 +43,7 @@ module Decidim
           @category ||= current_component.categories.find_by(id: decidim_category_id)
         end
 
-        # Finds the Scope from the given decidim_scope_id, uses the compoenent scope if missing.
+        # Finds the Scope from the given decidim_scope_id, uses the component scope if missing.
         #
         # Returns a Decidim::Scope
         def scope

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

@@ -86,7 +86,7 @@ module Decidim
 
       # Public: Overrides the `reported_searchable_content_extras` Reportable concern method.
       def reported_searchable_content_extras
-        [normalized_author.name]
+        [author_name]
       end
 
       # Public: Calculates whether the current debate is an AMA-styled one or not.

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

@@ -1,11 +1,11 @@
 <div class="form__wrapper">
   <div class="card pt-4">
     <div class="card-section debate-fields">
-       <div class="row column hashtags__container">
+       <div class="row column">
         <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true, aria: { label: :title } %>
       </div>
 
-       <div class="row column hashtags__container">
+       <div class="row column">
         <%= form.translated :editor, :description, hashtaggable: true, aria: { label: :description } %>
       </div>
 

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

@@ -16,7 +16,7 @@
           <th><%= t("models.debate.fields.start_time", scope: "decidim.debates") %></th>
           <th><%= t("models.debate.fields.end_time", scope: "decidim.debates") %></th>
           <%= th_resource_scope_label %>
-          <th class="actions"><%= t("actions.title", scope: "decidim.debates") %></th>
+          <th><%= t("actions.title", scope: "decidim.debates") %></th>
         </tr>
       </thead>
       <tbody>

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

@@ -30,7 +30,7 @@ edit_link(
     <div class="layout-author">
       <%= cell "decidim/author", debate_presenter.author, skip_profile_link: true %>
       <% if debate.closed? %>
-        <span class="success label proposal-status">
+        <span class="success label">
           <%= t("debate_closed", scope: "decidim.debates.debates.show") %>
         </span>
       <% end %>

data/decidim-debates.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.1.0"
+  s.required_ruby_version = "~> 3.2.0"
 
   s.name = "decidim-debates"
   s.summary = "Decidim debates module"

data/lib/decidim/debates/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-debates version.
   module Debates
     def self.version
-      "0.28.2"
+      "0.29.0.rc2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-debates
 version: !ruby/object:Gem::Version
-  version: 0.28.2
+  version: 0.29.0.rc2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -19,56 +19,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
 description: A debates component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -279,14 +279,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Decidim debates module