decidim-blogs 0.23.3 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 829cd62a2189bf63ff5d5c1e3ddd1afce4c2e9e6fefbc25733a6056fb8bb690d
-  data.tar.gz: 4f7b27a43e3d771b2d0b5ffb098068d4e726d7809fe4894764700810c22643cf
+  metadata.gz: 70483abf959a69a9456cbdd3dd1049d27fefe0c9a135630bb6ee98bf82d5cc6d
+  data.tar.gz: 5bc12315bc6db0f8687334a996c9931c7e9ccb863ffe89405fbd3bdb681c566c
 SHA512:
-  metadata.gz: 7442afc80066aa1bd6a0d5529552f46c6468abcbdbed6a791d016c633ef1114c093adae60d179930290b8df1e30e3c6f1d8f0d5b79f97066ea2a8348c78b5dfb
-  data.tar.gz: e87863789fea2fc959e59eb3e000e9b92c366cd404b077d84b9b35fdc5b4f7f37ad6c44fad9ae09ddc9313242c998a4919b520bad06ef4533a11fdc495f51b29
+  metadata.gz: 46b72ebd4dd4a69cdde1b629d725e92b9db0021f7fc28c6a57f67ac11a4e8fbe323e3e85d0e877192479566db2bcf49415813cc0aac15450f02d6a76a7286cc7
+  data.tar.gz: 632b7d4ae8986d957febec86aef1cf31b7dfbc998812fecbfceb40a4f46890a0bedd952153a4213cd5d7d0c9fa7a1fc0e50c9cfce63a637a709f38a2a3623b2a

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

@@ -13,7 +13,7 @@ module Decidim
 
       def endorsements_count
         with_tooltip t("decidim.endorsable.endorsements") do
-          icon("bullhorn", class: "icon--small") + " " + model.endorsements_count.to_s
+          "#{icon("bullhorn", class: "icon--small")} #{model.endorsements_count}"
         end
       end
     end

data/app/models/decidim/blogs/post.rb

@@ -26,12 +26,18 @@ module Decidim
 
       scope :created_at_desc, -> { order(arel_table[:created_at].desc) }
 
-      searchable_fields(
-        participatory_space: { component: :participatory_space },
-        A: :title,
-        D: :body,
-        datetime: :created_at
-      )
+      searchable_fields({
+                          participatory_space: { component: :participatory_space },
+                          A: :title,
+                          D: :body,
+                          datetime: :created_at
+                        },
+                        index_on_create: true,
+                        index_on_update: ->(post) { post.visible? })
+
+      def visible?
+        participatory_space.try(:visible?) && component.try(:published?)
+      end
 
       # Public: Overrides the `commentable?` Commentable concern method.
       def commentable?

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

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

data/config/locales/ca.yml

@@ -29,6 +29,7 @@ ca:
             success: La publicació s'ha eliminat correctament
           edit:
             save: Actualitza
+            title: Editar publicació
           index:
             title: Publicacions
           new:

data/config/locales/cs.yml

@@ -31,6 +31,7 @@ cs:
             success: Příspěvek byl úspěšně odstraněn
           edit:
             save: Aktualizovat
+            title: Upravit příspěvek
           index:
             title: Příspěvky
           new:

data/config/locales/de.yml

@@ -18,7 +18,7 @@ de:
       admin:
         models:
           components:
-            body: Karosserie
+            body: Haupttext
           post:
             name: Post
         posts:
@@ -29,6 +29,7 @@ de:
             success: Beitrag wurde erfolgreich gelöscht
           edit:
             save: Aktualisieren
+            title: Post bearbeiten
           index:
             title: Beiträge
           new:
@@ -43,7 +44,7 @@ de:
         post:
           fields:
             author: Autor
-            body: Karosserie
+            body: Haupttext
             created_at: Hergestellt in
             title: Titel
       posts:

data/config/locales/en.yml

@@ -30,6 +30,7 @@ en:
             success: Post successfully deleted
           edit:
             save: Update
+            title: Edit post
           index:
             title: Posts
           new:

data/config/locales/es-MX.yml

@@ -29,6 +29,7 @@ es-MX:
             success: Publicación eliminada con éxito
           edit:
             save: Actualizar
+            title: Editar publicación
           index:
             title: Publicaciones
           new:

data/config/locales/es-PY.yml

@@ -29,6 +29,7 @@ es-PY:
             success: Publicación eliminada con éxito
           edit:
             save: Actualizar
+            title: Editar publicación
           index:
             title: Publicaciones
           new:

data/config/locales/es.yml

@@ -29,6 +29,7 @@ es:
             success: La publicación se ha eliminado correctamente
           edit:
             save: Actualizar
+            title: Editar publicación
           index:
             title: Publicaciones
           new:

data/config/locales/fi-plain.yml

@@ -29,6 +29,7 @@ fi-pl:
             success: Artikkeli poistettu onnistuneesti
           edit:
             save: Päivitä
+            title: Muokkaa artikkelia
           index:
             title: Artikkelit
           new:
@@ -78,7 +79,7 @@ fi-pl:
     pages:
       home:
         statistics:
-          posts_count: Artikkeleja
+          posts_count: Artikkelit
     participatory_processes:
       statistics:
-        posts_count: Artikkeleja
+        posts_count: Artikkelit

data/config/locales/fi.yml

@@ -29,6 +29,7 @@ fi:
             success: Artikkelin poisto onnistui
           edit:
             save: Päivitä
+            title: Muokkaa artikkelia
           index:
             title: Artikkelit
           new:
@@ -78,7 +79,7 @@ fi:
     pages:
       home:
         statistics:
-          posts_count: Artikkeleja
+          posts_count: Artikkelit
     participatory_processes:
       statistics:
-        posts_count: Artikkelia
+        posts_count: Artikkelit

data/config/locales/fr-CA.yml

@@ -29,6 +29,7 @@ fr-CA:
             success: Article supprimé avec succès
           edit:
             save: Mettre à jour
+            title: Éditer le post
           index:
             title: Articles
           new:

data/config/locales/fr.yml

@@ -29,6 +29,7 @@ fr:
             success: Article supprimé avec succès
           edit:
             save: Mettre à jour
+            title: Éditer le post
           index:
             title: Articles
           new:

data/config/locales/gl.yml

@@ -29,6 +29,7 @@ gl:
             success: Publicación eliminada con éxito
           edit:
             save: Actualizar
+            title: Editar publicación
           index:
             title: Publicacións
           new:

data/config/locales/is-IS.yml

@@ -51,6 +51,10 @@ is-IS:
           email_outro: Þú hefur fengið þessa tilkynningu vegna þess að þú fylgist með "%{participatory_space_title}". Þú getur sleppt því frá fyrri tengilinn.
           email_subject: Ný staða birt í %{participatory_space_title}
           notification_title: Staða <a href="%{resource_path}">%{resource_title}</a> hefur verið birt í %{participatory_space_title}
+    pages:
+      home:
+        statistics:
+          posts_count: Innlegg
     participatory_processes:
       statistics:
         posts_count: Innlegg

data/config/locales/ja.yml

@@ -28,6 +28,7 @@ ja:
             success: 投稿を削除しました
           edit:
             save: 更新
+            title: 投稿を編集
           index:
             title: 投稿
           new:

data/config/locales/nl.yml

@@ -29,6 +29,7 @@ nl:
             success: Post succesvol verwijderd
           edit:
             save: Bijwerken
+            title: Bericht bewerken
           index:
             title: berichten
           new:
@@ -81,4 +82,4 @@ nl:
           posts_count: berichten
     participatory_processes:
       statistics:
-        posts_count: Berichten
+        posts_count: berichten

data/config/locales/pl.yml

@@ -31,6 +31,7 @@ pl:
             success: Wpis został usunięty
           edit:
             save: Aktualizuj
+            title: Edytuj wpis
           index:
             title: Wpisy
           new:

data/config/locales/ro-RO.yml

@@ -30,6 +30,7 @@ ro:
             success: Postare stearsa cu succes
           edit:
             save: Actualizare
