decidim 0.0.5 → 0.0.6

data/README.md

@@ -1,8 +1,8 @@
 # Decidim [![Gem](https://img.shields.io/gem/v/decidim.svg)](https://rubygems.org/gems/decidim) [![Gem](https://img.shields.io/gem/dt/decidim.svg)](https://rubygems.org/gems/decidim) [![GitHub contributors](https://img.shields.io/github/contributors/AjuntamentdeBarcelona/decidim.svg)](https://github.com/AjuntamentdeBarcelona/decidim/graphs/contributors) [![License: AGPL v3](https://img.shields.io/github/license/AjuntamentdeBarcelona/decidim.svg)](https://github.com/AjuntamentdeBarcelona/decidim/blob/master/LICENSE-AGPLv3.txt)
 
-[![Demo](https://img.shields.io/badge/demo-staging-orange.svg?style=flat)](http://staging.decidim.codegram.com) 
-[[![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://rubydoc.info/github/AjuntamentdeBarcelona/decidim/master)](http://www.rubydoc.info/github/AjuntamentdeBarcelona/decidim/master) 
-[![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg)]()
+[![Demo](https://img.shields.io/badge/demo-staging-orange.svg?style=flat)](http://staging.decidim.codegram.com)
+[![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://rubydoc.info/github/AjuntamentdeBarcelona/decidim/master)
+[![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg)](https://gitter.im/AjuntamentdeBarcelona/decidim)
 
 
 ### Code quality
@@ -12,16 +12,20 @@
 [![Dependency Status](https://img.shields.io/gemnasium/AjuntamentdeBarcelona/decidim.svg)](https://gemnasium.com/github.com/AjuntamentdeBarcelona/decidim)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/decidim/localized.svg)](https://crowdin.com/project/decidim/invite)
 [![Inline docs](http://inch-ci.org/github/AjuntamentdeBarcelona/decidim.svg?branch=master)](http://inch-ci.org/github/AjuntamentdeBarcelona/decidim)
+[![Accessibility issues](https://rocketvalidator.com/badges/a11y_issues.svg?url=http://staging.decidim.codegram.com/)](https://rocketvalidator.com/badges/link?url=http://staging.decidim.codegram.com/&report=a11y)
+[![HTML issues](https://rocketvalidator.com/badges/html_issues.svg?url=http://staging.decidim.codegram.com/)](https://rocketvalidator.com/badges/link?url=http://staging.decidim.codegram.com/&report=html)
 
 ### Project management [[See on Waffle.io]](https://waffle.io/AjuntamentdeBarcelona/decidim)
 [![Stories in Discussion](https://img.shields.io/waffle/label/AjuntamentdeBarcelona/decidim/discussion.svg)](https://github.com/AjuntamentdeBarcelona/decidim/issues?q=is%3Aopen+is%3Aissue+label%3Adiscussion)
-[![Stories in Ready](https://img.shields.io/waffle/label/AjuntamentdeBarcelona/decidim/ready.svg)](https://github.com/AjuntamentdeBarcelona/decidim/issues?q=is%3Aopen+is%3Aissue+label%3Aready)
+[![Stories in Planned](https://img.shields.io/waffle/label/AjuntamentdeBarcelona/decidim/planned.svg)](https://github.com/AjuntamentdeBarcelona/decidim/issues?q=is%3Aopen+is%3Aissue+label%3Aplanned)
 [![Bugs](https://img.shields.io/waffle/label/AjuntamentdeBarcelona/decidim/bug.svg)](https://github.com/AjuntamentdeBarcelona/decidim/issues?q=is%3Aopen+is%3Aissue+label%3Abug)
 [![In Progress](https://img.shields.io/waffle/label/AjuntamentdeBarcelona/decidim/in-progress.svg)](https://github.com/AjuntamentdeBarcelona/decidim/issues?q=is%3Aopen+is%3Aissue+label%3Ain-progress)
 [![In Review](https://img.shields.io/waffle/label/AjuntamentdeBarcelona/decidim/in-review.svg)](https://github.com/AjuntamentdeBarcelona/decidim/issues?q=is%3Aopen+is%3Aissue+label%3Ain-review)
 
 ---
 
+Decidim is a participatory democracy framework written on Ruby on Rails originally developed for the Barcelona City government online and offline participation website. Installing this libraries you'll get a generator and gems to help you develop web applications like the ones found on [example applications](#example-applications).
+
 ## What do you need to do?
 
 - [Contribute to the project](#how-to-contribute)
@@ -60,14 +64,14 @@ $ rails db:setup
 
 This will also create some default data so you can start testing the app:
 
-* A `Decidim::System::Admin` with email `system@decidim.org` and password
+* A `Decidim::System::Admin` with email `system@example.org` and password
  `decidim123456`, to log in at `/system`.
 * A `Decidim::Organization` named `Decidim Staging`. You probably want to
   change its name and hostname to match your needs.
 * A `Decidim::User` acting as an admin for the organization, with email
- `admin@decidim.org` and password `decidim123456`.
+ `admin@example.org` and password `decidim123456`.
 * A `Decidim::User` that also belongs to the organization but it's a regular
-  user, with email `user@decidim.org` and password `decidim123456`.
+  user, with email `user@example.org` and password `decidim123456`.
 
 This data won't be created in production environments, if you still want to do it, run:
 
@@ -142,7 +146,7 @@ After you create a development app (`bundle exec rake development_app`):
 - `bundle exec rails s`
 - Go to 'http://localhost:3000'
 
-Optionally, you can log in as: user@decidim.org | decidim123456
+Optionally, you can log in as: user@example.org | decidim123456
 
 Also, if you want to verify yourself against the default authorization handler use a document number ended with "X".
 
@@ -153,7 +157,7 @@ After you create a development app (`bundle exec rake development_app`):
 - `cd development_app`
 - `bundle exec rails s`
 - Go to 'http://localhost:3000/admin'
-- Login data: admin@decidim.org | decidim123456
+- Login data: admin@example.org | decidim123456
 
 
 ## Components
@@ -174,9 +178,14 @@ After you create a development app (`bundle exec rake development_app`):
 ## Further configuration
 
 - [Social providers integration](https://github.com/AjuntamentdeBarcelona/decidim/blob/master/docs/social_providers.md): Enable sign up from social networks.
+- [Analytics](https://github.com/AjuntamentdeBarcelona/decidim/blob/master/docs/analytics.md): How to enable analytics
 
 ## Technical tradeoffs
 
+### Architecture
+
+This is not your tipical Ruby on Rails Vanilla App. We've tried that using [Consul](http://decide.es) but we've found some problems on reutilization, adaptation, modularization and configuration. You can read more about that on "[Propuesta de Cambios de Arquitectura de Consul](https://www.gitbook.com/book/alabs/propuesta-de-cambios-en-la-arquitectura-de-consul/details)".
+
 ### Turbolinks
 
 Decidim doesn't support `turbolinks` so it isn't included on our generated apps and it's removed for existing Rails applications which install the Decidim engine.
@@ -185,4 +194,13 @@ The main reason for this is we are injecting some scripts into the body for some
 
 The support of Turbolinks was dropped in [d8c7d9f](https://github.com/AjuntamentdeBarcelona/decidim/commit/d8c7d9f63e4d75307e8f7a0360bef977fab209b6). If you're interested in bringing turbolinks back, further discussion is welcome.
 
-TODO: Improve guide.
+## Following our license
+
+If you plan to release your application you'll need to publish it using the same license: GPL Affero 3. We recommend doing that on Github before publishing, you can read more on "[Being Open Source From Day One is Especially Important for Government Projects](http://producingoss.com/en/governments-and-open-source.html#starting-open-for-govs)". If you have any trouble doing that you can contact us on [Gitter](https://gitter.im/AjuntamentdeBarcelona/decidim).
+
+
+## Example applications
+
+* [Demo](http://staging.decidim.codegram.com)
+* [Decidim Barcelona](https://decidim.barcelona)
+* [L'H ON dels barris](https://www.lhon-participa.cat)

data/Rakefile

@@ -4,7 +4,7 @@ require "rspec/core/rake_task"
 require_relative "lib/generators/decidim/app_generator"
 require_relative "lib/generators/decidim/docker_generator"
 
-DECIDIM_GEMS = %w(core system admin api pages meetings proposals comments results budgets).freeze
+DECIDIM_GEMS = %w(core system admin api pages meetings proposals comments results budgets dev).freeze
 
 RSpec::Core::RakeTask.new(:spec)
 

data/decidim-admin/README.md

@@ -1,6 +1,6 @@
 # Decidim::Admin
 
-This library adds and administration dashboard so users can manage their
+This library adds an administration dashboard so users can manage their
 organization, participatory processes and all other entities.
 
 ## Usage

data/decidim-admin/app/assets/stylesheets/decidim/admin/_sidebar.scss

@@ -60,6 +60,7 @@
 
   .session-box {
     padding: $global-padding 0;
+    border-bottom: 1px solid black;
 
     @include grid-row;
 
@@ -69,5 +70,33 @@
       overflow: hidden;
     }
     .sign-out{ @include grid-column(4); }
+
   }
-}
+}
+
+.dropdown > li > a{
+  padding-left: 0;
+}
+.dropdown{
+  display: inline-block;
+  vertical-align: middle;
+}
+
+.is-dropdown-submenu{
+  z-index: 2;
+  text-align: left;
+  background: lighten($black, 5) !important;
+  border: none !important;
+  box-shadow: 0 3px 5px rgba(0, 0, 0, .3) !important;;
+  min-width: 250px !important;
+  a{
+    color: $light-gray;
+    padding: .5rem;
+  }
+  a:hover{
+    color: lighten($light-gray, 20);
+  }
+  li:hover{
+    background: lighten($black, 10);
+  }
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/_tables.scss

@@ -2,6 +2,9 @@ table{
   td.actions, th.actions{
     text-align: right;
   }
+  td.center, th.center{
+    text-align: center;
+  }
 }
 
 tbody.sortable tr {

data/decidim-admin/app/assets/stylesheets/decidim/admin/application.scss

@@ -11,6 +11,9 @@
 @import "decidim/editor";
 @import "decidim/utils/fontface";
 
+@import "foundation";
+@include foundation-everything;
+
 body {
   font-family: 'Source Sans Pro', sans-serif;
 }

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

@@ -46,7 +46,10 @@ module Decidim
             hero_image: form.hero_image,
             banner_image: form.banner_image,
             promoted: form.promoted,
-            organization: form.current_organization
+            meta_scope: form.meta_scope,
+            scope: form.scope,
+            organization: form.current_organization,
+            participatory_process_group: form.participatory_process_group
           )
 
           return process unless process.valid?

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

@@ -9,8 +9,9 @@ module Decidim
       # form - A form object with the params.
       # participatory_process - The ParticipatoryProcess that will hold the
       #   user role
-      def initialize(form, participatory_process)
+      def initialize(form, current_user, participatory_process)
         @form = form
+        @current_user = current_user
         @participatory_process = participatory_process
       end
 
@@ -24,7 +25,7 @@ module Decidim
         return broadcast(:invalid) if form.invalid?
         return broadcast(:invalid) unless user
 
-        create_participatory_process_admin
+        create_role
         broadcast(:ok)
       rescue ActiveRecord::RecordInvalid
         form.errors.add(:email, :taken)
@@ -33,21 +34,39 @@ module Decidim
 
       private
 
-      attr_reader :form, :participatory_process
+      attr_reader :form, :participatory_process, :current_user
 
-      def create_participatory_process_admin
+      def create_role
         ParticipatoryProcessUserRole.create!(
-          role: :admin,
+          role: form.role.to_sym,
           user: user,
           participatory_process: @participatory_process
         )
       end
 
       def user
-        User.where(
+        @user ||= User.where(
           email: form.email,
           organization: participatory_process.organization
-        ).first
+        ).first || InviteUser.call(user_form) do
+          on(:ok) do |user|
+            return user
+          end
+        end
+      end
+
+      def user_form
+        OpenStruct.new(name: form.name,
+                       email: form.email.downcase,
+                       organization: participatory_process.organization,
+                       roles: [form.role.to_sym],
+                       invited_by: current_user,
+                       invitation_instructions: invitation_instructions)
+      end
+
+      def invitation_instructions
+        return "invite_admin" if form.role == "admin"
+        "invite_collaborator"
       end
     end
   end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # A command with all the business logic when creating a new participatory
+    # process group in the system.
+    class CreateParticipatoryProcessGroup < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # form - A form object with the params.
+      def initialize(form)
+        @form = form
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) if form.invalid?
+        group = create_participatory_process_group
+
+        if group.persisted?
+          broadcast(:ok, group)
+        else
+          form.errors.add(:hero_image, group.errors[:hero_image]) if group.errors.include? :hero_image
+          form.errors.add(:banner_image, group.errors[:banner_image]) if group.errors.include? :banner_image
+          broadcast(:invalid)
+        end
+      end
+
+      private
+
+      attr_reader :form
+
+      def create_participatory_process_group
+        transaction do
+          group = ParticipatoryProcessGroup.create(
+            name: form.name,
+            description: form.description,
+            hero_image: form.hero_image,
+            participatory_processes: participatory_processes,
+            organization: form.current_organization
+          )
+        end
+      end
+
+      def participatory_processes
+        Decidim::ParticipatoryProcess.where(id: form.participatory_process_ids)
+      end
+    end
+  end
+end

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

@@ -35,7 +35,6 @@ module Decidim
         ParticipatoryProcessStep.create!(
           title: form.title,
           description: form.description,
-          short_description: form.short_description,
           start_date: form.start_date,
           end_date: form.end_date,
           participatory_process: @participatory_process

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

@@ -29,8 +29,10 @@ module Decidim
       private
 
       def reorder_steps
+        steps = @participatory_process.steps.reload
+
         ReorderParticipatoryProcessSteps
-          .new(@participatory_process.steps, @participatory_process.steps.map(&:id))
+          .new(steps, steps.map(&:id))
           .call
       end
     end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # A command with all the business logic when a user hides a resource.
+    class HideResource < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # reportable - A Decidim::Reportable
+      def initialize(reportable)
+        @reportable = reportable
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the resource.
+      # - :invalid if the resource is already hidden
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) unless hideable?
+
+        hide!
+        broadcast(:ok, @reportable)
+      end
+
+      private
+
+      def hideable?
+        !@reportable.hidden? && @reportable.reported?
+      end
+
+      def hide!
+        @reportable.moderation.update_attributes!(hidden_at: Time.current)
+      end
+    end
+  end
+end

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

@@ -36,6 +36,7 @@ module Decidim
 
         ParticipatoryProcessStep.transaction do
           collection.update_all(position: nil)
+          collection.reload
           collection.update(data.keys, data.values)
         end
       end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # A command with all the business logic when a user unreports a resource.
+    class UnreportResource < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # reportable - A Decidim::Reportable
+      def initialize(reportable)
+        @reportable = reportable
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the resource.
+      # - :invalid if the resource is not reported
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) unless @reportable.reported?
+
+        unreport!
+        broadcast(:ok, @reportable)
+      end
+
+      private
+
+      def unreport!
+        @reportable.moderation.update_attributes!(report_count: 0, hidden_at: nil)
+      end
+    end
+  end
+end

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

@@ -58,8 +58,10 @@ module Decidim
           target: form.target,
           participatory_scope: form.participatory_scope,
           participatory_structure: form.participatory_structure,
-          end_date: form.end_date
-        }.compact
+          meta_scope: form.meta_scope,
+          end_date: form.end_date,
+          participatory_process_group: form.participatory_process_group
+        }
       end
     end
   end

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # A command with all the business logic when creating a new participatory
+    # process group in the system.
+    class UpdateParticipatoryProcessGroup < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # participatory_process_group - the ParticipatoryProcessGroup to update
+      # form - A form object with the params.
+      def initialize(participatory_process_group, form)
+        @participatory_process_group = participatory_process_group
+        @form = form
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) if form.invalid?
+        update_participatory_process_group
+
+        if @participatory_process_group.valid?
+          broadcast(:ok, @participatory_process_group)
+        else
+          form.errors.add(:hero_image, @participatory_process_group.errors[:hero_image]) if @participatory_process_group.errors.include? :hero_image
+          broadcast(:invalid)
+        end
+      end
+
+      private
+
+      attr_reader :form
+
+      def update_participatory_process_group
+        @participatory_process_group.assign_attributes(attributes)
+        @participatory_process_group.save! if @participatory_process_group.valid?
+      end
+
+      def attributes
+        {
+          name: form.name,
+          hero_image: form.hero_image,
+          description: form.description,
+          participatory_processes: participatory_processes
+        }
+      end
+
+      def participatory_processes
+        Decidim::ParticipatoryProcess.where(id: form.participatory_process_ids)
+      end
+    end
+  end
+end