decidim 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e8c6493fbd0cf1f5c25e29ca9437738e4869b50
-  data.tar.gz: 771d309025def8f3a500e4ba8078facc79731245
+  metadata.gz: e3c1ce6d8097666c29d5a2ee74f62750944f341d
+  data.tar.gz: 7870076ecbe2c22d746060042dd9cc144f01a1a6
 SHA512:
-  metadata.gz: 785a89832bf46e94da8a15f858a62f28edce44a5ba66041ec074ae298a855693730a4a82a9fd5d5e162ed3d8e3b63ca6cba8663689aa3785b5806a81978adab3
-  data.tar.gz: 77bc5c209524a36bf19ff3193b15b0913ed90ddde979f6f425739daea7e1e4c83b4efc479cf20949ee22e04bc89c8418b306db2ef997cdefa1ed207095aea531
+  metadata.gz: e207cfb1f022dc8b2bfdfd6b69f767aa183070c5d54f6003b9b9b3c8c158fdcce5da7aad1bd9a7e38efaf7fd2b73ab549bbd14c09ac61c740204bb43b3b2656a
+  data.tar.gz: 81701edacce800f4836d31f99e215cbf1fe943527dc7f33563bd55c3c4b4bc065140b36a4e23251ad8d28dca3ec4fbaaa49a3538e22570e69c857339027763dd

data/.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: codegram/decidim:0.6.5
+      - image: codegram/decidim:0.6.6
         environment:
           SIMPLECOV: true
           DATABASE_USERNAME: postgres
@@ -24,6 +24,7 @@ jobs:
       - run:
           name: Install app dependencies
           command: |
+            gem install decidim
             bundle install
             npm i
       - run:

data/.rubocop.yml

@@ -1265,5 +1265,5 @@ Metrics/BlockLength:
     - 'decidim-*/lib/**/*/test/**/*'
     - 'decidim-*/lib/**/*/feature.rb'
     - 'decidim-*/lib/**/*/participatory_space.rb'
-    - 'decidim-*/spec/**/*.rb'
+    - '**/spec/**/*.rb'
     - '**/*.gemspec'

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Change Log
 
