decidim-assemblies 0.11.2 → 0.12.0.pre

data/db/migrate/20180314143822_add_assembly_members.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AddAssemblyMembers < ActiveRecord::Migration[5.1]
+  def change
+    create_table :decidim_assembly_members do |t|
+      t.references :decidim_assembly, index: true
+      t.integer :weight, null: false, default: 0, index: { name: "index_decidim_assembly_members_on_weight" }
+      t.string :full_name
+      t.string :gender
+      t.date :birthday
+      t.string :birthplace
+      t.date :designation_date
+      t.string :designation_mode
+      t.string :position
+      t.string :position_other
+      t.date :ceased_date
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20180426162405_assembly_member_belongs_to_user.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AssemblyMemberBelongsToUser < ActiveRecord::Migration[5.1]
+  def change
+    add_reference :decidim_assembly_members, :decidim_user, index: { name: "index_decidim_assembly_members_on_decidim_user_id" }
+  end
+end

data/db/migrate/20180515073049_update_assembly_members_index.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class UpdateAssemblyMembersIndex < ActiveRecord::Migration[5.1]
+  def change
+    remove_index :decidim_assembly_members, column: :weight
+    add_index :decidim_assembly_members, [:weight, :created_at]
+  end
+end

data/lib/decidim/assemblies/admin_engine.rb

@@ -17,6 +17,7 @@ module Decidim
         resources :assemblies, param: :slug, except: :show do
           resource :publish, controller: "assembly_publications", only: [:create, :destroy]
           resources :copies, controller: "assembly_copies", only: [:new, :create]
+          resources :members, controller: "assembly_members"
 
           resources :user_roles, controller: "assembly_user_roles" do
             member do
@@ -69,17 +70,6 @@ module Decidim
         app.config.assets.precompile += %w(admin/decidim_assemblies_manifest.js)
       end
 
-      initializer "decidim_assemblies.inject_abilities_to_user" do |_app|
-        Decidim.configure do |config|
-          config.admin_abilities += [
-            "Decidim::Assemblies::Abilities::Admin::AdminAbility",
-            "Decidim::Assemblies::Abilities::Admin::AssemblyModeratorAbility",
-            "Decidim::Assemblies::Abilities::Admin::AssemblyCollaboratorAbility",
-            "Decidim::Assemblies::Abilities::Admin::AssemblyAdminAbility"
-          ]
-        end
-      end
-
       initializer "decidim_assemblies.admin_menu" do
         Decidim.menu :admin_menu do |menu|
           menu.item I18n.t("menu.assemblies", scope: "decidim.admin"),
@@ -87,7 +77,7 @@ module Decidim
                     icon_name: "dial",
                     position: 3.5,
                     active: :inclusive,
-                    if: can?(:read, Decidim::Assembly)
+                    if: allowed_to?(:enter, :space_area, space_name: :assemblies)
         end
       end
     end

data/lib/decidim/assemblies/engine.rb

@@ -23,6 +23,7 @@ module Decidim
         }, constraints: { assembly_id: /[0-9]+/ }
 
         resources :assemblies, only: [:index, :show], param: :slug, path: "assemblies" do
+          resources :assembly_members, only: :index, path: "members"
           resource :assembly_widget, only: :show, path: "embed"
         end
 
@@ -41,16 +42,9 @@ module Decidim
         app.config.assets.precompile += %w(decidim_assemblies_manifest.js)
       end
 
-      initializer "decidim_assemblies.inject_abilities_to_user" do |_app|
-        Decidim.configure do |config|
-          config.abilities += [
-            "Decidim::Assemblies::Abilities::EveryoneAbility",
-            "Decidim::Assemblies::Abilities::AssemblyAdminAbility",
-            "Decidim::Assemblies::Abilities::AssemblyCollaboratorAbility",
-            "Decidim::Assemblies::Abilities::AssemblyModeratorAbility",
-            "Decidim::Assemblies::Abilities::AdminAbility"
-          ]
-        end
+      initializer "decidim_assemblies.add_cells_view_paths" do
+        Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Assemblies::Engine.root}/app/cells")
+        Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Assemblies::Engine.root}/app/views") # for partials
       end
 
       initializer "decidim.stats" do
@@ -82,6 +76,23 @@ module Decidim
             }
           )
         end
