decidim 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2869b645c9f346103a37cf717d6c7fca2e861c9f
-  data.tar.gz: fefd609fec533ed65d3bd2682d2debac2d08aa55
+  metadata.gz: b4967577009dee595cd0f4e2b433af4dfc09ac61
+  data.tar.gz: 952054cd021780bbe7c36af4a6e9a082f7513414
 SHA512:
-  metadata.gz: 316a9291581cef1a24a4e4d6bc1fbaaf896f69e6a7eb2b6bd56bfd5629a738291f0d58a49945828c0a53b262fa9951543b9b4223d2c0016c60743c56f0a5f54f
-  data.tar.gz: 648cc97cf6780a706a8c741c3ccec6749d0be7b8672556d8f7d6ca86e86fc254237ec3e23108a65928e50d1704e8dd32016eba85469c7c8b24364e8d00bca647
+  metadata.gz: 20de3c5a3f538c661d40b14dc79efbba4ee8d3829b2f21c70c4a8078c5f881fc418b1c7d2fb772901976b2e4c577636435e7bdb7650b09fd3f30078fd82c15b3
+  data.tar.gz: 5f549fe406ca1b9ef7d7ddec5784af29edc25b9e2b89f9587b1552b8fe6370f25d87e5b769460a00dcd5886dfd2053667b98220d6794c41eee11ac4e9e2360d9

data/.circleci/config.yml

@@ -25,7 +25,7 @@ jobs:
           name: Install app dependencies
           command: |
             bundle install
-            yarn
+            npm i
       - run:
           name: Generate test app
           command: bundle exec rake decidim:generate_test_app
@@ -34,34 +34,34 @@ jobs:
           command: |
             case $CIRCLE_NODE_INDEX in
               0)
-                (cd /code && yarn lint && bundle exec rspec spec) &&
-                (cd /code && yarn test -- decidim-api) &&
+                (cd /code && npm run lint && bundle exec rspec spec) &&
+                (cd /code && npm test -- decidim-api) &&
                 (cd /code/decidim-api && bundle exec rake) &&
-                (cd /code && yarn test -- decidim-core) &&
+                (cd /code && npm test -- decidim-core) &&
                 (cd /code/decidim-core && bundle exec rake)
                 ;;
               1)
-                (cd /code && yarn test -- decidim-admin) &&
+                (cd /code && npm test -- decidim-admin) &&
                 (cd /code/decidim-admin && bundle exec rake) &&
-                (cd /code && yarn test -- decidim-meetings) &&
+                (cd /code && npm test -- decidim-meetings) &&
                 (cd /code/decidim-meetings && bundle exec rake)
                 ;;
               2)
-                (cd /code && yarn test -- decidim-proposals) &&
+                (cd /code && npm test -- decidim-proposals) &&
                 (cd /code/decidim-proposals && bundle exec rake) &&
-                (cd /code && yarn test -- decidim-comments) &&
+                (cd /code && npm test -- decidim-comments) &&
                 (cd /code/decidim-comments && bundle exec rake)
                 ;;
               3)
-                (cd /code && yarn test -- decidim-pages) &&
+                (cd /code && npm test -- decidim-pages) &&
                 (cd /code/decidim-pages && bundle exec rake) &&
-                (cd /code && yarn test -- decidim-system) &&
+                (cd /code && npm test -- decidim-system) &&
                 (cd /code/decidim-system && bundle exec rake) &&
-                (cd /code && yarn test -- decidim-results) &&
+                (cd /code && npm test -- decidim-results) &&
                 (cd /code/decidim-results && bundle exec rake) &&
-                (cd /code && yarn test -- decidim-budgets) &&
+                (cd /code && npm test -- decidim-budgets) &&
                 (cd /code/decidim-budgets && bundle exec rake) &&
-                (cd /code && yarn test -- decidim-surveys) &&
+                (cd /code && npm test -- decidim-surveys) &&
                 (cd /code/decidim-surveys && bundle exec rake)
                 ;;
             esac

data/.rubocop.yml

