decidim 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eeec3dc6198f888837c2af927f49cf8204ea305
-  data.tar.gz: 8f583b31a52255552123cbe9964f110bf8fc3f5e
+  metadata.gz: 42a867ce6d753e443dc7c9b505f48a73425bbd61
+  data.tar.gz: 9635831b53baec09202193ed335618068d3d3096
 SHA512:
-  metadata.gz: 18d55e2a4088c9996034c08838ba86b1fbbf03fe10a61e82edac2b6f616e26e7ee67df700f7bba175e277d208a3b11761c6b2333ccbff365c1b6b96957a12ab6
-  data.tar.gz: e3972203ac8f11d8459ff22be8515a81c4eb3945ca5382fb1f64446ad642e14b056626ad1b7f9065a168c9f1151b258a8fc555c1fa42bcdc0ca0db698b02a595
+  metadata.gz: 67b511a1d9b77510752fcd91f9f1c4862360264e4b77597b08901ab2c897368530048a84cd722e736ba179e259e4634cb88c1be4a2c50c9a59b130dd1a547193
+  data.tar.gz: 2a69a4ea0c0a9570970a0ba5b3b6b3d6c55c59b9a28352a58c99ede1c2391d65c4c165ac8b58d464549bae5a69cce03ed827acab2eac02d266d61a7fb4801f50

data/.rubocop.yml

@@ -435,7 +435,7 @@ Style/ExtraSpacing:
   # When true, allows most uses of extra spacing if the intent is to align
   # things with the previous or next line, not counting empty lines or comment
   # lines.
-  AllowForAlignment: true
+  AllowForAlignment: false
   # When true, forces the alignment of = in assignments on consecutive lines.
   ForceEqualSignAlignment: false
 

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    decidim (0.3.2)
-      decidim-admin (= 0.3.2)
-      decidim-api (= 0.3.2)
-      decidim-budgets (= 0.3.2)
-      decidim-comments (= 0.3.2)
-      decidim-core (= 0.3.2)
-      decidim-meetings (= 0.3.2)
-      decidim-pages (= 0.3.2)
-      decidim-proposals (= 0.3.2)
-      decidim-results (= 0.3.2)
-      decidim-surveys (= 0.3.2)
-      decidim-system (= 0.3.2)
-    decidim-admin (0.3.2)
+    decidim (0.4.0)
+      decidim-admin (= 0.4.0)
+      decidim-api (= 0.4.0)
+      decidim-budgets (= 0.4.0)
+      decidim-comments (= 0.4.0)
+      decidim-core (= 0.4.0)
+      decidim-meetings (= 0.4.0)
+      decidim-pages (= 0.4.0)
+      decidim-proposals (= 0.4.0)
+      decidim-results (= 0.4.0)
+      decidim-surveys (= 0.4.0)
+      decidim-system (= 0.4.0)
+    decidim-admin (0.4.0)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.3.2)
+      decidim-core (= 0.4.0)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.0)
@@ -24,29 +24,29 @@ PATH
       rails (~> 5.1.1)
       rectify (~> 0.9.1)
       sassc-rails (~> 1.3.0)
-    decidim-api (0.3.2)
-      graphiql-rails (~> 1.4.1)
+    decidim-api (0.4.0)
+      graphiql-rails (~> 1.4.2)
       graphql (~> 1.6.0)
       rack-cors (~> 0.4.0)
       rails (~> 5.1.1)
       sprockets-es6 (~> 0.9.2)
-    decidim-budgets (0.3.2)
-      decidim-comments (= 0.3.2)
-      decidim-core (= 0.3.2)
+    decidim-budgets (0.4.0)
+      decidim-comments (= 0.4.0)
+      decidim-core (= 0.4.0)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-comments (0.3.2)
-      decidim-core (= 0.3.2)
+    decidim-comments (0.4.0)
+      decidim-core (= 0.4.0)
       jquery-rails (~> 4.0)
       rails (~> 5.1.1)
