decidim 0.5.1 → 0.6.0

data/decidim-admin/decidim-admin.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
   s.add_dependency "select2-rails", "~> 4.0.3"
 
   s.add_development_dependency "decidim-dev", Decidim.version
+  s.add_development_dependency "decidim-participatory_processes", Decidim.version
 end

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

@@ -50,20 +50,6 @@ module Decidim
                     position: 1,
                     active: ["decidim/admin/dashboard" => :show]
 
-          menu.item I18n.t("menu.participatory_processes", scope: "decidim.admin"),
-                    decidim_admin.participatory_processes_path,
-                    icon_name: "target",
-                    position: 2,
-                    active: :inclusive,
-                    if: can?(:manage, Decidim::ParticipatoryProcess)
-
-          menu.item I18n.t("menu.participatory_process_groups", scope: "decidim.admin"),
-                    decidim_admin.participatory_process_groups_path,
-                    icon_name: "layers",
-                    position: 3,
-                    active: :inclusive,
-                    if: can?(:read, Decidim::ParticipatoryProcessGroup)
-
           menu.item I18n.t("menu.static_pages", scope: "decidim.admin"),
                     decidim_admin.static_pages_path,
                     icon_name: "book",

data/decidim-admin/{spec/commands/create_category_spec.rb → lib/decidim/admin/test/commands/create_category_examples.rb}

@@ -4,10 +4,9 @@ require "spec_helper"
 
 module Decidim
   module Admin
-    describe CreateCategory do
+    shared_examples_for "CreateCategory command" do
       describe "call" do
         let(:organization) { create(:organization) }