@@ -1259,5 +1259,6 @@ Metrics/BlockLength:
     - 'decidim-*/**/*/types/**/*'
     - 'decidim-*/lib/**/*/test/**/*'
     - 'decidim-*/lib/**/*/feature.rb'
+    - 'decidim-*/db/seeds.rb'
     - 'decidim-*/spec/**/*.rb'
     - '**/*.gemspec'

data/CHANGELOG.md

@@ -1,8 +1,22 @@
 # Change Log
 
 ## [Unreleased](https://github.com/decidim/decidim/tree/HEAD)
+[Full Changelog](https://github.com/decidim/decidim/compare/v0.4.3...HEAD)
 
-[Full Changelog](https://github.com/decidim/decidim/compare/v0.4.2...HEAD)
+## [v0.4.3](https://github.com/decidim/decidim/tree/v0.4.3) (2017-07-25)
+[Full Changelog](https://github.com/decidim/decidim/compare/v0.4.2...v0.4.3)
+
+**Added**
+
+- **decidim-core**: Added `show_statistics` flag to participatory processes. This flag enable/disable statistics per participatory process in the participatory public page. [\#1526](https://github.com/decidim/decidim/pull/1526)
+
+**Changed**
+
+- **decidim**: Replaced `yarn` with `npm` (v5) to handle js dependencies. [\#1628](https://github.com/decidim/decidim/pull/1628)
+
+**Fixed**
+
+- **decidim-core**: Fixed active option in main menu being incorrect sometimes [\#1638](https://githu.com/decidim/decidim/pull/1638).
 
 ## [v0.4.2](https://github.com/decidim/decidim/tree/v0.4.2) (2017-07-21)
 [Full Changelog](https://github.com/decidim/decidim/compare/v0.4.1...v0.4.2)
@@ -1630,4 +1644,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Dockerfile

@@ -3,12 +3,9 @@ MAINTAINER david.morcillo@codegram.com
 
 ENV APP_HOME /decidim
 
-RUN curl https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-    echo "deb http://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-
 RUN apt-get update
-RUN curl -sL https://deb.nodesource.com/setup_7.x | bash && \
-    apt-get install -y nodejs yarn
+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash && \
+    apt-get install -y nodejs
 
 ADD Gemfile /tmp/Gemfile
 ADD Gemfile.lock /tmp/Gemfile.lock
@@ -29,9 +26,9 @@ ADD decidim-budgets/decidim-budgets.gemspec /tmp/decidim-proposals/decidim-budge
 ADD decidim-surveys/decidim-surveys.gemspec /tmp/decidim-surveys/decidim-surveys.gemspec
 
 ADD package.json /tmp/package.json
-ADD yarn.lock /tmp/yarn.lock
+ADD package-lock.json /tmp/package-lock.json
 
-RUN cd /tmp && bundle install && yarn
+RUN cd /tmp && bundle install && npm i
 
 RUN mkdir -p $APP_HOME
 WORKDIR $APP_HOME

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    decidim (0.4.2)
-      decidim-admin (= 0.4.2)
-      decidim-api (= 0.4.2)
-      decidim-budgets (= 0.4.2)
-      decidim-comments (= 0.4.2)
-      decidim-core (= 0.4.2)
-      decidim-meetings (= 0.4.2)
-      decidim-pages (= 0.4.2)
-      decidim-proposals (= 0.4.2)
-      decidim-results (= 0.4.2)
-      decidim-surveys (= 0.4.2)
-      decidim-system (= 0.4.2)
-    decidim-admin (0.4.2)
+    decidim (0.4.3)
+      decidim-admin (= 0.4.3)
+      decidim-api (= 0.4.3)
+      decidim-budgets (= 0.4.3)
+      decidim-comments (= 0.4.3)
+      decidim-core (= 0.4.3)
+      decidim-meetings (= 0.4.3)
+      decidim-pages (= 0.4.3)
+      decidim-proposals (= 0.4.3)
+      decidim-results (= 0.4.3)
+      decidim-surveys (= 0.4.3)
+      decidim-system (= 0.4.3)
+    decidim-admin (0.4.3)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.4.2)
+      decidim-core (= 0.4.3)
       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.4.2)
+    decidim-api (0.4.3)
       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.4.2)
-      decidim-comments (= 0.4.2)
-      decidim-core (= 0.4.2)
+    decidim-budgets (0.4.3)
+      decidim-comments (= 0.4.3)
+      decidim-core (= 0.4.3)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-comments (0.4.2)
-      decidim-core (= 0.4.2)
+    decidim-comments (0.4.3)
+      decidim-core (= 0.4.3)
       jquery-rails (~> 4.0)
       rails (~> 5.1.1)
-    decidim-core (0.4.2)
+    decidim-core (0.4.3)
       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.4.2)
+      decidim-api (= 0.4.3)
       devise (~> 4.3)
       devise-i18n (~> 1.1.0)
       file_validators (~> 2.1.0)
@@ -74,36 +74,36 @@ PATH
       sprockets-es6 (~> 0.9.2)
       truncato (~> 0.7.9)
       wisper (~> 2.0.0)
-    decidim-meetings (0.4.2)
+    decidim-meetings (0.4.3)
       date_validator (~> 0.9)
-      decidim-core (= 0.4.2)
+      decidim-core (= 0.4.3)
       httparty (~> 0.15.0)
       jquery-tmpl-rails (~> 1.1.0)
       kaminari (~> 1.0.1)
       rectify (~> 0.8)
       searchlight (~> 4.1.0)
-    decidim-pages (0.4.2)
-      decidim-comments (= 0.4.2)
-      decidim-core (= 0.4.2)
+    decidim-pages (0.4.3)
+      decidim-comments (= 0.4.3)
+      decidim-core (= 0.4.3)
       rectify (~> 0.9.1)
-    decidim-proposals (0.4.2)
-      decidim-comments (= 0.4.2)
-      decidim-core (= 0.4.2)
+    decidim-proposals (0.4.3)
+      decidim-comments (= 0.4.3)
+      decidim-core (= 0.4.3)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       social-share-button (~> 0.10.0)
-    decidim-results (0.4.2)
-      decidim-comments (= 0.4.2)
-      decidim-core (= 0.4.2)
+    decidim-results (0.4.3)
+      decidim-comments (= 0.4.3)
+      decidim-core (= 0.4.3)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-surveys (0.4.2)
-      decidim-core (= 0.4.2)
+    decidim-surveys (0.4.3)
+      decidim-core (= 0.4.3)
       jquery-tmpl-rails (~> 1.1.0)
-    decidim-system (0.4.2)
+    decidim-system (0.4.3)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.4.2)
+      decidim-core (= 0.4.3)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.1)
@@ -116,14 +116,14 @@ PATH
 PATH
   remote: decidim-dev
   specs:
-    decidim-dev (0.4.2)
+    decidim-dev (0.4.3)
       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.4.2)