-## [v0.6.5](https://github.com/decidim/decidim/tree/v0.6.5) (2017-09-27)
+## [v0.6.6](https://github.com/decidim/decidim/tree/v0.6.6) (2017-10-05)
+[Full Changelog](https://github.com/decidim/decidim/compare/v0.6.5...v0.6.6)
+
+**Fixed**
+
+- **decidim**: Generator when run directly via decidim's executable was crashing due to bundler unavailability [\#1938](https://github.com/decidim/decidim/pull/1938)
+- **decidim-surveys**: When a survey is created without TOS, the survey cannot be answered by the users. We're making the TOS field rquired, please fill it for every language and every survey. [\#1980](https://github.com/decidim/decidim/pull/1980)
+- **decidim-surveys**: Fixes a bug where inputs for survey question bodies in the admin were not working properly when the organization had only one locale. [\#1983](https://github.com/decidim/decidim/pull/1983)
+
+## [v0.6.5](https://github.com/decidim/decidim/tree/v0.6.5) (2017-09-28)
 [Full Changelog](https://github.com/decidim/decidim/compare/v0.6.4...v0.6.5)
 
 **Fixed**

data/Gemfile

@@ -4,6 +4,29 @@ source "https://rubygems.org"
 
 ruby "2.4.1"
 
-gemspec
+gem "decidim", path: "."
 
-gem "decidim-dev", path: "decidim-dev"
+# Uncomment the following line if you want to use decidim-assemblies plugin
+# gem "decidim-assemblies", path: "."
+
+gem "puma", "~> 3.0"
+gem "uglifier", ">= 1.3.0"
+
+gem "faker", "~> 1.8.4"
+
+group :development, :test do
+  gem "byebug", platform: :mri
+
+  gem "decidim-dev", path: "."
+end
+
+group :development do
+  gem "letter_opener_web", "~> 1.3.0"
+  gem "listen", "~> 3.1.0"
+  gem "spring"
+  gem "spring-watcher-listen", "~> 2.0.0"
+  gem "web-console"
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    decidim (0.6.5)
-      decidim-admin (= 0.6.5)
-      decidim-api (= 0.6.5)
-      decidim-budgets (= 0.6.5)
-      decidim-comments (= 0.6.5)
-      decidim-core (= 0.6.5)
-      decidim-meetings (= 0.6.5)
-      decidim-pages (= 0.6.5)
-      decidim-participatory_processes (= 0.6.5)
-      decidim-proposals (= 0.6.5)
-      decidim-results (= 0.6.5)
-      decidim-surveys (= 0.6.5)
-      decidim-system (= 0.6.5)
-    decidim-admin (0.6.5)
+    decidim (0.6.6)
+      decidim-admin (= 0.6.6)
+      decidim-api (= 0.6.6)
+      decidim-budgets (= 0.6.6)
+      decidim-comments (= 0.6.6)
+      decidim-core (= 0.6.6)
+      decidim-meetings (= 0.6.6)
+      decidim-pages (= 0.6.6)
+      decidim-participatory_processes (= 0.6.6)
+      decidim-proposals (= 0.6.6)
+      decidim-results (= 0.6.6)
+      decidim-surveys (= 0.6.6)
+      decidim-system (= 0.6.6)
+    decidim-admin (0.6.6)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.6.5)
+      decidim-core (= 0.6.6)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.0)
@@ -26,29 +26,29 @@ PATH
       rectify (~> 0.9.1)
       sassc-rails (~> 1.3.0)
       select2-rails (~> 4.0.3)
-    decidim-api (0.6.5)
-      graphiql-rails (~> 1.4.2)
+    decidim-api (0.6.6)
+      graphiql-rails (= 1.4.4)
       graphql (~> 1.6.0)
       rack-cors (~> 0.4.0)
       rails (~> 5.1.3)
       sprockets-es6 (~> 0.9.2)
-    decidim-budgets (0.6.5)
-      decidim-comments (= 0.6.5)
-      decidim-core (= 0.6.5)
+    decidim-budgets (0.6.6)
+      decidim-comments (= 0.6.6)
+      decidim-core (= 0.6.6)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-comments (0.6.5)
-      decidim-core (= 0.6.5)
+    decidim-comments (0.6.6)
+      decidim-core (= 0.6.6)
       jquery-rails (~> 4.0)
       rails (~> 5.1.3)
-    decidim-core (0.6.5)
+    decidim-core (0.6.6)
       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.6.5)
+      decidim-api (= 0.6.6)
       devise (~> 4.3)
       devise-i18n (~> 1.1.0)
       file_validators (~> 2.1.0)
@@ -76,39 +76,61 @@ PATH
       sprockets-es6 (~> 0.9.2)
       truncato (~> 0.7.9)
       wisper (~> 2.0.0)
-    decidim-meetings (0.6.5)
+    decidim-dev (0.6.6)
+      byebug
+      capybara (~> 2.15.0)
+      capybara-screenshot (~> 1.0.14)
+      codecov (~> 0.1.9)
+      database_cleaner (~> 1.6.0)
+      db-query-matchers (~> 0.9.0)
+      decidim (= 0.6.6)
+      factory_girl_rails
+      faker (~> 1.8.4)
+      i18n-tasks (= 0.9.18)
+      launchy
+      listen (~> 3.1.0)
+      poltergeist (~> 1.16.0)
+      rails-controller-testing (~> 1.0.1)
+      rspec-html-matchers (~> 0.9.1)
+      rspec-rails (~> 3.6.1)
+      rspec-repeat (~> 1.0.2)
+      rubocop (~> 0.49.1)
+      simplecov (~> 0.13)
+      webmock (~> 3.0.1)
+      wisper-rspec (~> 0.0.3)
+    decidim-meetings (0.6.6)
       date_validator (~> 0.9)
-      decidim-core (= 0.6.5)
+      decidim-core (= 0.6.6)
       httparty (~> 0.15.0)
       icalendar (~> 2.4.1)
       jquery-tmpl-rails (~> 1.1.0)
       kaminari (~> 1.0.1)
       rectify (~> 0.8)
       searchlight (~> 4.1.0)
-    decidim-pages (0.6.5)
-      decidim-core (= 0.6.5)
+    decidim-pages (0.6.6)
+      decidim-core (= 0.6.6)
       rectify (~> 0.9.1)
