decidim-core 0.3.2 → 0.4.0

data/config/locales/fi.yml

@@ -307,13 +307,6 @@ fi:
   locale:
     name: Suomi
   pages:
-    '404':
-      back_home: Takaisin kotisivulle
-      content_doesnt_exist: Tämä osoite on virheellinen tai sivun osoite on muuttunut.
-      title: Etsimääsi sivua ei löydy
-    '500':
-      title: Palvelimellamme tapahtui virhe
-      try_later: Yritä myöhemmin uudestaan.
     home:
       extended:
         debates: Väittelyt

data/config/locales/fr.yml

@@ -176,8 +176,8 @@ fr:
         local_area: Localisation
         participatory_scope: Objectif du processus participatif
         participatory_structure: Organisations concernées
-        scope: Domaine d'application
-        target: Public
+        scope: Zone d'application
+        target: Public visé
     reported_mailer:
       hide:
         hello: Bonjour %{name},
@@ -188,7 +188,7 @@ fr:
     reports:
       create:
         error: Une erreur s'est produite lors de la création du rapport. Veuillez essayer à nouveau.
-        success: Le rapport a été créé avec succès, il sera examiné par un administrateur.
+        success: Le contenu a été signalé, il sera examiné par un administrateur.
     shared:
       action_authorization_modal:
         incomplete:
@@ -214,7 +214,7 @@ fr:
         close: Fermer
         description: Ce contenu est-il inapproprié?
         does_not_belong: Contient des activités illégales, des menaces suicidaires, des informations personnelles, ou autre chose que vous pensez ne pas être approprié à %{organization_name}.
-        offensive: Contient des propos racisme, sexiste, des insultes, des attaques personnelles, des menaces de mort, des incitations au suicide ou toute forme de discours de haine.
+        offensive: Contient des propos racistes, sexistes, des insultes, des attaques personnelles, des menaces de mort, des incitations au suicide ou toute forme de discours de haine.
         report: Signaler
         spam: Contient des piège-à-clic (clickbait), des publicités, des escroqueries ou des robots fonctionnant au script (script bots).
         title: Signaler un problème
@@ -323,13 +323,6 @@ fr:
   locale:
     name: Français
   pages:
-    '404':
-      back_home: Retour à l'accueil
-      content_doesnt_exist: Cette adresse web est incorrecte ou n'existe plus.
-      title: La page que vous recherchez ne peut être trouvée
-    '500':
-      title: Il y a eu un problème avec notre serveur
-      try_later: Veuillez réessayer plus tard.
     home:
       extended:
         debates: Débats

data/config/locales/it.yml

@@ -303,13 +303,6 @@ it:
   locale:
     name: Italiano
   pages:
-    '404':
-      back_home: Torna alla home page
-      content_doesnt_exist: Questo indirizzo non è corretto oppure è stato rimosso.
-      title: La pagina che stai cercando non esiste oppure non è disponibile
-    '500':
-      title: Si è verificato un problema da parte del server
-      try_later: Per cortesia riprova più tardi.
     home:
       extended:
         debates: Dibattiti

data/config/locales/nl.yml

@@ -307,13 +307,6 @@ nl:
   locale:
     name: Nederlands
   pages:
-    '404':
-      back_home: Terug naar huis
-      content_doesnt_exist: Dit adres is onjuist of is verwijderd.
-      title: De pagina die u zoekt is niet gevonden
-    '500':
-      title: Er was een probleem met de server
-      try_later: Probeer het later opnieuw.
     home:
       extended:
         debates: Debatten

data/config/routes.rb

@@ -36,8 +36,6 @@ Decidim::Core::Engine.routes.draw do
         mount manifest.engine, at: "/", as: "decidim_#{manifest.name}"
       end
     end
-
-    get "/", to: redirect("/404"), as: :feature
   end
 
   authenticate(:user) do
@@ -60,12 +58,8 @@ Decidim::Core::Engine.routes.draw do
   get "/static_map", to: "static_map#show", as: :static_map
   get "/cookies/accept", to: "cookie_policy#accept", as: :accept_cookies
 
-  match "/404", to: "pages#show", id: "404", via: :all
-  match "/500", to: "pages#show", id: "500", via: :all
-
-  if Rails.env.development? && defined?(LetterOpenerWeb::Engine)
-    mount LetterOpenerWeb::Engine, at: "/letter_opener"
-  end
+  match "/404", to: "errors#not_found", via: :all
+  match "/500", to: "errors#internal_server_error", via: :all
 
   resource :report, only: [:create]
 

data/db/migrate/20160817115213_devise_create_decidim_users.rb

@@ -4,22 +4,22 @@ class DeviseCreateDecidimUsers < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_users do |t|
       ## Database authenticatable