+
+        Decidim.view_hooks.register(:user_profile_bottom, priority: Decidim::ViewHooks::MEDIUM_PRIORITY) do |view_context|
+          assemblies = OrganizationPublishedAssemblies.new(view_context.current_organization, view_context.current_user)
+                                                      .query.distinct
+                                                      .joins(:members)
+                                                      .merge(Decidim::AssemblyMember.where(user: view_context.user))
+                                                      .reorder(title: :asc)
+
+          next unless assemblies.any?
+
+          view_context.render(
+            partial: "decidim/assemblies/pages/user_profile/member_of",
+            locals: {
+              assemblies: assemblies
+            }
+          )
+        end
       end
     end
   end

data/lib/decidim/assemblies/participatory_space.rb

@@ -8,6 +8,13 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
     Decidim::Assemblies::OrganizationAssemblies.new(organization).query
   end
 
+  participatory_space.permissions_class_name = "Decidim::Assemblies::Permissions"
+
+  participatory_space.register_resource(:assembly) do |resource|
+    resource.model_class_name = "Decidim::Assembly"
+    resource.card = "decidim/assemblies/assembly"
+  end
+
   participatory_space.context(:public) do |context|
     context.engine = Decidim::Assemblies::Engine
     context.layout = "layouts/decidim/assembly"
@@ -45,7 +52,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         target: Decidim::Faker::Localized.sentence(3),
         participatory_scope: Decidim::Faker::Localized.sentence(1),
         participatory_structure: Decidim::Faker::Localized.sentence(2),
-        scope: n.positive? ? Decidim::Scope.reorder("RANDOM()").first : nil,
+        scope: n.positive? ? Decidim::Scope.reorder(Arel.sql("RANDOM()")).first : nil,
         purpose_of_action: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
           Decidim::Faker::Localized.paragraph(3)
         end,
@@ -75,6 +82,29 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         github_handler: Faker::Lorem.word
       )
 
+      # Create users with specific roles
+      Decidim::AssemblyUserRole::ROLES.each do |role|
+        email = "assembly_#{assembly.id}_#{role}@example.org"
+
+        user = Decidim::User.find_or_initialize_by(email: email)
+        user.update!(
+          name: Faker::Name.name,
+          nickname: Faker::Twitter.unique.screen_name,
+          password: "decidim123456",
+          password_confirmation: "decidim123456",
+          organization: organization,
+          confirmed_at: Time.current,
+          locale: I18n.default_locale,
+          tos_agreement: true
+        )
+
+        Decidim::AssemblyUserRole.find_or_create_by!(
+          user: user,
+          assembly: assembly,
+          role: role
+        )
+      end
+
       child = Decidim::Assembly.create!(
         title: Decidim::Faker::Localized.sentence(5),
         slug: Faker::Internet.unique.slug(nil, "-"),
@@ -97,7 +127,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         target: Decidim::Faker::Localized.sentence(3),
         participatory_scope: Decidim::Faker::Localized.sentence(1),
         participatory_structure: Decidim::Faker::Localized.sentence(2),
-        scope: n.positive? ? Decidim::Scope.reorder("RANDOM()").first : nil,
+        scope: n.positive? ? Decidim::Scope.reorder(Arel.sql("RANDOM()")).first : nil,
         parent: assembly
       )
 
@@ -140,6 +170,32 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
           )
         end
 
+        Decidim::AssemblyMember::POSITIONS.each do |position|
+          Decidim::AssemblyMember.create!(
+            full_name: Faker::Name.name,
+            gender: Faker::Lorem.word,
+            birthday: Faker::Date.birthday(18, 65),
+            birthplace: Faker::Demographic.demonym,
+            designation_date: Faker::Date.between(1.year.ago, 1.month.ago),
+            designation_mode: Faker::Lorem.word,
+            position: position,
+            position_other: position == "other" ? Faker::Job.position : nil,
+            assembly: current_assembly
+          )
+        end
+
+        Decidim::AssemblyMember.create!(
+          user: current_assembly.organization.users.first,
+          gender: Faker::Lorem.word,
+          birthday: Faker::Date.birthday(18, 65),
+          birthplace: Faker::Demographic.demonym,
+          designation_date: Faker::Date.between(1.year.ago, 1.month.ago),
+          designation_mode: Faker::Lorem.word,
+          position: "other",
+          position_other: Faker::Job.position,
+          assembly: current_assembly
+        )
+
         Decidim.component_manifests.each do |manifest|
           manifest.seed!(current_assembly.reload)
         end