-    decidim-participatory_processes (0.6.5)
-      decidim-core (= 0.6.5)
+    decidim-participatory_processes (0.6.6)
+      decidim-core (= 0.6.6)
       rails (~> 5.1.3)
-    decidim-proposals (0.6.5)
-      decidim-comments (= 0.6.5)
-      decidim-core (= 0.6.5)
+    decidim-proposals (0.6.6)
+      decidim-comments (= 0.6.6)
+      decidim-core (= 0.6.6)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       social-share-button (~> 0.10.0)
-    decidim-results (0.6.5)
-      decidim-comments (= 0.6.5)
-      decidim-core (= 0.6.5)
+    decidim-results (0.6.6)
+      decidim-comments (= 0.6.6)
+      decidim-core (= 0.6.6)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-surveys (0.6.5)
-      decidim-core (= 0.6.5)
+    decidim-surveys (0.6.6)
+      decidim-core (= 0.6.6)
       jquery-tmpl-rails (~> 1.1.0)
-    decidim-system (0.6.5)
+    decidim-system (0.6.6)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.6.5)
+      decidim-core (= 0.6.6)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.1)
@@ -118,32 +140,6 @@ PATH
       rectify (~> 0.9.1)
       sassc-rails (~> 1.3.0)
 
-PATH
-  remote: decidim-dev
-  specs:
-    decidim-dev (0.6.5)
-      byebug
-      capybara (~> 2.15.0)
-      capybara-screenshot (~> 1.0.14)
-      codecov (~> 0.1.9)
-      database_cleaner (~> 1.6.0)
-      db-query-matchers (~> 0.9.0)
-      decidim (= 0.6.5)
-      factory_girl_rails
-      faker (~> 1.8.4)
-      i18n-tasks (= 0.9.18)
-      launchy
-      listen (~> 3.1.0)
-      poltergeist (~> 1.16.0)
-      rails-controller-testing (~> 1.0.1)
-      rspec-html-matchers (~> 0.9.1)
-      rspec-rails (~> 3.6.1)
-      rspec-repeat (~> 1.0.2)
-      rubocop (~> 0.49.1)
-      simplecov (~> 0.13)
-      webmock (~> 3.0.1)
-      wisper-rspec (~> 0.0.3)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -191,7 +187,7 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     arel (8.0.0)
     ast (2.3.0)
-    autoprefixer-rails (7.1.4)
+    autoprefixer-rails (7.1.4.1)
       execjs
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -202,6 +198,7 @@ GEM
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
     bcrypt (3.1.11)
+    bindex (0.5.0)
     builder (3.2.3)
     byebug (9.1.0)
     cancancan (2.0.0)
@@ -236,6 +233,7 @@ GEM
     concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
+    crass (1.0.2)
     css_parser (1.6.0)
       addressable
     database_cleaner (1.6.1)
@@ -266,7 +264,7 @@ GEM
     equalizer (0.0.11)
     erubi (1.6.1)
     execjs (2.7.0)
-    factory_girl (4.8.0)
+    factory_girl (4.8.1)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.8.0)
       factory_girl (~> 4.8.0)
@@ -339,15 +337,22 @@ 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)
       ruby_dep (~> 1.2)
-    loofah (2.0.3)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.6)
       mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
+    method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
@@ -397,14 +402,15 @@ GEM
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
-    premailer (1.10.4)
+    premailer (1.11.0)
       addressable
-      css_parser (>= 1.4.10)
+      css_parser (>= 1.6.0)
       htmlentities (>= 4.0.0)
     premailer-rails (1.9.7)
       actionmailer (>= 3, < 6)
       premailer (~> 1.7, >= 1.7.9)
     public_suffix (3.0.0)
+    puma (3.10.0)
     rack (2.0.3)
     rack-cors (0.4.1)
     rack-test (0.7.0)
@@ -441,7 +447,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
-    rake (12.0.0)
+    rake (12.1.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -488,7 +494,7 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.3)
+    ruby-progressbar (1.9.0)
     ruby_dep (1.5.0)
     rubyzip (1.2.1)
     safe_yaml (1.0.4)
@@ -514,6 +520,11 @@ GEM
     simplecov-html (0.10.2)
     social-share-button (0.10.0)
       coffee-rails
