decidim-core 0.5.1 → 0.6.0

data/config/routes.rb

@@ -22,20 +22,8 @@ Decidim::Core::Engine.routes.draw do
 
   resource :locale, only: [:create]
 
-  resources :participatory_process_groups, only: :show, path: "processes_groups"
-  resources :participatory_processes, only: [:index, :show], path: "processes" do
-    resources :participatory_process_steps, only: [:index], path: "steps"
-    resource :participatory_process_widget, only: :show, path: "embed"
-  end
-
-  scope "/processes/:participatory_process_id/f/:feature_id" do
-    Decidim.feature_manifests.each do |manifest|
-      next unless manifest.engine
-
-      constraints Decidim::CurrentFeature.new(manifest) do
-        mount manifest.engine, at: "/", as: "decidim_#{manifest.name}"
-      end
-    end
+  Decidim.participatory_space_manifests.each do |manifest|
+    mount manifest.engine, at: "/", as: "decidim_#{manifest.name}"
   end
 
   authenticate(:user) do
@@ -49,6 +37,11 @@ Decidim::Core::Engine.routes.draw do
         get :delete
       end
     end
+    resources :notifications, only: [:index, :destroy] do
+      collection do
+        delete :read_all
+      end
+    end
     resource :notifications_settings, only: [:show, :update], controller: "notifications_settings"
     resources :own_user_groups, only: [:index]
   end
@@ -63,6 +56,7 @@ Decidim::Core::Engine.routes.draw do
   match "/404", to: "errors#not_found", via: :all
   match "/500", to: "errors#internal_server_error", via: :all
 
+  resource :follow, only: [:create, :destroy]
   resource :report, only: [:create]
 
   root to: "pages#show", id: "home"

data/db/migrate/20170720120231_make_moderations_polymorphic.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class MakeModerationsPolymorphic < ActiveRecord::Migration[5.1]
+  def change
+    remove_index :decidim_moderations,
+                 name: "decidim_moderations_participatory_process"
+
+    add_column :decidim_moderations, :decidim_participatory_space_type, :string
+
+    reversible do |direction|
+      direction.up do
+        execute <<~SQL.squish
+          UPDATE decidim_moderations
+          SET decidim_participatory_space_type = 'Decidim::ParticipatoryProcess'
+        SQL
+      end
+    end
+
+    rename_column :decidim_moderations,
+                  :decidim_participatory_process_id,
+                  :decidim_participatory_space_id
+
+    add_index :decidim_moderations,
+              [:decidim_participatory_space_id, :decidim_participatory_space_type],
+              name: "decidim_moderations_participatory_space"
+
+    change_column_null :decidim_moderations, :decidim_participatory_space_type, false
+  end
+end

data/db/migrate/20170726145242_make_categories_polymorphic.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class MakeCategoriesPolymorphic < ActiveRecord::Migration[5.1]
+  def change
+    remove_index :decidim_categories,
+                 name: "index_decidim_categories_on_decidim_participatory_process_id"
+
+    add_column :decidim_categories, :decidim_participatory_space_type, :string
+
+    reversible do |direction|
+      direction.up do
+        execute <<~SQL.squish
+          UPDATE decidim_categories
+          SET decidim_participatory_space_type = 'Decidim::ParticipatoryProcess'
+        SQL
+      end
+    end
+
+    rename_column :decidim_categories,
+                  :decidim_participatory_process_id,
+                  :decidim_participatory_space_id
+
+    add_index :decidim_categories,
+              [:decidim_participatory_space_id, :decidim_participatory_space_type],
+              name: "index_decidim_categories_on_decidim_participatory_space"
+  end
+end

data/db/migrate/20170807123535_create_decidim_follows.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class CreateDecidimFollows < ActiveRecord::Migration[5.1]
+  def change
+    create_table :decidim_follows do |t|
+      t.references :decidim_user, null: false
+      t.references :decidim_followable, polymorphic: true, index: false
+      t.timestamps
+    end
+
+    add_index :decidim_follows,
+              [:decidim_user_id, :decidim_followable_id, :decidim_followable_type],
+              unique: true,
+              name: "index_uniq_on_follows_user_and_followable"
+    add_index :decidim_follows,
+              [:decidim_followable_id, :decidim_followable_type],
+              unique: true,
+              name: "index_uniq_on_followable"
+  end
+end