-        let(:participatory_process) { create :participatory_process, organization: organization }
         let(:form_params) do
           {
             "category" => {
@@ -23,12 +22,12 @@ module Decidim
         let(:form) do
           CategoryForm.from_params(
             form_params,
-            current_process: participatory_process
+            current_participatory_space: participatory_space
           ).with_context(
             current_organization: organization
           )
         end
-        let(:command) { described_class.new(form, participatory_process) }
+        let(:command) { described_class.new(form, participatory_space) }
 
         describe "when the form is not valid" do
           before do
@@ -54,7 +53,7 @@ module Decidim
           it "creates a new category" do
             expect do
               command.call
-            end.to change { participatory_process.categories.count }.by(1)
+            end.to change { participatory_space.categories.count }.by(1)
           end
         end
       end

data/decidim-admin/{spec/commands/destroy_category_spec.rb → lib/decidim/admin/test/commands/destroy_category_examples.rb}

@@ -4,11 +4,10 @@ require "spec_helper"
 
 module Decidim
   module Admin
-    describe DestroyCategory do
+    shared_examples_for "DestroyCategory command" do
       describe "call" do
         let(:organization) { create(:organization) }
-        let(:participatory_process) { create :participatory_process, organization: organization }
-        let(:category) { create(:category, participatory_process: participatory_process) }
+        let(:category) { create(:category, participatory_space: participatory_space) }
         let(:command) { described_class.new(category) }
 
         describe "when the category is not present" do

data/decidim-admin/{spec/commands/update_category_spec.rb → lib/decidim/admin/test/commands/update_category_examples.rb}

@@ -4,11 +4,10 @@ require "spec_helper"
 
 module Decidim
   module Admin
-    describe UpdateCategory do
+    shared_examples_for "UpdateCategory command" do
       describe "call" do
         let(:organization) { create(:organization) }
-        let(:participatory_process) { create :participatory_process, organization: organization }
-        let(:category) { create(:category, participatory_process: participatory_process) }
+        let(:category) { create(:category, participatory_space: participatory_space) }
         let(:form_params) do
           {
             "category" => {
@@ -24,7 +23,7 @@ module Decidim
         let(:form) do
           CategoryForm.from_params(
             form_params,
-            current_process: participatory_process
+            current_participatory_space: participatory_space
           ).with_context(
             current_organization: organization
           )

data/decidim-admin/{spec/forms/category_form_spec.rb → lib/decidim/admin/test/forms/category_form_examples.rb}

@@ -4,7 +4,7 @@ require "spec_helper"
 
 module Decidim
   module Admin
-    describe CategoryForm do
+    shared_examples_for "category form" do
       let(:name) do
         {
           en: "Name",
@@ -34,13 +34,12 @@ module Decidim
         }
       end
       let(:organization) { create :organization }
-      let(:participatory_process) { create :participatory_process, organization: organization }
 
       subject do
         described_class.from_params(
           attributes
         ).with_context(
-          current_process: participatory_process,
+          current_participatory_space: participatory_space,
           current_organization: organization
         )
       end
@@ -71,15 +70,16 @@ module Decidim
       end
 
       context "when the parent_id is set" do
+        let!(:category) { create :category, participatory_space: participatory_space }
+
         context "to the ID of a first-class category" do
-          let!(:category) { create :category, participatory_process: participatory_process }
           let(:parent_id) { category.id }
 
           it { is_expected.to be_valid }
         end
 
         context "to the ID of a subcategory" do
-          let!(:subcategory) { create :subcategory }
+          let!(:subcategory) { create :subcategory, parent: category }
           let(:parent_id) { subcategory.id }
 
           it { is_expected.not_to be_valid }

data/decidim-admin/lib/decidim/admin/test/manage_attachments_examples.rb

@@ -28,7 +28,7 @@ shared_examples "manage attachments examples" do
     it "can add attachments to a process" do
       find(".card-title a.new").click
 
-      within ".new_participatory_process_attachment" do
+      within ".new_attachment" do
         fill_in_i18n(
           :attachment_title,
           "#attachment-title-tabs",
@@ -77,7 +77,7 @@ shared_examples "manage attachments examples" do
         end
       end
 
-      within ".edit_participatory_process_attachment" do
+      within ".edit_attachment" do
         fill_in_i18n(
           :attachment_title,
           "#attachment-title-tabs",

data/decidim-admin/{spec/features/admin_manages_feature_permissions_spec.rb → lib/decidim/admin/test/manage_feature_permissions_examples.rb}

@@ -2,22 +2,18 @@
 
 require "spec_helper"
 
-describe "manage a feature's permissions", type: :feature do
+shared_examples "Managing feature permissions" do
   let(:organization) { create(:organization, available_authorizations: ["Decidim::DummyAuthorizationHandler"]) }
   let(:user) { create(:user, :admin, :confirmed, organization: organization) }
 
-  let!(:participatory_process) do
-    create(:participatory_process, :with_steps, organization: organization)
-  end
-
   let!(:feature) do
-    create(:feature, participatory_process: participatory_process)
+    create(:feature, participatory_space: participatory_space)
   end
 
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user
-    visit decidim_admin.features_path(participatory_process)
+    visit participatory_space_engine.features_path(participatory_space)
 
     within ".feature-#{feature.id}" do
       page.find(".action-icon--permissions").click

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

@@ -7,7 +7,7 @@ module Decidim
     describe UpdateFeature do
       let!(:participatory_process) { create(:participatory_process, :with_steps) }
       let(:step) { participatory_process.steps.first }
-      let!(:feature) { create(:feature, participatory_process: participatory_process) }
+      let!(:feature) { create(:feature, participatory_space: participatory_process) }
       let(:manifest) { feature.manifest }
 
       let(:form) do

data/decidim-admin/spec/factories.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
 require "decidim/core/test/factories"
+require "decidim/participatory_processes/test/factories"

data/decidim-admin/spec/features/admin_manages_organization_admins_spec.rb

@@ -81,7 +81,7 @@ describe "Organization admins", type: :feature do
           page.find(".action-icon.resend-invitation").click
         end
 
-        expect(page).to have_content("Invitation email sent successfully")
+        expect(page).to have_content("Invitation resent successfully")
       end
 
       it "can remove the admin rights" do

data/decidim-admin/spec/forms/organization_form_spec.rb

@@ -12,6 +12,8 @@ module Decidim
       let(:instagram_handler) { "My instagram awesome handler" }
       let(:youtube_handler) { "My youtube awesome handler" }
       let(:github_handler) { "My github awesome handler" }
+      let(:header_snippets) { "<my-html />" }
+      let(:default_locale) { :en }
       let(:welcome_text) do
         {
           en: "Welcome",
@@ -33,7 +35,7 @@ module Decidim
           "organization" => {
             "name" => name,
             "reference_prefix" => reference_prefix,
-            "default_locale" => :en,
+            "default_locale" => default_locale,
             "available_locales" => %w(en ca es),
             "welcome_text_en" => welcome_text[:en],
             "welcome_text_es" => welcome_text[:es],
@@ -43,6 +45,7 @@ module Decidim
             "description_ca" => description[:ca],
             "homepage_image" => Rack::Test::UploadedFile.new(homepage_image_path, "image/jpeg"),
             "show_statics" => false,
+            "header_snippets" => header_snippets,
             "twitter_handler" => twitter_handler,
             "facebook_handler" => facebook_handler,
             "instagram_handler" => instagram_handler,
@@ -73,6 +76,21 @@ module Decidim
 
         it { is_expected.to be_invalid }
       end
+
+      context "when default_locale is missing" do
+        let(:default_locale) { nil }
+
+        it { is_expected.to be_invalid }
+      end
+
+      context "when default_locale is not an available locale" do
+        let(:default_locale) { :de }
+        before do
+          allow(organization).to receive(:available_locales).and_return([:en, :es, :ca])
+        end
+
+        it { is_expected.to be_invalid }
+      end
     end
   end
 end

data/decidim-admin/spec/helpers/exports_helper_spec.rb

@@ -19,7 +19,7 @@ module Decidim
 
       it "creates links for each format" do
         link = subject.css("li.exports--format--csv.exports--dummies a")[0]
-        expect(link["href"]).to eq("/admin/participatory_processes/#{feature.participatory_process.id}/features/#{feature.id}/exports.csv?id=dummies")
+        expect(link["href"]).to eq("/admin/participatory_processes/#{feature.participatory_space.id}/features/#{feature.id}/exports.csv?id=dummies")
         expect(link["data-method"]).to eq("post")
       end
     end

data/decidim-admin/spec/helpers/menu_helper_spec.rb

@@ -17,10 +17,11 @@ module Decidim
 
         it "renders the default main menu" do
           expect(default_main_menu).to \
-            have_selector("li", count: 7) &
+            have_selector("li", count: 8) &
             have_link("?Dashboard", href: "/admin/") &
             have_link("?Processes", href: "/admin/participatory_processes") &
             have_link("?Process groups", href: "/admin/participatory_process_groups") &
+            have_link("?Assemblies", href: "/admin/assemblies") &
             have_link("?Pages", href: "/admin/static_pages") &
             have_link("?Users", href: "/admin/users") &
             have_link("?Newsletters", href: "/admin/newsletters") &

data/decidim-admin/spec/models/abilities/admin_ability_spec.rb

@@ -16,8 +16,6 @@ describe Decidim::Admin::Abilities::AdminAbility do
     end
   end
 
-  it { is_expected.to be_able_to(:manage, Decidim::ParticipatoryProcess) }
-  it { is_expected.to be_able_to(:manage, Decidim::ParticipatoryProcessStep) }
   it { is_expected.to be_able_to(:manage, Decidim::Moderation) }
   it { is_expected.to be_able_to(:manage, Decidim::Attachment) }
   it { is_expected.to be_able_to(:manage, Decidim::Scope) }

data/decidim-admin/spec/models/abilities/participatory_process_admin_ability_spec.rb

@@ -18,7 +18,7 @@ describe Decidim::Admin::Abilities::ParticipatoryProcessAdminAbility do
     let(:unmanaged_process_step) { create :participatory_process_step, participatory_process: unmanaged_process }
     let(:user_process_attachment) { create :attachment, attached_to: user_process }
     let(:unmanaged_process_attachment) { create :attachment, attached_to: unmanaged_process }
-    let(:feature) { create(:feature, participatory_process: user_process) }
+    let(:feature) { create(:feature, participatory_space: user_process) }
     let(:dummy_resource) { create(:dummy_resource, feature: feature) }
     let(:user_process_moderation) { create(:moderation, reportable: dummy_resource) }
     let(:unmanaged_process_moderation) { create(:moderation) }

data/decidim-api/decidim-api.gemspec

@@ -23,5 +23,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "decidim-dev", Decidim.version
   s.add_development_dependency "decidim-core", Decidim.version
+  s.add_development_dependency "decidim-participatory_processes", Decidim.version
   s.add_development_dependency "decidim-comments", Decidim.version
 end

data/decidim-api/spec/factories.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
 require "decidim/core/test/factories"
+require "decidim/participatory_processes/test/factories"
 require "decidim/comments/test/factories"

data/decidim-assemblies/.gitignore

@@ -0,0 +1,3 @@
+.bundle/
+log/*.log
+pkg/

data/decidim-assemblies/README.md

@@ -0,0 +1,34 @@
+# Decidim::Assemblies
+
+Assemblies are the permanent Decidim's participatory space. They are always
+"active" so unlike participatory processes, they have no steps or phases.
+
+A assembly can get different features (such as meetings or proposals) attached.
+It can also have attachments, be associated to custom categories or scopes, and
+can be fully managed via an administration UI.
+
+## Usage
+
+This plugin provides:
+
+* A CRUD engine to manage assemblies.
+
+* Public views for assembly via a high level section in the main menu.
+
+## Installation
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'decidim-assemblies'
+```
+
+And then execute:
+```bash
+$ bundle
+```
+
+## Contributing
+See [Decidim](https://github.com/decidim/decidim).
+
+## License
+See [Decidim](https://github.com/decidim/decidim).

data/decidim-assemblies/Rakefile

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require "decidim/dev/common_rake"

data/decidim-assemblies/app/assets/config/admin/decidim_assemblies_manifest.js

@@ -0,0 +1 @@
+//= link decidim/assemblies/admin/assemblies.js

data/decidim-assemblies/app/assets/config/decidim_assemblies_manifest.js

@@ -0,0 +1 @@
+//= link_directory ../images/decidim/assemblies

data/decidim-assemblies/app/assets/images/decidim/assemblies/assembly.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36.02 36.02">
+  <path d="M883.8,543.84a18,18,0,1,1,18-18A18,18,0,0,1,883.8,543.84Zm0-34a16,16,0,1,0,16,16A16,16,0,0,0,883.8,509.83Z" transform="translate(-865.8 -507.83)" />
+  <ellipse ry="5.504777" rx="5.5598245" cy="17.971844" cx="18" />
+  <path d="M883.8,543.84a18,18,0,1,1,18-18A18,18,0,0,1,883.8,543.84Zm0-34a16,16,0,1,0,16,16A16,16,0,0,0,883.8,509.83Z" transform="translate(-865.8 -507.83)" />
+  <path d="m 6.3078227,-25.154474 a 9.3338938,9.0435648 0 0 1 -8.7369752,9.025052 9.3338938,9.0435648 0 0 1 -9.8544645,-7.870717 9.3338938,9.0435648 0 0 1 7.4765554,-10.031744" transform="matrix(-0.78352169,0.62136443,-0.62136443,-0.78352169,0,0)" class="stroked-shape" />
+</svg>

data/decidim-assemblies/app/assets/javascripts/decidim/assemblies/admin/assemblies.js.es6

@@ -0,0 +1,12 @@
+$(() => {
+  const $assemblyScopeEnabled = $('#assembly_scopes_enabled');
+  const $assemblyScopeId = $("#assembly_scope_id");
+
+  if ($('.edit_assembly, .new_assembly').length > 0) {
+    $assemblyScopeEnabled.on('change', (event) => {
+      const checked = event.target.checked;
+      $assemblyScopeId.attr("disabled", !checked);
+    })
+    $assemblyScopeId.attr("disabled", !$assemblyScopeEnabled.prop('checked'));
+  }
+});

data/decidim-assemblies/app/commands/decidim/assemblies/admin/copy_assembly.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # A command with all the business logic when copying a new participatory
+      # assembly in the system.
+      class CopyAssembly < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # form - A form object with the params.
+        # assembly - An assembly we want to duplicate
+        def initialize(form, assembly)
+          @form = form
+          @assembly = assembly
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          Assembly.transaction do
+            copy_assembly
+            copy_assembly_categories if @form.copy_categories?
+            copy_assembly_features if @form.copy_features?
+          end
+
+          broadcast(:ok, @copied_assembly)
+        end
+
+        private
+
+        attr_reader :form
+
+        def copy_assembly
+          @copied_assembly = Assembly.create!(
+            organization: @assembly.organization,
+            title: form.title,
+            subtitle: @assembly.subtitle,
+            slug: form.slug,
+            hashtag: @assembly.hashtag,
+            description: @assembly.description,
+            short_description: @assembly.short_description,
+            hero_image: @assembly.hero_image,
+            banner_image: @assembly.banner_image,
+            promoted: @assembly.promoted,
+            scope: @assembly.scope,
+            developer_group: @assembly.developer_group,
+            local_area: @assembly.local_area,
+            target: @assembly.target,
+            participatory_scope: @assembly.participatory_scope,
+            participatory_structure: @assembly.participatory_structure,
+            meta_scope: @assembly.meta_scope
+          )
+        end
+
+        def copy_assembly_categories
+          @assembly.categories.each do |category|
+            Category.create!(
+              name: category.name,
+              description: category.description,
+              parent_id: category.parent_id,
+              participatory_space: @copied_assembly
+            )
+          end
+        end
+
+        def copy_assembly_features
+          @assembly.features.each do |feature|
+            new_feature = Feature.create!(
+              manifest_name: feature.manifest_name,
+              name: feature.name,
+              participatory_space: @copied_assembly,
+              settings: feature.settings,
+              step_settings: feature.step_settings
+            )
+            feature.manifest.run_hooks(:copy, new_feature: new_feature, old_feature: feature)
+          end
+        end
+      end
+    end
+  end
+end