decidim 0.2.0 → 0.3.0

data/decidim-comments/config/locales/es.yml

@@ -19,6 +19,9 @@ es:
             subject: Tienes un nuevo comentario
           reply_created:
             subject: Uno de tus comentarios ha recibido respuesta
+      votes:
+        create:
+          error: Ha habido errores al votar el comentario.
     components:
       add_comment_form:
         account_message: "<a href=\"%{sign_in_url}\">Entra con tu cuenta</a> o <a href=\"%{sign_up_url}\">regístrate</a> para dejar tu comentario.\n"
@@ -37,6 +40,7 @@ es:
         alignment:
           against: En contra
           in_favor: A favor
+        deleted_user: Usuario eliminado
         reply: Respuesta
         report:
           action: Denunciar
@@ -49,6 +53,7 @@ es:
             offensive: Contiene racismo, sexismo, insultos, ataques personales, amenazas de muerte, solicitudes de suicidio o cualquier forma de discurso de odio.
             spam: Contiene clickbait, publicidad o estafas.
           title: Denunciar un problema
+        verified_user_group: Organización verificada
       comment_order_selector:
         order:
           best_rated: Mejor valoración

data/decidim-comments/config/locales/it.yml

@@ -0,0 +1,65 @@
+it:
+  activerecord:
+    errors:
+      messages:
+        cannot_have_comments: non si possono fare commenti
+  decidim:
+    comments:
+      comment_notification_mailer:
+        comment_created:
+          new_comment_html: C'è un nuovo commento da parte di <b>%{commenter}</b> al link <b>%{commentable_link}</b>
+        hello: Ciao %{name},
+        manage_email_subscriptions_html: Puoi bloccare la ricezione di questo tipo di email variando le impostazioni su %{link}.
+        notifications_settings_link: pagina per le impostazioni delle notifiche
+        reply_created:
+          new_reply_html: C'è una nuova risposta al tuo commento da parte di <b>%{commenter}</b> in <b>%{commentable_link}</b>
+      mailer:
+        comment_notification:
+          comment_created:
+            subject: C'è un nuovo commento
+          reply_created:
+            subject: Hai ricevuto una nuova risposta ad un tuo commento
+    components:
+      add_comment_form:
+        account_message: '<a href="%{sign_in_url}">Entra col tuo account</a> or <a href="%{sign_up_url}">Registrati</a> per poter commentare. '
+        form:
+          body:
+            label: Commenta
+            placeholder: Cosa ne pensi?
+          form_error: Il testo è necessario, deve essere obbligatoriamente indicato (max %{length} caratteri).
+          submit: Invia
+          user_group_id:
+            label: Commenta come
+        opinion:
+          neutral: Neutro
+        title: Aggiungi il tuo commento
+      comment:
+        alignment:
+          against: Contro
+          in_favor: A favore
+        reply: Rispondi
+        report:
+          already_reported: Questo contenuto è già stato indicato e sarà revisionato da un utente Admnistrator.
+          close: Chiudi
+          description: Trovi questo contenuto inappropriato?
+          details: motivazione
+          reasons:
+            does_not_belong: Contiene un'attività illegale, istigazioni al suicidio, minacce, informazioni personali o riservate, oppure vi sono dei contenuti che reputi inappropriati per %{organization_name}.
+            offensive: Vi sono contenuti razzisti, sessisti, offensivi, attacchi di carattere personale, minacce di morte o altro tipo di minacci, istigazioni al suicidio o altre forme d'odio verbale.
+            spam: Contiene pubblicità, truffe, clickbait ("esca da click") o altro contenuto mirato ad attrarre traffico internet.
+          title: Segnala un problema
+      comment_order_selector:
+        order:
+          best_rated: Favoriti
+          most_discussed: Più discussi
+          older: Più vecchi
+          recent: Più recenti
+        title: 'Ordina per:'
+      comment_thread:
+        title: Conversazioni con %{authorName}
+      comments:
+        blocked_comments_warning: I commenti sono disabilitati per questa fase, ma puoi leggere i commenti delle fasi precedenti.
+        loading: Sto caricando i commenti ...
+        title: "%{count} commenti"
+      featured_comment:
+        title: Commento in primo piano

data/decidim-comments/db/migrate/20161130143508_create_comments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateComments < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_comments_comments do |t|