+    spring (2.0.2)
+      activesupport (>= 4.2)
+    spring-watcher-listen (2.0.1)
+      listen (>= 2.7, < 4.0)
+      spring (>= 1.2, < 3.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -536,6 +547,8 @@ GEM
       nokogiri (~> 1.7.0)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
+    uglifier (3.2.0)
+      execjs (>= 0.3.0, < 3)
     unicode-display_width (1.3.0)
     url (0.3.2)
     virtus (1.0.5)
@@ -545,6 +558,11 @@ GEM
       equalizer (~> 0.0, >= 0.0.9)
     warden (1.2.7)
       rack (>= 1.0)
+    web-console (3.5.1)
+      actionview (>= 5.0)
+      activemodel (>= 5.0)
+      bindex (>= 0.4.0)
+      railties (>= 5.0)
     webmock (3.0.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -561,11 +579,18 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.12)
+  byebug
   decidim!
   decidim-dev!
-  rake (~> 12.0.0)
-  rspec (~> 3.0)
+  faker (~> 1.8.4)
+  letter_opener_web (~> 1.3.0)
+  listen (~> 3.1.0)
+  puma (~> 3.0)
+  spring
+  spring-watcher-listen (~> 2.0.0)
+  tzinfo-data
+  uglifier (>= 1.3.0)
+  web-console
 
 RUBY VERSION
    ruby 2.4.1p111

data/README.md

@@ -73,6 +73,7 @@ The easiest way to work on decidim is to clone decidim's repository and install
 ```bash
 $ git clone git@github.com:decidim/decidim.git
 $ cd decidim
+$ gem install decidim
 $ bundle install
 $ npm install
 ```

data/Rakefile

@@ -22,7 +22,7 @@ task test_all: :spec do
     Dir.chdir("#{__dir__}/decidim-#{gem_name}") do
       puts "Running #{gem_name}'s tests..."
       status = system "rake"
-      exit 1 unless status || ENV["FAIL_FAST"] == "false"
+      abort unless status || ENV["FAIL_FAST"] == "false"
     end
   end
 end
@@ -45,18 +45,17 @@ end
 desc "Generates a development app."
 task :development_app do
   Dir.chdir(__dir__) do
-    sh "rm -fR development_app"
+    sh "rm -fR development_app", verbose: false
   end
 
-  Decidim::Generators::AppGenerator.start(
-    ["development_app", "--path", "..", "--recreate_db"]
-  )
+  Bundler.with_clean_env do
+    Decidim::Generators::AppGenerator.start(
+      ["development_app", "--path", "..", "--recreate_db", "--seed_db"]
+    )
 
-  Dir.chdir("#{__dir__}/development_app") do
-    Bundler.with_clean_env do
-      sh "bundle exec rails db:seed"
-      sh "bundle exec spring stop"
-      sh "bundle exec rails generate decidim:demo"
+    Dir.chdir("#{__dir__}/development_app") do
+      sh "bundle exec spring stop", verbose: false
+      sh "bundle exec rails generate decidim:demo", verbose: false
     end
   end
 end
@@ -69,9 +68,11 @@ task :docker_development_app do
 
   path = __dir__ + "/docker_development_app"
 
-  Decidim::Generators::DockerGenerator.start(
-    ["docker_development_app", "--path", path]
-  )
+  Bundler.with_clean_env do
+    Decidim::Generators::DockerGenerator.start(
+      ["docker_development_app", "--path", path]
+    )
+  end
 end
 
 desc "Build webpack bundle files"

data/decidim-admin/db/migrate/20170128112958_change_user_groups_verified_to_timestamp.rb

@@ -4,7 +4,7 @@ class ChangeUserGroupsVerifiedToTimestamp < ActiveRecord::Migration[5.0]
   def change
     ActiveRecord::Base.transaction do
       add_column :decidim_user_groups, :verified_at, :datetime
-      ActiveRecord::Base.connection.execute("UPDATE decidim_user_groups SET verified_at = '#{Time.current.to_s(:db)}' WHERE verified = 't'")
+      execute("UPDATE decidim_user_groups SET verified_at = '#{Time.current.to_s(:db)}' WHERE verified = 't'")
       remove_column :decidim_user_groups, :verified
     end
   end

data/decidim-api/decidim-api.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", *Decidim.rails_version
   s.add_dependency "graphql", "~> 1.6.0"
-  s.add_dependency "graphiql-rails", "~> 1.4.2"
+  s.add_dependency "graphiql-rails", "= 1.4.4"
   s.add_dependency "rack-cors", "~> 0.4.0"
   s.add_dependency "sprockets-es6", "~> 0.9.2"
 

data/decidim-core/app/helpers/decidim/decidim_form_helper.rb

@@ -64,9 +64,11 @@ module Decidim
       field_label = label_tag(name, options[:label])
 
       if locales.count == 1
+        field_name = "#{name}_#{locales.first.to_s.gsub("-", "__")}"
         field_input = send(
           type,
-          "#{name}_#{locales.first.to_s.gsub("-", "__")}"
+          "#{object_name}[#{field_name}]",
+          value[locales.first.to_s]
         )
 
         return safe_join [field_label, field_input]

data/decidim-core/db/migrate/20170206142116_add_published_at_to_decidim_features.rb

@@ -3,6 +3,6 @@
 class AddPublishedAtToDecidimFeatures < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_features, :published_at, :datetime
-    execute "UPDATE decidim_features SET published_at=#{ActiveRecord::Base.connection.quote(Time.current)}"
+    execute "UPDATE decidim_features SET published_at=#{quote(Time.current)}"
   end
 end

data/decidim-core/db/migrate/20170713131308_migrate_user_roles_to_participatory_process_roles.rb

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
 class MigrateUserRolesToParticipatoryProcessRoles < ActiveRecord::Migration[5.1]
+  class ParticipatoryProcess < ApplicationRecord
+    self.table_name = :decidim_participatory_processes
+  end
+
   class User < ApplicationRecord
     self.table_name = :decidim_users
   end
 
   def up
-    participatory_processes = Decidim::ParticipatoryProcess.includes(:organization).all
+    participatory_processes = ParticipatoryProcess.includes(:organization).all
     User.find_each do |user|
       next if user.roles.empty? || user.roles.include?("admin")
 

data/decidim-core/lib/decidim/core/version.rb

@@ -3,7 +3,7 @@
 # This holds Decidim's version and the Rails version on which it depends.
 module Decidim
   def self.version
-    "0.6.5"
+    "0.6.6"
   end
 
   def self.rails_version

data/decidim-core/spec/helpers/decidim/decidim_form_helper_spec.rb

@@ -38,12 +38,12 @@ module Decidim
             :text_field_tag,
             "survey[questions][]",
             "body",
-            "My dummy body",
+            { "en" => "My dummy body" },
             label: "Guacamole"
           )
 
           expected_markup = <<~HTML