data/lib/decidim/assemblies/test/factories.rb

@@ -98,4 +98,39 @@ FactoryBot.define do
              role: :moderator
     end
   end
+
+  factory :assembly_collaborator, parent: :user, class: "Decidim::User" do
+    transient do
+      assembly { create(:assembly) }
+    end
+
+    organization { assembly.organization }
+
+    after(:create) do |user, evaluator|
+      create :assembly_user_role,
+             user: user,
+             assembly: evaluator.assembly,
+             role: :collaborator
+    end
+  end
+
+  factory :assembly_member, class: "Decidim::AssemblyMember" do
+    assembly { create(:assembly) }
+
+    full_name { Faker::Name.name }
+    gender { Faker::Lorem.word }
+    birthday { Faker::Date.birthday(18, 65) }
+    birthplace { Faker::Lorem.word }
+    position { Decidim::AssemblyMember::POSITIONS.first }
+    designation_date { Faker::Date.between(1.year.ago, 1.month.ago) }
+    designation_mode { Faker::Lorem.word }
+
+    trait :ceased do
+      ceased_date { Faker::Date.between(1.day.ago, 5.days.ago) }
+    end
+
+    trait :with_user do
+      user { create(:user, organization: assembly.organization) }
+    end
+  end
 end

data/lib/decidim/assemblies/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.11.2"
+      "0.12.0.pre"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0.pre
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -69,15 +69,25 @@ files:
 - app/assets/config/decidim_assemblies_manifest.js
 - app/assets/images/decidim/assemblies/assembly.svg
 - app/assets/javascripts/decidim/assemblies/admin/assemblies.js.es6
+- app/assets/javascripts/decidim/assemblies/admin/assembly_members.js.es6
 - app/assets/javascripts/decidim/assemblies/assemblies.js.es6
+- app/cells/decidim/assemblies/assembly_cell.rb
+- app/cells/decidim/assemblies/assembly_m/footer.erb
+- app/cells/decidim/assemblies/assembly_m/tags.erb
+- app/cells/decidim/assemblies/assembly_m_cell.rb
+- app/cells/decidim/assemblies/assembly_member/show.erb
+- app/cells/decidim/assemblies/assembly_member_cell.rb
 - app/commands/decidim/assemblies/admin/copy_assembly.rb
 - app/commands/decidim/assemblies/admin/create_assembly.rb
 - app/commands/decidim/assemblies/admin/create_assembly_admin.rb
+- app/commands/decidim/assemblies/admin/create_assembly_member.rb
 - app/commands/decidim/assemblies/admin/destroy_assembly_admin.rb
+- app/commands/decidim/assemblies/admin/destroy_assembly_member.rb
 - app/commands/decidim/assemblies/admin/publish_assembly.rb
 - app/commands/decidim/assemblies/admin/unpublish_assembly.rb
 - app/commands/decidim/assemblies/admin/update_assembly.rb
 - app/commands/decidim/assemblies/admin/update_assembly_admin.rb
+- app/commands/decidim/assemblies/admin/update_assembly_member.rb
 - app/constraints/decidim/assemblies/current_assembly.rb
 - app/constraints/decidim/assemblies/current_component.rb
 - app/controllers/concerns/decidim/assemblies/admin/assembly_context.rb
@@ -86,6 +96,7 @@ files:
 - app/controllers/decidim/assemblies/admin/assembly_attachment_collections_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_attachments_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_copies_controller.rb
+- app/controllers/decidim/assemblies/admin/assembly_members_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_publications_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_user_roles_controller.rb
 - app/controllers/decidim/assemblies/admin/categories_controller.rb
@@ -95,33 +106,31 @@ files:
 - app/controllers/decidim/assemblies/admin/exports_controller.rb
 - app/controllers/decidim/assemblies/admin/moderations_controller.rb
 - app/controllers/decidim/assemblies/admin/participatory_space_private_users_controller.rb
+- app/controllers/decidim/assemblies/application_controller.rb
 - app/controllers/decidim/assemblies/assemblies_controller.rb
+- app/controllers/decidim/assemblies/assembly_members_controller.rb
 - app/controllers/decidim/assemblies/assembly_widgets_controller.rb
-- app/controllers/decidim/assemblies/categories_controller.rb
 - app/forms/decidim/assemblies/admin/assembly_copy_form.rb
 - app/forms/decidim/assemblies/admin/assembly_form.rb