data/db/migrate/20170808071019_create_decidim_notifications.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CreateDecidimNotifications < ActiveRecord::Migration[5.1]
+  def change
+    create_table :decidim_notifications do |t|
+      t.references :decidim_user, null: false
+      t.references :decidim_resource, polymorphic: true, index: false, null: false
+      t.string :event_name, null: false
+      t.string :event_class, null: false
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20170906091718_add_extra_to_notifications.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddExtraToNotifications < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_notifications, :extra, :jsonb
+  end
+end

data/db/migrate/20170912082054_add_emails_on_notifications_flag_to_user.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddEmailsOnNotificationsFlagToUser < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_users, :email_on_notification, :boolean, default: false, null: false
+  end
+end

data/db/migrate/20170913092351_add_header_snippets_to_organizations.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddHeaderSnippetsToOrganizations < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_organizations, :header_snippets, :text
+  end
+end

data/db/migrate/20170914075721_remove_followable_index_from_follows.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveFollowableIndexFromFollows < ActiveRecord::Migration[5.1]
+  def change
+    remove_index :decidim_follows, [:decidim_followable_id, :decidim_followable_type]
+  end
+end

data/db/migrate/20170914092116_remove_comment_and_replies_notifications_from_users.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class RemoveCommentAndRepliesNotificationsFromUsers < ActiveRecord::Migration[5.1]
+  def change
+    remove_column :decidim_users, :comments_notifications
+    remove_column :decidim_users, :replies_notifications
+  end
+end

data/db/seeds.rb

@@ -62,9 +62,7 @@ if !Rails.env.production? || ENV["SEED"]
     confirmed_at: Time.current,
     locale: I18n.default_locale,
     admin: true,
-    tos_agreement: true,
-    comments_notifications: true,
-    replies_notifications: true
+    tos_agreement: true
   )
 
   Decidim::User.find_or_initialize_by(email: "user@example.org").update!(
@@ -74,9 +72,7 @@ if !Rails.env.production? || ENV["SEED"]
     confirmed_at: Time.current,
     locale: I18n.default_locale,
     organization: organization,
-    tos_agreement: true,
-    comments_notifications: true,
-    replies_notifications: true
+    tos_agreement: true
   )
 
   Decidim::User.find_each do |user|
@@ -95,106 +91,4 @@ if !Rails.env.production? || ENV["SEED"]
       )
     end
   end