-            <label for="body">Guacamole</label><input type="text" name="body_en" id="body_en" />
+            <label for="body">Guacamole</label><input type="text" name="survey[questions][][body_en]" id="survey_questions__body_en" value="My dummy body" />
           HTML
 
           expect(expected_markup.strip).to eq(actual_markup.strip)

data/decidim-dev/lib/tasks/test_app.rake

@@ -7,10 +7,12 @@ namespace :decidim do
   task :generate_test_app do
     dummy_app_path = File.expand_path(File.join(Dir.pwd, "spec", "decidim_dummy_app"))
 
-    Decidim::Generators::DummyGenerator.start(
-      [
-        "--dummy_app_path=#{dummy_app_path}"
-      ]
-    )
+    Bundler.with_clean_env do
+      Decidim::Generators::DummyGenerator.start(
+        [
+          "--dummy_app_path=#{dummy_app_path}"
+        ]
+      )
+    end
   end
 end

data/decidim-meetings/db/migrate/20170215132546_add_reference_to_meetings.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
 class AddReferenceToMeetings < ActiveRecord::Migration[5.0]
+  class Meeting < ApplicationRecord
+    self.table_name = :decidim_meetings_meetings
+  end
+
   def change
     add_column :decidim_meetings_meetings, :reference, :string
-    Decidim::Meetings::Meeting.find_each(&:save)
+    Meeting.find_each(&:save)
     change_column_null :decidim_meetings_meetings, :reference, false
   end
 end

data/decidim-participatory_processes/db/migrate/20170123134023_make_attachments_polymorphic.rb

