decidim-blogs 0.28.4 → 0.29.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 260eac71b1c230ba4fe9b070114c10ef925e676f12338c0492b79c09bdd83095
-  data.tar.gz: 85c8fee8fda910fe8a2c1ec0e0384f59172755cf88e0382967ff2dd037abef7c
+  metadata.gz: 2d3e05fbe48097df47ffc82f4b2ebbde3fc54a955c8d2b2df9b56b38f75d1014
+  data.tar.gz: 0f053312ab155c859de24f3f0249876f301bedb5339eaa8ce5e82a49a9397d84
 SHA512:
-  metadata.gz: 54c224d21c32130867c54d64edc21ac04d6e05629cb14ea29a7dd85a371fbc379316b013eb43b26961347f6c7a78c8b6a11382c1758b54873a4145246cb00645
-  data.tar.gz: d1339f5f95cceace6d1928a7257268fa3e2f4883ad8c3f2cabdba494ca53644db812568993dc53a7dc502fe4687627a1969d1dfba940e9ac314f48253aa633ed
+  metadata.gz: 0a46ed37e62404b0a957b8d4ac280233e34643f03d28f7248274539570a5dab1e43e459ee77ce2102f656b37fc9eb10c3f3a410b61b4f0cf56af58480aa7525f
+  data.tar.gz: b4fa8aea088a2ad4d7b68dd92e03028cfb88bc9ea97cb3ed845b7600b0df575116e2b9ad0d57d33c9cc3f1e9c263996b9311db0058c594252ec330641c91e836

data/app/cells/decidim/blogs/post_g_cell.rb

@@ -9,6 +9,10 @@ module Decidim
 
       private
 
+      def has_image?
+        resource_image_path.present?
+      end
+
       def show_description?
         true
       end
@@ -17,7 +21,7 @@ module Decidim
         "decidim/blogs/post_metadata_g"
       end
 
-      def resource_image_url
+      def resource_image_path
         return if photo.blank?
 
         photo.url

data/app/cells/decidim/blogs/post_l_cell.rb

@@ -9,6 +9,10 @@ module Decidim
 
       private
 
+      def has_image?
+        true
+      end
+
       def has_description?
         true
       end
@@ -21,7 +25,7 @@ module Decidim
         "decidim/blogs/post_metadata"
       end
 
-      def resource_image_url
+      def resource_image_path
         return if photo.blank?
 
         photo.url

data/app/commands/decidim/blogs/admin/create_post.rb

@@ -5,51 +5,21 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Post from the admin
       # panel.
-      class CreatePost < Decidim::Command
-        def initialize(form, current_user)
-          @form = form
-          @current_user = current_user
-        end
-
-        # Creates the post if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if @form.invalid?
-
-          transaction do
-            create_post!
-            send_notification
-          end
-
-          broadcast(:ok, @post)
-        end
+      class CreatePost < Decidim::Commands::CreateResource
+        fetch_form_attributes :title, :body, :published_at, :author, :component
 
         private
 
-        def create_post!
-          attributes = {
-            title: @form.title,
-            body: @form.body,
-            published_at: @form.published_at,
-            component: @form.current_component,
-            author: @form.author
-          }
+        def resource_class = Decidim::Blogs::Post
 
-          @post = Decidim.traceability.create!(
-            Post,
-            @current_user,
-            attributes,
-            visibility: "all"
-          )
-        end
+        def extra_params = { visibility: "all" }
 
-        def send_notification
+        def run_after_hooks
           Decidim::EventsManager.publish(
             event: "decidim.events.blogs.post_created",
             event_class: Decidim::Blogs::CreatePostEvent,
-            resource: @post,
-            followers: @post.participatory_space.followers
+            resource:,
+            followers: resource.participatory_space.followers
           )
         end
       end

data/app/commands/decidim/blogs/admin/update_post.rb

@@ -3,51 +3,15 @@
 module Decidim
   module Blogs
     module Admin
-      # This command is executed when the user changes a Blog from the admin
+      # This command is executed when the user changes a Post from the admin
       # panel.
