decidim-blogs 0.27.8 → 0.28.0.rc4

data/lib/decidim/api/blogs_type.rb

@@ -18,11 +18,23 @@ module Decidim
       end
 
       def posts(filter: {}, order: {})
-        Decidim::Core::ComponentListBase.new(model_class: Post).call(object, { filter: filter, order: order }, context)
+        base_query = Decidim::Core::ComponentListBase.new(model_class: Post).call(object, { filter:, order: }, context)
+        if context[:current_user]&.admin?
+          base_query
+        else
+          base_query.published
+        end
       end
 
       def post(id:)
-        Decidim::Core::ComponentFinderBase.new(model_class: Post).call(object, { id: id }, context)
+        scope =
+          if context[:current_user]&.admin?
+            Post
+          else
+            Post.published
+          end
+
+        Decidim::Core::ComponentFinderBase.new(model_class: scope).call(object, { id: }, context)
       end
     end
   end

data/lib/decidim/api/post_type.rb

@@ -16,6 +16,7 @@ module Decidim
       field :id, GraphQL::Types::ID, "The internal ID of this post", null: false
       field :title, Decidim::Core::TranslatedFieldType, "The title for this post", null: true
       field :body, Decidim::Core::TranslatedFieldType, "The body of this post", null: true
+      field :published_at, Decidim::Core::DateTimeType, "The time this page was published", null: false
     end
   end
 end

data/lib/decidim/blogs/admin_engine.rb

@@ -12,8 +12,8 @@ module Decidim
 
       routes do
         resources :posts do
-          resources :attachment_collections
-          resources :attachments
+          resources :attachment_collections, except: [:show]
+          resources :attachments, except: [:show]
         end
         root to: "posts#index"
       end

data/lib/decidim/blogs/component.rb

@@ -1,17 +1,16 @@
 # frozen_string_literal: true
 
-require "decidim/components/namer"
-
 Decidim.register_component(:blogs) do |component|
   component.engine = Decidim::Blogs::Engine
   component.admin_engine = Decidim::Blogs::AdminEngine
   component.icon = "media/images/decidim_blogs.svg"
+  component.icon_key = "pen-nib-line"
   component.permissions_class_name = "Decidim::Blog::Permissions"
 
   component.query_type = "Decidim::Blogs::BlogsType"
 
   component.on(:before_destroy) do |instance|
-    raise StandardError, "Can't remove this component" if Decidim::Blogs::Post.where(component: instance).any?
+    raise StandardError, "Cannot remove this component" if Decidim::Blogs::Post.where(component: instance).any?
   end
 
   component.register_stat :posts_count, primary: true, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, _start_at, _end_at|
@@ -41,63 +40,8 @@ Decidim.register_component(:blogs) do |component|
   end
 
   component.seeds do |participatory_space|
-    admin_user = Decidim::User.find_by(
-      organization: participatory_space.organization,
-      email: "admin@example.org"
-    )
-
-    step_settings = if participatory_space.allows_steps?
-                      { participatory_space.active_step.id => { comments_enabled: true, comments_blocked: false } }
-                    else
-                      {}
-                    end
-
-    params = {
-      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :blogs).i18n_name,
-      manifest_name: :blogs,
-      published_at: Time.current,
-      participatory_space: participatory_space,
-      settings: {
-        vote_limit: 0
-      },
-      step_settings: step_settings
-    }
-
-    component = Decidim.traceability.perform_action!(
-      "publish",
-      Decidim::Component,
-      admin_user,
-      visibility: "all"
-    ) do
-      Decidim::Component.create!(params)
-    end
-
-    6.times do |n|
-      author = if n >= 3
-                 Decidim::User.where(organization: component.organization).order(Arel.sql("RANDOM()")).first
-               elsif n <= 1
-                 Decidim::UserGroup.where(organization: component.organization).order(Arel.sql("RANDOM()")).first
-               else
-                 component.organization
-               end
-
-      params = {
-        component: component,
-        title: Decidim::Faker::Localized.sentence(word_count: 5),
-        body: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(sentence_count: 20)
-        end,
-        author: author
-      }
-
-      post = Decidim.traceability.create!(
-        Decidim::Blogs::Post,
-        author,
-        params,
-        visibility: "all"
-      )
+    require "decidim/blogs/seeds"
 
-      Decidim::Comments::Seed.comments_for(post)
-    end
+    Decidim::Blogs::Seeds.new(participatory_space:).call
   end
 end