@@ -7,8 +7,7 @@ class MakeAttachmentsPolymorphic < ActiveRecord::Migration[5.0]
       rename_table :decidim_participatory_process_attachments, :decidim_attachments
 
       add_column :decidim_attachments, :attachable_type, :string
-      ActiveRecord::Base.connection
-                        .execute("UPDATE decidim_attachments SET attachable_type = 'Decidim::ParticipatoryProcess'")
+      execute("UPDATE decidim_attachments SET attachable_type = 'Decidim::ParticipatoryProcess'")
 
       rename_column :decidim_attachments, :decidim_participatory_process_id, :attachable_id
       add_index :decidim_attachments, [:attachable_id, :attachable_type]

data/decidim-participatory_processes/db/migrate/20170220110740_remove_steps_short_description.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
 class RemoveStepsShortDescription < ActiveRecord::Migration[5.0]
+  class ParticipatoryProcessStep < ApplicationRecord
+    self.table_name = :decidim_participatory_process_steps
+  end
+
   def change
-    Decidim::ParticipatoryProcessStep.transaction do
-      Decidim::ParticipatoryProcessStep.find_each do |step|
+    ParticipatoryProcessStep.transaction do
+      ParticipatoryProcessStep.find_each do |step|
         step.update_attributes!(
           description: new_description_for(step)
         )

data/decidim-surveys/app/forms/decidim/surveys/admin/survey_form.rb

@@ -14,7 +14,7 @@ module Decidim
 
         attribute :questions, Array[SurveyQuestionForm]
 
-        validates :title, translatable_presence: true
+        validates :title, :tos, translatable_presence: true
       end
     end
   end

data/decidim-surveys/app/views/decidim/surveys/surveys/show.html.erb

@@ -68,14 +68,12 @@
                     </div>
                   <% end %>
 
-                  <% if translated_attribute(survey.tos).present? %>
-                    <div class="row column">
-                      <%= form.check_box :tos_agreement, label: t(".tos_agreement"), id: "survey_tos_agreement" %>
-                      <div class="tos-agreement-help-text help-text">
-                        <%== translated_attribute survey.tos %>
-                      </div>
+                  <div class="row column">
+                    <%= form.check_box :tos_agreement, label: t(".tos_agreement"), id: "survey_tos_agreement" %>
+                    <div class="tos-agreement-help-text help-text">
+                      <%== sanitize translated_attribute survey.tos %>
                     </div>
-                  <% end %>
+                  </div>
 
                   <div class="button--double form-general-submit">
                     <%= form.submit t(".submit"), class: "button", data: { confirm: t('.are_you_sure') } %>

data/decidim-surveys/spec/commands/decidim/surveys/admin/update_survey_spec.rb

@@ -18,6 +18,11 @@ module Decidim
               "ca" => "Title",
               "es" => "Title"
             },
+            "tos" => {
+              "en" => "<p>TOS</p>",
+              "ca" => "<p>TOS</p>",
+              "es" => "<p>TOS</p>"
+            },
             "description" => {
               "en" => "<p>Content</p>",
               "ca" => "<p>Contingut</p>",
@@ -136,6 +141,11 @@ module Decidim
                   "ca" => "<p>Contingut</p>",
                   "es" => "<p>Contenido</p>"
                 },
