decidim-assemblies 0.10.1 → 0.11.0.pre1

data/db/migrate/20180302121116_add_fields_to_assemblies.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddFieldsToAssemblies < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_assemblies, :purpose_of_action, :jsonb
+    add_column :decidim_assemblies, :composition, :jsonb
+    add_column :decidim_assemblies, :assembly_type, :string
+    add_column :decidim_assemblies, :assembly_type_other, :jsonb
+    add_column :decidim_assemblies, :creation_date, :date
+    add_column :decidim_assemblies, :created_by, :string
+    add_column :decidim_assemblies, :created_by_other, :jsonb
+    add_column :decidim_assemblies, :duration, :date
+    add_column :decidim_assemblies, :included_at, :date
+    add_column :decidim_assemblies, :closing_date, :date
+    add_column :decidim_assemblies, :closing_date_reason, :jsonb
+    add_column :decidim_assemblies, :internal_organisation, :jsonb
+    add_column :decidim_assemblies, :is_transparent, :boolean, default: true
+    add_column :decidim_assemblies, :special_features, :jsonb
+    add_column :decidim_assemblies, :twitter_handler, :string
+    add_column :decidim_assemblies, :instagram_handler, :string
+    add_column :decidim_assemblies, :facebook_handler, :string
+    add_column :decidim_assemblies, :youtube_handler, :string
+    add_column :decidim_assemblies, :github_handler, :string
+  end
+end

data/lib/decidim/assemblies/admin_engine.rb

@@ -31,8 +31,8 @@ module Decidim
         scope "/assemblies/:assembly_slug" do
           resources :categories
 
-          resources :features do
-            resource :permissions, controller: "feature_permissions"
+          resources :components do
+            resource :permissions, controller: "component_permissions"
             member do
               put :publish
               put :unpublish
@@ -46,13 +46,19 @@ module Decidim
               put :hide
             end
           end
+
+          resources :participatory_space_private_users, controller: "participatory_space_private_users" do
+            member do
+              post :resend_invitation, to: "participatory_space_private_users#resend_invitation"
+            end
+          end
         end
 
-        scope "/assemblies/:assembly_slug/features/:feature_id/manage" do
-          Decidim.feature_manifests.each do |manifest|
+        scope "/assemblies/:assembly_slug/components/:component_id/manage" do
+          Decidim.component_manifests.each do |manifest|
             next unless manifest.admin_engine
 
-            constraints CurrentFeature.new(manifest) do
+            constraints CurrentComponent.new(manifest) do
               mount manifest.admin_engine, at: "/", as: "decidim_admin_assembly_#{manifest.name}"
             end
           end

data/lib/decidim/assemblies/engine.rb

@@ -17,20 +17,20 @@ module Decidim
           assembly ? "/assemblies/#{assembly.slug}" : "/404"
         }, constraints: { assembly_id: /[0-9]+/ }
 