-    decidim-core (0.3.2)
+    decidim-core (0.4.0)
       active_link_to (~> 1.0.4)
       autoprefixer-rails (~> 7.1.1)
       cancancan (~> 2.0.0)
       carrierwave (~> 1.1.0)
       date_validator (~> 0.9.0)
-      decidim-api (= 0.3.2)
+      decidim-api (= 0.4.0)
       devise (~> 4.3)
       devise-i18n (~> 1.1.0)
       file_validators (~> 2.1.0)
@@ -62,47 +62,48 @@ PATH
       omniauth-facebook (~> 4.0.0)
       omniauth-google-oauth2 (~> 0.5.0)
       omniauth-twitter (~> 1.4.0)
-      pg (~> 0.20.0)
+      pg (~> 0.21.0)
       premailer-rails (~> 1.9.5)
       rails (~> 5.1.1)
       rails-i18n
       rectify (~> 0.9.1)
       redis (~> 3.3.3)
       rubyzip (= 1.2.1)
+      sass (= 3.4.24)
       sassc-rails (~> 1.3.0)
       sprockets-es6 (~> 0.9.2)
       truncato (~> 0.7.9)
       wisper (~> 2.0.0)
-    decidim-meetings (0.3.2)
+    decidim-meetings (0.4.0)
       date_validator (~> 0.9)
-      decidim-core (= 0.3.2)
+      decidim-core (= 0.4.0)
       httparty (~> 0.15.0)
       jquery-tmpl-rails (~> 1.1.0)
       kaminari (~> 1.0.1)
       rectify (~> 0.8)
       searchlight (~> 4.1.0)
-    decidim-pages (0.3.2)
-      decidim-comments (= 0.3.2)
-      decidim-core (= 0.3.2)
+    decidim-pages (0.4.0)
+      decidim-comments (= 0.4.0)
+      decidim-core (= 0.4.0)
       rectify (~> 0.9.1)
-    decidim-proposals (0.3.2)
-      decidim-comments (= 0.3.2)
-      decidim-core (= 0.3.2)
+    decidim-proposals (0.4.0)
+      decidim-comments (= 0.4.0)
+      decidim-core (= 0.4.0)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       social-share-button (~> 0.10.0)
-    decidim-results (0.3.2)
-      decidim-comments (= 0.3.2)
-      decidim-core (= 0.3.2)
+    decidim-results (0.4.0)
+      decidim-comments (= 0.4.0)
+      decidim-core (= 0.4.0)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-surveys (0.3.2)
-      decidim-core (= 0.3.2)
+    decidim-surveys (0.4.0)
+      decidim-core (= 0.4.0)
       jquery-tmpl-rails (~> 1.1.0)
-    decidim-system (0.3.2)
+    decidim-system (0.4.0)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.3.2)
+      decidim-core (= 0.4.0)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.1)
@@ -115,22 +116,21 @@ PATH
 PATH
   remote: decidim-dev
   specs:
-    decidim-dev (0.3.2)
+    decidim-dev (0.4.0)
       byebug
       capybara (~> 2.14.0)
       capybara-screenshot (~> 1.0.14)
       codecov (~> 0.1.9)
       database_cleaner (~> 1.6.0)
       db-query-matchers (~> 0.9.0)
-      decidim (= 0.3.2)
+      decidim (= 0.4.0)
       factory_girl_rails
       faker (~> 1.7.3)
       i18n-tasks (= 0.9.15)
       launchy
-      letter_opener_web (~> 1.3.0)
       listen (~> 3.1.0)
       poltergeist (~> 1.15.0)
-      puma (~> 3.8.2)
+      puma (~> 3.9.1)
       rails-controller-testing (~> 1.0.1)
       rspec-html-matchers (~> 0.9.1)
       rspec-rails (~> 3.5, < 3.6)
@@ -291,7 +291,7 @@ GEM
       activesupport (>= 4.2.0)
     graphiql-rails (1.4.2)
       rails
-    graphql (1.6.3)
+    graphql (1.6.4)
     hashdiff (0.3.4)
     hashie (3.5.5)
     high_voltage (3.0.0)
@@ -335,12 +335,6 @@ GEM
     kaminari-core (1.0.1)
     launchy (2.4.3)
       addressable (~> 2.3)