+            title: Editează postarea
           index:
             title: Mesaje
           new:

data/config/locales/ru.yml

@@ -75,7 +75,7 @@ ru:
     pages:
       home:
         statistics:
-          posts_count: Постов
+          posts_count: Посты
     participatory_processes:
       statistics:
-        posts_count: Постов
+        posts_count: Посты

data/config/locales/sv.yml

@@ -29,6 +29,7 @@ sv:
             success: Inlägget har raderats
           edit:
             save: Uppdatera
+            title: Redigera inlägg
           index:
             title: Inlägg
           new:

data/config/locales/tr-TR.yml

@@ -29,6 +29,7 @@ tr:
             success: Yayın başarıyla silindi
           edit:
             save: Güncelleştirme
+            title: Gönderiyi düzenle
           index:
             title: Mesajlar
           new:

data/config/locales/uk.yml

@@ -73,7 +73,7 @@ uk:
     pages:
       home:
         statistics:
-          posts_count: Дописів
+          posts_count: Дописи
     participatory_processes:
       statistics:
-        posts_count: Дописів
+        posts_count: Дописи

data/db/migrate/20210310120514_add_followable_counter_cache_to_blogs.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddFollowableCounterCacheToBlogs < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_blogs_posts, :follows_count, :integer, null: false, default: 0, index: true
+
+    reversible do |dir|
+      dir.up do
+        Decidim::Blogs::Post.reset_column_information
+        Decidim::Blogs::Post.find_each do |record|
+          record.class.reset_counters(record.id, :follows)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/api/blogs_type.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    class BlogsType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::ComponentInterface
+
+      graphql_name "Blogs"
+      description "A blogs component of a participatory space."
+
+      field :posts, type: Decidim::Blogs::PostType.connection_type, description: "List all posts", connection: true, null: false do
+        argument :order, Decidim::Blogs::PostInputSort, "Provides several methods to order the results", required: false
+        argument :filter, Decidim::Blogs::PostInputFilter, "Provides several methods to filter the results", required: false
+      end
+
+      field :post, type: Decidim::Blogs::PostType, description: "Finds one post", null: true do
+        argument :id, GraphQL::Types::ID, "The ID of the post", required: true
+      end
+
+      def posts(filter: {}, order: {})
+        Decidim::Core::ComponentListBase.new(model_class: Post).call(object, { filter: filter, order: order }, context)
+      end
+
+      def post(id:)
+        Decidim::Core::ComponentFinderBase.new(model_class: Post).call(object, { id: id }, context)
+      end
+    end
+  end
+end

data/{app/types/decidim/blogs → lib/decidim/api}/post_input_sort.rb

@@ -9,7 +9,7 @@ module Decidim
       graphql_name "PostSort"
       description "A type used for sorting blog posts"
 
-      argument :id, String, "Sort by ID, valid values are ASC or DESC", required: false
+      argument :id, GraphQL::Types::String, "Sort by ID, valid values are ASC or DESC", required: false
     end
   end
 end

data/lib/decidim/api/post_type.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    # This type represents a Post.
+    class PostType < Decidim::Api::Types::BaseObject
+      implements Decidim::Comments::CommentableInterface
+      implements Decidim::Core::AttachableInterface
+      implements Decidim::Core::AuthorableInterface
+      implements Decidim::Core::TraceableInterface
+      implements Decidim::Core::EndorsableInterface
+      implements Decidim::Core::TimestampsInterface
+
+      description "A post"
+
+      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
+    end
+  end
+end

data/lib/decidim/blogs.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/blogs/admin"
+require "decidim/blogs/api"
 require "decidim/blogs/engine"
 require "decidim/blogs/admin_engine"
 require "decidim/blogs/component"

data/lib/decidim/blogs/api.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    autoload :PostInputSort, "decidim/api/post_input_sort"
+    autoload :PostInputFilter, "decidim/api/post_input_filter"
+    autoload :PostType, "decidim/api/post_type"
+    autoload :BlogsType, "decidim/api/blogs_type"
+  end
+end