-      class UpdatePost < Decidim::Command
-        # Initializes a UpdateBlog Command.
-        #
-        # form - The form from which to get the data.
-        # blog - The current instance of the page to be updated.
-        def initialize(form, post, user)
-          @form = form
-          @post = post
-          @user = user
-        end
-
-        # Updates the blog if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          transaction do
-            update_post!
-          end
-
-          broadcast(:ok, post)
-        end
+      class UpdatePost < Decidim::Commands::UpdateResource
+        fetch_form_attributes :title, :body, :author
 
         private
 
-        attr_reader :form, :post
-
-        def update_post!
-          Decidim.traceability.update!(
-            post,
-            @user,
-            attributes
-          )
-        end
-
         def attributes
-          {
-            title: form.title,
-            body: form.body,
-            published_at: form.published_at,
-            author: form.author
-          }.reject do |attribute, value|
+          super.merge(published_at: form.published_at).reject do |attribute, value|
             value.blank? && attribute == :published_at
           end
         end

data/app/controllers/decidim/blogs/admin/posts_controller.rb

@@ -17,7 +17,7 @@ module Decidim
           enforce_permission_to :create, :blogpost
           @form = form(PostForm).from_params(params, current_component:)
 
-          CreatePost.call(@form, current_user) do
+          CreatePost.call(@form) do
             on(:ok) do
               flash[:notice] = I18n.t("posts.create.success", scope: "decidim.blogs.admin")
               redirect_to posts_path
@@ -39,7 +39,7 @@ module Decidim
           enforce_permission_to :update, :blogpost, blogpost: post
           @form = form(PostForm).from_params(params, current_component:)
 
-          UpdatePost.call(@form, post, current_user) do
+          UpdatePost.call(@form, post) do
             on(:ok) do
               flash[:notice] = I18n.t("posts.update.success", scope: "decidim.blogs.admin")
               redirect_to posts_path
@@ -55,13 +55,12 @@ module Decidim
         def destroy
           enforce_permission_to :destroy, :blogpost, blogpost: post
 
