decidim 0.5.1 → 0.6.0

data/README.md

@@ -108,16 +108,18 @@ After you create a development app (`bundle exec rake development_app`):
 
 | Library        | Description           |
 | ------------- |-------------|
-| [Admin](https://github.com/decidim/decidim/tree/master/decidim-admin)      | This library adds an administration dashboard so users can manage their organization, participatory processes and all other entities. |
+| [Admin](https://github.com/decidim/decidim/tree/master/decidim-admin)      | This library adds an administration dashboard so users can manage their organization and all other entities. |
 | [API](https://github.com/decidim/decidim/tree/master/decidim-api)      | This library exposes a GraphQL API to programatically interact with the Decidim platform via HTTP      |
-| [Budgets](https://github.com/decidim/decidim/tree/master/decidim-budgets) | Adds a participatory budgets system to any participatory process. |
+| [Assemblies](https://github.com/decidim/decidim/tree/master/decidim-assemblies) | Permanent participatory spaces. Currently in beta as an optional feature, can be included by explicitly adding `decidim-assemblies` to the Gemfile. |
+| [Budgets](https://github.com/decidim/decidim/tree/master/decidim-budgets) | Adds a participatory budgets system to any participatory space. |
 | [Comments](https://github.com/decidim/decidim/tree/master/decidim-comments) | The Comments module adds the ability to include comments to any resource which can be commentable by users.      |
-| [Core](https://github.com/decidim/decidim/tree/master/decidim-core) | The basics of Decidim: users, participatory processes, etc. This is the only required engine to run Decidim, all the others are optional. |
+| [Core](https://github.com/decidim/decidim/tree/master/decidim-core) | The basics of Decidim: users, organizations, etc. This is the only required engine to run Decidim, all the others are optional. |
+| [Participatory Processes](https://github.com/decidim/decidim/tree/master/decidim-participatory_processes) | The main concept of a Decidim installation: participatory processes. |
 | [Dev](https://github.com/decidim/decidim/tree/master/decidim-dev) | This gem aids the local development of Decidim's features. |
-| [Meeting](https://github.com/decidim/decidim/tree/master/decidim-meetings) | The Meeting module adds meeting to any participatory process. It adds a CRUD engine to the admin and public view scoped inside the participatory process. |
-| [Pages](https://github.com/decidim/decidim/tree/master/decidim-pages) | The Pages module adds static page capabilities to any participatory process. It basically provides an interface to include arbitrary HTML content to any step. |
-| [Proposals](https://github.com/decidim/decidim/tree/master/decidim-proposals) | The Proposals module adds one of the main features of Decidim: allows users to contribute to a participatory process by creating proposals. |
-| [Results](https://github.com/decidim/decidim/tree/master/decidim-results) | Adds a results section to any participatory process so users can follow along the state of the accepted proposals. |
+| [Meeting](https://github.com/decidim/decidim/tree/master/decidim-meetings) | The Meeting module adds meeting to any participatory space. It adds a CRUD engine to the admin and public view scoped inside the participatory space. |
+| [Pages](https://github.com/decidim/decidim/tree/master/decidim-pages) | The Pages module adds static page capabilities to any participatory space. It basically provides an interface to include arbitrary HTML content to any step. |
+| [Proposals](https://github.com/decidim/decidim/tree/master/decidim-proposals) | The Proposals module adds one of the main features of Decidim: allows users to contribute to a participatory space by creating proposals. |
+| [Results](https://github.com/decidim/decidim/tree/master/decidim-results) | Adds a results section to any participatory space so users can follow along the state of the accepted proposals. |
 | [Surveys](https://github.com/decidim/decidim/tree/master/decidim-surveys) | Adds the ability for admins to create arbitrary surveys. |
 | [System](https://github.com/decidim/decidim/tree/master/decidim-system) | Multitenant Admin to manage multiple organizations in a single installation |
 

data/Rakefile

@@ -8,14 +8,14 @@ require "decidim/dev"
 
 load "decidim-dev/lib/tasks/test_app.rake"
 
-DECIDIM_GEMS = %w(core system admin api pages meetings proposals comments results budgets surveys dev).freeze
+DECIDIM_GEMS = %w(core system admin api participatory_processes assemblies pages meetings proposals comments results budgets surveys dev).freeze
 
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
 
 desc "Runs all tests in all Decidim engines"
-task :test_all do
+task test_all: :spec do
   DECIDIM_GEMS.each do |gem_name|
     next if gem_name == "dev"
 
@@ -39,11 +39,7 @@ end
 
 desc "Makes sure all official locales are complete and clean."
 task :check_locale_completeness do
-  DECIDIM_GEMS.each do |gem_name|
-    Dir.chdir("#{__dir__}/decidim-#{gem_name}") do
-      system({ "ENFORCED_LOCALES" => "en,ca,es" }, "rspec spec/i18n_spec.rb")
-    end
-  end
+  system({ "ENFORCED_LOCALES" => "en,ca,es" }, "rspec spec/i18n_spec.rb")
 end
 
 desc "Generates a development app."
@@ -59,6 +55,7 @@ task :development_app do
   Dir.chdir("#{__dir__}/development_app") do
     Bundler.with_clean_env do
       sh "bundle exec rails db:seed"
+      sh "bundle exec spring stop"
       sh "bundle exec rails generate decidim:demo"
     end
   end

data/{decidim-core/config → config}/i18n-tasks.yml

@@ -14,20 +14,15 @@ data:
 
   # Locale files or `File.find` patterns where translations are read from:
   read:
-    ## Default:
-    # - config/locales/%{locale}.yml
-    ## More files:
-    # - config/locales/**/*.%{locale}.yml
-    ## Another gem (replace %#= with %=):
-    # - "<%#= %x[bundle show vagrant].chomp %>/templates/locales/%{locale}.yml"
+    - decidim-*/config/locales/%{locale}.yml
 
   # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom:
   # `i18n-tasks normalize -p` will force move the keys according to these rules
   write:
-    ## For example, write devise and simple form keys to their respective files:
-    # - ['{devise, simple_form}.*', 'config/locales/\1.%{locale}.yml']
-    ## Catch-all default:
-    # - config/locales/%{locale}.yml
+    <% Dir.glob("decidim-*").each do |path| -%>
+      <%= "- ['#{path.sub('-', '.')}.*', '#{path}/config/locales/%{locale}.yml']" %>
+    <% end -%>
+      - 'decidim-core/config/locales/%{locale}.yml'
 
   ## Specify the router (see Readme for details). Valid values: conservative_router, pattern_router, or a custom class.
   # router: convervative_router
@@ -49,22 +44,27 @@ data:
 search:
   ## Paths or `File.find` patterns to search in:
   paths:
-   - app/
-   - lib/
-
-  ## Root directories for relative keys resolution.
-  # relative_roots:
-  #   - app/controllers
-  #   - app/helpers
-  #   - app/mailers
-  #   - app/presenters
-  #   - app/views
+    <% Dir.glob("decidim-*").each do |path| -%>
+      <%= "- #{path}/app\n" %>
+      <%= "- #{path}/lib\n" %>
+    <% end -%>
+
+  # Root directories for relative keys resolution.
+  relative_roots:
+    <% Dir.glob("decidim-*").each do |path| -%>
+      <%= "- #{path}/app/controllers\n" %>
+      <%= "- #{path}/app/helpers\n" %>
+      <%= "- #{path}/app/mailers\n" %>
+      <%= "- #{path}/app/presenters\n" %>
+      <%= "- #{path}/app/views\n" %>
+    <% end -%>
 
   ## Files or `File.fnmatch` patterns to exclude from search. Some files are always excluded regardless of this setting:
   ##   %w(*.jpg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less *.yml *.json)
   exclude:
-    - app/assets/images
-    - app/assets/fonts
+    - decidim-comments/app/assets/javascripts/decidim/comments/bundle.js
+    - decidim-comments/app/assets/javascripts/decidim/comments/bundle.js.map
+    - "*.jpeg"
 
   ## Alternatively, the only files or `File.fnmatch patterns` to search in `paths`:
   ## If specified, this settings takes priority over `exclude`, but `exclude` still applies.
@@ -82,36 +82,30 @@ search:
 #   # Get an API key and set billing info at https://code.google.com/apis/console to use Google Translate
 #   api_key: "AbC-dEf5"
 
-## Do not consider these keys missing:
+# Do not consider these keys missing:
 ignore_missing:
-- '{devise,simple_form}.*'
+  - '{devise,components}.*'
 
-## Consider these keys used:
+# Consider these keys used:
 ignore_unused:
-  - '{time.formats}.*'
-  - devise.mailer.password_change.subject
-  - activerecord.attributes.decidim/user.*
-  - activerecord.models.decidim/user
-  - activemodel.attributes.user.*
-  - activemodel.attributes.report.*
+  - activemodel.attributes.*
+  - activerecord.attributes.*
   - booleans.*
-  - errors.messages.*
-  - social_share_button.*
+  - '{date,time.formats}.*'
+  - decidim.admin.participatory_process_steps.default_title
+  - decidim.assemblies.statistics.*
+  - decidim.components.*
   - decidim.filters.linked_classes.*
   - decidim.forms.errors.*
-  - decidim.authorizations.first_login.actions.*
-  - decidim.features.dummy.*
+  - decidim.participatory_processes.statistics.*
+  - decidim.proposals.answers.*
+  - decidim.proposals.proposals.orders.*
+  - decidim.resource_links.*
+  - decidim.system.default_pages.placeholders.*
+  - errors.messages.*
   - invisible_captcha.*
-  - decidim.participatory_processes.scopes.global
-  - decidim.participatory_processes.participatory_process_groups.none
   - pages.home.statistics.*
-  - decidim.participatory_processes.statistics.*
-  - forms.*
-# - 'activerecord.attributes.*'
-# - '{devise,kaminari,will_paginate}.*'
-# - 'simple_form.{yes,no}'
-# - 'simple_form.{placeholders,hints,labels}.*'
-# - 'simple_form.{error_notification,required}.:'
+  - social_share_button.*
 
 ## Exclude these keys from the `i18n-tasks eq-base' report:
 # ignore_eq_base:
@@ -122,7 +116,7 @@ ignore_unused:
 
 ## Ignore these keys completely:
 # ignore:
-#  - kaminari.*
+#   - kaminari.*
 
 ## Sometimes, it isn't possible for i18n-tasks to match the key correctly,
 ## e.g. in case of a relative key defined in a helper method.

data/decidim-admin/README.md

@@ -21,13 +21,6 @@ $ bundle
 
 ## Features
 
-### Participatory process
-
-Here you can manage participatory processes.
-
-TODO: Elaborate on this.
-
-
 ### Static pages
 
 This feature allows an admin to create pages to serve static content. Some

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

@@ -10,7 +10,6 @@
 // = require moment.min
 // = require ./select2
 // = require ./scopes
-// = require ./participatory_processes
 // = require_self
 
 window.Decidim = window.Decidim || {};

data/decidim-admin/app/assets/stylesheets/decidim/admin/extra/_quill.scss

@@ -0,0 +1,5 @@
+.ql-disabled {
+  .ql-editor {
+    background: #eee;
+  }
+}

data/decidim-admin/app/commands/decidim/admin/create_category.rb

@@ -8,11 +8,11 @@ module Decidim
       # Public: Initializes the command.
       #
       # form - A form object with the params.
-      # participatory_process - The ParticipatoryProcess that will hold the
+      # participatory_space - The participatory space that will hold the
       #   category
-      def initialize(form, participatory_process)
+      def initialize(form, participatory_space)
         @form = form
-        @participatory_process = participatory_process
+        @participatory_space = participatory_space
       end
 
       # Executes the command. Broadcasts these events:
@@ -37,7 +37,7 @@ module Decidim
           name: form.name,
           description: form.description,
           parent_id: form.parent_id,
-          participatory_process: @participatory_process
+          participatory_space: @participatory_space
         )
       end
     end

data/decidim-admin/app/commands/decidim/admin/create_feature.rb

@@ -4,17 +4,17 @@ module Decidim
   module Admin
     # This command gets called when a feature is created from the admin panel.
     class CreateFeature < Rectify::Command
-      attr_reader :form, :manifest, :participatory_process
+      attr_reader :form, :manifest, :participatory_space
 
       # Public: Initializes the command.
       #
-      # manifest              - The feature's manifest to create a feature from.
-      # form                  - The form from which the data in this feature comes from.
-      # participatory_process - The participatory process that will hold this feature.
-      def initialize(manifest, form, participatory_process)
+      # manifest            - The feature's manifest to create a feature from.
+      # form                - The form from which the data in this feature comes from.
+      # participatory_space - The participatory space that will hold this feature.
+      def initialize(manifest, form, participatory_space)
         @manifest = manifest
         @form = form
-        @participatory_process = participatory_process
+        @participatory_space = participatory_space
       end
 
       # Public: Creates the Feature.
@@ -37,7 +37,7 @@ module Decidim
         @feature = Feature.create!(
           manifest_name: manifest.name,
           name: form.name,
-          participatory_process: participatory_process,
+          participatory_space: participatory_space,
           settings: form.settings,
           default_step_settings: form.default_step_settings,
           step_settings: form.step_settings

data/decidim-admin/app/commands/decidim/admin/create_managed_user.rb

@@ -39,8 +39,6 @@ module Decidim
           organization: form.current_organization,
           admin: false,
           managed: true,
-          comments_notifications: true,
-          replies_notifications: true,
           tos_agreement: true
         )
       end

data/decidim-admin/app/commands/decidim/admin/update_organization.rb

@@ -65,6 +65,7 @@ module Decidim
           official_img_footer: form.official_img_footer,
           remove_official_img_footer: form.remove_official_img_footer,
           official_url: form.official_url,
+          header_snippets: form.header_snippets,
           show_statistics: form.show_statistics
         }
       end

data/decidim-admin/app/controllers/decidim/admin/application_controller.rb

@@ -13,8 +13,6 @@ module Decidim
       helper Decidim::Admin::ApplicationHelper
       helper Decidim::Admin::AttributesDisplayHelper
       helper Decidim::Admin::SettingsHelper
-      helper Decidim::Admin::ProcessGroupsForSelectHelper
-      helper Decidim::Admin::ProcessesForSelectHelper
       helper Decidim::Admin::IconLinkHelper
       helper Decidim::Admin::MenuHelper
       helper Decidim::Admin::ScopesHelper

data/decidim-admin/app/controllers/decidim/admin/categories_controller.rb

@@ -5,7 +5,7 @@ module Decidim
     # Controller that allows managing categories.
     #
     class CategoriesController < Decidim::Admin::ApplicationController
-      include Concerns::ParticipatoryProcessAdmin
+      helper_method :current_participatory_space
 
       def index
         authorize! :read, Decidim::Category
@@ -13,17 +13,17 @@ module Decidim
 
       def new
         authorize! :create, Decidim::Category
-        @form = form(CategoryForm).from_params({}, current_process: current_participatory_process)
+        @form = form(CategoryForm).from_params({}, current_participatory_space: current_participatory_space)
       end
 
       def create
         authorize! :create, Decidim::Category
-        @form = form(CategoryForm).from_params(params, current_process: current_participatory_process)
+        @form = form(CategoryForm).from_params(params, current_participatory_space: current_participatory_space)
 
-        CreateCategory.call(@form, current_participatory_process) do
+        CreateCategory.call(@form, current_participatory_space) do
           on(:ok) do
             flash[:notice] = I18n.t("categories.create.success", scope: "decidim.admin")
-            redirect_to categories_path(current_participatory_process)
+            redirect_to categories_path(current_participatory_space)
           end
 
           on(:invalid) do
@@ -36,18 +36,18 @@ module Decidim
       def edit
         @category = collection.find(params[:id])
         authorize! :update, @category
-        @form = form(CategoryForm).from_model(@category, current_process: current_participatory_process)
+        @form = form(CategoryForm).from_model(@category, current_participatory_space: current_participatory_space)
       end
 
       def update
         @category = collection.find(params[:id])
         authorize! :update, @category
-        @form = form(CategoryForm).from_params(params, current_process: current_participatory_process)
+        @form = form(CategoryForm).from_params(params, current_participatory_space: current_participatory_space)
 
         UpdateCategory.call(@category, @form) do
           on(:ok) do
             flash[:notice] = I18n.t("categories.update.success", scope: "decidim.admin")
-            redirect_to categories_path(current_participatory_process)
+            redirect_to categories_path(current_participatory_space)
           end
 
           on(:invalid) do
@@ -75,14 +75,14 @@ module Decidim
             flash[:alert] = I18n.t("categories.destroy.error", scope: "decidim.admin")
           end
 
-          redirect_back(fallback_location: categories_path(current_participatory_process))
+          redirect_back(fallback_location: categories_path(current_participatory_space))
         end
       end
 
       private
 
       def collection
-        @collection ||= current_participatory_process.categories.includes(:subcategories)
+        @collection ||= current_participatory_space.categories.includes(:subcategories)
       end
     end
   end

data/decidim-admin/app/controllers/decidim/admin/exports_controller.rb

@@ -4,7 +4,6 @@ module Decidim
   module Admin
     # This controller allows admins to manage proposals in a participatory process.
     class ExportsController < Decidim::Admin::ApplicationController
-      include Concerns::ParticipatoryProcessAdmin
       include Decidim::FeaturePathHelper
 
       def create
@@ -25,7 +24,7 @@ module Decidim
       end
 
       def feature
-        @feature ||= current_participatory_process.features.find(params[:feature_id])
+        @feature ||= current_participatory_space.features.find(params[:feature_id])
       end
     end
   end

data/decidim-admin/app/controllers/decidim/admin/feature_permissions_controller.rb

@@ -5,7 +5,6 @@ module Decidim
     # Controller that allows managing feature permissions.
     #
     class FeaturePermissionsController < Decidim::Admin::ApplicationController
-      include Concerns::ParticipatoryProcessAdmin
       helper_method :authorizations, :feature
 
       def edit
@@ -22,7 +21,7 @@ module Decidim
         UpdateFeaturePermissions.call(@permissions_form, feature) do
           on(:ok) do
             flash[:notice] = t("feature_permissions.update.success", scope: "decidim.admin")
-            redirect_to features_path(current_participatory_process)
+            redirect_to features_path(current_participatory_space)
           end
 
           on(:invalid) do
@@ -51,7 +50,7 @@ module Decidim
       end
 
       def feature
-        @feature ||= current_participatory_process.features.find(params[:feature_id])
+        @feature ||= current_participatory_space.features.find(params[:feature_id])
       end
     end
   end

data/decidim-admin/app/controllers/decidim/admin/features/base_controller.rb

@@ -7,16 +7,18 @@ module Decidim
       # controllers in their admin engines should inherit from.
       class BaseController < Admin::ApplicationController
         skip_authorize_resource
-        include Concerns::ParticipatoryProcessAdmin
         include Settings
 
         helper Decidim::ResourceHelper
         helper Decidim::Admin::ExportsHelper
 
         helper_method :current_feature,
+                      :current_participatory_space,
                       :parent_path
 
-        delegate :active_step, to: :current_participatory_process, prefix: false
+        before_action do
+          extend current_participatory_space.admin_extension_module
+        end
 
         before_action except: [:index, :show] do
           authorize! :manage, current_feature
@@ -30,8 +32,12 @@ module Decidim
           request.env["decidim.current_feature"]
         end
 
+        def current_participatory_space
+          current_feature.participatory_space
+        end
+
         def parent_path
-          decidim_admin.features_path(current_participatory_process)
+          @parent_path ||= EngineRouter.admin_proxy(current_participatory_space).features_path
         end
       end
     end