data/lib/decidim/blogs/component.rb

@@ -77,9 +77,9 @@ Decidim.register_component(:blogs) do |component|
 
       params = {
         component: component,
-        title: Decidim::Faker::Localized.sentence(5),
+        title: Decidim::Faker::Localized.sentence(word_count: 5),
         body: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(20)
+          Decidim::Faker::Localized.paragraph(sentence_count: 20)
         end,
         author: author
       }

data/lib/decidim/blogs/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-blogs
 version: !ruby/object:Gem::Version
-  version: 0.23.3
+  version: 0.24.1
 platform: ruby
 authors:
 - Isaac Massot Gil
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,56 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: jquery-tmpl-rails
   requirement: !ruby/object:Gem::Requirement
@@ -106,56 +92,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 description: A Blog component for decidim's participatory spaces.
 email:
 - isaac.mg@coditramuntana.com
@@ -187,10 +173,6 @@ files:
 - app/models/decidim/blogs/post.rb
 - app/permissions/decidim/blog/permissions.rb
 - app/presenters/decidim/blogs/post_presenter.rb
-- app/types/decidim/blogs/blogs_type.rb
-- app/types/decidim/blogs/post_input_filter.rb
-- app/types/decidim/blogs/post_input_sort.rb
-- app/types/decidim/blogs/post_type.rb
 - app/views/decidim/blogs/admin/posts/_form.html.erb
 - app/views/decidim/blogs/admin/posts/edit.html.erb
 - app/views/decidim/blogs/admin/posts/index.html.erb
@@ -275,9 +257,15 @@ files:
 - db/migrate/20200128094730_add_endorsements_counter_cache_to_blogs.rb
 - 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
+- lib/decidim/api/blogs_type.rb
+- lib/decidim/api/post_input_filter.rb
+- lib/decidim/api/post_input_sort.rb
+- lib/decidim/api/post_type.rb
 - lib/decidim/blogs.rb
 - lib/decidim/blogs/admin.rb
 - lib/decidim/blogs/admin_engine.rb
+- lib/decidim/blogs/api.rb
 - lib/decidim/blogs/component.rb
 - lib/decidim/blogs/engine.rb
 - lib/decidim/blogs/test/factories.rb
@@ -294,14 +282,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Decidim blogs module

data/app/types/decidim/blogs/blogs_type.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Blogs
-    BlogsType = GraphQL::ObjectType.define do
-      interfaces [-> { Decidim::Core::ComponentInterface }]
-
-      name "Blogs"
-      description "A blogs component of a participatory space."
-
-      connection :posts,
-                 type: PostType.connection_type,
-                 description: "List all posts",
-                 function: PostListHelper.new(model_class: Post)
-      field :post,
-            type: PostType,
-            description: "Finds one post",
-            function: PostFinderHelper.new(model_class: Post)
-    end
-
-    class PostListHelper < Decidim::Core::ComponentListBase
-      argument :order, PostInputSort, "Provides several methods to order the results"
-      argument :filter, PostInputFilter, "Provides several methods to filter the results"
-    end
-
-    class PostFinderHelper < Decidim::Core::ComponentFinderBase
-      argument :id, !types.ID, "The ID of the post"
-    end
-  end
-end

data/app/types/decidim/blogs/post_type.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Blogs
-    # This type represents a Post.
-    PostType = GraphQL::ObjectType.define do
-      interfaces [
-        -> { Decidim::Comments::CommentableInterface },
-        -> { Decidim::Core::AttachableInterface },
-        -> { Decidim::Core::AuthorableInterface },
-        -> { Decidim::Core::TraceableInterface },
-        -> { Decidim::Core::EndorsableInterface },
-        -> { Decidim::Core::TimestampsInterface }
-      ]
-
-      name "Post"
-      description "A post"
-
-      field :id, !types.ID, "The internal ID of this post"
-      field :title, Decidim::Core::TranslatedFieldType, "The title for this post"
-      field :body, Decidim::Core::TranslatedFieldType, "The body of this post"
-    end
-  end
-end