-    letter_opener (1.4.1)
-      launchy (~> 2.2)
-    letter_opener_web (1.3.1)
-      actionmailer (>= 3.2)
-      letter_opener (~> 1.0)
-      railties (>= 3.2)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -353,7 +347,7 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_magick (4.7.1)
+    mini_magick (4.7.2)
     mini_portile2 (2.1.0)
     minitest (5.10.2)
     multi_json (1.12.1)
@@ -391,7 +385,7 @@ GEM
     orm_adapter (0.5.0)
     parser (2.4.0.0)
       ast (~> 2.2)
-    pg (0.20.0)
+    pg (0.21.0)
     poltergeist (1.15.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
@@ -401,11 +395,11 @@ GEM
       addressable
       css_parser (>= 1.4.10)
       htmlentities (>= 4.0.0)
-    premailer-rails (1.9.6)
+    premailer-rails (1.9.7)
       actionmailer (>= 3, < 6)
       premailer (~> 1.7, >= 1.7.9)
     public_suffix (2.0.5)
-    puma (3.8.2)
+    puma (3.9.1)
     rack (2.0.3)
     rack-cors (0.4.1)
     rack-test (0.6.3)
@@ -534,7 +528,7 @@ GEM
       nokogiri (~> 1.7.0)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    unicode-display_width (1.2.1)
+    unicode-display_width (1.3.0)
     url (0.3.2)
     virtus (1.0.5)
       axiom-types (~> 0.1)

data/README.md

@@ -1,4 +1,4 @@
-<img src="https://decidim.github.io/images/logo.svg" alt="Decidim Logo">
+<img src="https://cdn.rawgit.com/decidim/decidim/master/logo.svg" alt="Decidim Logo" width="400">
 
 The participatory democracy framework.
 
@@ -116,6 +116,7 @@ After you create a development app (`bundle exec rake development_app`):
 | [Pages](https://github.com/decidim/decidim/tree/master/decidim-pages) | The Pages module adds static page capabilities to any participatory process. It basically provides an interface to include arbitrary HTML content to any step. |
 | [Proposals](https://github.com/decidim/decidim/tree/master/decidim-proposals) | The Proposals module adds one of the main features of Decidim: allows users to contribute to a participatory process by creating proposals. |
 | [Results](https://github.com/decidim/decidim/tree/master/decidim-results) | Adds a results section to any participatory process so users can follow along the state of the accepted proposals. |
+| [Surveys](https://github.com/decidim/decidim/tree/master/decidim-surveys) | Adds the ability for admins to create arbitrary surveys. |
 | [System](https://github.com/decidim/decidim/tree/master/decidim-system) | Multitenant Admin to manage multiple organizations in a single installation |
 
 ## Technical tradeoffs

data/Rakefile

@@ -2,10 +2,10 @@
 
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require_relative "lib/generators/decidim/app_generator"
-require_relative "lib/generators/decidim/docker_generator"
+require "generators/decidim/app_generator"
+require "generators/decidim/docker_generator"
+require "decidim/dev"
 
-load "decidim-core/lib/tasks/decidim_tasks.rake"
 load "decidim-dev/lib/tasks/test_app.rake"
 
 DECIDIM_GEMS = %w(core system admin api pages meetings proposals comments results budgets surveys dev).freeze
@@ -15,7 +15,7 @@ RSpec::Core::RakeTask.new(:spec)
 task default: :spec
 
 desc "Runs all tests in all Decidim engines"
-task test_all: ["decidim:generate_test_app"] do
+task :test_all do
   DECIDIM_GEMS.each do |gem_name|
     next if gem_name == "dev"
 

data/decidim-admin/app/assets/stylesheets/decidim/admin/extra/_label-required.scss

@@ -0,0 +1,3 @@
+.label-required {
+  margin-left: 5px;
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/extra/_title_bar.scss

@@ -2,4 +2,60 @@
   a.logo {
     color: #fff;
   }
-}
+  @include breakpoint(smallmedium down){
+    border-top: 2.125rem solid darken($dark-gray, 15%);
+  }
+}
+
+.tool-bar{
+  text-align: right;
+  position: absolute;
+  right: 2rem;
+  vertical-align: middle;
+  @include breakpoint(smallmedium down){
+    position: initial;
+  }
+  .user-login{
+    vertical-align: middle;
+    position: initial;
+    text-align: left;
+    display: inline-block;
+    margin-top: 0px;
+    @include breakpoint(smallmedium down){
+      position: absolute;
+      right: 2rem;
+      margin-top: -1.2rem;
+    }
+  }
+  .language-choose{
+    position: initial;
+    vertical-align: middle;
+    text-align: left;
+    display: inline-block;
+    vertical-align: middle;
+    .is-dropdown-submenu-parent a{
+      color: #fff;
+      &:after{
+        border-color: #fff transparent transparent !important;
+      }
+    }
+    .is-dropdown-submenu li > a {
+      color: $dark-gray;
+      &:hover{
+        background-color: lighten($medium-gray, 30%)
+      }
+    }
+    @include breakpoint(smallmedium down){
+      font-size: .8rem;
+      position: absolute;
+      top: -2.2rem;
+      left: .5rem;
+      margin-left: 0;
+      .dropdown.menu > li.is-dropdown-submenu-parent > a::after{
+        border-width: 3px;
+        right: 10px;
+        margin-top: 0;
+      }
+    }
+  }
+}

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

@@ -24,9 +24,12 @@ module Decidim
       # Returns nothing.
       def call
         return broadcast(:invalid) if form.invalid?
-        return broadcast(:invalid) unless user
 
-        create_role
+        ActiveRecord::Base.transaction do
+          create_or_invite_user
+          create_role
+        end
+
         broadcast(:ok)
       rescue ActiveRecord::RecordInvalid
         form.errors.add(:email, :taken)
@@ -35,21 +38,39 @@ module Decidim
 
       private
 
-      attr_reader :form, :participatory_process, :current_user
+      attr_reader :form, :participatory_process, :current_user, :user
 
       def create_role
-        ParticipatoryProcessUserRole.create!(
+        ParticipatoryProcessUserRole.find_or_create_by!(
           role: form.role.to_sym,
           user: user,
           participatory_process: @participatory_process
         )
       end
 
-      def user
-        @user ||= User.where(
+      def create_or_invite_user
+        @user ||= existing_user || new_user
+      end
+
+      def existing_user
+        return @existing_user if defined?(@existing_user)
+
+        @existing_user = User.where(
           email: form.email,
           organization: participatory_process.organization
-        ).first || InviteUser.call(user_form) do
+        ).first
+
+        if @existing_user && !@existing_user.invitation_accepted?
+          InviteUserAgain.call(@existing_user, invitation_instructions)
+        end
+
+        @existing_user
+      end
+
+      def new_user
+        new_user_form = user_form.dup
+        new_user_form.roles = []
+        @new_user ||= InviteUser.call(new_user_form) do
           on(:ok) do |user|
             return user
           end

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

@@ -38,7 +38,8 @@ module Decidim
           description: form.description,
           start_date: form.start_date,
           end_date: form.end_date,
-          participatory_process: @participatory_process
+          participatory_process: @participatory_process,
+          active: @participatory_process.steps.empty?
         )
       end
     end

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

@@ -19,8 +19,7 @@ module Decidim
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid, :last_step) if @participatory_process.steps.count == 1
-        return broadcast(:invalid, :active_step) if @step.active?
+        return broadcast(:invalid, :active_step) if active_step?
 
         @step.destroy!
         reorder_steps
@@ -29,6 +28,10 @@ module Decidim
 
       private
 
+      def active_step?
+        @participatory_process.steps.count > 1 && @step.active?
+      end
+
       def reorder_steps
         steps = @participatory_process.steps.reload
 

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

@@ -36,6 +36,7 @@ module Decidim
         @feature.update_attributes(
           name: form.name,
           settings: form.settings,
+          default_step_settings: form.default_step_settings,
           step_settings: form.step_settings,
           weight: form.weight
         )