decidim-initiatives 0.9.1 → 0.11.0.pre1

data/config/locales/uk.yml

@@ -0,0 +1,5 @@
+uk:
+  activemodel:
+    attributes:
+      initiative:
+        decidim_user_group_id: Автор

data/db/migrate/20170906091626_create_decidim_initiatives_types.rb

@@ -10,7 +10,7 @@ class CreateDecidimInitiativesTypes < ActiveRecord::Migration[5.1]
       t.integer :decidim_organization_id,
                 foreign_key: true,
                 index: {
-                  name: 'index_decidim_initiative_types_on_decidim_organization_id'
+                  name: "index_decidim_initiative_types_on_decidim_organization_id"
                 }
 
       t.timestamps

data/db/migrate/20170906094044_create_decidim_initiatives.rb

@@ -10,12 +10,12 @@ class CreateDecidimInitiatives < ActiveRecord::Migration[5.1]
       t.integer :decidim_organization_id,
                 foreign_key: true,
                 index: {
-                  name: 'index_decidim_initiatives_on_decidim_organization_id'
+                  name: "index_decidim_initiatives_on_decidim_organization_id"
                 }
 
       # Text search indexes for initiatives.
-      t.index :title, name: 'decidim_initiatives_title_search'
-      t.index :description, name: 'decidim_initiatives_description_search'
+      t.index :title, name: "decidim_initiatives_title_search"
+      t.index :description, name: "decidim_initiatives_description_search"
 
       t.references :decidim_author, index: true
       t.string :banner_image

data/db/migrate/20170922152432_create_decidim_initiatives_committee_members.rb

@@ -5,10 +5,10 @@ class CreateDecidimInitiativesCommitteeMembers < ActiveRecord::Migration[5.1]
   def change
     create_table :decidim_initiatives_committee_members do |t|
       t.references :decidim_initiatives, index: {
-        name: 'index_decidim_committee_members_initiative'
+        name: "index_decidim_committee_members_initiative"
       }
       t.references :decidim_users, index: {
-        name: 'index_decidim_committee_members_user'
+        name: "index_decidim_committee_members_user"
       }
       t.integer :state, index: true, null: false, default: 0
 

data/db/migrate/20170927153744_change_signature_interval_to_optional.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ChangeSignatureIntervalToOptional < ActiveRecord::Migration[5.1]
   def change
     change_column :decidim_initiatives, :signature_start_time, :date, null: true

data/db/migrate/20170928160302_add_decidim_user_group_id_to_decidim_initiatives_votes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddDecidimUserGroupIdToDecidimInitiativesVotes < ActiveRecord::Migration[5.1]
   def change
     add_column :decidim_initiatives_votes,

data/db/migrate/20170928160912_remove_scope_from_decidim_initiatives_votes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveScopeFromDecidimInitiativesVotes < ActiveRecord::Migration[5.1]
   def change
     remove_column :decidim_initiatives_votes, :scope, :integer

data/db/migrate/20171011110714_add_banner_image_to_initiative_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddBannerImageToInitiativeType < ActiveRecord::Migration[5.1]
   def change
     add_column :decidim_initiatives_types, :banner_image, :string

data/db/migrate/20171011152425_add_hashtag_to_initiatives.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddHashtagToInitiatives < ActiveRecord::Migration[5.1]
   def change
     add_column :decidim_initiatives, :hashtag, :string, unique: true

data/db/migrate/20171013090432_add_initiative_supports_count_to_initiative.rb

@@ -1,10 +1,16 @@
+# frozen_string_literal: true
+
 class AddInitiativeSupportsCountToInitiative < ActiveRecord::Migration[5.1]
+  class Initiative < ApplicationRecord
+    self.table_name = :decidim_initiatives
+  end
+
   def change
     add_column :decidim_initiatives, :initiative_supports_count, :integer, null: false, default: 0
 
     reversible do |change|
       change.up do