-
-  process_groups = []
-  3.times do
-    process_groups << Decidim::ParticipatoryProcessGroup.create!(
-      name: Decidim::Faker::Localized.sentence(3),
-      description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.paragraph(3)
-      end,
-      hero_image: File.new(File.join(seeds_root, "city.jpeg")),
-      organization: organization
-    )
-  end
-
-  3.times do
-    Decidim::ParticipatoryProcess.create!(
-      title: Decidim::Faker::Localized.sentence(5),
-      slug: Faker::Internet.unique.slug(nil, "-"),
-      subtitle: Decidim::Faker::Localized.sentence(2),
-      hashtag: "##{Faker::Lorem.word}",
-      short_description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.sentence(3)
-      end,
-      description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.paragraph(3)
-      end,
-      hero_image: File.new(File.join(seeds_root, "city.jpeg")),
-      banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
-      promoted: true, published_at: 2.weeks.ago,
-      organization: organization,
-      meta_scope: Decidim::Faker::Localized.word,
-      developer_group: Decidim::Faker::Localized.sentence(1),
-      local_area: Decidim::Faker::Localized.sentence(2),
-      target: Decidim::Faker::Localized.sentence(3),
-      participatory_scope: Decidim::Faker::Localized.sentence(1),
-      participatory_structure: Decidim::Faker::Localized.sentence(2),
-      end_date: 2.month.from_now.at_midnight,
-      participatory_process_group: process_groups.sample,
-      scope: Faker::Boolean.boolean(0.5) ? nil : Decidim::Scope.reorder("RANDOM()").first
-    )
-  end
-
-  Decidim::ParticipatoryProcess.find_each do |process|
-    Decidim::ParticipatoryProcessStep.find_or_initialize_by(
-      participatory_process: process,
-      active: true
-    ).update!(
-      title: Decidim::Faker::Localized.sentence(1, false, 2),
-      description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.paragraph(3)
-      end,
-      start_date: 1.month.ago.at_midnight,
-      end_date: 2.months.from_now.at_midnight
-    )
-
-    # Create users with specific roles
-    Decidim::ParticipatoryProcessUserRole::ROLES.each do |role|
-      email = "participatory_process_#{process.id}_#{role}@example.org"
-
-      user = Decidim::User.find_or_initialize_by(email: email)
-      user.update!(
-        name: Faker::Name.name,
-        password: "decidim123456",
-        password_confirmation: "decidim123456",
-        organization: organization,
-        confirmed_at: Time.current,
-        locale: I18n.default_locale,
-        tos_agreement: true,
-        comments_notifications: true,
-        replies_notifications: true
-      )
-
-      Decidim::ParticipatoryProcessUserRole.find_or_create_by!(
-        user: user,
-        participatory_process: process,
-        role: role
-      )
-    end
-
-    Decidim::Attachment.create!(
-      title: Decidim::Faker::Localized.sentence(2),
-      description: Decidim::Faker::Localized.sentence(5),
-      file: File.new(File.join(seeds_root, "city.jpeg")),
-      attached_to: process
-    )
-
-    Decidim::Attachment.create!(
-      title: Decidim::Faker::Localized.sentence(2),
-      description: Decidim::Faker::Localized.sentence(5),
-      file: File.new(File.join(seeds_root, "Exampledocument.pdf")),
-      attached_to: process
-    )
-
-    2.times do
-      Decidim::Category.create!(
-        name: Decidim::Faker::Localized.sentence(5),
-        description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
-        end,
-        participatory_process: process
-      )
-    end
-  end
 end

data/lib/decidim/core.rb

@@ -12,11 +12,12 @@ module Decidim
   autoload :FilterFormBuilder, "decidim/filter_form_builder"
   autoload :DeviseFailureApp, "decidim/devise_failure_app"
   autoload :FeatureManifest, "decidim/feature_manifest"
+  autoload :ParticipatorySpaceManifest, "decidim/participatory_space_manifest"
   autoload :ResourceManifest, "decidim/resource_manifest"
   autoload :Resourceable, "decidim/resourceable"
   autoload :Reportable, "decidim/reportable"
   autoload :Authorable, "decidim/authorable"
-  autoload :Notifiable, "decidim/notifiable"
+  autoload :Participable, "decidim/participable"
   autoload :Publicable, "decidim/publicable"
   autoload :Scopable, "decidim/scopable"
   autoload :Features, "decidim/features"
@@ -26,6 +27,7 @@ module Decidim
   autoload :HasFeature, "decidim/has_feature"
   autoload :HasScope, "decidim/has_scope"
   autoload :HasCategory, "decidim/has_category"
+  autoload :Followable, "decidim/followable"
   autoload :HasReference, "decidim/has_reference"
   autoload :Attributes, "decidim/attributes"
   autoload :StatsRegistry, "decidim/stats_registry"
@@ -36,6 +38,8 @@ module Decidim
   autoload :MenuRegistry, "decidim/menu_registry"
   autoload :ManifestRegistry, "decidim/manifest_registry"
   autoload :Abilities, "decidim/abilities"
+  autoload :EngineRouter, "decidim/engine_router"
+  autoload :Events, "decidim/events"
 
   include ActiveSupport::Configurable
 
@@ -52,11 +56,7 @@ module Decidim
       railtie.load_seed
     end
 
-    Decidim::ParticipatoryProcess.find_each do |process|
-      Decidim.feature_manifests.each do |feature|
-        feature.seed!(process)
-      end
-    end
+    Decidim.participatory_space_manifests.each(&:seed!)
 
     I18n.available_locales = original_locale
   end
@@ -90,7 +90,7 @@ module Decidim
 
   # Exposes a configuration option: The application available locales.
   config_accessor :available_locales do
-    %w(en ca es eu it fi fr nl)
+    %w(en ca es eu it fi fr nl uk)
   end
 
   # Exposes a configuration option: The application default locale.