data/decidim-comments/db/migrate/20161214082645_add_depth_to_comments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddDepthToComments < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_comments_comments, :depth, :integer, null: false, default: 0

data/decidim-comments/db/migrate/20161216102820_add_alignment_to_comments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddAlignmentToComments < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_comments_comments, :alignment, :integer, null: false, default: 0

data/decidim-comments/db/migrate/20161219150806_create_comment_votes.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 class CreateCommentVotes < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_comments_comment_votes do |t|
       t.integer :weight, null: false
       t.references :decidim_comment, null: false, index: { name: "decidim_comments_comment_vote_comment" }
       t.references :decidim_author, null: false, index: { name: "decidim_comments_comment_vote_author" }
-      
+
       t.timestamps
     end
 

data/decidim-comments/db/migrate/20170123102043_add_user_group_id_to_comments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddUserGroupIdToComments < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_comments_comments, :decidim_user_group_id, :integer, index: true

data/decidim-comments/db/migrate/20170504085413_add_root_commentable_to_comments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddRootCommentableToComments < ActiveRecord::Migration[5.0]
   def change
     change_table :decidim_comments_comments do |t|

data/decidim-comments/db/migrate/20170510091348_update_root_commentable_for_comments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class UpdateRootCommentableForComments < ActiveRecord::Migration[5.0]
   def up
     Decidim::Comments::Comment.where(depth: 0).update_all(
@@ -10,8 +12,7 @@ class UpdateRootCommentableForComments < ActiveRecord::Migration[5.0]
     end
   end
 
-  def down
-  end
+  def down; end
 
   private
 

data/decidim-comments/db/migrate/20170510091409_set_root_commentable_null_constraints.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SetRootCommentableNullConstraints < ActiveRecord::Migration[5.0]
   def change
     change_column_null(:decidim_comments_comments, :decidim_root_commentable_id, false)

data/decidim-comments/decidim-comments.gemspec

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 
 # Maintain your gem's version:
 require_relative "../decidim-core/lib/decidim/core/version"

data/decidim-comments/lib/decidim/comments/comment_serializer.rb

@@ -30,7 +30,7 @@ module Decidim
       private
 
       def root_commentable_url
-        @root_commentable_url ||= decidim_resource_url(resource.root_commentable)
+        @root_commentable_url ||= Decidim::ResourceLocatorPresenter.new(resource.root_commentable).url
       end
     end
   end

data/decidim-comments/lib/decidim/comments/commentable.rb

@@ -11,23 +11,23 @@ module Decidim
       included do
         has_many :comments, as: :commentable, foreign_key: "decidim_commentable_id", foreign_type: "decidim_commentable_type", class_name: "Decidim::Comments::Comment"
 
-        # Public: Wether the object's comments are visible or not.
+        # Public: Whether the object's comments are visible or not.
         def commentable?
           true
         end
 
-        # Public: Wether the object can have new comments or not.
+        # Public: Whether the object can have new comments or not.
         def accepts_new_comments?
           true
         end
 
-        # Public: Wether the object's comments can have alignment or not. It enables the
+        # Public: Whether the object's comments can have alignment or not. It enables the
         # alignment selector in the add new comment form.
         def comments_have_alignment?
           false
         end
 
-        # Public: Wether the object's comments can have have votes or not. It enables the
+        # Public: Whether the object's comments can have have votes or not. It enables the
         # upvote and downvote buttons for comments.
         def comments_have_votes?
           false

data/decidim-comments/spec/commands/create_comment_spec.rb

@@ -82,7 +82,7 @@ module Decidim
             it "sends an email to the author of the commentable" do
               expect(CommentNotificationMailer)
                 .to receive(:comment_created)
-                .with(author, an_instance_of(Comment), commentable)
+                .with(an_instance_of(Comment), commentable)
                 .and_call_original
 
               command.call
@@ -120,7 +120,7 @@ module Decidim
             it "sends an email to the author of the parent comment" do
               expect(CommentNotificationMailer)
                 .to receive(:reply_created)
-                .with(author, an_instance_of(Comment), commentable, commentable.root_commentable)
+                .with(an_instance_of(Comment), commentable, commentable.root_commentable)
                 .and_call_original
 
               command.call

data/decidim-comments/spec/features/admin_manages_comments_spec.rb

@@ -3,11 +3,8 @@
 require "spec_helper"
 
 describe "Admin manages comments", type: :feature do
-  include_context "admin"
-  it_behaves_like "manage moderations"
-  include_context "feature"
   let(:manifest_name) { "dummy" }
-
+  let!(:dummy) { create :dummy_resource, feature: current_feature }
   let!(:resources) { create_list(:dummy_resource, 3, feature: current_feature) }
   let!(:reportables) do
     resources.map do |resource|
@@ -15,9 +12,7 @@ describe "Admin manages comments", type: :feature do
     end
   end
 
-  before do
-    switch_to_host(organization.host)
-    login_as user, scope: :user
-    visit decidim_admin.manage_feature_path(participatory_process_id: participatory_process, feature_id: current_feature)
-  end
+  include_context "feature admin"
+
+  it_behaves_like "manage moderations"
 end

data/decidim-comments/spec/features/process_admin_manages_comments_spec.rb

@@ -3,12 +3,8 @@
 require "spec_helper"
 
 describe "Process admin manages comments", type: :feature do
-  include_context "admin"
-  let(:user) { process_admin }
-  it_behaves_like "manage moderations"
-  include_context "feature"
-  let(:manifest_name) { "proposals" }
-
+  let(:manifest_name) { "dummy" }
+  let!(:dummy) { create :dummy_resource, feature: current_feature }
   let!(:resources) { create_list(:dummy_resource, 3, feature: current_feature) }
   let!(:reportables) do
     resources.map do |resource|
@@ -16,9 +12,7 @@ describe "Process admin manages comments", type: :feature do
     end
   end
 
-  before do
-    switch_to_host(organization.host)
-    login_as user, scope: :user
-    visit decidim_admin.manage_feature_path(participatory_process_id: participatory_process, feature_id: current_feature)
-  end
+  include_context "feature process admin"
+
+  it_behaves_like "manage moderations"
 end

data/decidim-comments/spec/mailers/comment_notification_mailer_spec.rb

@@ -6,12 +6,17 @@ require "spec_helper"
 module Decidim
   module Comments
     describe CommentNotificationMailer, type: :mailer do
-      let(:commentable) { create(:dummy_resource) }
-      let(:comment) { create(:comment, commentable: commentable) }
-      let(:reply) { create(:comment, commentable: comment) }
+      let(:organization) { create(:organization) }
+      let(:participatory_process) { create(:participatory_process, organization: organization) }
+      let(:feature) { create(:feature, participatory_process: participatory_process) }
+      let(:commentable_author) { create(:user, organization: organization) }
+      let(:commentable) { create(:dummy_resource, author: commentable_author, feature: feature) }
+      let(:author) { create(:user, organization: organization) }
+      let(:comment) { create(:comment, author: author, commentable: commentable) }
+      let(:reply) { create(:comment, author: author, commentable: comment) }
 
       describe "comment_created" do
-        let(:mail) { described_class.comment_created(user, comment, commentable) }
+        let(:mail) { described_class.comment_created(comment, commentable) }
 
         let(:subject) { "Tens un nou comentari" }
         let(:default_subject) { "You have a new comment" }
@@ -19,11 +24,11 @@ module Decidim
         let(:body) { "Hi ha un nou comentari d" }
         let(:default_body) { "There is a new comment" }
 
-        include_examples "localised email"
+        include_examples "author localised email"
       end
 
       describe "reply_created" do
-        let(:mail) { described_class.reply_created(user, reply, comment, commentable) }
+        let(:mail) { described_class.reply_created(reply, comment, commentable) }
 
         let(:subject) { "Tens una nova resposta del teu comentari" }
         let(:default_subject) { "You have a new reply of your comment" }
@@ -31,7 +36,7 @@ module Decidim
         let(:body) { "Hi ha una nova resposta de" }
         let(:default_body) { "There is a new reply of your comment" }
 
-        include_examples "localised email"
+        include_examples "author localised email"
       end
     end
   end

data/decidim-comments/spec/shared/author_localised_email.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples "author localised email" do
+  let(:author) { create(:user, locale: locale, organization: organization) }
+  let(:commentable_author) { create(:user, locale: locale, organization: organization) }
+
+  context "when the user has a custom locale" do
+    let(:locale) { "ca" }
+
+    it "uses the user's locale" do
+      expect(mail.subject).to eq(subject)
+      expect(mail.body.encoded).to match(body)
+    end
+  end
+
+  context "otherwise" do
+    let(:locale) { nil }
+
+    it "uses the default locale" do
+      expect(mail.subject).to eq(default_subject)
+      expect(mail.body.encoded).to match(default_body)
+    end
+  end
+end

data/decidim-comments/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
+ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
 
 require "decidim/dev/test/base_spec_helper"

data/decidim-dev/config/locales/it.yml

@@ -0,0 +1,9 @@
+it:
+  decidim:
+    dummy:
+      admin:
+        exports:
+          dummies: "Risorse Fittizie"
+    resource_links:
+      test_link:
+        dummy_resource_dummy: Risorse fittizie correlate

data/decidim-dev/decidim-dev.gemspec

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 
 # Maintain your gem's version:
 require_relative "../decidim-core/lib/decidim/core/version"
@@ -19,7 +20,10 @@ Gem::Specification.new do |s|
   s.add_dependency "database_cleaner", "~> 1.6.0"
   s.add_dependency "capybara", "~> 2.14.0"
   s.add_dependency "capybara-screenshot", "~> 1.0.14"
-  s.add_dependency "rspec-rails", "~> 3.5"
+
+  # Until https://github.com/rspec/rspec-rails/issues/1800 fixed
+  s.add_dependency "rspec-rails", "~> 3.5", "< 3.6"
+
   s.add_dependency "rspec-repeat", "~> 1.0.2"
   s.add_dependency "byebug"
   s.add_dependency "wisper-rspec", "~> 0.0.3"
@@ -31,9 +35,10 @@ Gem::Specification.new do |s|
   s.add_dependency "rails-controller-testing", "~> 1.0.1"
   s.add_dependency "simplecov", "~> 0.13"
   s.add_dependency "codecov", "~> 0.1.9"
-  s.add_dependency "rubocop", "~> 0.49.0"
+  s.add_dependency "rubocop", "~> 0.48.1"
   s.add_dependency "db-query-matchers", "~> 0.9.0"
   s.add_dependency "letter_opener_web", "~> 1.3.0"
   s.add_dependency "rspec-html-matchers", "~> 0.9.1"
   s.add_dependency "webmock", "~> 3.0.1"
+  s.add_dependency "puma", "~> 3.8.2"
 end

data/decidim-dev/lib/decidim/dev.rb

@@ -12,14 +12,7 @@ module Decidim
     #
     # Returns a String with the path for a particular asset.
     def self.asset(name)
-      File.expand_path(
-        File.join(
-          File.dirname(__FILE__),
-          "dev",
-          "assets",
-          name
-        )
-      )
+      File.expand_path(File.join(__dir__, "dev", "assets", name))
     end
   end
 end

data/decidim-dev/lib/decidim/dev/railtie.rb

@@ -6,7 +6,7 @@ module Decidim
       railtie_name :decidim_dev
 
       rake_tasks do
-        Dir[File.join(File.dirname(__FILE__), "../../tasks/*.rake")].each do |file|
+        Dir[File.join(__dir__, "../../tasks/*.rake")].each do |file|
           load file
         end
       end

data/decidim-dev/lib/decidim/dev/test/base_spec_helper.rb

@@ -2,7 +2,7 @@
 
 ENV["RAILS_ENV"] ||= "test"
 
-root_path = File.join(Dir.pwd, "..")
+root_path = File.expand_path("..", Dir.pwd)
 engine_spec_dir = File.join(Dir.pwd, "spec")
 dummy_app_path = File.expand_path(File.join(root_path, "spec", "decidim_dummy_app"))
 
@@ -22,15 +22,17 @@ if ENV["SIMPLECOV"]
     end
   end
 
-  require "codecov"
-  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+  if ENV["CI"]
+    require "codecov"
+    SimpleCov.formatter = SimpleCov::Formatter::Codecov
+  end
 end
 
 require "rails"
 require "active_support/core_ext/string"
 require "decidim/core"
 require "decidim/core/test"
-require "#{File.dirname(__FILE__)}/rspec_support/feature.rb"
+require "#{__dir__}/rspec_support/feature.rb"
 
 begin
   require "#{dummy_app_path}/config/environment"