-        Decidim::Initiative.find_each do |initiative|
+        Initiative.find_each do |initiative|
           initiative.initiative_supports_count = initiative.votes.supports.count
           initiative.save
         end

data/db/migrate/20171017090551_create_decidim_initiatives_decidim_initiatives_type_scopes.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 class CreateDecidimInitiativesDecidimInitiativesTypeScopes < ActiveRecord::Migration[5.1]
   def change
     create_table :decidim_initiatives_type_scopes do |t|
-      t.references :decidim_initiatives_types, index: { name: 'idx_scoped_initiative_type_type' }
-      t.references :decidim_scopes, index: { name: 'idx_scoped_initiative_type_scope' }
+      t.references :decidim_initiatives_types, index: { name: "idx_scoped_initiative_type_type" }
+      t.references :decidim_scopes, index: { name: "idx_scoped_initiative_type_scope" }
       t.integer :supports_required, null: false
 
       t.timestamps

data/db/migrate/20171017091458_remove_supports_required_from_decidim_initiatives_types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveSupportsRequiredFromDecidimInitiativesTypes < ActiveRecord::Migration[5.1]
   def change
     remove_column :decidim_initiatives_types, :supports_required, :integer, null: false

data/db/migrate/20171017091734_add_scopes_for_all_initiative_types.rb

@@ -1,14 +1,38 @@
+# frozen_string_literal: true
+
 class AddScopesForAllInitiativeTypes < ActiveRecord::Migration[5.1]
+  class Scope < ApplicationRecord
+    self.table_name = :decidim_scopes
+  end
+
+  class Organization < ApplicationRecord
+    self.table_name = :decidim_organizations
+
+    has_many :scopes, foreign_key: "decidim_organization_id", class_name: "Scope"
+  end
+
+  class InitiativesType < ApplicationRecord
+    self.table_name = :decidim_initiatives_types
+
+    belongs_to :organization,
+               foreign_key: "decidim_organization_id",
+               class_name: "Organization"
+  end
+
+  class InitiativesTypeScope < ApplicationRecord
+    self.table_name = :decidim_initiatives_type_scopes
+  end
+
   def up
     # This migrantion intent is simply to keep seed data at staging
     # environment consistent with the underlying data model. It is
     # not relevant for production environments.
-    Decidim::Organization.find_each do |organization|
-      Decidim::InitiativesType.where(organization: organization).find_each do |type|
+    Organization.find_each do |organization|
+      InitiativesType.where(organization: organization).find_each do |type|
         organization.scopes.each do |scope|
