decidim 0.0.4 → 0.0.5

data/decidim-admin/app/views/decidim/admin/newsletters/new.html.erb

@@ -0,0 +1,11 @@
+<% provide :title do %>
+  <h2><%= t ".title" %></h2>
+<% end %>
+
+<%= decidim_form_for(@form) do |f| %>
+  <%= render partial: 'form', object: f %>
+
+  <div class="actions">
+    <%= f.submit t(".save") %>
+  </div>
+<% end %>

data/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb

@@ -0,0 +1,14 @@
+<h3><%= t ".preview" %></h3>
+
+<dl>
+  <dt><%= t ".subject" %></dt>
+  <dd><%= @email.subject %></dd>
+</dl>
+
+<iframe src="<%= preview_newsletter_path(@newsletter) %>" class="email-preview">
+</iframe>
+
+<div class="actions">
+  <%= link_to t("actions.edit", scope: "decidim.admin"), ['edit', @newsletter] %>
+  <%= link_to t(".deliver"), deliver_newsletter_path(@newsletter), method: :post, class: "button", data: { confirm: t(".confirm_deliver") } %>
+</div>

data/decidim-admin/app/views/decidim/admin/participatory_process_steps/_form.html.erb

@@ -7,7 +7,7 @@
 </div>
 
 <div class="field">
-  <%= form.translated :editor, :description, toolbar: :full, lines: 20 %>
+  <%= form.translated :editor, :description, toolbar: :full, lines: 25 %>
 </div>
 
 <div class="field">

data/decidim-admin/app/views/decidim/admin/participatory_processes/_form.html.erb

@@ -19,7 +19,7 @@
 </div>
 
 <div class="field">
-  <%= form.translated :editor, :description, toolbar: :full, lines: 20 %>
+  <%= form.translated :editor, :description, toolbar: :full, lines: 25 %>
 </div>
 
 <div class="field">

data/decidim-admin/app/views/decidim/admin/static_pages/_form.html.erb

@@ -9,5 +9,5 @@
 <% end %>
 
 <div class="field">
-  <%= form.translated :editor, :content, toolbar: :full %>
+  <%= form.translated :editor, :content, toolbar: :full, lines: 25 %>
 </div>

data/decidim-admin/app/views/layouts/decidim/admin/_sidebar.html.erb

@@ -13,6 +13,7 @@
   <%= active_link_to t("menu.scopes", scope: "decidim.admin"), decidim_admin.scopes_path, active: :inclusive if can? :read, Decidim::Scope %>
   <%= active_link_to t("menu.users", scope: "decidim.admin"), decidim_admin.users_path, active: :inclusive if can? :read, :admin_users %>
   <%= active_link_to t("menu.user_groups", scope: "decidim.admin"), decidim_admin.user_groups_path, active: :inclusive if can? :index, Decidim::UserGroup %>
+  <%= active_link_to t("menu.newsletters", scope: "decidim.admin"), decidim_admin.newsletters_path, active: :inclusive if can? :index, Decidim::Newsletter %>
   <%= active_link_to t("menu.settings", scope: "decidim.admin"), decidim_admin.edit_organization_path, active: :inclusive if can? :read, current_organization %>
 </nav>
 

data/decidim-admin/config/locales/ca.yml

@@ -12,6 +12,9 @@ ca:
       feature:
         name: Nom
         weight: Pes
+      newsletter:
+        body: Cos
+        subject: Assumpte
       organization:
         default_locale: Idioma per defecte
         description: Descripció
@@ -161,6 +164,7 @@ ca:
           success: La funcionalitat s'ha actualitzat correctament.
       menu:
         dashboard: Tauler de control
+        newsletters: Butlletins
         participatory_processes: Processos participatius
         participatory_processes_submenu:
           attachments: Adjunts
@@ -185,6 +189,13 @@ ca:
           fields:
             name: Nom
           name: Categoria