@@ -113,7 +113,7 @@ module Decidim
   # 6589: ID of the resource
   config_accessor :resource_reference_generator do
     lambda do |resource, feature|
-      ref = feature.participatory_process.organization.reference_prefix
+      ref = feature.participatory_space.organization.reference_prefix
       class_identifier = resource.class.name.demodulize[0..3].upcase
       year_month = (resource.created_at || Time.current).strftime("%Y-%m")
 
@@ -156,6 +156,21 @@ module Decidim
     feature_registry.register(name, &block)
   end
 
+  # Public: Registers a participatory space, usually held in an external library
+  # or in a separate folder in the main repository. Exposes a DSL defined by
+  # `Decidim::ParticipatorySpaceManifest`.
+  #
+  # Participatory space manifests are held in a global registry and are used in
+  # all kinds of places to figure out what new components or functionalities the
+  # participatory space provides.
+  #
+  # name - A Symbol with the participatory space's unique name.
+  #
+  # Returns nothing.
+  def self.register_participatory_space(name, &block)
+    participatory_space_registry.register(name, &block)
+  end
+
   # Public: Finds all registered feature manifest's via the `register_feature`
   # method.
   #
@@ -164,6 +179,14 @@ module Decidim
     feature_registry.manifests
   end
 
+  # Public: Finds all registered participatory space manifest's via the
+  # `register_participatory_space` method.
+  #
+  # Returns an Array[ParticipatorySpaceManifest].
+  def self.participatory_space_manifests
+    participatory_space_registry.manifests
+  end
+
   # Public: Finds a feature manifest by the feature's name.
   #
   # name - The name of the FeatureManifest to find.
@@ -173,6 +196,16 @@ module Decidim
     feature_registry.find(name.to_sym)
   end
 
+  # Public: Finds a participatory space manifest by the participatory space's
+  # name.
+  #
+  # name - The name of the ParticipatorySpaceManifest to find.
+  #
+  # Returns a ParticipatorySpaceManifest if found, nil otherwise.
+  def self.find_participatory_space_manifest(name)
+    participatory_space_registry.find(name.to_sym)
+  end
+
   # Public: Finds a resource manifest by the resource's name.
   #
   # resource_name_or_class - The String of the ResourceManifest name or the class of
@@ -188,6 +221,11 @@ module Decidim
     @feature_registry ||= ManifestRegistry.new(:features)
   end
 
+  # Public: Stores the registry of participatory spaces
+  def self.participatory_space_registry
+    @participatory_space_registry ||= ManifestRegistry.new(:participatory_spaces)
+  end
+
   # Public: Stores an instance of StatsRegistry
   def self.stats
     @stats ||= StatsRegistry.new

data/lib/decidim/core/engine.rb

@@ -131,7 +131,7 @@ module Decidim
         end
 
         Decidim.stats.register :processes_count, priority: StatsRegistry::HIGH_PRIORITY do |organization, start_at, end_at|
-          processes = OrganizationPrioritizedParticipatoryProcesses.new(organization)
+          processes = ParticipatoryProcesses::OrganizationPrioritizedParticipatoryProcesses.new(organization)
           processes = processes.where("created_at >= ?", start_at) if start_at.present?
           processes = processes.where("created_at <= ?", end_at) if end_at.present?
           processes.count
@@ -145,17 +145,31 @@ module Decidim
                     position: 1,
                     active: :exact
 
-          menu.item I18n.t("menu.processes", scope: "decidim"),
-                    decidim.participatory_processes_path,
-                    position: 2,
-                    active: :inclusive
-
           menu.item I18n.t("menu.more_information", scope: "decidim"),
                     decidim.pages_path,
                     position: 3,
                     active: :inclusive
         end
       end
+
+      initializer "decidim.notifications" do
+        Decidim::EventsManager.subscribe(/^decidim\.events\./) do |event_name, data|
+          EmailNotificationGeneratorJob.perform_later(
+            event_name,
+            data[:event_class],
+            data[:resource],
+            data[:recipient_ids],
+            data[:extra]
+          )
+          NotificationGeneratorJob.perform_later(
+            event_name,
+            data[:event_class],
+            data[:resource],
+            data[:recipient_ids],
+            data[:extra]
+          )
+        end
+      end
     end
   end
 end