+      decidim (= 0.4.3)
       factory_girl_rails
       faker (~> 1.7.3)
       i18n-tasks (= 0.9.15)
@@ -270,7 +270,7 @@ GEM
       railties (>= 3.0.0)
     faker (1.7.3)
       i18n (~> 0.5)
-    faraday (0.12.1)
+    faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
     file_validators (2.1.0)
@@ -297,7 +297,7 @@ GEM
     high_voltage (3.0.0)
     highline (1.7.8)
     htmlentities (4.3.4)
-    httparty (0.15.5)
+    httparty (0.15.6)
       multi_xml (>= 0.5.2)
     i18n (0.8.6)
     i18n-tasks (0.9.15)
@@ -522,7 +522,7 @@ GEM
     thor (0.19.4)
     thread (0.2.2)
     thread_safe (0.3.6)
-    tilt (2.0.7)
+    tilt (2.0.8)
     truncato (0.7.9)
       htmlentities (~> 4.3.1)
       nokogiri (~> 1.7.0)

data/README.md

@@ -62,7 +62,7 @@ In order to develop on decidim, you'll need:
 
 * **PostgreSQL** 9.4+
 * **Ruby** 2.4.1
-* **NodeJS** with **yarn** (JavaScript dependency manager, can be installed with `npm install yarn`)
+* **NodeJS** 8.x.x
 * **ImageMagick**
 * **PhantomJS**
 