+        newsletter:
+          fields:
+            created_at: Data de creació
+            progress: Progrés
+            sent_at: Enviat el
+            subject: Assumpte
+          name: Butlletí
         participatory_process:
           fields:
             created_at: Data de creació
@@ -228,6 +239,35 @@ ca:
             name: Nom
             phone: Telèfon
             users_count: Número d'usuaris
+      newsletters:
+        create:
+          error: S'ha produït un error en crear aquest butlletí.
+          success: Butlletí creat amb èxit. Si us plau, revisa'l abans d'enviar.
+        deliver:
+          error: Hi ha hagut un error d'enviament d'aquest butlletí.
+          success: Butlletí enviat amb èxit.
+        destroy:
+          error_already_sent: 'No es pot destruir butlletí de notícies: Ja s''ha enviat.'
+          success: Butlletí destruït amb èxit.
+        edit:
+          save_and_preview: Desar i vista prèvia
+          title: Editar butlletí
+        form:
+          interpolations_hint: 'Consell: Podeu utilitzar "%{name}" en qualsevol part del cos o assumpte i serà reemplaçat pel nom del destinatari.'
+        index:
+          confirm_delete: Esteu segur que voleu suprimir aquest butlletí?
+          title: Butlletins
+        new:
+          save: Desar
+          title: Nou butlletí
+        show:
+          confirm_deliver: Estàs segur de que vols enviar aquest butlletí? Aquesta acció no es pot desfer.
+          deliver: Enviar butlletí
+          preview: Previsualitzar
+          subject: Assumpte
+        update:
+          error: S'ha produït un error en actualitzar aquest butlletí.
+          success: Butlletí actualitzat correctament. Si us plau, revisa'l abans d'enviar-lo.
       organization:
         edit:
           title: Edita organització

data/decidim-admin/config/locales/en.yml

@@ -13,6 +13,9 @@ en:
       feature:
         name: Name
         weight: Weight
+      newsletter:
+        body: Body
+        subject: Subject
       organization:
         default_locale: Default locale
         description: Description
@@ -162,6 +165,7 @@ en:
           success: The feature was updated successfully.
       menu:
         dashboard: Dashboard
+        newsletters: Newsletters
         participatory_processes: Participatory processes
         participatory_processes_submenu:
           attachments: Attachments
@@ -186,6 +190,13 @@ en:
           fields:
             name: Name
           name: Category
+        newsletter:
+          fields:
+            created_at: Created at
+            progress: Progress
+            sent_at: Sent at
+            subject: Subject
+          name: Newsletter
         participatory_process:
           fields:
             created_at: Created at
@@ -229,6 +240,35 @@ en:
             name: Name
             phone: Phone
             users_count: Users count
+      newsletters:
+        create:
+          error: There's been an error creating this newsletter.
+          success: Newsletter created successfully. Please, review it before sending.
+        deliver:
+          error: There's been an error delivering this newsletter.
+          success: Newsletter delivered successfully.
+        destroy:
+          error_already_sent: 'Can''t destroy newsletter: It has already been sent.'
+          success: Newsletter destroyed successfully.
+        edit:
+          save_and_preview: Save and preview
+          title: Edit newsletter
+        form:
+          interpolations_hint: 'Hint: You can use "%{name}" anywhere in the body or subject and it will be replaced by the recipient''s name.'
+        index:
+          confirm_delete: Are you sure you want to delete this newsletter?
+          title: Newsletters
+        new:
+          save: Save
+          title: New newsletter
+        show:
+          confirm_deliver: Are you sure you want to deliver this newsletter? This action cannot be undone.
+          deliver: Deliver newsletter
+          preview: Preview
+          subject: Subject
+        update:
+          error: There's been an error updating this newsletter.
+          success: Newsletter updated successfully. Please review it before sending.
       organization:
         edit:
           title: Edit organization

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

@@ -12,6 +12,9 @@ es:
       feature:
         name: Nombre
         weight: Peso
