decidim-comments 0.11.2 → 0.12.0.pre

data/config/locales/fr.yml

@@ -1,6 +1,21 @@
 fr:
+  activemodel:
+    models:
+      decidim/comments/comment_by_followed_user_event: Commentaire
+      decidim/comments/comment_created_event: Commentaire
+      decidim/comments/reply_created_event: Réponse à un commentaire
+      decidim/comments/user_mentioned_event: Mention
+  activerecord:
+    models:
+      decidim/comments/comment:
+        one: Commentaire
+        other: Commentaires
+      decidim/comments/comment_vote:
+        one: Vote
+        other: Votes
   decidim:
     comments:
+      comments: Commentaires
       votes:
         create:
           error: Une erreur s'est produite lors du soutien du commentaire.

data/config/locales/gl.yml

@@ -1,6 +1,21 @@
 gl:
+  activemodel:
+    models:
+      decidim/comments/comment_by_followed_user_event: Comentario
+      decidim/comments/comment_created_event: Comentario
+      decidim/comments/reply_created_event: Comentario de resposta
+      decidim/comments/user_mentioned_event: Mención
+  activerecord:
+    models:
+      decidim/comments/comment:
+        one: Comentario
+        other: Comentarios
+      decidim/comments/comment_vote:
+        one: Vota
+        other: Votos
   decidim:
     comments:
+      comments: Comentarios
       votes:
         create:
           error: Houbo erros ao votar o comentario.

data/config/locales/it.yml

@@ -1,6 +1,21 @@
 it:
+  activemodel:
+    models:
+      decidim/comments/comment_by_followed_user_event: Commento
+      decidim/comments/comment_created_event: Commento
+      decidim/comments/reply_created_event: Risposta al commento
+      decidim/comments/user_mentioned_event: Citare
+  activerecord:
+    models:
+      decidim/comments/comment:
+        one: Commento
+        other: Commenti
+      decidim/comments/comment_vote:
+        one: Votazione
+        other: voti
   decidim:
     comments:
+      comments: Commenti
       votes:
         create:
           error: Ci sono stati errori durante la votazione del commento.

data/config/locales/nl.yml

@@ -1,6 +1,21 @@
 nl:
+  activemodel:
+    models:
+      decidim/comments/comment_by_followed_user_event: Commentaar
+      decidim/comments/comment_created_event: Commentaar
+      decidim/comments/reply_created_event: Reactie antwoord
+      decidim/comments/user_mentioned_event: Noemen
+  activerecord:
+    models:
+      decidim/comments/comment:
+        one: Commentaar
+        other: Comments
+      decidim/comments/comment_vote:
+        one: Stemmen
+        other: stemmen
   decidim:
     comments:
+      comments: Comments
       votes:
         create:
           error: Er zijn fouten geweest bij het stemmen van de reactie.

data/config/locales/pl.yml

@@ -1,6 +1,25 @@
 pl:
+  activemodel:
+    models:
+      decidim/comments/comment_by_followed_user_event: Komentarz
+      decidim/comments/comment_created_event: Komentarz
+      decidim/comments/reply_created_event: Odpowiedź na komentarz
+      decidim/comments/user_mentioned_event: Wzmianka
+  activerecord:
+    models:
+      decidim/comments/comment:
+        one: Komentarz
+        few: Komentarze
+        many: Komentarze
+        other: Komentarze
+      decidim/comments/comment_vote:
+        one: Głosować
+        few: Głosy
+        many: Głosy
+        other: Głosy
   decidim:
     comments:
+      comments: Komentarze
       votes:
         create:
           error: Podczas głosowania komentarza wystąpiły błędy.

data/config/locales/pt-BR.yml

@@ -1,6 +1,21 @@
 pt-BR:
+  activemodel:
+    models:
+      decidim/comments/comment_by_followed_user_event: Comente
+      decidim/comments/comment_created_event: Comentário
+      decidim/comments/reply_created_event: Resposta
+      decidim/comments/user_mentioned_event: Mencionar
+  activerecord:
+    models:
+      decidim/comments/comment:
+        one: Comentário
+        other: Comentários
+      decidim/comments/comment_vote:
+        one: Voto
+        other: Votos
   decidim:
     comments:
+      comments: Comentários
       votes:
         create:
           error: Houve erros ao votar o comentário.

data/config/locales/pt.yml

@@ -1,6 +1,21 @@
 pt:
+  activemodel:
+    models:
+      decidim/comments/comment_by_followed_user_event: Comente
+      decidim/comments/comment_created_event: Comente
+      decidim/comments/reply_created_event: Comentário resposta
+      decidim/comments/user_mentioned_event: Menção
+  activerecord:
+    models:
+      decidim/comments/comment:
+        one: Comente
+        other: Comentários
+      decidim/comments/comment_vote:
+        one: Voto
+        other: Votos
   decidim:
     comments:
+      comments: Comentários
       votes:
         create:
           error: Houve erros ao votar o comentário.

data/config/locales/ru.yml

@@ -1,6 +1,25 @@
 ru:
+  activemodel:
+    models:
+      decidim/comments/comment_by_followed_user_event: Комментарий
+      decidim/comments/comment_created_event: Комментарий
+      decidim/comments/reply_created_event: Ответ на комментарий
+      decidim/comments/user_mentioned_event: Упоминание
+  activerecord:
+    models:
+      decidim/comments/comment:
+        one: Комментарий
+        few: Комментария
+        many: Комментариев
+        other: Комментариев
+      decidim/comments/comment_vote:
+        one: Голос
+        few: Голоса
+        many: Голосов
+        other: Голосов
   decidim:
     comments:
+      comments: Комментарии
       votes:
         create:
           error: При голосовании за комментарий произошли ошибки.

data/config/locales/sv.yml

@@ -1,6 +1,21 @@
 sv:
+  activemodel:
+    models:
+      decidim/comments/comment_by_followed_user_event: Kommentar
+      decidim/comments/comment_created_event: Kommentar
+      decidim/comments/reply_created_event: Kommentar svar
+      decidim/comments/user_mentioned_event: Nämna
+  activerecord:
+    models:
+      decidim/comments/comment:
+        one: Kommentar
+        other: kommentarer
+      decidim/comments/comment_vote:
+        one: Rösta
+        other: röster
   decidim:
     comments:
+      comments: kommentarer
       votes:
         create:
           error: Det har varit fel när du röstar kommentaren.

data/config/locales/uk.yml

@@ -1,6 +1,25 @@
 uk:
+  activemodel:
+    models:
+      decidim/comments/comment_by_followed_user_event: Коментар
+      decidim/comments/comment_created_event: Коментар
+      decidim/comments/reply_created_event: Відповідь на коментар
+      decidim/comments/user_mentioned_event: Згадка
+  activerecord:
+    models:
+      decidim/comments/comment:
+        one: Коментар
+        few: Коментаря
+        many: Коментарів
+        other: Коментарів
+      decidim/comments/comment_vote:
+        one: Голос
+        few: Голоси
+        many: Голосів
+        other: Голосів
   decidim:
     comments:
+      comments: Коментарі
       votes:
         create:
           error: При голосуванні коментаря сталися помилки.

data/lib/decidim/comments/admin_engine.rb

@@ -8,16 +8,6 @@ module Decidim
 
       paths["db/migrate"] = nil
 
-      initializer "decidim_comments.inject_abilities_to_user" do |_app|
-        Decidim.configure do |config|
-          config.admin_abilities += [
-            "Decidim::Comments::Abilities::AdminAbility",
-            "Decidim::Comments::Abilities::ParticipatoryProcessAdminAbility",
-            "Decidim::Comments::Abilities::ParticipatoryProcessModeratorAbility"
-          ]
-        end
-      end
-
       def load_seed
         nil
       end

data/lib/decidim/comments/api/comment_type.rb

@@ -8,8 +8,8 @@ module Decidim
       description "A comment"
 
       interfaces [
-        Decidim::Comments::CommentableInterface,
-        Decidim::Core::AuthorableInterface
+        -> { Decidim::Comments::CommentableInterface },
+        -> { Decidim::Core::AuthorableInterface }
       ]
 
       field :id, !types.ID, "The Comment's unique ID"

data/lib/decidim/comments/engine.rb

@@ -36,18 +36,12 @@ module Decidim
       end
 
       initializer "decidim.stats" do
-        Decidim.stats.register :comments_count, priority: StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
+        Decidim.stats.register :comments_count, priority: StatsRegistry::MEDIUM_PRIORITY do |organization|
           Decidim.component_manifests.sum do |component|
-            component.stats.filter(tag: :comments).with_context(components, start_at, end_at).map { |_name, value| value }.sum
+            component.stats.filter(tag: :comments).with_context(organization.published_components).map { |_name, value| value }.sum
           end
         end
       end
-
-      initializer "decidim_comments.inject_abilities_to_user" do |_app|
-        Decidim.configure do |config|
-          config.abilities += ["Decidim::Comments::Abilities::CurrentUserAbility"]
-        end
-      end
     end
   end
 end

data/lib/decidim/comments/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-comments version.
   module Comments
     def self.version
-      "0.11.2"
+      "0.12.0.pre"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0.pre
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -46,28 +46,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -133,10 +133,6 @@ files:
 - app/frontend/support/require_all.ts
 - app/frontend/support/resolve_graphql_query.ts
 - app/frontend/support/schema.ts
-- app/models/decidim/comments/abilities/admin_ability.rb
-- app/models/decidim/comments/abilities/current_user_ability.rb
-- app/models/decidim/comments/abilities/participatory_process_admin_ability.rb
-- app/models/decidim/comments/abilities/participatory_process_moderator_ability.rb
 - app/models/decidim/comments/application_record.rb
 - app/models/decidim/comments/comment.rb
 - app/models/decidim/comments/comment_vote.rb
@@ -204,9 +200,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6

data/app/models/decidim/comments/abilities/admin_ability.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Comments
-    module Abilities
-      # Defines the abilities related to comments for a logged in admin user.
-      # Intended to be used with `cancancan`.
-      class AdminAbility < Decidim::Abilities::AdminAbility
-        def define_abilities
-          super
-
-          can :manage, Comment
-          can :unreport, Comment
-          can :hide, Comment
-        end
-      end
-    end
-  end
-end

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

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Comments
-    module Abilities
-      # Defines the abilities related to comments for a logged in user.
-      # Intended to be used with `cancancan`.
-      class CurrentUserAbility
-        include CanCan::Ability
-
-        attr_reader :user, :context
-
-        def initialize(user, context)
-          return unless user
-
-          @user = user
-          @context = context
-
-          can :report, Decidim::Comments::Comment
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/comments/abilities/participatory_process_admin_ability.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Comments
-    module Abilities
-      # Defines the abilities related to comments for a logged in process admin user.
-      # Intended to be used with `cancancan`.
-      class ParticipatoryProcessAdminAbility < Decidim::Abilities::ParticipatoryProcessAdminAbility
-        def define_participatory_process_abilities
-          super
-
-          can [:manage, :unreport, :hide], Comment do |comment|
-            can_manage_process?(comment.component.participatory_space)
-          end
-        end
-      end
-    end
-  end
-end