data/lib/decidim/blogs/engine.rb

@@ -15,7 +15,14 @@ module Decidim
 
       routes do
         resources :posts, only: [:index, :show]
-        root to: "posts#index"
+        scope "/posts" do
+          root to: "posts#index"
+        end
+        get "/", to: redirect("posts", status: 301)
+      end
+
+      initializer "decidim_blogs.register_icons" do
+        Decidim.icons.register(name: "Decidim::Blogs::Post", icon: "pen-nib-line", description: "Blogs post", category: "activity", engine: :core)
       end
 
       initializer "decidim_blogs.add_cells_view_paths" do
@@ -26,6 +33,14 @@ module Decidim
       initializer "decidim_blogs.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
+
+      initializer "decidim_blogs.authorization_transfer" do
+        config.to_prepare do
+          Decidim::AuthorizationTransfer.register(:blogs) do |transfer|
+            transfer.move_records(Decidim::Blogs::Post, :decidim_author_id)
+          end
+        end
+      end
     end
   end
 end

data/lib/decidim/blogs/seeds.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require "decidim/components/namer"
+
+module Decidim
+  module Blogs
+    class Seeds
+      attr_reader :participatory_space
+
+      def initialize(participatory_space:)
+        @participatory_space = participatory_space
+      end
+
+      def call
+        admin_user = Decidim::User.find_by(
+          organization: participatory_space.organization,
+          email: "admin@example.org"
+        )
+
+        step_settings = if participatory_space.allows_steps?
+                          { participatory_space.active_step.id => { comments_enabled: true, comments_blocked: false } }
+                        else
+                          {}
+                        end
+
+        params = {
+          name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :blogs).i18n_name,
+          manifest_name: :blogs,
+          published_at: Time.current,
+          participatory_space:,
+          settings: {
+            vote_limit: 0
+          },
+          step_settings:
+        }
+
+        component = Decidim.traceability.perform_action!(
+          "publish",
+          Decidim::Component,
+          admin_user,
+          visibility: "all"
+        ) do
+          Decidim::Component.create!(params)
+        end
+
+        6.times do |n|
+          author = if n >= 3
+                     Decidim::User.where(organization: component.organization).sample
+                   elsif n <= 1
+                     Decidim::UserGroup.where(organization: component.organization).sample
+                   else
+                     component.organization
+                   end
+
+          params = {
+            component:,
+            title: Decidim::Faker::Localized.sentence(word_count: 5),
+            body: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+              Decidim::Faker::Localized.paragraph(sentence_count: 20)
+            end,
+            author:
+          }
+
+          post = Decidim.traceability.create!(
+            Decidim::Blogs::Post,
+            author,
+            params,
+            visibility: "all"
+          )
+
+          Decidim::Comments::Seed.comments_for(post)
+        end
+      end
+    end
+  end
+end

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

@@ -1,37 +1,27 @@
 # frozen_string_literal: true
 
+require "decidim/components/namer"
 require "decidim/faker/localized"
 require "decidim/core/test/factories"
 require "decidim/participatory_processes/test/factories"
 
 FactoryBot.define do
   factory :post_component, parent: :component do
-    transient do
-      skip_injection { false }
-    end
-
-    name { generate_component_name(participatory_space.organization.available_locales, :blogs, skip_injection: skip_injection) }
+    name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :blogs).i18n_name }
     manifest_name { :blogs }
-    participatory_space { create(:participatory_process, :with_steps, skip_injection: skip_injection, organization: organization) }
+    participatory_space { create(:participatory_process, :with_steps, organization:) }
   end
 
   factory :post, class: "Decidim::Blogs::Post" do