-          Decidim::InitiativesTypeScope.create(
-            type: type,
-            scope: scope,
+          InitiativesTypeScope.create(
+            decidim_initiatives_types_id: type.id,
+            decidim_scopes_id: scope.id,
             supports_required: 1000
           )
         end

data/db/migrate/20171017094911_add_scoped_type_to_initiative.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddScopedTypeToInitiative < ActiveRecord::Migration[5.1]
   def change
     add_column :decidim_initiatives,

data/db/migrate/20171017095143_update_initiative_scoped_type.rb

@@ -1,9 +1,51 @@
+# frozen_string_literal: true
+
 class UpdateInitiativeScopedType < ActiveRecord::Migration[5.1]
+  class InitiativesTypeScope < ApplicationRecord
+    self.table_name = :decidim_initiatives_type_scopes
+  end
+
+  class Scope < ApplicationRecord
+    self.table_name = :decidim_scopes
+
+    # Scope to return only the top level scopes.
+    #
+    # Returns an ActiveRecord::Relation.
+    def self.top_level
+      where parent_id: nil
+    end
+  end
+
+  class Organization < ApplicationRecord
+    self.table_name = :decidim_organizations
+
+    has_many :scopes, foreign_key: "decidim_organization_id", class_name: "Scope"
+
+    # Returns top level scopes for this organization.
+    #
+    # Returns an ActiveRecord::Relation.
+    def top_scopes
+      @top_scopes ||= scopes.top_level
+    end
+  end
+
+  class Initiative < ApplicationRecord
+    self.table_name = :decidim_initiatives
+
+    belongs_to :scoped_type,
+               foreign_key: "scoped_type_id",
+               class_name: "InitiativesTypeScope"
+
+    belongs_to :organization,
+               foreign_key: "decidim_organization_id",
+               class_name: "Organization"
+  end
+
   def up
-    Decidim::Initiative.find_each do |initiative|
-      initiative.scoped_type = Decidim::InitiativesTypeScope.find_by(
-        type: Decidim::InitiativesType.find(initiative.type_id),
-        scope: Decidim::Scope.find_by(id: initiative.decidim_scope_id) || initiative.organization.top_scopes.first
+    Initiative.find_each do |initiative|
+      initiative.scoped_type = InitiativesTypeScope.find_by(
+        decidim_initiatives_types_id: initiative.type_id,
+        decidim_scopes_id: initiative.decidim_scope_id || initiative.organization.top_scopes.first
       )
 
       initiative.save!
@@ -11,5 +53,6 @@ class UpdateInitiativeScopedType < ActiveRecord::Migration[5.1]
   end
 
   def down
+    raise ActiveRecord::IrreversibleMigration, "Can't undo initialization of mandatory attribute"
   end
 end

data/db/migrate/20171017103029_remove_unused_attributes_from_initiative.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveUnusedAttributesFromInitiative < ActiveRecord::Migration[5.1]
   def change
     remove_column :decidim_initiatives, :banner_image, :string

data/db/migrate/20171019103358_add_initiative_notification_dates.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddInitiativeNotificationDates < ActiveRecord::Migration[5.1]
   def change
     add_column :decidim_initiatives,

data/db/migrate/20171023075942_create_initiative_extra_data.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateInitiativeExtraData < ActiveRecord::Migration[5.1]
   def change
     create_table :decidim_initiatives_extra_data do |t|

data/db/migrate/20171023122747_create_static_pages.rb

@@ -1,10 +1,20 @@
+# frozen_string_literal: true
+
 class CreateStaticPages < ActiveRecord::Migration[5.1]
+  class Organization < ApplicationRecord
+    self.table_name = :decidim_organizations
+  end
+
+  class StaticPage < ApplicationRecord
+    self.table_name = :decidim_static_pages
+  end
+
   def change
-    Decidim::Organization.find_each do |organization|
-      Decidim::StaticPage.find_or_create_by!(slug: 'initiatives') do |page|
-        page.organization = organization
-        page.title = localized_attribute(organization,'initiatives', :title)
-        page.content = localized_attribute(organization,'initiatives', :content)
+    Organization.find_each do |organization|
+      StaticPage.find_or_create_by!(slug: "initiatives") do |page|
+        page.decidim_organization_id = organization.id
+        page.title = localized_attribute(organization, "initiatives", :title)
+        page.content = localized_attribute(organization, "initiatives", :content)
       end
     end
   end
@@ -20,5 +30,4 @@ class CreateStaticPages < ActiveRecord::Migration[5.1]
       result.update(locale => text)
     end
   end
-
 end

data/db/migrate/20171023141639_optional_validation_support.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class OptionalValidationSupport < ActiveRecord::Migration[5.1]
   def change
     add_column :decidim_initiatives_types,

data/db/migrate/20171031183855_add_offline_votes_to_initiative.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddOfflineVotesToInitiative < ActiveRecord::Migration[5.1]
   def change
     add_column :decidim_initiatives,

data/db/migrate/20171102094250_drop_initiative_description_index.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DropInitiativeDescriptionIndex < ActiveRecord::Migration[5.1]
   def change
     remove_index :decidim_initiatives, :description

data/db/migrate/20171102094556_create_initiative_description_index.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 class CreateInitiativeDescriptionIndex < ActiveRecord::Migration[5.1]
   def up
-    execute 'CREATE INDEX decidim_initiatives_description_search ON decidim_initiatives(md5(description::text))'
+    execute "CREATE INDEX decidim_initiatives_description_search ON decidim_initiatives(md5(description::text))"
   end
 
   def down
-    execute 'DROP INDEX decidim_initiatives_description_search'
+    execute "DROP INDEX decidim_initiatives_description_search"
   end
 end

data/db/migrate/20171109132011_enable_pg_extensions.rb

@@ -1,9 +1,9 @@
+# frozen_string_literal: true
+
 class EnablePgExtensions < ActiveRecord::Migration[5.1]
   def change
-    begin
-      enable_extension 'pg_trgm'
-    rescue => e
-      puts "Can not deal with pg_trgm extension: #{e}"
-    end
+    enable_extension "pg_trgm"
+  rescue ActiveRecord::CatchAll => e
+    logger.error "Can not deal with pg_trgm extension: #{e}"
   end
 end

data/db/migrate/20171204094639_drop_decidim_initiatives_extra_data.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DropDecidimInitiativesExtraData < ActiveRecord::Migration[5.1]
   def up
     drop_table :decidim_initiatives_extra_data

data/db/migrate/20171204103119_remove_requires_validation_from_decidim_initiatives_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveRequiresValidationFromDecidimInitiativesType < ActiveRecord::Migration[5.1]
   def change
     remove_column :decidim_initiatives_types,

data/db/migrate/20171214161410_add_unique_on_votes.rb

@@ -2,12 +2,16 @@
 # frozen_string_literal: true
 
 class AddUniqueOnVotes < ActiveRecord::Migration[5.1]
+  class InitiativesVote < ApplicationRecord
+    self.table_name = :decidim_initiatives_votes
+  end
+
   def get_duplicates(*columns)
-    Decidim::InitiativesVote.select("#{columns.join(',')}, COUNT(*)").group(columns).having('COUNT(*) > 1')
+    InitiativesVote.select("#{columns.join(",")}, COUNT(*)").group(columns).having("COUNT(*) > 1")
   end
 
   def row_count(issue)
-    Decidim::InitiativesVote.where(
+    InitiativesVote.where(
       decidim_initiative_id: issue.decidim_initiative_id,
       decidim_author_id: issue.decidim_author_id,
       decidim_user_group_id: issue.decidim_user_group_id
@@ -15,7 +19,7 @@ class AddUniqueOnVotes < ActiveRecord::Migration[5.1]
   end
 
   def find_next(issue)
-    Decidim::InitiativesVote.find_by(
+    InitiativesVote.find_by(
       decidim_initiative_id: issue.decidim_initiative_id,
       decidim_author_id: issue.decidim_author_id,
       decidim_user_group_id: issue.decidim_user_group_id
@@ -23,18 +27,15 @@ class AddUniqueOnVotes < ActiveRecord::Migration[5.1]
   end
 
   def up
-    columns = %i[decidim_initiative_id decidim_author_id decidim_user_group_id]
+    columns = [:decidim_initiative_id, :decidim_author_id, :decidim_user_group_id]
 
     get_duplicates(columns).each do |issue|
-      while row_count(issue) > 1 do
-        find_next(issue)&.destroy
-      end
+      find_next(issue)&.destroy while row_count(issue) > 1
     end
 
-
     add_index :decidim_initiatives_votes,
               columns,
               unique: true,
-              name: 'decidim_initiatives_voutes_author_uniqueness_index'
+              name: "decidim_initiatives_voutes_author_uniqueness_index"
   end
 end

data/lib/decidim/initiatives.rb

@@ -41,8 +41,8 @@ module Decidim
       120
     end
 
-    # Features enabled for a new initiative
-    config_accessor :default_features do
+    # Components enabled for a new initiative
+    config_accessor :default_components do
       [:pages, :meetings]
     end
 

data/lib/decidim/initiatives/admin_engine.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'rails'
-require 'active_support/all'
-require 'decidim/core'
+require "rails"
+require "active_support/all"
+require "decidim/core"
 
 module Decidim
   module Initiatives
@@ -10,14 +10,14 @@ module Decidim
     class AdminEngine < ::Rails::Engine
       isolate_namespace Decidim::Initiatives::Admin
 
-      paths['db/migrate'] = nil
+      paths["db/migrate"] = nil
 
       routes do
         resources :initiatives_types, except: :show do
-          resources :initiatives_type_scopes, except: %i[index show]
+          resources :initiatives_type_scopes, except: [:index, :show]
         end
 
-        resources :initiatives, only: %i[index show edit update], param: :slug do
+        resources :initiatives, only: [:index, :show, :edit, :update], param: :slug do
           member do
             get :send_to_technical_validation
             post :publish
@@ -28,9 +28,9 @@ module Decidim
             delete :reject
           end
 
-          resources :attachments, controller: 'initiative_attachments'
+          resources :attachments, controller: "initiative_attachments"
 
-          resources :committee_requests, only: %i[index] do
+          resources :committee_requests, only: [:index] do
             member do
               get :approve
               delete :revoke
@@ -38,9 +38,9 @@ module Decidim
           end
         end
 
-        scope '/initiatives/:initiative_slug' do
-          resources :features do
-            resource :permissions, controller: 'feature_permissions'
+        scope "/initiatives/:initiative_slug" do
+          resources :components do
+            resource :permissions, controller: "component_permissions"
             member do
               put :publish
               put :unpublish
@@ -49,42 +49,42 @@ module Decidim
           end
         end
 
-        scope '/initiatives/:initiative_slug/features/:feature_id/manage' do
-          Decidim.feature_manifests.each do |manifest|
+        scope "/initiatives/:initiative_slug/components/:component_id/manage" do
+          Decidim.component_manifests.each do |manifest|
             next unless manifest.admin_engine
 
-            constraints CurrentFeature.new(manifest) do
-              mount manifest.admin_engine, at: '/', as: "decidim_admin_initiative_#{manifest.name}"
+            constraints CurrentComponent.new(manifest) do
+              mount manifest.admin_engine, at: "/", as: "decidim_admin_initiative_#{manifest.name}"
             end
           end
         end
       end
 
-      initializer 'admin_decidim_initiatives.assets' do |app|
-        app.config.assets.precompile += %w[
-            admin_decidim_initiatives_manifest.js
-          ]
+      initializer "admin_decidim_initiatives.assets" do |app|
+        app.config.assets.precompile += %w(
+          admin_decidim_initiatives_manifest.js
+        )
       end
 
-      initializer 'decidim_assemblies.inject_abilities_to_user' do |_app|
+      initializer "decidim_assemblies.inject_abilities_to_user" do |_app|
         Decidim.configure do |config|
-          config.admin_abilities += %w[
+          config.admin_abilities += %w(
             Decidim::Initiatives::Abilities::Admin::CommitteeUserAbility
             Decidim::Initiatives::Abilities::Admin::InitiativeUserAbility
             Decidim::Initiatives::Abilities::Admin::CommitteeAdminAbility
             Decidim::Initiatives::Abilities::Admin::InitiativeAdminAbility
             Decidim::Initiatives::Abilities::Admin::InitiativeTypeAbility
             Decidim::Initiatives::Abilities::Admin::AttachmentsAbility
-            Decidim::Initiatives::Abilities::Admin::FeaturesAbility
-          ]
+            Decidim::Initiatives::Abilities::Admin::ComponentsAbility
+          )
         end
       end
 
-      initializer 'decidim_assemblies.admin_menu' do
+      initializer "decidim_assemblies.admin_menu" do
         Decidim.menu :admin_menu do |menu|
-          menu.item I18n.t('menu.initiatives', scope: 'decidim.admin'),
+          menu.item I18n.t("menu.initiatives", scope: "decidim.admin"),
                     decidim_admin_initiatives.initiatives_path,
-                    icon_name: 'chat',
+                    icon_name: "chat",
                     position: 3.7,
                     active: :inclusive,
                     if: can?(:index, Decidim::Initiative)