@@ -72,7 +72,7 @@ The easiest way to work on decidim is to clone decidim's repository and install
 $ git clone git@github.com:decidim/decidim.git
 $ cd decidim
 $ bundle install
-$ yarn install
+$ npm install
 ```
 
 You have several rake tasks available for you:

data/Rakefile

@@ -53,13 +53,12 @@ task :development_app do
   end
 
   Decidim::Generators::AppGenerator.start(
-    ["development_app", "--path", ".."]
+    ["development_app", "--path", "..", "--recreate_db"]
   )
 
   Dir.chdir("#{__dir__}/development_app") do
     Bundler.with_clean_env do
       sh "bundle exec spring stop"
-      sh "bundle exec rake db:drop db:create db:migrate"
       sh "bundle exec rake db:seed"
       sh "bundle exec rails generate decidim:demo"
     end
@@ -80,11 +79,11 @@ task :docker_development_app do
 end
 
 desc "Build webpack bundle files"
-task webpack: ["yarn:install"] do
-  sh "yarn build:prod"
+task webpack: ["npm:install"] do
+  sh "npm run build:prod"
 end
 
-desc "Install yarn dependencies"
-task "yarn:install" do
-  sh "yarn"
+desc "Install npm dependencies"
+task "npm:install" do
+  sh "npm i"
 end

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

@@ -63,7 +63,8 @@ module Decidim
           participatory_structure: form.participatory_structure,
           meta_scope: form.meta_scope,
           end_date: form.end_date,
-          participatory_process_group: form.participatory_process_group
+          participatory_process_group: form.participatory_process_group,
+          show_statistics: form.show_statistics
         }
       end
     end

data/decidim-admin/app/controllers/decidim/admin/categories_controller.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Admin
     # Controller that allows managing categories.
     #
-    class CategoriesController < ApplicationController
+    class CategoriesController < Decidim::Admin::ApplicationController
       include Concerns::ParticipatoryProcessAdmin
 
       def index

data/decidim-admin/app/controllers/decidim/admin/dashboard_controller.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Admin
     # Controller that shows a simple dashboard.
     #
-    class DashboardController < ApplicationController
+    class DashboardController < Decidim::Admin::ApplicationController
       authorize_resource :admin_dashboard, class: false
     end
   end

data/decidim-admin/app/controllers/decidim/admin/feature_permissions_controller.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Admin
     # Controller that allows managing feature permissions.
     #
-    class FeaturePermissionsController < ApplicationController
+    class FeaturePermissionsController < Decidim::Admin::ApplicationController
       include Concerns::ParticipatoryProcessAdmin
       helper_method :authorizations, :feature
 

data/decidim-admin/app/controllers/decidim/admin/features_controller.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Admin
     # Controller that allows managing the Participatory Process' Features in the
     # admin panel.
     #
-    class FeaturesController < ApplicationController
+    class FeaturesController < Decidim::Admin::ApplicationController
       include Concerns::ParticipatoryProcessAdmin
 
       helper_method :manifest

data/decidim-admin/app/controllers/decidim/admin/moderations_controller.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # This controller allows admins to manage moderations in a participatory process.
-    class ModerationsController < Admin::ApplicationController
+    class ModerationsController < Decidim::Admin::ApplicationController
       include Concerns::ParticipatoryProcessAdmin
 
       helper_method :moderations

data/decidim-admin/app/controllers/decidim/admin/organization_controller.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Admin
     # Controller that allows managing the user organization.
     #
-    class OrganizationController < ApplicationController
+    class OrganizationController < Decidim::Admin::ApplicationController
       layout "decidim/admin/settings"
 
       def edit