-    transient do
-      skip_injection { false }
-    end
-
-    title { generate_localized_title(:blog_title, skip_injection: skip_injection) }
-    body { generate_localized_description(:blog_body, skip_injection: skip_injection) }
-    component { build(:post_component, skip_injection: skip_injection) }
-    author { build(:user, :confirmed, skip_injection: skip_injection, organization: component.organization) }
+    title { generate_localized_title }
+    body { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    component { build(:component, manifest_name: "blogs") }
+    author { build(:user, :confirmed, organization: component.organization) }
 
     trait :with_endorsements do
-      after :create do |post, evaluator|
+      after :create do |post|
         5.times.collect do
-          create(:endorsement,
-                 resource: post,
-                 skip_injection: evaluator.skip_injection,
-                 author: build(:user, skip_injection: evaluator.skip_injection, organization: post.participatory_space.organization))
+          create(:endorsement, resource: post, author: build(:user, organization: post.participatory_space.organization))
         end
       end
     end

data/lib/decidim/blogs/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-pages version.
   module Blogs
     def self.version
-      "0.27.8"
+      "0.28.0.rc4"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-blogs
 version: !ruby/object:Gem::Version
-  version: 0.27.8
+  version: 0.28.0.rc4
 platform: ruby
 authors:
 - Isaac Massot Gil
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-30 00:00:00.000000000 Z
+date: 2023-12-11 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.27.8
+        version: 0.28.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.8
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.8
+        version: 0.28.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.8
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.8
+        version: 0.28.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.8
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.8
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.8
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.8
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.8
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.8
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.8
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.8
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.8
+        version: 0.28.0.rc4
 description: A Blog component for decidim's participatory spaces.
 email:
 - isaac.mg@coditramuntana.com
@@ -117,10 +117,15 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- app/cells/decidim/blogs/content_blocks/highlighted_posts/content.erb
+- app/cells/decidim/blogs/content_blocks/highlighted_posts_cell.rb
 - app/cells/decidim/blogs/post_activity_cell.rb
 - app/cells/decidim/blogs/post_cell.rb
-- app/cells/decidim/blogs/post_m/footer.erb
-- app/cells/decidim/blogs/post_m_cell.rb
+- app/cells/decidim/blogs/post_g_cell.rb
+- app/cells/decidim/blogs/post_l_cell.rb
+- app/cells/decidim/blogs/post_metadata_cell.rb
+- app/cells/decidim/blogs/post_metadata_g_cell.rb
+- app/cells/decidim/blogs/post_s_cell.rb
 - app/commands/decidim/blogs/admin/create_post.rb
 - app/commands/decidim/blogs/admin/update_post.rb
 - app/controllers/decidim/blogs/admin/application_controller.rb
@@ -138,6 +143,7 @@ files:
 - app/models/decidim/blogs/post.rb
 - app/packs/entrypoints/decidim_blogs.js
 - app/packs/images/decidim/blogs/decidim_blogs.svg
+- app/packs/stylesheets/blogs.scss
 - app/permissions/decidim/blog/permissions.rb
 - app/presenters/decidim/blogs/admin_log/post_presenter.rb
 - app/presenters/decidim/blogs/official_author_presenter.rb
@@ -146,9 +152,7 @@ files:
 - app/views/decidim/blogs/admin/posts/edit.html.erb
 - app/views/decidim/blogs/admin/posts/index.html.erb
 - app/views/decidim/blogs/admin/posts/new.html.erb
-- app/views/decidim/blogs/posts/_datetime.html.erb
-- app/views/decidim/blogs/posts/_posts.html.erb
-- app/views/decidim/blogs/posts/_sidebar_blog.html.erb
+- app/views/decidim/blogs/posts/_actions.html.erb
 - app/views/decidim/blogs/posts/index.html.erb
 - app/views/decidim/blogs/posts/show.html.erb
 - config/assets.rb
@@ -184,7 +188,6 @@ files:
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
 - config/locales/gn-PY.yml
-- config/locales/he-IL.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -240,7 +243,7 @@ files:
 - db/migrate/20200320105910_index_foreign_keys_in_decidim_blogs_posts.rb
 - db/migrate/20200827153709_add_commentable_counter_cache_to_posts.rb
 - db/migrate/20210310120514_add_followable_counter_cache_to_blogs.rb
-- decidim-blogs.gemspec
+- db/migrate/20220812122940_add_published_at_to_decidim_blogs_posts.rb
 - lib/decidim/api/blogs_type.rb
 - lib/decidim/api/post_input_filter.rb
 - lib/decidim/api/post_input_sort.rb
@@ -251,28 +254,34 @@ files:
 - lib/decidim/blogs/api.rb
 - lib/decidim/blogs/component.rb
 - lib/decidim/blogs/engine.rb
+- lib/decidim/blogs/seeds.rb
 - lib/decidim/blogs/test/factories.rb
 - lib/decidim/blogs/version.rb
-homepage: https://github.com/decidim/decidim
+homepage: https://decidim.org
 licenses:
 - AGPL-3.0
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/decidim/decidim/issues
+  documentation_uri: https://docs.decidim.org/
+  funding_uri: https://opencollective.com/decidim
+  homepage_uri: https://decidim.org
+  source_code_uri: https://github.com/decidim/decidim
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.5.14
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Decidim blogs module

data/app/cells/decidim/blogs/post_m/footer.erb

@@ -1,5 +0,0 @@
-<div class="card__footer card__footer--spaces">
-  <div class="card__support">
-    <%= link_to t("decidim.blogs.posts.show.view"), resource_path, class: "card__button button--sc light button small" %>
-  </div>
-</div>

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

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Blogs
-    # This cell renders the Medium (:m) post card
-    # for an given instance of a Post
-    class PostMCell < Decidim::CardMCell
-      private
-
-      def has_actions?
-        false
-      end
-
-      def endorsements_count
-        with_tooltip t("decidim.endorsable.endorsements") do
-          "#{icon("bullhorn", class: "icon--small")} #{model.endorsements_count}"
-        end
-      end
-    end
-  end
-end

data/app/views/decidim/blogs/posts/_datetime.html.erb

@@ -1 +0,0 @@
-<%= l post.created_at, format: "%d/%m/%Y" %>

data/app/views/decidim/blogs/posts/_posts.html.erb

@@ -1,24 +0,0 @@
-<div class="row small-12">
-  <% paginate_posts.each do |post| %>
-    <div class="card card--post">
-      <% if post.photo.present? %>
-        <%= image_tag post.photo.url, class: "card__image" %>
-      <% end %>
-      <div class="card__content">
-        <div class="card__header">
-          <%= link_to post, class: "card__link" do %>
-          <h2 class="card__title">
-            <%= translated_attribute post.title %>
-          </h2>
-          <% end %>
-          <div class="card__author">
-            <% post_presenter = Decidim::Blogs::PostPresenter.new(post) %>
-            <%= cell "decidim/author", post_presenter.author, from: post, has_actions: true %>
-          </div>
-        </div>
-        <%= decidim_sanitize_editor post_description(post) %>
-      </div>
-    </div>
-  <% end %>
-</div>
-<%= decidim_paginate paginate_posts %>

data/app/views/decidim/blogs/posts/_sidebar_blog.html.erb

@@ -1,21 +0,0 @@
-<% if posts.any? %>
-  <div class="section">
-    <div class="section-heading">
-      <%= t(".most_commented_posts") %>
-    </div>
-    <% posts.each do |post| %>
-      <div class="m-bottom">
-        <strong><%= link_to translated_attribute(post.title), post %></strong>
-        <div class="author-data author-data--nopadding">
-          <%= render partial: "datetime", locals: { post: post } %>&nbsp;&nbsp;·&nbsp;&nbsp;
-          <%= link_to "#{post_path(post)}#comments", title: t(".comments") do %>
-            <%= icon "comment-square", class: "icon--small", aria_label: t(".comments"), role: "img" %>
-            <%= post.comments_count %>
-            <%= t(".comments") %>
-          <% end %>
-          <a href="#comments" title="<%= t(".comments") %>"></a>
-        </div>
-      </div>
-    <% end %>
-  </div>
-<% end %>

data/config/locales/he-IL.yml

@@ -1 +0,0 @@
-he:

data/decidim-blogs.gemspec

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-$LOAD_PATH.push File.expand_path("lib", __dir__)
-
-# Maintain your gem's version:
-require "decidim/blogs/version"
-
-# Describe your gem and declare its dependencies:
-Gem::Specification.new do |s|
-  s.version = Decidim::Blogs.version
-  s.authors = ["Isaac Massot Gil"]
-  s.email = ["isaac.mg@coditramuntana.com"]
-  s.license = "AGPL-3.0"
-  s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = "~> 3.0.0"
-
-  s.name = "decidim-blogs"
-  s.summary = "Decidim blogs module"
-  s.description = "A Blog component for decidim's participatory spaces."
-
-  s.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").select do |f|
-      (File.expand_path(f) == __FILE__) ||
-        f.start_with?(*%w(app/ config/ db/ lib/ Rakefile README.md))
-    end
-  end
-
-  s.add_dependency "decidim-admin", Decidim::Blogs.version
-  s.add_dependency "decidim-comments", Decidim::Blogs.version
-  s.add_dependency "decidim-core", Decidim::Blogs.version
-
-  s.add_development_dependency "decidim-admin", Decidim::Blogs.version
-  s.add_development_dependency "decidim-assemblies", Decidim::Blogs.version
-  s.add_development_dependency "decidim-dev", Decidim::Blogs.version
-  s.add_development_dependency "decidim-participatory_processes", Decidim::Blogs.version
-end