-        get "/assemblies/:assembly_id/f/:feature_id", to: redirect { |params, _request|
+        get "/assemblies/:assembly_id/f/:component_id", to: redirect { |params, _request|
           assembly = Decidim::Assembly.find(params[:assembly_id])
-          assembly ? "/assemblies/#{assembly.slug}/f/#{params[:feature_id]}" : "/404"
+          assembly ? "/assemblies/#{assembly.slug}/f/#{params[:component_id]}" : "/404"
         }, constraints: { assembly_id: /[0-9]+/ }
 
         resources :assemblies, only: [:index, :show], param: :slug, path: "assemblies" do
           resource :assembly_widget, only: :show, path: "embed"
         end
 
-        scope "/assemblies/:assembly_slug/f/:feature_id" do
-          Decidim.feature_manifests.each do |manifest|
+        scope "/assemblies/:assembly_slug/f/:component_id" do
+          Decidim.component_manifests.each do |manifest|
             next unless manifest.engine
 
-            constraints CurrentFeature.new(manifest) do
+            constraints CurrentComponent.new(manifest) do
               mount manifest.engine, at: "/", as: "decidim_assembly_#{manifest.name}"
             end
           end
@@ -55,7 +55,7 @@ module Decidim
 
       initializer "decidim.stats" do
         Decidim.stats.register :assemblies_count, priority: StatsRegistry::HIGH_PRIORITY do |organization, _start_at, _end_at|
-          Decidim::Assembly.where(organization: organization).published.count
+          Decidim::Assembly.where(organization: organization).public_spaces.count
         end
       end
 
@@ -71,7 +71,7 @@ module Decidim
 
       initializer "decidim_assemblies.view_hooks" do
         Decidim.view_hooks.register(:highlighted_elements, priority: Decidim::ViewHooks::MEDIUM_PRIORITY) do |view_context|
-          highlighted_assemblies = OrganizationPrioritizedAssemblies.new(view_context.current_organization)
+          highlighted_assemblies = OrganizationPrioritizedAssemblies.new(view_context.current_organization, view_context.current_user)
 
           next unless highlighted_assemblies.any?
 

data/lib/decidim/assemblies/participatory_space.rb

@@ -45,49 +45,104 @@ 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("RANDOM()").first : nil,
+        purpose_of_action: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+          Decidim::Faker::Localized.paragraph(3)
+        end,
+        composition: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+          Decidim::Faker::Localized.paragraph(3)
+        end,
+        assembly_type: "others",
+        assembly_type_other: Decidim::Faker::Localized.word,
+        creation_date: 1.day.from_now,
+        created_by: "others",
+        created_by_other: Decidim::Faker::Localized.word,
+        duration: 2.days.from_now,
+        included_at: 5.days.from_now,
+        closing_date: 5.days.from_now,
+        closing_date_reason: Decidim::Faker::Localized.sentence(3),
+        internal_organisation: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+          Decidim::Faker::Localized.paragraph(3)
+        end,
+        is_transparent: true,
+        special_features: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+          Decidim::Faker::Localized.paragraph(3)
+        end,
+        twitter_handler: Faker::Lorem.word,
+        facebook_handler: Faker::Lorem.word,
+        instagram_handler: Faker::Lorem.word,
+        youtube_handler: Faker::Lorem.word,
+        github_handler: Faker::Lorem.word
       )
 
-      attachment_collection = Decidim::AttachmentCollection.create!(
-        name: Decidim::Faker::Localized.word,
-        description: Decidim::Faker::Localized.sentence(5),
-        collection_for: assembly
+      child = Decidim::Assembly.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),
+        scope: n.positive? ? Decidim::Scope.reorder("RANDOM()").first : nil,
+        parent: assembly
       )
 
-      Decidim::Attachment.create!(
-        title: Decidim::Faker::Localized.sentence(2),
-        description: Decidim::Faker::Localized.sentence(5),
-        file: File.new(File.join(seeds_root, "Exampledocument.pdf")),
-        attachment_collection: attachment_collection,
-        attached_to: assembly
-      )
+      [assembly, child].each do |current_assembly|
+        attachment_collection = Decidim::AttachmentCollection.create!(
+          name: Decidim::Faker::Localized.word,
+          description: Decidim::Faker::Localized.sentence(5),
+          collection_for: current_assembly
+        )
 
-      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: assembly
-      )
+        Decidim::Attachment.create!(
+          title: Decidim::Faker::Localized.sentence(2),
+          description: Decidim::Faker::Localized.sentence(5),
+          file: File.new(File.join(seeds_root, "Exampledocument.pdf")),
+          attachment_collection: attachment_collection,
+          attached_to: current_assembly
+        )
 
-      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: assembly
-      )
+        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: current_assembly
+        )
 
-      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_space: assembly
+        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: current_assembly
         )
-      end
 
-      Decidim.feature_manifests.each do |manifest|
-        manifest.seed!(assembly.reload)
+        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_space: current_assembly
+          )
+        end
+
+        Decidim.component_manifests.each do |manifest|
+          manifest.seed!(current_assembly.reload)
+        end
       end
     end
   end

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

@@ -25,6 +25,26 @@ FactoryBot.define do
     participatory_scope { Decidim::Faker::Localized.sentence(1) }
     participatory_structure { Decidim::Faker::Localized.sentence(2) }
     show_statistics true