+- app/forms/decidim/assemblies/admin/assembly_member_form.rb
 - app/forms/decidim/assemblies/admin/assembly_user_role_form.rb
 - app/helpers/decidim/assemblies/admin/assemblies_helper.rb
 - app/helpers/decidim/assemblies/assemblies_helper.rb
-- app/models/decidim/assemblies/abilities/admin/admin_ability.rb
-- app/models/decidim/assemblies/abilities/admin/assembly_admin_ability.rb
-- app/models/decidim/assemblies/abilities/admin/assembly_collaborator_ability.rb
-- app/models/decidim/assemblies/abilities/admin/assembly_moderator_ability.rb
-- app/models/decidim/assemblies/abilities/admin/assembly_role_ability.rb
-- app/models/decidim/assemblies/abilities/admin_ability.rb
-- app/models/decidim/assemblies/abilities/assembly_admin_ability.rb
-- app/models/decidim/assemblies/abilities/assembly_collaborator_ability.rb
-- app/models/decidim/assemblies/abilities/assembly_moderator_ability.rb
-- app/models/decidim/assemblies/abilities/assembly_role_ability.rb
-- app/models/decidim/assemblies/abilities/everyone_ability.rb
 - app/models/decidim/assembly.rb
+- app/models/decidim/assembly_member.rb
 - app/models/decidim/assembly_user_role.rb
+- app/permissions/decidim/assemblies/permissions.rb
+- app/presenters/decidim/admin/assembly_member_presenter.rb
+- app/presenters/decidim/assemblies/admin_log/assembly_member_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/assembly_user_role_presenter.rb
+- app/presenters/decidim/assemblies/admin_log/value_types/member_position_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/value_types/role_presenter.rb
 - app/presenters/decidim/assemblies/assembly_stats_presenter.rb
+- app/presenters/decidim/assembly_member_presenter.rb
 - app/presenters/decidim/log/value_types/assembly_presenter.rb
 - app/queries/decidim/assemblies/admin/admin_users.rb
+- app/queries/decidim/assemblies/admin/assembly_members.rb
 - app/queries/decidim/assemblies/assemblies_with_user_role.rb
 - app/queries/decidim/assemblies/organization_assemblies.rb
 - app/queries/decidim/assemblies/organization_prioritized_assemblies.rb
@@ -138,6 +147,10 @@ files:
 - app/views/decidim/assemblies/admin/assemblies/new.html.erb
 - app/views/decidim/assemblies/admin/assembly_copies/_form.html.erb
 - app/views/decidim/assemblies/admin/assembly_copies/new.html.erb
+- app/views/decidim/assemblies/admin/assembly_members/_form.html.erb
+- app/views/decidim/assemblies/admin/assembly_members/edit.html.erb
+- app/views/decidim/assemblies/admin/assembly_members/index.html.erb
+- app/views/decidim/assemblies/admin/assembly_members/new.html.erb
 - app/views/decidim/assemblies/admin/assembly_user_roles/_form.html.erb
 - app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
 - app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
@@ -147,8 +160,11 @@ files:
 - app/views/decidim/assemblies/assemblies/_statistics.html.erb
 - app/views/decidim/assemblies/assemblies/index.html.erb
 - app/views/decidim/assemblies/assemblies/show.html.erb
+- app/views/decidim/assemblies/assembly_members/index.html.erb
 - app/views/decidim/assemblies/assembly_widgets/show.html.erb
 - app/views/decidim/assemblies/pages/home/_highlighted_assemblies.html.erb
+- app/views/decidim/assemblies/pages/user_profile/_member_of.html.erb
+- app/views/decidim/assembly_members/_assembly_member.html.erb
 - app/views/layouts/decidim/_assembly_header.html.erb
 - app/views/layouts/decidim/admin/assemblies.html.erb
 - app/views/layouts/decidim/admin/assembly.html.erb
@@ -176,6 +192,9 @@ files:
 - db/migrate/20180216091553_add_area_to_assemblies.rb
 - db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
 - db/migrate/20180302121116_add_fields_to_assemblies.rb
+- db/migrate/20180314143822_add_assembly_members.rb
+- db/migrate/20180426162405_assembly_member_belongs_to_user.rb
+- db/migrate/20180515073049_update_assembly_members_index.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -202,9 +221,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6