decidim 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b40409515f277c9b0a7a947dd0e2b1e6b3c89eb
-  data.tar.gz: 3ae27316858244258a2c9820e0836a2ccb9657b3
+  metadata.gz: 87eb409fe358de2fd25fc2ad9a666eaf073cb45b
+  data.tar.gz: c09f08acc49fb022dfd5fa6c5dcd5361f0438f53
 SHA512:
-  metadata.gz: 6a50d7560c87ac361df4911a6cd887cf35b60dba4dff07a83bfb8e4ce913464e01ae5e3c0d117de413a8683b3f4310a09af351944de354cc36d60911214c1705
-  data.tar.gz: b96fdba8243d18a153c500f4ed96ba5b9b38a5a0d9ba2290f9ddba84690130f586a8c9e4cbc0242a6ed64791224a7a5e95f1a8e6d68523d1cb98398e56f537cd
+  metadata.gz: 4cde38e84e33301f84f820b345e15dac160b199c32e0772b02a85718836efb7fde6314efa4ab726676f286d33ac9733d25554f951156b0bb80578ec42d3309a5
+  data.tar.gz: c13ad956c5b71be8527b70ad32a039a97649eb39962f8d888fc4866172fd7c252a7284918816ef21da58baaf0d403ab4b959412a60cc01da5bc4d700d7cd3173

data/.travis.yml

@@ -15,6 +15,8 @@ env:
   global:
     - BUNDLE_GEMFILE="$TRAVIS_BUILD_DIR/Gemfile"
     - BUNDLE_PATH="$HOME/.bundle"
+    - PHANTOMJS_VERSION=2.1.1
+    - PHANTOMJS_BIN="$HOME/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64/bin/phantomjs"
   matrix:
     - GEM=. DB=postgres
     - GEM=decidim-admin DB=postgres
@@ -25,10 +27,19 @@ env:
     - GEM=decidim-comments DB=postgres
     - GEM=decidim-meetings DB=postgres
     - GEM=decidim-proposals DB=postgres
+    - GEM=decidim-results DB=postgres
+    - GEM=decidim-budgets DB=postgres
 
 before_install:
+  # Upgrade PhantomJS
+  - "export PATH=$HOME/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64/bin:$PATH"
+  - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then rm -rf $HOME/travis_phantomjs; mkdir -p $HOME/travis_phantomjs; fi"
+  - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then wget https://github.com/Medium/phantomjs/releases/download/v$PHANTOMJS_VERSION/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -O $HOME/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2; fi"
+  - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then tar -xvf $HOME/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -C $HOME/travis_phantomjs; fi"
+  - "phantomjs --version"
   # Repo for newer Node.js versions
   - curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
+  - gem update --system
   - yarn
 
 bundler_args: --jobs=3 --retry=3 --deployment --path="$HOME/.bundle"
@@ -39,6 +50,7 @@ cache:
     - $TRAVIS_BUILD_DIR/.yarn-cache
     - $TRAVIS_BUILD_DIR/node_modules
     - $BUNDLE_PATH
+    - $HOME/travis_phantomjs
 
 script:
   - cd $GEM;

data/Dockerfile

@@ -24,6 +24,8 @@ ADD decidim-pages/decidim-pages.gemspec /tmp/decidim-pages/decidim-pages.gemspec
 ADD decidim-comments/decidim-comments.gemspec /tmp/decidim-comments/decidim-comments.gemspec
 ADD decidim-meetings/decidim-meetings.gemspec /tmp/decidim-meetings/decidim-meetings.gemspec
 ADD decidim-proposals/decidim-proposals.gemspec /tmp/decidim-proposals/decidim-proposals.gemspec
+ADD decidim-results/decidim-results.gemspec /tmp/decidim-results/decidim-results.gemspec
+ADD decidim-budgets/decidim-budgets.gemspec /tmp/decidim-proposals/decidim-budgets.gemspec
 
 ADD package.json /tmp/package.json
 ADD yarn.lock /tmp/yarn.lock

data/Gemfile.lock

@@ -1,32 +1,46 @@
 PATH
   remote: .
   specs:
-    decidim (0.0.2)
-      decidim-admin (= 0.0.2)
-      decidim-api (= 0.0.2)
-      decidim-comments (= 0.0.2)
-      decidim-core (= 0.0.2)
-      decidim-meetings (= 0.0.2)
-      decidim-pages (= 0.0.2)
-      decidim-proposals (= 0.0.2)
-      decidim-system (= 0.0.2)
+    decidim (0.0.3)
+      decidim-admin (= 0.0.3)
+      decidim-api (= 0.0.3)
+      decidim-budgets (= 0.0.3)
+      decidim-comments (= 0.0.3)
+      decidim-core (= 0.0.3)
+      decidim-meetings (= 0.0.3)
+      decidim-pages (= 0.0.3)
+      decidim-proposals (= 0.0.3)
+      decidim-results (= 0.0.3)
+      decidim-system (= 0.0.3)
       rails (~> 5.0.0, >= 5.0.0.1)
       rails-i18n (~> 5.0.0, >= 5.0.0.1)
-    decidim-proposals (0.0.2)
-      decidim-comments (= 0.0.2)
-      decidim-core (= 0.0.2)
+    decidim-budgets (0.0.3)
+      decidim-comments (= 0.0.3)
+      decidim-core (= 0.0.3)
+      kaminari (~> 1.0.0.rc1)
+      rectify (~> 0.8)
+      searchlight (~> 4.1.0)
+    decidim-proposals (0.0.3)
+      decidim-comments (= 0.0.3)
+      decidim-core (= 0.0.3)
       kaminari (~> 1.0.1)
       rectify (~> 0.8.0)
       social-share-button (~> 0.8.8)
+    decidim-results (0.0.3)
+      decidim-comments (= 0.0.3)
+      decidim-core (= 0.0.3)
+      kaminari (~> 1.0.0.rc1)
+      rectify (~> 0.8)
+      searchlight (~> 4.1.0)
 
 PATH
   remote: decidim-admin
   specs:
-    decidim-admin (0.0.2)
+    decidim-admin (0.0.3)
       active_link_to (~> 1.0.0)
       cancancan (~> 1.15.0)
       carrierwave (~> 1.0.0.rc)
-      decidim-core (= 0.0.2)
+      decidim-core (= 0.0.3)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.0)
@@ -35,14 +49,13 @@ PATH
       rails (~> 5.0.0, >= 5.0.0.1)
       rectify (~> 0.8.0)
       sassc-rails (~> 1.3.0)
-      turbolinks (~> 5.0.0, >= 5.0.0.1)
 
 PATH
   remote: decidim-api
   specs:
-    decidim-api (0.0.2)
+    decidim-api (0.0.3)
       graphiql-rails (~> 1.4.1)
-      graphql (~> 1.4.1)
+      graphql (~> 1.4.2)
       rack-cors (~> 0.4.0)
       rails (~> 5.0.0, >= 5.0.0.1)
       sprockets-es6 (~> 0.9.2)
@@ -50,21 +63,20 @@ PATH
 PATH
   remote: decidim-comments
   specs:
-    decidim-comments (0.0.2)
-      decidim-core (= 0.0.2)
+    decidim-comments (0.0.3)
+      decidim-core (= 0.0.3)
       jquery-rails (~> 4.0)
       rails (~> 5.0.0, >= 5.0.0.1)
-      turbolinks (~> 5.0.0, >= 5.0.0.1)
 
 PATH
   remote: decidim-core
   specs:
-    decidim-core (0.0.2)
+    decidim-core (0.0.3)
       active_link_to (~> 1.0.0)
       cancancan (~> 1.15.0)
       carrierwave (~> 1.0.0)
       date_validator (~> 0.9.0)
-      decidim-api (= 0.0.2)
+      decidim-api (= 0.0.3)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       file_validators (~> 2.1.0)
@@ -80,44 +92,46 @@ PATH
       pg (~> 0.19.0)
       rails (~> 5.0.0, >= 5.0.0.1)
       rectify (~> 0.8.0)
-      redis (~> 3.3.0)
+      redis (~> 3.3.3)
       roadie (~> 3.2.1)
       roadie-rails (~> 1.0)
       sassc-rails (~> 1.3.0)
       sprockets-es6 (~> 0.9.2)
       truncato (~> 0.7.9)