+    private_space false
+    purpose_of_action { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
+    composition { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
+    assembly_type { "others" }
+    assembly_type_other { Decidim::Faker::Localized.sentence(1) }
+    creation_date { 1.month.ago }
+    created_by { "others" }
+    created_by_other { Decidim::Faker::Localized.word }
+    duration { 2.months.from_now.at_midnight }
+    included_at { 1.month.ago }
+    closing_date { 2.months.from_now.at_midnight }
+    closing_date_reason { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
+    internal_organisation { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
+    is_transparent true
+    special_features { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
+    twitter_handler { "others" }
+    facebook_handler { "others" }
+    instagram_handler { "others" }
+    youtube_handler { "others" }
+    github_handler { "others" }
 
     trait :promoted do
       promoted true
@@ -37,6 +57,10 @@ FactoryBot.define do
     trait :published do
       published_at { Time.current }
     end
+
+    trait :with_parent do
+      parent { create :assembly, organization: organization }
+    end
   end
 
   factory :assembly_user_role, class: "Decidim::AssemblyUserRole" do

data/lib/decidim/assemblies/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.10.1"
+      "0.11.0.pre1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0.pre1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-04-26 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.10.1
+        version: 0.11.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -69,6 +69,7 @@ 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/assemblies.js.es6
 - 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
@@ -78,7 +79,7 @@ files:
 - app/commands/decidim/assemblies/admin/update_assembly.rb
 - app/commands/decidim/assemblies/admin/update_assembly_admin.rb
 - app/constraints/decidim/assemblies/current_assembly.rb
-- app/constraints/decidim/assemblies/current_feature.rb
+- app/constraints/decidim/assemblies/current_component.rb
 - app/controllers/concerns/decidim/assemblies/admin/assembly_context.rb
 - app/controllers/decidim/assemblies/admin/application_controller.rb
 - app/controllers/decidim/assemblies/admin/assemblies_controller.rb
@@ -88,17 +89,20 @@ files:
 - 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
+- app/controllers/decidim/assemblies/admin/component_permissions_controller.rb
+- app/controllers/decidim/assemblies/admin/components_controller.rb
 - app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
 - app/controllers/decidim/assemblies/admin/exports_controller.rb
-- app/controllers/decidim/assemblies/admin/feature_permissions_controller.rb
-- app/controllers/decidim/assemblies/admin/features_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/assemblies_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_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
@@ -116,6 +120,7 @@ files:
 - app/presenters/decidim/assemblies/admin_log/assembly_user_role_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/value_types/role_presenter.rb
 - app/presenters/decidim/assemblies/assembly_stats_presenter.rb
+- app/presenters/decidim/log/value_types/assembly_presenter.rb
 - app/queries/decidim/assemblies/admin/admin_users.rb
 - app/queries/decidim/assemblies/assemblies_with_user_role.rb
 - app/queries/decidim/assemblies/organization_assemblies.rb
@@ -124,6 +129,7 @@ files:
 - app/queries/decidim/assemblies/prioritized_assemblies.rb
 - app/queries/decidim/assemblies/promoted_assemblies.rb
 - app/queries/decidim/assemblies/published_assemblies.rb
+- app/queries/decidim/assemblies/visible_assemblies.rb
 - app/views/decidim/assemblies/_assembly.html.erb
 - app/views/decidim/assemblies/_order_by_assemblies.html.erb
 - app/views/decidim/assemblies/admin/assemblies/_form.html.erb
@@ -136,6 +142,7 @@ files:
 - app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
 - app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
 - app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
+- app/views/decidim/assemblies/assemblies/_nav_breadcumb.html.erb
 - app/views/decidim/assemblies/assemblies/_promoted_assembly.html.erb
 - app/views/decidim/assemblies/assemblies/_statistics.html.erb
 - app/views/decidim/assemblies/assemblies/index.html.erb
@@ -164,8 +171,11 @@ files:
 - db/migrate/20170727190859_add_assemblies.rb
 - db/migrate/20170822153055_add_scopes_enabled_to_assemblies.rb
 - db/migrate/20180109105917_add_assembly_user_roles.rb
+- db/migrate/20180124083729_add_private_to_assemblies.rb
 - db/migrate/20180125104426_add_reference_to_assemblies.rb
 - 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/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -192,9 +202,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.3