-      t.string :email,              null: false, default: ""
+      t.string :email, null: false, default: ""
       t.string :encrypted_password, null: false, default: ""
 
       ## Recoverable
-      t.string   :reset_password_token
+      t.string :reset_password_token
       t.datetime :reset_password_sent_at
 
       ## Rememberable
       t.datetime :remember_created_at
 
       ## Trackable
-      t.integer  :sign_in_count, default: 0, null: false
+      t.integer :sign_in_count, default: 0, null: false
       t.datetime :current_sign_in_at
       t.datetime :last_sign_in_at
-      t.string   :current_sign_in_ip
-      t.string   :last_sign_in_ip
+      t.string :current_sign_in_ip
+      t.string :last_sign_in_ip
 
       ## Confirmable
       # t.string   :confirmation_token
@@ -35,7 +35,7 @@ class DeviseCreateDecidimUsers < ActiveRecord::Migration[5.0]
       t.timestamps null: false
     end
 
-    add_index :decidim_users, :email,                unique: true
+    add_index :decidim_users, :email, unique: true
     add_index :decidim_users, :reset_password_token, unique: true
     # add_index :decidim_users, :confirmation_token,   unique: true
     # add_index :decidim_users, :unlock_token,         unique: true

data/db/migrate/20160920140207_devise_invitable_add_to_decidim_users.rb

@@ -3,16 +3,16 @@
 class DeviseInvitableAddToDecidimUsers < ActiveRecord::Migration[4.2]
   def up
     change_table :decidim_users do |t|
-      t.string     :invitation_token
-      t.datetime   :invitation_created_at
-      t.datetime   :invitation_sent_at
-      t.datetime   :invitation_accepted_at
-      t.integer    :invitation_limit
+      t.string :invitation_token
+      t.datetime :invitation_created_at
+      t.datetime :invitation_sent_at
+      t.datetime :invitation_accepted_at
+      t.integer :invitation_limit
       t.references :invited_by, polymorphic: true
-      t.integer    :invitations_count, default: 0
-      t.index      :invitations_count
-      t.index      :invitation_token, unique: true # for invitable
-      t.index      :invited_by_id
+      t.integer :invitations_count, default: 0
+      t.index :invitations_count
+      t.index :invitation_token, unique: true # for invitable
+      t.index :invited_by_id
     end
   end
 

data/db/seeds.rb

@@ -70,7 +70,7 @@ if !Rails.env.production? || ENV["SEED"]
   )
 
   3.times do