-      turbolinks (~> 5.0.0, >= 5.0.0.1)
 
 PATH
   remote: decidim-dev
   specs:
-    decidim-dev (0.0.2)
+    decidim-dev (0.0.3)
       byebug
-      capybara (~> 2.11.0)
+      capybara (~> 2.12.0)
       capybara-screenshot (~> 1.0.14)
       codecov (~> 0.1.9)
       database_cleaner (~> 1.5.0)
       db-query-matchers (~> 0.7.0)
-      decidim (= 0.0.2)
+      decidim (= 0.0.3)
       factory_girl_rails
       faker (~> 1.7.2)
       i18n-tasks (= 0.9.8)
       launchy
       listen (~> 3.1.0)
-      poltergeist (~> 1.12.0)
+      poltergeist (~> 1.13.0)
       rails-controller-testing (~> 1.0.1)
       rspec-rails (~> 3.5)
       rspec-repeat (~> 1.0.2)
       rubocop (~> 0.47)
-      simplecov (~> 0.12)
+      simplecov (~> 0.13)
       wisper-rspec
 
 PATH
   remote: decidim-meetings
   specs:
-    decidim-meetings (0.0.2)
+    decidim-meetings (0.0.3)
       date_validator (~> 0.9)
-      decidim-core (= 0.0.2)
+      decidim-core (= 0.0.3)
+      geocoder (~> 1.4.1)
+      httparty (~> 0.14.0)
+      jquery-tmpl-rails (~> 1.1.0)
       kaminari (~> 1.0.1)
       rectify (~> 0.8)
       searchlight (~> 4.1.0)
@@ -125,17 +139,17 @@ PATH
 PATH
   remote: decidim-pages
   specs:
-    decidim-pages (0.0.2)
-      decidim-comments (= 0.0.2)
-      decidim-core (= 0.0.2)
+    decidim-pages (0.0.3)
+      decidim-comments (= 0.0.3)
+      decidim-core (= 0.0.3)
       rectify (~> 0.8.0)
 
 PATH
   remote: decidim-system
   specs:
-    decidim-system (0.0.2)
+    decidim-system (0.0.3)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.0.2)
+      decidim-core (= 0.0.3)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.0)
@@ -144,7 +158,6 @@ PATH
       rails (~> 5.0.0, >= 5.0.0.1)
       rectify (~> 0.8.0)
       sassc-rails (~> 1.3.0)
-      turbolinks (~> 5.0.0, >= 5.0.0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -204,7 +217,7 @@ GEM
     builder (3.2.3)
     byebug (9.0.6)
     cancancan (1.15.0)
-    capybara (2.11.0)
+    capybara (2.12.0)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -233,6 +246,8 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.4)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     css_parser (1.4.7)
       addressable
     database_cleaner (1.5.3)
@@ -252,7 +267,7 @@ GEM
     devise_invitable (1.7.0)
       actionmailer (>= 4.0.0)
       devise (>= 4.0.0)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
     easy_translate (0.5.0)
       json
@@ -284,16 +299,20 @@ GEM
       activesupport (>= 4.1)
       railties (>= 4.1)
       tzinfo (~> 1.2, >= 1.2.2)
+    geocoder (1.4.2)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     graphiql-rails (1.4.1)
       rails
-    graphql (1.4.1)
-    hashie (3.4.6)
+    graphql (1.4.2)
+    hashdiff (0.3.2)
+    hashie (3.5.1)
     high_voltage (3.0.0)
     highline (1.7.8)
     htmlentities (4.3.4)
-    i18n (0.7.0)
+    httparty (0.14.0)
+      multi_xml (>= 0.5.2)
+    i18n (0.8.0)
     i18n-tasks (0.9.8)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
@@ -309,6 +328,8 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    jquery-tmpl-rails (1.1.0)
+      rails (>= 3.1.0)
     json (2.0.3)
     jwt (1.5.6)
     kaminari (1.0.1)
@@ -376,14 +397,14 @@ GEM
     parser (2.3.3.1)
       ast (~> 2.2)
     pg (0.19.0)