+                "tos" => {
+                  "en" => "<p>TOS</p>",
+                  "ca" => "<p>TOS</p>",
+                  "es" => "<p>TOS</p>"
+                },
                 "questions" => [
                   {
                     "id" => survey_question.id,

data/decidim-surveys/spec/forms/decidim/surveys/admin/survey_form_spec.rb

@@ -16,6 +16,14 @@ module Decidim
           }
         end
 
+        let(:tos) do
+          {
+            "en" => tos_english,
+            "ca" => "<p>TOS: contingut</p>",
+            "es" => "<p>TOS: contenido</p>"
+          }
+        end
+
         let(:description) do
           {
             "en" => "<p>Content</p>",
@@ -25,6 +33,7 @@ module Decidim
         end
 
         let(:body_english) { "First question" }
+        let(:tos_english) { "<p>TOS: content</p>" }
 
         let(:questions) do
           [
@@ -53,6 +62,7 @@ module Decidim
         let(:attributes) do
           {
             "survey" => {
+              "tos" => tos,
               "title" => title,
               "description" => description,
               "questions" => questions
@@ -75,6 +85,12 @@ module Decidim
 
           it { is_expected.not_to be_valid }
         end
+
+        context "when tos is not valid" do
+          let(:tos_english) { "" }
+
+          it { is_expected.not_to be_valid }
+        end
       end
     end
   end

data/lib/generators/decidim/app_generator.rb

@@ -39,6 +39,9 @@ module Decidim
       class_option :recreate_db, type: :boolean, default: false,
                                  desc: "Recreate test database"
 
+      class_option :seed_db, type: :boolean, default: false,
+                             desc: "Seed test database"
+
       class_option :app_const_base, type: :string,
                                     desc: "The application constant name"
 
@@ -67,7 +70,21 @@ module Decidim
       end
 
       def gemfile
-        template "Gemfile.erb", "Gemfile", force: true
+        path = File.expand_path(File.join("..", "..", "..", "Gemfile"), __dir__)
+
+        template path, "Gemfile", force: true
+
+        gem_modifier = if options[:path]
+                         "path: \"#{options[:path]}\""
+                       elsif options[:edge]
+                         "git: \"https://github.com/decidim/decidim.git\""
+                       elsif options[:branch]
+                         "git: \"https://github.com/decidim/decidim.git\", branch: \"#{options[:branch]}\""
+                       else
+                         "\"#{Decidim.version}\""
+                       end
+
+        gsub_file "Gemfile", /gem "decidim([^"]*)".*/, "gem \"decidim\\1\", #{gem_modifier}"
       end
 
       def secret_token
@@ -75,17 +92,6 @@ module Decidim
         SecureRandom.hex(64)
       end
 
-      def install
-        Decidim::Generators::InstallGenerator.start [
-          "--recreate_db=#{options[:recreate_db]}",
-          "--app_name=#{app_name}"
-        ]
-      end
-
-      def app_const_base
-        options["app_const_base"] || super
-      end
-
       def add_ignore_uploads
         unless options["skip_git"]
           append_file ".gitignore", "\n# Ignore public uploads\npublic/uploads"
@@ -100,6 +106,22 @@ module Decidim
       def authorization_handler
         template "authorization_handler.rb", "app/services/example_authorization_handler.rb", force: true
       end
+
+      def install
+        Decidim::Generators::InstallGenerator.start(
+          [
+            "--recreate_db=#{options[:recreate_db]}",
+            "--seed_db=#{options[:seed_db]}",
+            "--app_name=#{app_name}"
+          ]
+        )
+      end
+
+      private
+
+      def app_const_base
+        options["app_const_base"] || super
+      end
     end
   end
 end

data/lib/generators/decidim/install_generator.rb

@@ -18,20 +18,17 @@ module Decidim
                               desc: "The name of the app"
       class_option :recreate_db, type: :boolean, default: false,
                                  desc: "Recreate db after installing decidim"
+      class_option :seed_db, type: :boolean, default: false,
+                             desc: "Seed db after installing decidim"
 
       def bundle_install
-        Bundler.with_clean_env { run "bundle install" }
+        run "bundle install"
       end
 
       def install
         route "mount Decidim::Core::Engine => '/'"
       end
 
-      def copy_migrations
-        rails_command "railties:install:migrations"
-        recreate_db if options[:recreate_db]
-      end
-
       def add_seeds
         append_file("db/seeds.rb", <<~SEEDS_CONTENT)
           # You can remove the 'faker' gem if you don't want Decidim seeds.
@@ -96,6 +93,11 @@ module Decidim
         end
       end
 
+      def copy_migrations
+        rails "railties:install:migrations"
+        recreate_db if options[:recreate_db]
+      end
+
       def letter_opener_web
         route <<~RUBY.gsub(/^ *\|/, "")
           |
@@ -116,10 +118,26 @@ module Decidim
       private
 
       def recreate_db
-        rails_command "db:environment:set db:drop" unless ENV["CI"]
-        rails_command "db:create"
-        rails_command "db:migrate"
-        rails_command "db:test:prepare"
+        soft_rails "db:environment:set", "db:drop"
+        rails "db:create"
+
+        if options[:seed_db]
+          rails "db:migrate", "db:seed"
+        else
+          rails "db:migrate"
+        end
+
+        rails "db:test:prepare"
+      end
+
+      # Runs rails commands in a subprocess, and aborts if it doesn't suceeed
+      def rails(*args)
+        abort unless system("bin/rails", *args)
+      end
+
+      # Runs rails commands in a subprocess silencing errors, and ignores status
+      def soft_rails(*args)
+        system("bin/rails", *args, err: File::NULL)
       end
 
       def scss_variables

data/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "decidim",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "decidim",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git"

data/spec/generator_spec.rb

@@ -1,31 +1,47 @@
 # frozen_string_literal: true
 
 describe "Application generation" do
-  let(:status) { system(command, out: File::NULL) }
+  let(:status) { Bundler.clean_system(command, out: File::NULL) }
 
-  after { FileUtils.rm_rf("tmp/test_app") }
+  let(:test_app) { "spec/generator_test_app" }
 
-  context "with edge argument" do
-    let(:command) { "bin/decidim --edge tmp/test_app" }
+  after { FileUtils.rm_rf(test_app) }
 
+  shared_examples_for "a sane generator" do
     it "successfully generates application" do
       expect(status).to eq(true)
     end
   end
 
-  context "with branch argument" do
-    let(:command) { "bin/decidim --branch master tmp/test_app" }
+  context "without flags" do
+    let(:command) { "bin/decidim #{test_app}" }
 
-    it "successfully generates application" do
-      expect(status).to eq(true)
-    end
+    it_behaves_like "a sane generator"
   end
 
-  context "with path argument" do
-    let(:command) { "bin/decidim --path #{File.expand_path("..", __dir__)} tmp/test_app" }
+  context "with --edge flag" do
+    let(:command) { "bin/decidim --edge #{test_app}" }
 
-    it "successfully generates application" do
-      expect(status).to eq(true)
+    it_behaves_like "a sane generator"
+  end
+
+  context "with --branch flag" do
+    let(:command) { "bin/decidim --branch master #{test_app}" }
+
+    it_behaves_like "a sane generator"
+  end
+
+  context "with --path flag" do
+    let(:command) { "bin/decidim --path #{File.expand_path("..", __dir__)} #{test_app}" }
+
+    it_behaves_like "a sane generator"
+  end
+
+  context "development application" do
+    let(:command) do
+      "bin/decidim --path #{File.expand_path("..", __dir__)} #{test_app} --recreate_db --seed_db"
     end
+
+    it_behaves_like "a sane generator"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2017-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,168 +18,168 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: decidim-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: decidim-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: decidim-pages
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: decidim-surveys
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -2482,7 +2482,6 @@ files:
 - lib/generators/decidim/install_generator.rb
 - lib/generators/decidim/templates/Dockerfile.dev.erb
 - lib/generators/decidim/templates/Dockerfile.erb
-- lib/generators/decidim/templates/Gemfile.erb
 - lib/generators/decidim/templates/README.md.erb
 - lib/generators/decidim/templates/authorization_handler.rb
 - lib/generators/decidim/templates/cable.yml.erb

data/lib/generators/decidim/templates/Gemfile.erb

@@ -1,40 +0,0 @@
-source "https://rubygems.org"
-
-ruby "<%= RUBY_VERSION %>"
-
-<%- gem_modifier = if options[:path]
-                     "path: \"#{options[:path]}\""
-                   elsif options[:edge]
-                     "git: \"https://github.com/decidim/decidim.git\""
-                   elsif options[:branch]
-                     "git: \"https://github.com/decidim/decidim.git\", branch: \"#{options[:branch]}\""
-                   else
-                     "\"#{Decidim.version}\""
-                   end -%>
-
-gem "decidim", <%= gem_modifier %>
-
-# Uncomment the following line if you want to use decidim-assemblies plugin
-# gem "decidim-assemblies", <%= gem_modifier %>
-
-gem "puma", "~> 3.0"
-gem "uglifier", ">= 1.3.0"
-
-gem "faker", "<%= Decidim.faker_version %>"
-
-group :development, :test do
-  gem "byebug", platform: :mri
-
-  gem "decidim-dev", <%= gem_modifier %>
-end
-
-group :development do
-  gem "web-console"
-  gem "listen", "~> 3.1.0"
-  gem "spring"
-  gem "spring-watcher-listen", "~> 2.0.0"
-  gem "letter_opener_web", "~> 1.3.0"
-end
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]