-    Decidim::User.all.each do |user|
+    Decidim::User.find_each do |user|
       user_group = Decidim::UserGroup.create!(
         name: Faker::Company.name,
         document_number: Faker::Number.number(10),
@@ -85,7 +85,7 @@ if !Rails.env.production? || ENV["SEED"]
       )
 
       user_group = Decidim::UserGroup.create!(
-        name: Faker::Company.name,
+        name: Faker::Company.unique.name,
         document_number: Faker::Number.number(10),
         phone: Faker::PhoneNumber.phone_number,
         decidim_organization_id: user.organization.id

data/lib/decidim/core.rb

@@ -17,6 +17,7 @@ module Decidim
   autoload :Resourceable, "decidim/resourceable"
   autoload :Reportable, "decidim/reportable"
   autoload :Authorable, "decidim/authorable"
+  autoload :Notifiable, "decidim/notifiable"
   autoload :Features, "decidim/features"
   autoload :HasAttachments, "decidim/has_attachments"
   autoload :FeatureValidator, "decidim/feature_validator"
@@ -84,14 +85,37 @@ module Decidim
     []
   end
 
-  # Exposes a configuration option: The application name String.
+  # Exposes a configuration option: The application available locales.
   config_accessor :available_locales do
     %w(en ca es eu it fi fr nl)
   end
 
+  # Exposes a configuration option: The application default locale.
+  config_accessor :default_locale { :en }
+
   # Exposes a configuration option: an object to configure geocoder
   config_accessor :geocoder
 
+  # Exposes a configuration option: a custom method to generate references
+  # Default: Calculates a unique reference for the model in
+  # the following format:
+  #
+  # "BCN-DPP-2017-02-6589" which in this example translates to:
+  #
+  # BCN: A setting configured at the organization to be prepended to each reference.
+  # PROP: Unique name identifier for a resource: Decidim::Proposals::Proposal (MEET for meetings or PROJ for projects).
+  # 2017-02: Year-Month of the resource creation date
+  # 6589: ID of the resource
+  config_accessor :resource_reference_generator do
+    lambda do |resource, feature|
+      ref = feature.participatory_process.organization.reference_prefix
+      class_identifier = resource.class.name.demodulize[0..3].upcase
+      year_month = (resource.created_at || Time.current).strftime("%Y-%m")
+
+      [ref, class_identifier, year_month, resource.id].join("-")
+    end
+  end
+
   # Exposes a configuration option: the currency unit
   config_accessor :currency_unit { "€" }
 

data/lib/decidim/core/engine.rb

@@ -84,7 +84,6 @@ module Decidim
       end
 
       initializer "decidim.locales" do |app|
-        app.config.i18n.available_locales = Decidim.config.available_locales
         app.config.i18n.fallbacks = true
       end
 

data/lib/decidim/core/test.rb

@@ -11,3 +11,4 @@ require "decidim/core/test/shared_examples/comments_examples"
 require "decidim/core/test/shared_examples/reportable"
 require "decidim/core/test/shared_examples/reports_examples"
 require "decidim/core/test/shared_examples/manage_moderations_examples"
+require "decidim/core/test/shared_examples/errors"

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

@@ -126,14 +126,14 @@ FactoryGirl.define do
   end
 
   factory :user, class: Decidim::User do
-    email                 { generate(:email) }
-    password              "password1234"
+    email { generate(:email) }
+    password "password1234"
     password_confirmation "password1234"
-    name                  { generate(:name) }
+    name { generate(:name) }
     organization
-    locale                { organization.default_locale }
-    tos_agreement         "1"
-    avatar                { test_file("avatar.jpg", "image/jpeg") }
+    locale { organization.default_locale }
+    tos_agreement "1"
+    avatar { test_file("avatar.jpg", "image/jpeg") }
     comments_notifications true
     replies_notifications true
 
@@ -141,6 +141,11 @@ FactoryGirl.define do
       confirmed_at { Time.current }
     end
 
+    trait :deleted do
+      email ""
+      deleted_at { Time.current }
+    end
+
     trait :admin do
       roles ["admin"]
     end

data/lib/decidim/core/test/shared_examples/comments_examples.rb

@@ -4,24 +4,14 @@
 RSpec.shared_examples "comments" do
   let!(:organization) { create(:organization) }
   let!(:user) { create(:user, :confirmed, organization: organization) }
-  let!(:comments) do
-    Array.new(3) do
-      create(:comment, commentable: commentable)
-    end
-  end
-  let(:authenticated) { false }
-
-  def visit_commentable_path
-    login_as user, scope: :user if authenticated
-    visit resource_path
-  end
+  let!(:comments) { create_list(:comment, 3, commentable: commentable) }
 
   before do
     switch_to_host(organization.host)
   end
 
-  it "user should see a list of comments" do
-    visit_commentable_path
+  it "shows the list of comments for the resorce" do
+    visit resource_path
 
     expect(page).to have_selector("#comments")
     expect(page).to have_selector("article.comment", count: comments.length)
@@ -34,11 +24,11 @@ RSpec.shared_examples "comments" do
     end
   end
 
-  it "user should be able to sort the comments" do
+  it "allows user to sort the comments" do
     comment = create(:comment, commentable: commentable, body: "Most Rated Comment")
     create(:comment_vote, comment: comment, author: user, weight: 1)
 
-    visit_commentable_path
+    visit resource_path
 
     within ".order-by" do
       page.find(".dropdown.menu .is-dropdown-submenu-parent").hover
@@ -52,44 +42,41 @@ RSpec.shared_examples "comments" do
   end
 
   context "when not authenticated" do
-    it "user should not see the form to add comments" do
-      visit_commentable_path
+    it "does not show form to add comments to user" do
+      visit resource_path
       expect(page).not_to have_selector(".add-comment form")
     end
   end
 
   context "when authenticated" do
-    let(:authenticated) { true }
-
-    it "user sees the form to add comments" do
-      visit_commentable_path
+    before do
+      login_as user, scope: :user
+      visit resource_path
+    end
 
+    it "shows form to add comments to user" do
       expect(page).to have_selector(".add-comment form")
     end
 
     context "when user adds a new comment" do
       before do
-        visit_commentable_path
-
-        expect(page).to have_selector(".add-comment form")
-
         within ".add-comment form" do
           fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: "This is a new comment"
           click_button "Send"
         end
       end
 
-      it "user visualize the comment" do
+      it "shows comment to the user" do
         within "#comments" do
           expect(page).to have_content user.name
           expect(page).to have_content "This is a new comment"
         end
       end
 
-      it "commentable's author receives notificatione" do
-        if commentable.respond_to? :author
+      it "send notifications" do
+        if commentable.notifiable?(author: user)
           wait_for_email subject: "new comment"
-          login_as commentable.author, scope: :user
+          relogin_as commentable.users_to_notify.first, scope: :user
           visit last_email_first_link
 
           within "#comments" do
@@ -111,8 +98,8 @@ RSpec.shared_examples "comments" do
         create(:user_group_membership, user: user, user_group: user_group)
       end
 
-      it "user can add a new comment as a user group" do
-        visit_commentable_path
+      it "adds new comment as a user group" do
+        visit resource_path
 
         expect(page).to have_selector(".add-comment form")
 
@@ -129,12 +116,12 @@ RSpec.shared_examples "comments" do
       end
     end
 
-    context "when a user replies a coment" do
+    context "when a user replies to a comment" do
       let!(:comment_author) { create(:user, :confirmed, organization: organization) }
       let!(:comment) { create(:comment, commentable: commentable, author: comment_author) }
 
       before do
-        visit_commentable_path
+        visit resource_path
 
         expect(page).to have_selector(".comment__reply")
 
@@ -145,15 +132,15 @@ RSpec.shared_examples "comments" do
         end
       end
 
-      it "user visualize the reply" do
+      it "shows reply to the user" do
         within "#comments #comment_#{comment.id}" do
           expect(page).to have_content "This is a reply"
         end
       end
 
-      it "comment's author receives notification" do
+      it "sends notifications received by commentable's author" do
         wait_for_email subject: "new reply"
-        login_as comment.author, scope: :user
+        relogin_as comment.author, scope: :user
         visit last_email_first_link
 
         within "#comments #comment_#{comment.id}" do
@@ -162,51 +149,67 @@ RSpec.shared_examples "comments" do
       end
     end
 
-    context "when arguable option is enabled" do
-      before do
-        expect_any_instance_of(commentable.class).to receive(:comments_have_alignment?).and_return(true)
-      end
-
-      it "user can comment in favor" do
-        visit_commentable_path
+    describe "arguable option" do
+      context "commenting with alignment" do
+        before do
+          visit resource_path
 
-        expect(page).to have_selector(".add-comment form")
+          expect(page).to have_selector(".add-comment form")
+        end
 
-        page.find(".opinion-toggle--ok").click
+        it "works according to the setting in the commentable" do
+          if commentable.comments_have_alignment?
+            page.find(".opinion-toggle--ok").click
 
-        within ".add-comment form" do
-          fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: "I am in favor about this!"
-          click_button "Send"
-        end
+            within ".add-comment form" do
+              fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: "I am in favor about this!"
+              click_button "Send"
+            end
 
-        within "#comments" do
-          expect(page).to have_selector "span.success.label", text: "In favor"
+            within "#comments" do
+              expect(page).to have_selector "span.success.label", text: "In favor"
+            end
+          else
+            expect(page).not_to have_selector(".opinion-toggle--ok")
+          end
         end
       end
     end
 
-    context "when votable option is enabled" do
+    describe "votable option" do
       before do
-        expect_any_instance_of(commentable.class).to receive(:comments_have_votes?).and_return(true)
+        visit resource_path
       end
 
-      it "user can upvote a comment" do
-        visit_commentable_path
-
-        within "#comment_#{comments[0].id}" do
-          expect(page).to have_selector(".comment__votes--up", text: /0/)
-          page.find(".comment__votes--up").click
-          expect(page).to have_selector(".comment__votes--up", text: /1/)
+      context "upvoting a comment" do
+        it "works according to the setting in the commentable" do
+          within "#comment_#{comments[0].id}" do
+            if commentable.comments_have_votes?
+              expect(page).to have_selector(".comment__votes--up", text: /0/)
+              page.find(".comment__votes--up").click
+              expect(page).to have_selector(".comment__votes--up", text: /1/)
+            else
+              expect(page).to_not have_selector(".comment__votes--up", text: /0/)
+            end
+          end
         end
       end
 
-      it "user can downvote a comment" do
-        visit_commentable_path
+      context "downvoting a comment" do
+        before do
+          visit resource_path
+        end
 
-        within "#comment_#{comments[0].id}" do
-          expect(page).to have_selector(".comment__votes--down", text: /0/)
-          page.find(".comment__votes--down").click
-          expect(page).to have_selector(".comment__votes--down", text: /1/)
+        it "works according to the setting in the commentable" do
+          within "#comment_#{comments[0].id}" do
+            if commentable.comments_have_votes?
+              expect(page).to have_selector(".comment__votes--down", text: /0/)
+              page.find(".comment__votes--down").click
+              expect(page).to have_selector(".comment__votes--down", text: /1/)
+            else
+              expect(page).to_not have_selector(".comment__votes--down", text: /0/)
+            end
+          end
         end
       end
     end