+      newsletter:
+        body: Cuerpo
+        subject: Asunto
       organization:
         default_locale: Configuración regional predeterminada
         description: Descripción
@@ -161,6 +164,7 @@ es:
           success: La funcionalidad se ha actualizado correctamente.
       menu:
         dashboard: Panel de control
+        newsletters: Boletines
         participatory_processes: Procesos participativos
         participatory_processes_submenu:
           attachments: Archivos adjuntos
@@ -185,6 +189,13 @@ es:
           fields:
             name: Nombre
           name: Categoría
+        newsletter:
+          fields:
+            created_at: Fecha de creación
+            progress: Progreso
+            sent_at: Enviado el
+            subject: Asunto
+          name: Boletín
         participatory_process:
           fields:
             created_at: Fecha de creación
@@ -228,6 +239,35 @@ es:
             name: Nombre
             phone: Teléfono
             users_count: Número de usuarios
+      newsletters:
+        create:
+          error: Se ha producido un error al crear este boletín.
+          success: Boletín creado con éxito. Por favor, revíselo antes de enviarlo.
+        deliver:
+          error: Ha habido un error de entrega de este boletín.
+          success: Boletín enviado con éxito.
+        destroy:
+          error_already_sent: 'No se puede destruir el boletín de noticias: Ya se ha enviado.'
+          success: Boletín destruido con éxito.
+        edit:
+          save_and_preview: Guardar y vista previa
+          title: Editar boletín
+        form:
+          interpolations_hint: 'Sugerencia: Puede utilizar "%{name}" en cualquier parte del cuerpo o asunto y será reemplazado por el nombre del destinatario.'
+        index:
+          confirm_delete: '¿Estás seguro de que quieres eliminar este boletín?'
+          title: Boletines
+        new:
+          save: Guardar
+          title: Nuevo boletín
+        show:
+          confirm_deliver: '¿Estás seguro de que quieres enviar este boletín? Esta acción no se puede deshacer.'
+          deliver: Enviar boletín
+          preview: Previsualizar
+          subject: Asunto
+        update:
+          error: Se ha producido un error al actualizar este boletín.
+          success: Boletín actualizado correctamente. Por favor revísalo antes de enviarlo.
       organization:
         edit:
           title: Editar organización

data/decidim-admin/config/routes.rb

@@ -45,6 +45,13 @@ Decidim::Admin::Engine.routes.draw do
       end
     end
 
+    resources :newsletters do
+      member do
+        get :preview
+        post :deliver
+      end
+    end
+
     resources :user_groups, only: [:index] do
       member do
         put :verify

data/decidim-admin/decidim-admin.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
   s.add_dependency "foundation_rails_helper", "~> 3.0.0.rc"
   s.add_dependency "active_link_to", "~> 1.0.0"
   s.add_dependency "carrierwave", "~> 1.0.0.rc"
-  s.add_dependency "cancancan", "~> 1.15.0"
 
   s.add_development_dependency "decidim-dev", Decidim.version
 end

data/decidim-admin/lib/decidim/admin/engine.rb

@@ -33,6 +33,7 @@ module Decidim
         Decidim.configure do |config|
           config.abilities += ["Decidim::Admin::Abilities::AdminUser"]
           config.abilities += ["Decidim::Admin::Abilities::ParticipatoryProcessAdmin"]
+          config.abilities += ["Decidim::Admin::Abilities::CollaboratorUser"]
         end
       end
     end

data/decidim-admin/lib/decidim/admin/features/base_controller.rb

@@ -16,10 +16,14 @@ module Decidim
 
         delegate :active_step, to: :current_participatory_process, prefix: false
 
-        before_action do
+        before_action except: [:index, :show] do
           authorize! :manage, current_feature
         end
 
+        before_action on: [:index, :show] do
+          authorize! :read, current_feature
+        end
+
         def current_feature
           request.env["decidim.current_feature"]
         end