-    poltergeist (1.12.0)
+    poltergeist (1.13.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
     public_suffix (2.0.5)
     rack (2.0.1)
-    rack-cors (0.4.0)
+    rack-cors (0.4.1)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (5.0.1)
@@ -419,7 +440,7 @@ GEM
     rainbow (2.2.1)
     rake (12.0.0)
     rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     rectify (0.8.0)
       activemodel (>= 4.1.0)
@@ -427,7 +448,7 @@ GEM
       activesupport (>= 4.1.0)
       virtus (~> 1.0.5)
       wisper (>= 1.6.1)
-    redis (3.3.2)
+    redis (3.3.3)
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
     roadie (3.2.1)
@@ -467,8 +488,9 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
     ruby_dep (1.5.0)
+    safe_yaml (1.0.4)
     sass (3.4.23)
-    sassc (1.11.1)
+    sassc (1.11.2)
       bundler
       ffi (~> 1.9.6)
       sass (>= 3.3.0)
@@ -480,7 +502,7 @@ GEM
       sprockets-rails
       tilt
     searchlight (4.1.0)
-    simplecov (0.12.0)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
@@ -505,14 +527,11 @@ GEM
     thor (0.19.4)
     thread (0.2.2)
     thread_safe (0.3.5)
-    tilt (2.0.5)
+    tilt (2.0.6)
     tins (1.13.0)
     truncato (0.7.9)
       htmlentities (~> 4.3.1)
       nokogiri (~> 1.7.0)
-    turbolinks (5.0.1)
-      turbolinks-source (~> 5)
-    turbolinks-source (5.0.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unicode-display_width (1.1.3)
@@ -522,9 +541,13 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    warden (1.2.6)
+    warden (1.2.7)
       rack (>= 1.0)
-    websocket-driver (0.6.4)
+    webmock (2.3.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     wisper (1.6.1)
@@ -545,9 +568,12 @@ DEPENDENCIES
   decidim-dev!
   decidim-meetings!
   decidim-pages!
+  decidim-proposals (= 0.0.3)
+  decidim-results (= 0.0.3)
   decidim-system!
   rake (~> 12.0.0)
   rspec (~> 3.0)
+  webmock (~> 2.3.2)
 
 RUBY VERSION
    ruby 2.4.0p0

data/README.md

@@ -29,6 +29,7 @@
 - [Use Docker to deploy "Decidim"](#docker-instructions)
 - [Check current components](#components)
 - [Further configuration](#further-configuration)
+- [Technical tradeoffs](#technical-tradeoffs)
 
 ---
 
@@ -88,10 +89,10 @@ And don't forget to run the upgrade script:
 
 ```
 $ rails decidim:upgrade
+
 ```
 
 If new migrations appear, remember to:
-
 ```
 $ rails db:migrate
 ```
@@ -101,7 +102,9 @@ $ rails db:migrate
 You can use Docker instead of installing the gems yourself. Run `docker-compose build` and then you can generate a new decidim application using `docker-compose run --rm decidim bundle exec bin/decidim <app-name>`.
 
 Also you can run it as a standalone container like this:
-`docker run --rm codegram/decidim bundle exec bin/decidim <app-name>`.
+`docker run --rm -v $(pwd):/tmp -it codegram/decidim bundle exec bin/decidim /tmp/<app-name>`
+
+Now you have a new Decidim app created at `<app-name>` 🎉
 
 ## How to contribute
 
@@ -170,4 +173,14 @@ After you create a development app (`bundle exec rake development_app`):
 
 - [Social providers integration](https://github.com/AjuntamentdeBarcelona/decidim/blob/master/docs/social_providers.md): Enable sign up from social networks.
 
+## Technical tradeoffs
+
+### 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.
+
+The main reason for this is we are injecting some scripts into the body for some individual pages and Turbolinks loads the scripts in parallel. For some libraries like [leaflet](http://leafletjs.com/) it's very inconvenient because its plugins extend an existing global object.
+
+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.

data/decidim-admin/app/assets/javascripts/decidim/admin/application.js.es6

@@ -3,7 +3,6 @@
 // = require jquery
 // = require jquery_ujs
 // = require foundation
-// = require turbolinks
 // = require html.sortable
 // = require ./sort_steps
 // = require ./tab_focus
@@ -15,4 +14,6 @@ const pageLoad = () => {
   sortSteps();
 };
 
-$(document).on('turbolinks:load', pageLoad);
+$(() => {
+  pageLoad();
+});