-          Decidim.traceability.perform_action!("delete", post, current_user) do
-            post.destroy!
+          Decidim::Commands::DestroyResource.call(post, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("posts.destroy.success", scope: "decidim.blogs.admin")
+              redirect_to posts_path
+            end
           end
-
-          flash[:notice] = I18n.t("posts.destroy.success", scope: "decidim.blogs.admin")
-
-          redirect_to posts_path
         end
 
         private

data/app/helpers/decidim/blogs/admin/posts_helper.rb

@@ -22,7 +22,7 @@ module Decidim
 
         def post_author_select_field(form, name, _options = {})
           select_options = [
-            [current_organization.name, ""],
+            [current_organization_name, ""],
             [current_user.name, current_user.id]
           ]
           current_user_groups = Decidim::UserGroups::ManageableUserGroups.for(current_user).verified

data/app/views/decidim/blogs/admin/posts/_form.html.erb

@@ -2,9 +2,7 @@
   <div class="card pt-4">
     <div class="card-section">
       <div class="row column">
-        <div class="field">
           <%= post_author_select_field form, :decidim_author_id, label: t("decidim.blogs.actions.author_id") %>
-        </div>
       </div>
 
       <div class="row column">

data/app/views/decidim/blogs/admin/posts/index.html.erb

@@ -15,7 +15,7 @@
           <th><%= t("models.post.fields.body", scope: "decidim.blogs") %></th>
           <th><%= t("models.post.fields.author", scope: "decidim.blogs") %></th>
           <th><%= t("models.post.fields.published_at", scope: "decidim.blogs") %></th>
-          <th class="actions"><%= t("actions.title", scope: "decidim.blogs") %></th>
+          <th><%= t("actions.title", scope: "decidim.blogs") %></th>
         </tr>
       </thead>
       <tbody>
@@ -33,7 +33,7 @@
               <%= decidim_sanitize_editor post_description_admin(post) %>
             </td>
             <td>
-              <%= post.try(:author).try(:name) %>
+              <%= translated_attribute(post.try(:author).try(:name)) %>
             </td>
             <% publish_data = publish_data(post.published_at) %>
             <td>

data/config/locales/sv.yml

@@ -5,7 +5,6 @@ sv:
       post:
         body: Innehåll
         decidim_author_id: Författare
-        published_at: Publicerad
         title: Titel
     models:
       decidim/blogs/create_post_event: Nytt blogginlägg
@@ -25,31 +24,18 @@ sv:
         title: Åtgärder
       admin:
         posts:
-          create:
-            invalid: Det gick inte att skapa inlägget.
-            success: Inlägget har skapats.
-          destroy:
-            success: Inlägget har raderats.
           edit:
             save: Uppdatera
             title: Redigera inlägg
           index:
-            not_published_yet: Ej publicerat.
             title: Inlägg
           new:
             create: Skapa
             title: Skapa inlägg
           update:
             invalid: Det gick inte att spara inlägget.
-            success: Inlägget har sparats.
-      admin_log:
-        post:
-          create: "%{user_name} skapade blogginlägget %{resource_name} i %{space_name}"
-          delete: "%{user_name} raderade blogginlägget %{resource_name} från %{space_name}"
-          update: "%{user_name} uppdaterade blogginlägget %{resource_name} i %{space_name}"
       content_blocks:
         highlighted_posts:
-          last_published: Senast publicerade
           name: Inlägg
           see_all: Se alla inlägg
       last_activity:
@@ -60,33 +46,26 @@ sv:
             author: Författare
             body: Innehåll
             official_blog_post: Officiellt inlägg
-            published_at: Publicerad
             title: Titel
-      posts:
-        index:
-          count:
-            one: "%{count} inlägg"
-            other: "%{count} inlägg"
-          empty: Det finns inga inlägg ännu.
     components:
       blogs:
         actions:
           comment: Kommentera
           create: Skapa
           destroy: Radera
-          endorse: Gilla
+          endorse: Instäm
           update: Uppdatera
         name: Blogg
         settings:
           global:
             announcement: Meddelande
-            comments_enabled: Aktivera kommentarer
-            comments_max_length: Maximal kommentarslängd (ange 0 för att använda standardvärdet)
+            comments_enabled: Kommentarer aktiverade
+            comments_max_length: Maximal längd för kommentarer (Lämna 0 för standardvärde)
           step:
             announcement: Meddelande
-            comments_blocked: Stäng av kommentarer
-            endorsements_blocked: Blockera gilla-markeringar
-            endorsements_enabled: Aktivera gilla-markeringar
+            comments_blocked: Kommentarer blockerade
+            endorsements_blocked: Instämmanden är blockerade
+            endorsements_enabled: Instämmanden tillåtna
     events:
       blogs:
         post_created:

data/decidim-blogs.gemspec

@@ -19,7 +19,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-blogs"
   s.summary = "Decidim blogs module"

data/lib/decidim/blogs/test/factories.rb

@@ -14,22 +14,6 @@ FactoryBot.define do
     name { generate_component_name(participatory_space.organization.available_locales, :blogs, skip_injection:) }
     manifest_name { :blogs }
     participatory_space { create(:participatory_process, :with_steps, skip_injection:, organization:) }
-
-    trait :with_endorsements_enabled do
-      step_settings do
-        {
-          participatory_space.active_step.id => { endorsements_enabled: true }
-        }
-      end
-    end
-
-    trait :with_endorsements_disabled do
-      step_settings do
-        {
-          participatory_space.active_step.id => { endorsements_enabled: false }
-        }
-      end
-    end
   end
 
   factory :post, class: "Decidim::Blogs::Post" do

data/lib/decidim/blogs/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-pages version.
   module Blogs
     def self.version
-      "0.28.4"
+      "0.29.0.rc1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-blogs
 version: !ruby/object:Gem::Version
-  version: 0.28.4
+  version: 0.29.0.rc1
 platform: ruby
 authors:
 - Isaac Massot Gil
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 description: A Blog component for decidim's participatory spaces.
 email:
 - isaac.mg@coditramuntana.com
@@ -276,14 +276,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 blogs module