data/decidim-admin/spec/commands/create_newsletter_spec.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+module Decidim
+  module Admin
+    describe CreateNewsletter, :db do
+      describe "call" do
+        let(:user) { create(:user, organization: organization) }
+        let(:organization) { create(:organization) }
+
+        let(:form) do
+          double(
+            subject: Decidim::Faker::Localized.paragraph(3),
+            body: Decidim::Faker::Localized.paragraph(3),
+            valid?: true
+          )
+        end
+
+        let(:command) { described_class.new(form, user) }
+
+        describe "when the form is not valid" do
+          before do
+            expect(form).to receive(:valid?).and_return(false)
+          end
+
+          it "broadcasts invalid" do
+            expect { command.call }.to broadcast(:invalid)
+          end
+
+          it "doesn't create a newsletter" do
+            expect do
+              command.call
+            end.not_to change { Newsletter.count }
+          end
+        end
+
+        describe "when the form is valid" do
+          it "broadcasts ok" do
+            expect { command.call }.to broadcast(:ok)
+          end
+
+          it "creates a new category" do
+            expect do
+              command.call
+            end.to change { Newsletter.count }.by(1)
+          end
+
+          it "creates a newsletter with the right attributes" do
+            command.call
+            newsletter = Newsletter.last
+
+            expect(newsletter.author).to eq(user)
+            expect(newsletter.organization).to eq(organization)
+            expect(newsletter.subject).to eq(form.subject.stringify_keys)
+            expect(newsletter.sent?).to eq(false)
+            expect(newsletter.body).to eq(form.body.stringify_keys)
+          end
+        end
+      end
+    end
+  end
+end

data/decidim-admin/spec/commands/deliver_newsletter_spec.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+module Decidim
+  module Admin
+    describe DeliverNewsletter, :db do
+      describe "call" do
+        let(:organization) { create(:organization) }
+        let(:newsletter) do
+          create(:newsletter,
+                 organization: organization,
+                 body: Decidim::Faker::Localized.sentence(3))
+        end
+
+        let!(:deliverable_users) do
+          create_list(:user, 5, organization: organization, newsletter_notifications: true)
+        end
+
+        let!(:not_deliverable_users) do
+          create_list(:user, 3, organization: organization, newsletter_notifications: false)
+        end
+
+        let(:command) { described_class.new(newsletter) }
+
+        it "updates the counters and delivers to the right users" do
+          clear_emails
+          expect(emails.length).to eq(0)
+
+          perform_enqueued_jobs { command.call }
+
+          expect(emails.length).to eq(5)
+
+          deliverable_users.each do |user|
+            email = emails.find { |e| e.to.include? user.email }
+            expect(email_body(email)).to include(newsletter.body[user.locale])
+          end
+
+          newsletter.reload
+          expect(newsletter.total_deliveries).to eq(5)
+          expect(newsletter.total_recipients).to eq(5)
+        end
+      end
+    end
+  end
+end

data/decidim-admin/spec/commands/destroy_participatory_process_step_spec.rb

@@ -26,6 +26,8 @@ describe Decidim::Admin::DestroyParticipatoryProcessStep, class: true do
     end
 
     context "when destroying an inactive step" do
+      let(:reorderer) { double(call: true) }
+
       it "broadcasts ok" do
         expect { subject.call(inactive_step) }.to broadcast(:ok)
       end
@@ -34,6 +36,16 @@ describe Decidim::Admin::DestroyParticipatoryProcessStep, class: true do
         subject.call(inactive_step)
         expect(inactive_step).not_to be_persisted
       end
+
+      it "reorders the remaining steps" do
+        allow(Decidim::Admin::ReorderParticipatoryProcessSteps)
+          .to receive(:new)
+          .with([active_step], [active_step.id])
+          .and_return(reorderer)
+        expect(reorderer).to receive(:call)
+
+        subject.call(inactive_step)
+      end
     end
   end