decidim-generators 0.23.3 → 0.24.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +4 -2
  3. data/Gemfile.lock +275 -203
  4. data/lib/decidim/generators/app_generator.rb +6 -6
  5. data/lib/decidim/generators/app_templates/budgets_workflow_random.rb +1 -1
  6. data/lib/decidim/generators/app_templates/docker-compose-etherpad.yml +6 -1
  7. data/lib/decidim/generators/app_templates/dummy_authorization_handler.rb +65 -16
  8. data/lib/decidim/generators/app_templates/secrets.yml.erb +21 -4
  9. data/lib/decidim/generators/component_templates/Gemfile.erb +1 -1
  10. data/lib/decidim/generators/component_templates/decidim-component.gemspec.erb +1 -1
  11. data/lib/decidim/generators/version.rb +1 -1
  12. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1e1b06fe0c8095c69a1f577ad57d4ec6542de9a7fe5a5de3f8eff6dc0b2e9216
4
- data.tar.gz: d3571f3fffcae92ed0744458f72f230df0da9e175da66db1c9e1b723e57b4a5d
3
+ metadata.gz: 6b00096c797d8ef29f15feac66e8d6daa6c02bca63ac26a0126132c4285698e2
4
+ data.tar.gz: '0082750fa5160c3ae20d1862cd4281139304d1ecef6b088d0ed726bd9e779bd4'
5
5
  SHA512:
6
- metadata.gz: 75c3a3c578c0447e703e790f0edc112209c758d23e3f4683038a8ddf7259c6369ab456ea94b1d17f620e670dd80dd3d94e1b1d8c5810537c1faf77a2c5f8127b
7
- data.tar.gz: 989ecfac76e62ff46fa33ad73f029f5c0b8bfb9d24df5e9a06b6c8b88b9570472b65e56645124a1f9fdf8b87f855a4a77002286377272734215dd2053b051ed5
6
+ metadata.gz: ae147d28950e64a991614d35d792b860ba2d73a044dd8ff1044e5954fae43afc774769d0e8b8cf882d78282b2edd749a43155f1fc30ee3280d97bba0d290dda6
7
+ data.tar.gz: ca8c8954ac2e12327ac30b5cad74b745f3ebe552f82096d7476492ce85e23fb5f35bf5aae7ba4d837f1333474c80b302c61e2b42f2eb71d30ecb5ffa5524be9a
data/Gemfile CHANGED
@@ -5,16 +5,18 @@ source "https://rubygems.org"
5
5
  ruby RUBY_VERSION
6
6
 
7
7
  gem "decidim", path: ".."
8
+ gem "decidim-conferences", path: ".."
8
9
  gem "decidim-consultations", path: ".."
10
+ gem "decidim-elections", path: ".."
9
11
  gem "decidim-initiatives", path: ".."
10
12
  gem "decidim-templates", path: ".."
11
13
 
12
14
  gem "bootsnap", "~> 1.3"
13
15
 
14
- gem "puma", ">= 4.3.5"
16
+ gem "puma", ">= 5.0.0"
15
17
  gem "uglifier", "~> 4.1"
16
18
 
17
- gem "faker", "~> 1.9"
19
+ gem "faker", "~> 2.14"
18
20
 
19
21
  gem "wicked_pdf", "~> 1.4"
20
22
 
data/Gemfile.lock CHANGED
@@ -1,80 +1,85 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- decidim (0.23.3)
5
- decidim-accountability (= 0.23.3)
6
- decidim-admin (= 0.23.3)
7
- decidim-api (= 0.23.3)
8
- decidim-assemblies (= 0.23.3)
9
- decidim-blogs (= 0.23.3)
10
- decidim-budgets (= 0.23.3)
11
- decidim-comments (= 0.23.3)
12
- decidim-core (= 0.23.3)
13
- decidim-debates (= 0.23.3)
14
- decidim-forms (= 0.23.3)
15
- decidim-generators (= 0.23.3)
16
- decidim-meetings (= 0.23.3)
17
- decidim-pages (= 0.23.3)
18
- decidim-participatory_processes (= 0.23.3)
19
- decidim-proposals (= 0.23.3)
20
- decidim-sortitions (= 0.23.3)
21
- decidim-surveys (= 0.23.3)
22
- decidim-system (= 0.23.3)
23
- decidim-verifications (= 0.23.3)
24
- decidim-accountability (0.23.3)
25
- decidim-comments (= 0.23.3)
26
- decidim-core (= 0.23.3)
4
+ decidim (0.24.1)
5
+ decidim-accountability (= 0.24.1)
6
+ decidim-admin (= 0.24.1)
7
+ decidim-api (= 0.24.1)
8
+ decidim-assemblies (= 0.24.1)
9
+ decidim-blogs (= 0.24.1)
10
+ decidim-budgets (= 0.24.1)
11
+ decidim-comments (= 0.24.1)
12
+ decidim-core (= 0.24.1)
13
+ decidim-debates (= 0.24.1)
14
+ decidim-forms (= 0.24.1)
15
+ decidim-generators (= 0.24.1)
16
+ decidim-meetings (= 0.24.1)
17
+ decidim-pages (= 0.24.1)
18
+ decidim-participatory_processes (= 0.24.1)
19
+ decidim-proposals (= 0.24.1)
20
+ decidim-sortitions (= 0.24.1)
21
+ decidim-surveys (= 0.24.1)
22
+ decidim-system (= 0.24.1)
23
+ decidim-templates (= 0.24.1)
24
+ decidim-verifications (= 0.24.1)
25
+ decidim-accountability (0.24.1)
26
+ decidim-comments (= 0.24.1)
27
+ decidim-core (= 0.24.1)
27
28
  kaminari (~> 1.2, >= 1.2.1)
28
29
  searchlight (~> 4.1)
29
- decidim-admin (0.23.3)
30
+ decidim-admin (0.24.1)
30
31
  active_link_to (~> 1.0)
31
- decidim-core (= 0.23.3)
32
+ decidim-core (= 0.24.1)
32
33
  devise (~> 4.7)
33
34
  devise-i18n (~> 1.2)
34
35
  devise_invitable (~> 1.7)
35
- jquery-rails (~> 4.3)
36
- sassc (~> 2.3.0)
36
+ jquery-rails (~> 4.4)
37
+ sassc (~> 2.4.0)
37
38
  sassc-rails (~> 2.1.2)
38
- decidim-api (0.23.3)
39
+ decidim-api (0.24.1)
39
40
  graphiql-rails (~> 1.4, < 1.5)
40
- graphql (~> 1.9)
41
+ graphql (~> 1.12, >= 1.12.3)
41
42
  rack-cors (~> 1.0)
42
- redcarpet (~> 3.4)
43
+ redcarpet (~> 3.5, >= 3.5.1)
43
44
  sprockets-es6 (~> 0.9.2)
44
- decidim-assemblies (0.23.3)
45
- decidim-core (= 0.23.3)
46
- decidim-blogs (0.23.3)
47
- decidim-admin (= 0.23.3)
48
- decidim-comments (= 0.23.3)
49
- decidim-core (= 0.23.3)
50
- httparty (~> 0.17)
45
+ decidim-assemblies (0.24.1)
46
+ decidim-core (= 0.24.1)
47
+ decidim-blogs (0.24.1)
48
+ decidim-admin (= 0.24.1)
49
+ decidim-comments (= 0.24.1)
50
+ decidim-core (= 0.24.1)
51
51
  jquery-tmpl-rails (~> 1.1)
52
52
  kaminari (~> 1.2, >= 1.2.1)
53
- decidim-budgets (0.23.3)
54
- decidim-comments (= 0.23.3)
55
- decidim-core (= 0.23.3)
53
+ decidim-budgets (0.24.1)
54
+ decidim-comments (= 0.24.1)
55
+ decidim-core (= 0.24.1)
56
56
  kaminari (~> 1.2, >= 1.2.1)
57
57
  searchlight (~> 4.1)
58
- decidim-comments (0.23.3)
59
- decidim-core (= 0.23.3)
60
- jquery-rails (~> 4.3)
61
- redcarpet (~> 3.4)
62
- decidim-consultations (0.23.3)
63
- decidim-admin (= 0.23.3)
64
- decidim-comments (= 0.23.3)
65
- decidim-core (= 0.23.3)
66
- decidim-core (0.23.3)
58
+ decidim-comments (0.24.1)
59
+ decidim-core (= 0.24.1)
60
+ jquery-rails (~> 4.4)
61
+ redcarpet (~> 3.5, >= 3.5.1)
62
+ decidim-conferences (0.24.1)
63
+ decidim-core (= 0.24.1)
64
+ decidim-meetings (= 0.24.1)
65
+ wicked_pdf (~> 1.4)
66
+ wkhtmltopdf-binary (~> 0.12)
67
+ decidim-consultations (0.24.1)
68
+ decidim-admin (= 0.24.1)
69
+ decidim-comments (= 0.24.1)
70
+ decidim-core (= 0.24.1)
71
+ decidim-core (0.24.1)
67
72
  active_link_to (~> 1.0)
68
- anchored (>= 1.1.0)
73
+ anchored (~> 1.1)
69
74
  autoprefixer-rails (~> 8.0)
70
75
  batch-loader (~> 1.2)
71
76
  browser (~> 2.7)
72
- carrierwave (~> 1.3)
77
+ carrierwave (~> 2.2.1)
73
78
  cells-erb (~> 0.1.0)
74
79
  cells-rails (~> 0.0.9)
75
80
  charlock_holmes (~> 0.7)
76
81
  date_validator (~> 0.9.0)
77
- decidim-api (= 0.23.3)
82
+ decidim-api (= 0.24.1)
78
83
  devise (~> 4.7)
79
84
  devise-i18n (~> 1.2)
80
85
  diffy (~> 3.3)
@@ -82,12 +87,13 @@ PATH
82
87
  doorkeeper-i18n (~> 4.0)
83
88
  etherpad-lite (~> 0.3)
84
89
  file_validators (~> 2.1)
90
+ fog-local (~> 0.6)
85
91
  foundation-rails (~> 6.6, < 6.7)
86
92
  foundation_rails_helper (~> 3.0)
87
- geocoder (>= 1.5)
93
+ geocoder (~> 1.5)
88
94
  hashdiff (>= 0.4.0, < 2.0.0)
89
95
  invisible_captcha (~> 0.12)
90
- jquery-rails (~> 4.3)
96
+ jquery-rails (~> 4.4)
91
97
  kaminari (~> 1.2, >= 1.2.1)
92
98
  loofah (~> 2.3.1)
93
99
  mini_magick (~> 4.9)
@@ -102,15 +108,15 @@ PATH
102
108
  pg (~> 1.1.4, < 2)
103
109
  pg_search (~> 2.2)
104
110
  premailer-rails (~> 1.10)
105
- rack (>= 2.2.3)
111
+ rack (~> 2.2, >= 2.2.3)
106
112
  rack-attack (~> 6.0)
107
- rails (>= 5.2.4.4, < 6.0.x)
113
+ rails (~> 5.2.5)
108
114
  rails-i18n (~> 5.0)
109
115
  rectify (~> 0.13.0)
110
116
  redis (~> 4.1)
111
117
  request_store (~> 1.5.0)
112
118
  rubyzip (~> 2.0)
113
- sassc (~> 2.3.0)
119
+ sassc (~> 2.4.0)
114
120
  sassc-rails (~> 2.1.2)
115
121
  seven_zip_ruby (~> 1.3)
116
122
  social-share-button (~> 1.2, >= 1.2.1)
@@ -121,123 +127,130 @@ PATH
121
127
  uglifier (~> 4.1)
122
128
  valid_email2 (~> 2.1)
123
129
  wisper (~> 2.0)
124
- decidim-debates (0.23.3)
125
- decidim-comments (= 0.23.3)
126
- decidim-core (= 0.23.3)
130
+ decidim-debates (0.24.1)
131
+ decidim-comments (= 0.24.1)
132
+ decidim-core (= 0.24.1)
127
133
  kaminari (~> 1.2, >= 1.2.1)
128
134
  searchlight (~> 4.1)
129
- decidim-dev (0.23.3)
135
+ decidim-dev (0.24.1)
130
136
  byebug (~> 11.0)
131
137
  capybara (~> 3.24)
132
138
  db-query-matchers (~> 0.9.0)
133
- decidim (= 0.23.3)
139
+ decidim (= 0.24.1)
134
140
  erb_lint (~> 0.0.28)
135
141
  factory_bot_rails (~> 4.8)
136
142
  i18n-tasks (~> 0.9.18)
137
143
  mdl (~> 0.5)
138
- nokogiri (>= 1.10.8)
139
- puma (>= 4.3)
144
+ nokogiri (~> 1.11, >= 1.11.1)
145
+ puffing-billy (~> 2.4.0)
146
+ puma (~> 5.0)
140
147
  rails-controller-testing (~> 1.0)
141
148
  rspec-cells (~> 0.3.4)
142
149
  rspec-html-matchers (~> 0.9.1)
143
150
  rspec-rails (~> 3.7)
144
151
  rspec-retry (~> 0.6.2)
145
152
  rspec_junit_formatter (~> 0.3.0)
146
- rubocop (~> 0.71.0)
153
+ rubocop (~> 0.92.0)
147
154
  rubocop-rails (~> 2.0)
148
155
  rubocop-rspec (~> 1.21)
149
156
  selenium-webdriver (~> 3.142)
150
157
  simplecov (~> 0.19.0)
151
158
  simplecov-cobertura (~> 1.3.1)
152
159
  system_test_html_screenshots (~> 0.1.1)
160
+ vcr (~> 6.0)
153
161
  webmock (~> 3.6)
154
162
  wisper-rspec (~> 1.0)
155
- decidim-forms (0.23.3)
156
- decidim-core (= 0.23.3)
163
+ decidim-elections (0.24.1)
164
+ decidim-bulletin_board (= 0.9.2)
165
+ decidim-core (= 0.24.1)
166
+ decidim-forms (= 0.24.1)
167
+ decidim-proposals (= 0.24.1)
168
+ decidim-forms (0.24.1)
169
+ decidim-core (= 0.24.1)
157
170
  wicked_pdf (~> 1.4)
158
171
  wkhtmltopdf-binary (~> 0.12)
159
- decidim-generators (0.23.3)
160
- decidim-core (= 0.23.3)
161
- decidim-initiatives (0.23.3)
162
- decidim-admin (= 0.23.3)
163
- decidim-comments (= 0.23.3)
164
- decidim-core (= 0.23.3)
165
- decidim-verifications (= 0.23.3)
172
+ decidim-generators (0.24.1)
173
+ decidim-core (= 0.24.1)
174
+ decidim-initiatives (0.24.1)
175
+ decidim-admin (= 0.24.1)
176
+ decidim-comments (= 0.24.1)
177
+ decidim-core (= 0.24.1)
178
+ decidim-verifications (= 0.24.1)
166
179
  kaminari (~> 1.2, >= 1.2.1)
167
180
  origami (~> 2.1)
168
181
  virtus-multiparams (~> 0.1)
169
182
  wicked (~> 1.3)
170
183
  wicked_pdf (~> 1.4)
171
184
  wkhtmltopdf-binary (~> 0.12)
172
- decidim-meetings (0.23.3)
185
+ decidim-meetings (0.24.1)
173
186
  cells-erb (~> 0.1.0)
174
187
  cells-rails (~> 0.0.9)
175
- decidim-core (= 0.23.3)
176
- decidim-forms (= 0.23.3)
177
- httparty (~> 0.17)
188
+ decidim-core (= 0.24.1)
189
+ decidim-forms (= 0.24.1)
178
190
  icalendar (~> 2.5)
179
191
  jquery-tmpl-rails (~> 1.1)
180
192
  kaminari (~> 1.2, >= 1.2.1)
181
193
  searchlight (~> 4.1)
182
- decidim-pages (0.23.3)
183
- decidim-core (= 0.23.3)
184
- decidim-participatory_processes (0.23.3)
185
- decidim-core (= 0.23.3)
186
- decidim-proposals (0.23.3)
194
+ decidim-pages (0.24.1)
195
+ decidim-core (= 0.24.1)
196
+ decidim-participatory_processes (0.24.1)
197
+ decidim-core (= 0.24.1)
198
+ decidim-proposals (0.24.1)
187
199
  acts_as_list (~> 0.9)
188
200
  cells-erb (~> 0.1.0)
189
201
  cells-rails (~> 0.0.9)
190
- decidim-comments (= 0.23.3)
191
- decidim-core (= 0.23.3)
192
- doc2text (~> 0.4.2)
202
+ decidim-comments (= 0.24.1)
203
+ decidim-core (= 0.24.1)
204
+ doc2text (~> 0.4.3)
193
205
  kaminari (~> 1.2, >= 1.2.1)
194
206
  ransack (~> 2.1.1)
195
- redcarpet (~> 3.4)
196
- decidim-sortitions (0.23.3)
197
- decidim-admin (= 0.23.3)
198
- decidim-comments (= 0.23.3)
199
- decidim-core (= 0.23.3)
200
- decidim-proposals (= 0.23.3)
201
- decidim-surveys (0.23.3)
202
- decidim-core (= 0.23.3)
203
- decidim-forms (= 0.23.3)
204
- decidim-system (0.23.3)
207
+ redcarpet (~> 3.5, >= 3.5.1)
208
+ decidim-sortitions (0.24.1)
209
+ decidim-admin (= 0.24.1)
210
+ decidim-comments (= 0.24.1)
211
+ decidim-core (= 0.24.1)
212
+ decidim-proposals (= 0.24.1)
213
+ decidim-surveys (0.24.1)
214
+ decidim-core (= 0.24.1)
215
+ decidim-forms (= 0.24.1)
216
+ decidim-templates (= 0.24.1)
217
+ decidim-system (0.24.1)
205
218
  active_link_to (~> 1.0)
206
- decidim-core (= 0.23.3)
219
+ decidim-core (= 0.24.1)
207
220
  devise (~> 4.7)
208
221
  devise-i18n (~> 1.2)
209
222
  devise_invitable (~> 1.7)
210
- jquery-rails (~> 4.3)
211
- sassc (~> 2.3.0)
223
+ jquery-rails (~> 4.4)
224
+ sassc (~> 2.4.0)
212
225
  sassc-rails (~> 2.1.2)
213
- decidim-templates (0.23.3)
214
- decidim-core (= 0.23.3)
215
- decidim-forms (= 0.23.3)
216
- decidim-verifications (0.23.3)
217
- decidim-core (= 0.23.3)
226
+ decidim-templates (0.24.1)
227
+ decidim-core (= 0.24.1)
228
+ decidim-forms (= 0.24.1)
229
+ decidim-verifications (0.24.1)
230
+ decidim-core (= 0.24.1)
218
231
 
219
232
  GEM
220
233
  remote: https://rubygems.org/
221
234
  specs:
222
- actioncable (5.2.4.4)
223
- actionpack (= 5.2.4.4)
235
+ actioncable (5.2.5)
236
+ actionpack (= 5.2.5)
224
237
  nio4r (~> 2.0)
225
238
  websocket-driver (>= 0.6.1)
226
- actionmailer (5.2.4.4)
227
- actionpack (= 5.2.4.4)
228
- actionview (= 5.2.4.4)
229
- activejob (= 5.2.4.4)
239
+ actionmailer (5.2.5)
240
+ actionpack (= 5.2.5)
241
+ actionview (= 5.2.5)
242
+ activejob (= 5.2.5)
230
243
  mail (~> 2.5, >= 2.5.4)
231
244
  rails-dom-testing (~> 2.0)
232
- actionpack (5.2.4.4)
233
- actionview (= 5.2.4.4)
234
- activesupport (= 5.2.4.4)
245
+ actionpack (5.2.5)
246
+ actionview (= 5.2.5)
247
+ activesupport (= 5.2.5)
235
248
  rack (~> 2.0, >= 2.0.8)
236
249
  rack-test (>= 0.6.3)
237
250
  rails-dom-testing (~> 2.0)
238
251
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
239
- actionview (5.2.4.4)
240
- activesupport (= 5.2.4.4)
252
+ actionview (5.2.5)
253
+ activesupport (= 5.2.5)
241
254
  builder (~> 3.1)
242
255
  erubi (~> 1.4)
243
256
  rails-dom-testing (~> 2.0)
@@ -245,20 +258,20 @@ GEM
245
258
  active_link_to (1.0.5)
246
259
  actionpack
247
260
  addressable
248
- activejob (5.2.4.4)
249
- activesupport (= 5.2.4.4)
261
+ activejob (5.2.5)
262
+ activesupport (= 5.2.5)
250
263
  globalid (>= 0.3.6)
251
- activemodel (5.2.4.4)
252
- activesupport (= 5.2.4.4)
253
- activerecord (5.2.4.4)
254
- activemodel (= 5.2.4.4)
255
- activesupport (= 5.2.4.4)
264
+ activemodel (5.2.5)
265
+ activesupport (= 5.2.5)
266
+ activerecord (5.2.5)
267
+ activemodel (= 5.2.5)
268
+ activesupport (= 5.2.5)
256
269
  arel (>= 9.0)
257
- activestorage (5.2.4.4)
258
- actionpack (= 5.2.4.4)
259
- activerecord (= 5.2.4.4)
260
- marcel (~> 0.3.1)
261
- activesupport (5.2.4.4)
270
+ activestorage (5.2.5)
271
+ actionpack (= 5.2.5)
272
+ activerecord (= 5.2.5)
273
+ marcel (~> 1.0.0)
274
+ activesupport (5.2.5)
262
275
  concurrent-ruby (~> 1.0, >= 1.0.2)
263
276
  i18n (>= 0.7, < 2)
264
277
  minitest (~> 5.1)
@@ -304,10 +317,13 @@ GEM
304
317
  rack-test (>= 0.6.3)
305
318
  regexp_parser (>= 1.5, < 3.0)
306
319
  xpath (~> 3.2)
307
- carrierwave (1.3.2)
308
- activemodel (>= 4.0.0)
309
- activesupport (>= 4.0.0)
310
- mime-types (>= 1.16)
320
+ carrierwave (2.2.1)
321
+ activemodel (>= 5.0.0)
322
+ activesupport (>= 5.0.0)
323
+ addressable (~> 2.6)
324
+ image_processing (~> 1.1)
325
+ marcel (~> 1.0.0)
326
+ mini_mime (>= 0.1.3)
311
327
  ssrf_filter (~> 1.0)
312
328
  cells (4.1.7)
313
329
  declarative-builder (< 0.2.0)
@@ -321,7 +337,7 @@ GEM
321
337
  actionpack (>= 3.0)
322
338
  cells (>= 4.1.6, < 5.0.0)
323
339
  charlock_holmes (0.7.7)
324
- chef-utils (16.10.8)
340
+ chef-utils (16.12.3)
325
341
  childprocess (3.0.0)
326
342
  coercible (1.0.0)
327
343
  descendants_tracker (~> 0.0.1)
@@ -333,7 +349,8 @@ GEM
333
349
  execjs
334
350
  coffee-script-source (1.12.2)
335
351
  colorize (0.8.1)
336
- concurrent-ruby (1.1.7)
352
+ concurrent-ruby (1.1.8)
353
+ cookiejar (0.3.3)
337
354
  crack (0.4.5)
338
355
  rexml
339
356
  crass (1.0.6)
@@ -345,6 +362,12 @@ GEM
345
362
  db-query-matchers (0.9.0)
346
363
  activesupport (>= 4.0, <= 6.0)
347
364
  rspec (~> 3.0)
365
+ decidim-bulletin_board (0.9.2)
366
+ byebug (~> 11.0)
367
+ graphlient (~> 0.4.0)
368
+ jwt (~> 2.2.2)
369
+ rails (>= 5.0.0)
370
+ wisper (~> 2.0.0)
348
371
  declarative-builder (0.1.0)
349
372
  declarative-option (< 0.2.0)
350
373
  declarative-option (0.1.0)
@@ -356,22 +379,32 @@ GEM
356
379
  railties (>= 4.1.0)
357
380
  responders
358
381
  warden (~> 1.2.3)
359
- devise-i18n (1.9.2)
382
+ devise-i18n (1.9.3)
360
383
  devise (>= 4.7.1)
361
384
  devise_invitable (1.7.5)
362
385
  actionmailer (>= 4.1.0)
363
386
  devise (>= 4.0.0)
364
387
  diff-lcs (1.4.4)
365
388
  diffy (3.4.0)
366
- doc2text (0.4.2)
367
- nokogiri (~> 1.10.0)
368
- rubyzip (~> 2.0.0)
389
+ doc2text (0.4.3)
390
+ nokogiri (~> 1.11.1)
391
+ rubyzip (~> 2.3.0)
369
392
  docile (1.3.5)
370
393
  domain_name (0.5.20190701)
371
394
  unf (>= 0.0.5, < 1.0.0)
372
- doorkeeper (5.4.0)
395
+ doorkeeper (5.5.1)
373
396
  railties (>= 5)
374
397
  doorkeeper-i18n (4.0.1)
398
+ em-http-request (1.1.7)
399
+ addressable (>= 2.3.4)
400
+ cookiejar (!= 0.3.1)
401
+ em-socksify (>= 0.3)
402
+ eventmachine (>= 1.0.3)
403
+ http_parser.rb (>= 0.6.0)
404
+ em-socksify (0.3.2)
405
+ eventmachine (>= 1.0.0.beta.4)
406
+ em-synchrony (1.0.6)
407
+ eventmachine (>= 1.0.0.beta.1)
375
408
  equalizer (0.0.11)
376
409
  erb_lint (0.0.37)
377
410
  activesupport
@@ -383,26 +416,39 @@ GEM
383
416
  smart_properties
384
417
  erbse (0.1.4)
385
418
  temple
386
- erubi (1.9.0)
419
+ erubi (1.10.0)
387
420
  etherpad-lite (0.3.0)
388
421
  rest-client (>= 1.6)
422
+ eventmachine (1.2.7)
423
+ eventmachine_httpserver (0.2.1)
424
+ excon (0.79.0)
389
425
  execjs (2.7.0)
390
426
  factory_bot (4.11.1)
391
427
  activesupport (>= 3.0.0)
392
428
  factory_bot_rails (4.11.1)
393
429
  factory_bot (~> 4.11.1)
394
430
  railties (>= 3.0.0)
395
- faker (1.9.6)
396
- i18n (>= 0.7)
431
+ faker (2.14.0)
432
+ i18n (>= 1.6, < 2)
397
433
  faraday (1.3.0)
398
434
  faraday-net_http (~> 1.0)
399
435
  multipart-post (>= 1.2, < 3)
400
436
  ruby2_keywords
401
437
  faraday-net_http (1.0.1)
438
+ faraday_middleware (1.0.0)
439
+ faraday (~> 1.0)
402
440
  ffi (1.13.1)
403
441
  file_validators (2.3.0)
404
442
  activemodel (>= 3.2)
405
443
  mime-types (>= 1.0)
444
+ fog-core (2.2.3)
445
+ builder
446
+ excon (~> 0.71)
447
+ formatador (~> 0.2)
448
+ mime-types
449
+ fog-local (0.6.0)
450
+ fog-core (>= 1.27, < 3.0)
451
+ formatador (0.2.5)
406
452
  foundation-rails (6.6.2.0)
407
453
  railties (>= 3.1.0)
408
454
  sass (>= 3.3.0)
@@ -413,13 +459,20 @@ GEM
413
459
  activesupport (>= 4.1, < 6.0)
414
460
  railties (>= 4.1, < 6.0)
415
461
  tzinfo (~> 1.2, >= 1.2.2)
416
- geocoder (1.6.5)
462
+ geocoder (1.6.6)
417
463
  globalid (0.4.2)
418
464
  activesupport (>= 4.2.0)
419
465
  graphiql-rails (1.4.11)
420
466
  railties
421
467
  sprockets-rails
422
- graphql (1.12.4)
468
+ graphlient (0.4.0)
469
+ faraday (>= 1.0)
470
+ faraday_middleware
471
+ graphql-client
472
+ graphql (1.12.7)
473
+ graphql-client (0.16.0)
474
+ activesupport (>= 3.0)
475
+ graphql (~> 1.8)
423
476
  hashdiff (1.0.1)
424
477
  hashie (4.1.0)
425
478
  highline (2.0.3)
@@ -428,12 +481,10 @@ GEM
428
481
  http-accept (1.7.0)
429
482
  http-cookie (1.0.3)
430
483
  domain_name (~> 0.5)
431
- httparty (0.18.1)
432
- mime-types (~> 3.0)
433
- multi_xml (>= 0.5.2)
434
- i18n (1.8.3)
484
+ http_parser.rb (0.6.0)
485
+ i18n (1.8.9)
435
486
  concurrent-ruby (~> 1.0)
436
- i18n-tasks (0.9.33)
487
+ i18n-tasks (0.9.34)
437
488
  activesupport (>= 4.0.2)
438
489
  ast (>= 2.1.0)
439
490
  erubi
@@ -443,13 +494,15 @@ GEM
443
494
  rails-i18n
444
495
  rainbow (>= 2.2.2, < 4.0)
445
496
  terminal-table (>= 1.5.1)
446
- icalendar (2.7.0)
497
+ icalendar (2.7.1)
447
498
  ice_cube (~> 0.16)
448
499
  ice_cube (0.16.3)
449
500
  ice_nine (0.11.2)
501
+ image_processing (1.12.1)
502
+ mini_magick (>= 4.9.5, < 5)
503
+ ruby-vips (>= 2.0.17, < 3)
450
504
  invisible_captcha (0.13.0)
451
505
  rails (>= 3.2.0)
452
- jaro_winkler (1.5.4)
453
506
  jquery-rails (4.4.0)
454
507
  rails-dom-testing (>= 1, < 3)
455
508
  railties (>= 4.2.0)
@@ -469,7 +522,7 @@ GEM
469
522
  activerecord
470
523
  kaminari-core (= 1.2.1)
471
524
  kaminari-core (1.2.1)
472
- kramdown (2.3.0)
525
+ kramdown (2.3.1)
473
526
  rexml
474
527
  kramdown-parser-gfm (1.1.0)
475
528
  kramdown (~> 2.0)
@@ -489,8 +542,7 @@ GEM
489
542
  nokogiri (>= 1.5.9)
490
543
  mail (2.7.1)
491
544
  mini_mime (>= 0.1.1)
492
- marcel (0.3.3)
493
- mimemagic (~> 0.3.2)
545
+ marcel (1.0.1)
494
546
  mdl (0.11.0)
495
547
  kramdown (~> 2.3)
496
548
  kramdown-parser-gfm (~> 1.1)
@@ -500,16 +552,15 @@ GEM
500
552
  method_source (1.0.0)
501
553
  mime-types (3.3.1)
502
554
  mime-types-data (~> 3.2015)
503
- mime-types-data (3.2020.1104)
504
- mimemagic (0.3.5)
555
+ mime-types-data (3.2021.0225)
505
556
  mini_magick (4.11.0)
506
557
  mini_mime (1.0.2)
507
- mini_portile2 (2.4.0)
508
- minitest (5.14.1)
558
+ mini_portile2 (2.5.0)
559
+ minitest (5.14.3)
509
560
  mixlib-cli (2.1.8)
510
561
  mixlib-config (3.0.9)
511
562
  tomlrb
512
- mixlib-shellout (3.2.2)
563
+ mixlib-shellout (3.2.5)
513
564
  chef-utils
514
565
  msgpack (1.3.3)
515
566
  multi_json (1.15.0)
@@ -517,12 +568,13 @@ GEM
517
568
  multipart-post (2.1.1)
518
569
  mustache (1.1.1)
519
570
  netrc (0.11.0)
520
- nio4r (2.5.2)
571
+ nio4r (2.5.5)
521
572
  nobspw (0.6.2)
522
- nokogiri (1.10.9)
523
- mini_portile2 (~> 2.4.0)
524
- oauth (0.5.5)
525
- oauth2 (1.4.4)
573
+ nokogiri (1.11.1)
574
+ mini_portile2 (~> 2.5.0)
575
+ racc (~> 1.4)
576
+ oauth (0.5.6)
577
+ oauth2 (1.4.7)
526
578
  faraday (>= 0.8, < 2.0)
527
579
  jwt (>= 1.0, < 3.0)
528
580
  multi_json (~> 1.3)
@@ -533,10 +585,10 @@ GEM
533
585
  rack (>= 1.6.2, < 3)
534
586
  omniauth-facebook (5.0.0)
535
587
  omniauth-oauth2 (~> 1.2)
536
- omniauth-google-oauth2 (0.8.1)
588
+ omniauth-google-oauth2 (0.8.2)
537
589
  jwt (>= 2.0)
538
590
  oauth2 (~> 1.1)
539
- omniauth (>= 1.1.1)
591
+ omniauth (~> 1.1)
540
592
  omniauth-oauth2 (>= 1.6)
541
593
  omniauth-oauth (1.2.0)
542
594
  oauth
@@ -557,7 +609,7 @@ GEM
557
609
  activerecord (>= 4.2)
558
610
  request_store (~> 1.1)
559
611
  parallel (1.20.1)
560
- parser (3.0.0.0)
612
+ parser (3.0.1.0)
561
613
  ast (~> 2.4.1)
562
614
  pg (1.1.4)
563
615
  pg_search (2.3.5)
@@ -571,8 +623,17 @@ GEM
571
623
  actionmailer (>= 3)
572
624
  premailer (~> 1.7, >= 1.7.9)
573
625
  public_suffix (4.0.5)
574
- puma (4.3.5)
626
+ puffing-billy (2.4.1)
627
+ addressable (~> 2.5)
628
+ em-http-request (~> 1.1, >= 1.1.0)
629
+ em-synchrony
630
+ eventmachine (~> 1.2)
631
+ eventmachine_httpserver
632
+ http_parser.rb (~> 0.6.0)
633
+ multi_json
634
+ puma (5.1.1)
575
635
  nio4r (~> 2.0)
636
+ racc (1.5.2)
576
637
  rack (2.2.3)
577
638
  rack-attack (6.5.0)
578
639
  rack (>= 1.0, < 3)
@@ -580,18 +641,18 @@ GEM
580
641
  rack (>= 2.0.0)
581
642
  rack-test (1.1.0)
582
643
  rack (>= 1.0, < 3)
583
- rails (5.2.4.4)
584
- actioncable (= 5.2.4.4)
585
- actionmailer (= 5.2.4.4)
586
- actionpack (= 5.2.4.4)
587
- actionview (= 5.2.4.4)
588
- activejob (= 5.2.4.4)
589
- activemodel (= 5.2.4.4)
590
- activerecord (= 5.2.4.4)
591
- activestorage (= 5.2.4.4)
592
- activesupport (= 5.2.4.4)
644
+ rails (5.2.5)
645
+ actioncable (= 5.2.5)
646
+ actionmailer (= 5.2.5)
647
+ actionpack (= 5.2.5)
648
+ actionview (= 5.2.5)
649
+ activejob (= 5.2.5)
650
+ activemodel (= 5.2.5)
651
+ activerecord (= 5.2.5)
652
+ activestorage (= 5.2.5)
653
+ activesupport (= 5.2.5)
593
654
  bundler (>= 1.3.0)
594
- railties (= 5.2.4.4)
655
+ railties (= 5.2.5)
595
656
  sprockets-rails (>= 2.0.0)
596
657
  rails-controller-testing (1.0.5)
597
658
  actionpack (>= 5.0.1.rc1)
@@ -605,14 +666,14 @@ GEM
605
666
  rails-i18n (5.1.3)
606
667
  i18n (>= 0.7, < 2)
607
668
  railties (>= 5.0, < 6)
608
- railties (5.2.4.4)
609
- actionpack (= 5.2.4.4)
610
- activesupport (= 5.2.4.4)
669
+ railties (5.2.5)
670
+ actionpack (= 5.2.5)
671
+ activesupport (= 5.2.5)
611
672
  method_source
612
673
  rake (>= 0.8.7)
613
674
  thor (>= 0.19.0, < 2.0)
614
675
  rainbow (3.0.0)
615
- rake (13.0.1)
676
+ rake (13.0.3)
616
677
  ransack (2.1.1)
617
678
  actionpack (>= 5.0)
618
679
  activerecord (>= 5.0)
@@ -629,7 +690,7 @@ GEM
629
690
  wisper (>= 1.6.1)
630
691
  redcarpet (3.5.1)
631
692
  redis (4.2.5)
632
- regexp_parser (2.0.3)
693
+ regexp_parser (2.1.1)
633
694
  request_store (1.5.0)
634
695
  rack (>= 1.4)
635
696
  responders (3.0.1)
@@ -640,7 +701,7 @@ GEM
640
701
  http-cookie (>= 1.0.2, < 2.0)
641
702
  mime-types (>= 1.16, < 4.0)
642
703
  netrc (~> 0.8)
643
- rexml (3.2.4)
704
+ rexml (3.2.5)
644
705
  rspec (3.9.0)
645
706
  rspec-core (~> 3.9.0)
646
707
  rspec-expectations (~> 3.9.0)
@@ -672,28 +733,36 @@ GEM
672
733
  rspec-support (3.9.4)
673
734
  rspec_junit_formatter (0.3.0)
674
735
  rspec-core (>= 2, < 4, != 2.12.0)
675
- rubocop (0.71.0)
676
- jaro_winkler (~> 1.5.1)
736
+ rubocop (0.92.0)
677
737
  parallel (~> 1.10)
678
- parser (>= 2.6)
738
+ parser (>= 2.7.1.5)
679
739
  rainbow (>= 2.2.2, < 4.0)
740
+ regexp_parser (>= 1.7)
741
+ rexml
742
+ rubocop-ast (>= 0.5.0)
680
743
  ruby-progressbar (~> 1.7)
681
- unicode-display_width (>= 1.4.0, < 1.7)
682
- rubocop-rails (2.0.1)
744
+ unicode-display_width (>= 1.4.0, < 2.0)
745
+ rubocop-ast (1.4.1)
746
+ parser (>= 2.7.1.5)
747
+ rubocop-rails (2.9.1)
748
+ activesupport (>= 4.2.0)
683
749
  rack (>= 1.1)
684
- rubocop (>= 0.70.0)
685
- rubocop-rspec (1.41.0)
686
- rubocop (>= 0.68.1)
750
+ rubocop (>= 0.90.0, < 2.0)
751
+ rubocop-rspec (1.44.1)
752
+ rubocop (~> 0.87)
753
+ rubocop-ast (>= 0.7.1)
687
754
  ruby-ole (1.2.12.2)
688
755
  ruby-progressbar (1.11.0)
756
+ ruby-vips (2.1.0)
757
+ ffi (~> 1.12)
689
758
  ruby2_keywords (0.0.4)
690
- rubyzip (2.0.0)
759
+ rubyzip (2.3.0)
691
760
  sass (3.7.4)
692
761
  sass-listen (~> 4.0.0)
693
762
  sass-listen (4.0.0)
694
763
  rb-fsevent (~> 0.9, >= 0.9.4)
695
764
  rb-inotify (~> 0.9, >= 0.9.7)
696
- sassc (2.3.0)
765
+ sassc (2.4.0)
697
766
  ffi (~> 1.9)
698
767
  sassc-rails (2.1.2)
699
768
  railties (>= 4.0.0)
@@ -713,9 +782,9 @@ GEM
713
782
  simplecov (~> 0.8)
714
783
  simplecov-html (0.12.3)
715
784
  smart_properties (1.15.0)
716
- social-share-button (1.2.3)
785
+ social-share-button (1.2.4)
717
786
  coffee-rails
718
- spreadsheet (1.2.7)
787
+ spreadsheet (1.2.8)
719
788
  ruby-ole
720
789
  spring (2.1.0)
721
790
  spring-watcher-listen (2.0.1)
@@ -738,14 +807,14 @@ GEM
738
807
  temple (0.8.2)
739
808
  terminal-table (3.0.0)
740
809
  unicode-display_width (~> 1.1, >= 1.1.1)
741
- thor (1.0.1)
810
+ thor (1.1.0)
742
811
  thread_safe (0.3.6)
743
812
  tilt (2.0.10)
744
813
  tomlrb (2.0.1)
745
814
  truncato (0.7.11)
746
815
  htmlentities (~> 4.3.1)
747
816
  nokogiri (>= 1.7.0, <= 2.0)
748
- tzinfo (1.2.7)
817
+ tzinfo (1.2.9)
749
818
  thread_safe (~> 0.1)
750
819
  uber (0.1.0)
751
820
  uglifier (4.2.0)
@@ -753,10 +822,11 @@ GEM
753
822
  unf (0.1.4)
754
823
  unf_ext
755
824
  unf_ext (0.0.7.7)
756
- unicode-display_width (1.6.1)
825
+ unicode-display_width (1.7.0)
757
826
  valid_email2 (2.3.1)
758
827
  activemodel (>= 3.2)
759
828
  mail (~> 2.5)
829
+ vcr (6.0.0)
760
830
  virtus (1.0.5)
761
831
  axiom-types (~> 0.1)
762
832
  coercible (~> 1.0)
@@ -771,7 +841,7 @@ GEM
771
841
  activemodel (>= 5.0)
772
842
  bindex (>= 0.4.0)
773
843
  railties (>= 5.0)
774
- webmock (3.11.2)
844
+ webmock (3.12.2)
775
845
  addressable (>= 2.3.6)
776
846
  crack (>= 0.3.2)
777
847
  hashdiff (>= 0.4.0, < 2.0.0)
@@ -795,14 +865,16 @@ DEPENDENCIES
795
865
  bootsnap (~> 1.3)
796
866
  byebug (~> 11.0)
797
867
  decidim!
868
+ decidim-conferences!
798
869
  decidim-consultations!
799
870
  decidim-dev!
871
+ decidim-elections!
800
872
  decidim-initiatives!
801
873
  decidim-templates!
802
- faker (~> 1.9)
874
+ faker (~> 2.14)
803
875
  letter_opener_web (~> 1.3)
804
876
  listen (~> 3.1)
805
- puma (>= 4.3.5)
877
+ puma (>= 5.0.0)
806
878
  spring (~> 2.0)
807
879
  spring-watcher-listen (~> 2.0)
808
880
  uglifier (~> 4.1)
@@ -810,7 +882,7 @@ DEPENDENCIES
810
882
  wicked_pdf (~> 1.4)
811
883
 
812
884
  RUBY VERSION
813
- ruby 2.6.6p146
885
+ ruby 2.7.1p83
814
886
 
815
887
  BUNDLED WITH
816
888
  2.1.4
data/lib/decidim/generators/app_generator.rb CHANGED
@@ -35,7 +35,7 @@ module Decidim
35
35
 
36
36
  class_option :edge, type: :boolean,
37
37
  default: false,
38
- desc: "Use GitHub's edge version from master branch"
38
+ desc: "Use GitHub's edge version from develop branch"
39
39
 
40
40
  class_option :branch, type: :string,
41
41
  default: nil,
@@ -103,7 +103,7 @@ module Decidim
103
103
  gem_modifier = if options[:path]
104
104
  "path: \"#{options[:path]}\""
105
105
  elsif options[:edge]
106
- "git: \"https://github.com/decidim/decidim.git\""
106
+ "git: \"https://github.com/decidim/decidim.git\", branch: \"develop\""
107
107
  elsif options[:branch]
108
108
  "git: \"https://github.com/decidim/decidim.git\", branch: \"#{options[:branch]}\""
109
109
  else
@@ -170,7 +170,7 @@ module Decidim
170
170
  return unless options[:demo]
171
171
 
172
172
  gsub_file "config/initializers/decidim.rb",
173
- /# config.sms_gateway_service = \"MySMSGatewayService\"/,
173
+ /# config.sms_gateway_service = "MySMSGatewayService"/,
174
174
  "config.sms_gateway_service = 'Decidim::Verifications::Sms::ExampleGateway'"
175
175
  end
176
176
 
@@ -187,7 +187,7 @@ module Decidim
187
187
  return unless options[:demo]
188
188
 
189
189
  gsub_file "config/initializers/decidim.rb",
190
- /# config.timestamp_service = \"MyTimestampService\"/,
190
+ /# config.timestamp_service = "MyTimestampService"/,
191
191
  "config.timestamp_service = \"Decidim::Initiatives::DummyTimestamp\""
192
192
  end
193
193
 
@@ -195,7 +195,7 @@ module Decidim
195
195
  return unless options[:demo]
196
196
 
197
197
  gsub_file "config/initializers/decidim.rb",
198
- /# config.pdf_signature_service = \"MyPDFSignatureService\"/,
198
+ /# config.pdf_signature_service = "MyPDFSignatureService"/,
199
199
  "config.pdf_signature_service = \"Decidim::Initiatives::PdfSignatureExample\""
200
200
  end
201
201
 
@@ -203,7 +203,7 @@ module Decidim
203
203
  return unless options[:demo]
204
204
 
205
205
  gsub_file "config/initializers/decidim.rb",
206
- /# config.machine_translation_service = \"MyTranslationService\"/,
206
+ /# config.machine_translation_service = "MyTranslationService"/,
207
207
  "config.machine_translation_service = 'Decidim::Dev::DummyTranslator'"
208
208
  end
209
209
 
data/lib/decidim/generators/app_templates/budgets_workflow_random.rb CHANGED
@@ -11,7 +11,7 @@ class BudgetsWorkflowRandom < Decidim::Budgets::Workflows::Base
11
11
  end
12
12
 
13
13
  # User can vote in the resource where they have an order in progress or in the randomly selected resource.
14
- def vote_allowed?(resource, consider_progress = true)
14
+ def vote_allowed?(resource, consider_progress: true)
15
15
  return false if voted.any?
16
16
 
17
17
  if consider_progress
data/lib/decidim/generators/app_templates/docker-compose-etherpad.yml CHANGED
@@ -25,7 +25,12 @@ services:
25
25
  - ETHERPAD_DB_CHARSET=utf8mb4
26
26
  # if file APIKEY.txt is missing, the variable value is used to provision it
27
27
  - ETHERPAD_API_KEY=CHANGE_ME_API_KEY
28
- image: 'tvelocity/etherpad-lite'
28
+ # You can skip this if you are not using any proxy to handle SSL certificates.
29
+ - "TRUST_PROXY=true"
30
+ # Ensure this etherpad allows cookies while embeded in an Iframe
31
+ - "COOKIE_SAME_SITE=None"
32
+ # Official image is etherpad/etherpad but the latest version does not allow yet setting cookies to SameSite=None
33
+ image: 'platoniq/etherpad:1.8.7'
29
34
  deploy:
30
35
  replicas: 1
31
36
  update_config:
data/lib/decidim/generators/app_templates/dummy_authorization_handler.rb CHANGED
@@ -99,29 +99,43 @@ class DummyAuthorizationHandler < Decidim::AuthorizationHandler
99
99
  extra_explanations = []
100
100
  if allowed_postal_codes.present?
101
101
  # Does not authorize users with different postal codes
102
- if status_code == :ok && !allowed_postal_codes.member?(authorization.metadata["postal_code"])
103
- status_code = :unauthorized
104
- data[:fields] = { "postal_code" => authorization.metadata["postal_code"] }
105
- end
102
+ status_code = :unauthorized if status_code == :ok && disallowed_user_postal_code
106
103
 
107
104
  # Adds an extra message for inform the user the additional restriction for this authorization
108
- extra_explanations << { key: "extra_explanation.postal_codes",
109
- params: { scope: "decidim.verifications.dummy_authorization",
110
- count: allowed_postal_codes.count,
111
- postal_codes: allowed_postal_codes.join(", ") } }
105
+ if disallowed_user_postal_code
106
+ if user_postal_code
107
+ i18n_postal_codes_key = "extra_explanation.user_postal_codes"
108
+ user_postal_code_params = { user_postal_code: user_postal_code }
109
+ else
110
+ i18n_postal_codes_key = "extra_explanation.postal_codes"
111
+ user_postal_code_params = {}
112
+ end
113
+
114
+ extra_explanations << { key: i18n_postal_codes_key,
115
+ params: { scope: "decidim.verifications.dummy_authorization",
116
+ count: allowed_postal_codes.count,
117
+ postal_codes: allowed_postal_codes.join(", ") }.merge(user_postal_code_params) }
118
+ end
112
119
  end
113
120
 
114
121
  if allowed_scope.present?
115
122
  # Does not authorize users with different scope
116
- if status_code == :ok && allowed_scope_id != user_scope_id
117
- status_code = :unauthorized
118
- data[:fields] = { "scope_id" => user_scope.name[I18n.locale.to_s] }
119
- end
123
+ status_code = :unauthorized if status_code == :ok && disallowed_user_user_scope
120
124
 
121
125
  # Adds an extra message to inform the user about additional restrictions for this authorization
122
- extra_explanations << { key: "extra_explanation.scope",
123
- params: { scope: "decidim.verifications.dummy_authorization",
124
- scope_name: allowed_scope.name[I18n.locale.to_s] } }
126
+ if disallowed_user_user_scope
127
+ if user_scope_id
128
+ i18n_scope_key = "extra_explanation.user_scope"
129
+ user_scope_params = { user_scope_name: user_scope_name }
130
+ else
131
+ i18n_scope_key = "extra_explanation.scope"
132
+ user_scope_params = {}
133
+ end
134
+
135
+ extra_explanations << { key: i18n_scope_key,
136
+ params: { scope: "decidim.verifications.dummy_authorization",
137
+ scope_name: allowed_scope.name[I18n.locale.to_s] }.merge(user_scope_params) }
138
+ end
125
139
  end
126
140
 
127
141
  data[:extra_explanation] = extra_explanations if extra_explanations.any?
@@ -131,7 +145,7 @@ class DummyAuthorizationHandler < Decidim::AuthorizationHandler
131
145
 
132
146
  # Adds the list of allowed postal codes and scope to the redirect URL, to allow forms to inform about it
133
147
  def redirect_params
134
- { "postal_codes" => allowed_postal_codes&.join(","), "scope" => allowed_scope_id }
148
+ { postal_codes: allowed_postal_codes&.join(","), scope: allowed_scope_id }.merge(user_metadata_params)
135
149
  end
136
150
 
137
151
  private
@@ -145,7 +159,42 @@ class DummyAuthorizationHandler < Decidim::AuthorizationHandler
145
159
  end
146
160
 
147
161
  def user_scope_id
162
+ return unless authorization
163
+
148
164
  @user_scope_id ||= authorization.metadata["scope_id"]&.to_i
149
165
  end
166
+
167
+ def user_scope_name
168
+ @user_scope_name ||= user_scope.name[I18n.locale.to_s] if authorization && user_scope
169
+ end
170
+
171
+ def disallowed_user_user_scope
172
+ return unless user_scope || allowed_scope.present?
173
+
174
+ allowed_scope_id != user_scope_id
175
+ end
176
+
177
+ def user_postal_code
178
+ @user_postal_code ||= authorization.metadata["postal_code"] if authorization && authorization.metadata
179
+ end
180
+
181
+ def disallowed_user_postal_code
182
+ return unless user_postal_code || allowed_postal_codes.present?
183
+
184
+ !allowed_postal_codes.member?(user_postal_code)
185
+ end
186
+
187
+ def user_metadata_params
188
+ return {} unless authorization
189
+
190
+ @user_metadata_params ||= begin
191
+ user_metadata_params = {}
192
+ user_metadata_params[:user_scope_name] = user_scope.name[I18n.locale.to_s] if user_scope
193
+
194
+ user_metadata_params[:user_postal_code] = authorization.metadata["postal_code"] if authorization.metadata["postal_code"].present?
195
+
196
+ user_metadata_params
197
+ end
198
+ end
150
199
  end
151
200
  end
data/lib/decidim/generators/app_templates/secrets.yml.erb CHANGED
@@ -33,10 +33,16 @@ default: &default
33
33
  api_key: <%%= ENV["ETHERPAD_API_KEY"] %>
34
34
  api_version: "1.2.1"
35
35
  bulletin_board:
36
- identification_private_key: |
37
- <%= ENV["BULLETIN_BOARD_IDENTIFICATION_PRIVATE_KEY"]&.indent(6) %>
38
- server: <%= ENV["BULLETIN_BOARD_SERVER"] %>
39
- api_key: <%= ENV["BULLETIN_BOARD_API_KEY"] %>
36
+ identification_private_key: {"kty":"RSA","n":"pNgMt8lnPDD3TlWYGhRiV1oZkPQmnLdiUzwyb_-35qKD9k-HU86xo0uSgoOUWkBtnvFscq8zNDPAGAlZVokaN_z9ksZblSce0LEl8lJa3ICgghg7e8vg_7Lz5dyHSQ3PCLgenyFGcL401aglDde1Xo4ujdz33Lklc4U9zoyoLUI2_viYmNOU6n5Mn0sJd30FeICMrLD2gX46pGe3MGug6groT9EvpKcdOoJHKoO5yGSVaeY5-Bo3gngvlgjlS2mfwjCtF4NYwIQSd2al-p4BKnuYAVKRSgr8rYnnjhWfJ4GsCaqiyXNi5NPYRV6gl_cx_1jUcA1rRJqQR32I8c8QbAXm5qNO4URcdaKys9tNcVgXBL1FsSdbrLVVFWen1tfWNfHm-8BjiWCWD79-uk5gI0SjC9tWvTzVvswWXI5weNqqVXqpDydr46AsHE2sG40HRCR3UF3LupT-HwXTcYcOZr5dJClJIsU3Hrvy4wLssub69YSNR1Jxn-KX2vUc06xY8CNIuSMpfufEq5cZopL6O2l1pRsW1FQnF3s078_Y9MaQ1gPyBo0IipLBVUj5IjEIfPuiEk4jxkiUYDeqzf7bAvSFckp94yLkRWTs_pEZs7b_ogwRG6WMHjtcaNYe4CufhIm9ekkKDeAWOPRTHfKNmohRBh09XuvSjqrx5Z7rqb8","e":"AQAB","kid":"b8dba1459df956d60107690c34fa490db681eac4f73ffaf6e4055728c02ddc8e","d":"Uh3KIBe1VJez6pLbBUrYPlmE2N-3CGSWF46qNX62lq6ofB_b8xTJCuaPonJ3iYoE0aPEeVDrefq5m3-0wFXl-LQPgXlMj_1_7UgB9jeuSZ_N1WDK6P2EJPx5YS09O1gkpVxK7Mx_sZQe77wmUUH-eI7tg__qfUrB7E0Yn_cTpBATI2qlYaQsz6-A7e1MVvixq_ilmzVAZvuBrPp5mCZVb6FlXrV_PU9-UPIrD3O1La1lfO6SPBSbSGQkmGHwD2QbkHn9D_R_Vs-z_0TkM_dX71jIPQhrle3pN222KuJ8eQqwr9QP6biQMBuT5eKgr3MVtfUDRpp4sCEq9GIFwSd8LvbmGPrOoz8ueOEQ05nisIBQuOTYiWpYs2CEV062HR1bLFRLDUcSlflGNr0bgiXTUFx4wxRG06OaI-rQ6nG3M8TE0I0phMNCG3c7YyV28z_k2I65oQF9aKtiwFwc0YsUSGPTOFZGWHuCCPLm0lFeebpI_JIYqIv70NJxbSZEBY8DAIqZPqP6y_CRo2_C7piCgsjg9pnF8cp45vz4L6DWZ0Tumc_5aRuqIBkYXXwP9TjqhzxL-2SQHIqUAjj6Y6S35tZT6ekZSbnPIKX_e42y6bDT_Ztf01QfKiTkcx3_I8RwOuh6CzJzr72AykQpU3XKOKF1x1GBtYyrno4jG5LgaGE","p":"1UARZ-rRnpKG5NHKlXTys3irCy-d91edHL3fEIzDKvhMRQCIWh7dt8l0_sIpcBF-EbVilbFKj7yfgZBTr8EkAXHgweayK8rnlMqi2jte1_u-5DBtrGVVUTSQltSLDOZHK5QfUxVK6Bbk8K5ROLvef91oNgnSNWNOeoCZdlS55nMZcAgY_6mxSuuMq54Tgy8o4Ip890-ZEYY6OSFXhU-ieoGO4Jw--c6QzmCa3gGo2oVClidMNaM1jquK4Pj6xaoxR2NWeIX9Ix7k1P2B24pegyHXjSIpQ6JYdn352VViXi2tx7TTJh6ClNVjgoRmL4Gfy_IJNx0GhF5OB3yughUc7w","q":"xePJGBt466qM9F0BPxWFjyWbIs_GNXr-lBGASui0Z94cfgFbsZwqRsWQEf7jDVQsDNVnPSWZ_Wd6UqoQaIxc0tE8gaokPG6A4EUDyoLaZ231ZydDVoWof8FnPDaJwrcPwZ4R6ZLKGmkfytCZuU9I_9B4uuV0dyjEzKfS-Os3UcLumKPlgJ71OZAb49GTqUHuTePcSJjyYOYXx6eE7i_1m8TjU9Ut18BJNQhLqWmerA6X1ijbR2_syY6GXhGSfciSBH8xVkiUnqXb2jt1bE8nwWw-Sam5ikjzNbXqqs978IcCE5HTddQmy99bwuArA8PLqIFj3OOO1CSo8oyn2XDgMQ","dp":"Diky_rOZN-6DBq7nxQT_GOvqb9O5qbMnu8DgDzlJvJDAf9SJOXLTRmEaY9CA7_A5bvOcmFQtn13nObNb20_4FCB7zGSFcGMI_dh2-Ab5RV5yTrTok4onID1dXKbAlRq1ny825U2Eq-TZTyJEQoA3RkZtpSkBzInLrFbd2f3GWodKKSZggpnCLDd4H-1fXlbDYCXSJpoikAdZ1nFgXnnrUDdKRaAajnwpIYtIvXVewSQYR-BULzunUtIRZt8hx_6FRzhRha9gH_TtPTeYZ_vISuz0Y2rhUpx1Q2kaLlR9M8PUxm47l0xvX3LMKN6h6oWxFtn7wq0qwZ-Bjv24mOrOAQ","dq":"nXGD10hURrwk9W7hxP0sjB2Rdnr06iv3THs4JWFL16_h32bZO1BSWoho_chbgYlMmtFXGFFIWVLxAcAI2gWC_MA4cbmapvIMW2LNh1vgxJW5v95_NuGUlECeEEwcAu1-_b7z5XBCmAy3nLem9sbb_5wv0hMpPH0VRvbnZeBO3SBIkO0lddYCqU-8wN9HqkyoexQleSUnAm1O0iy4GIHT2aEmdNaRaKy2EhmNiTZdZeseZueOvyGPtTVONp2ofacMdcN0z39jr22qo9DWtdusd7nVPOpqkllEF6GrGUeHBnGD92n4YjDuxRnqefu8fXxUFrcLav0p8CNSv9ek291woQ","qi":"w6hfKEBLLHRWPkjajgxZyyetj-UFfVkILRT0plOllJ2JV8whcOXRXbiXH2r8zqMeyMFrrMwmuvv4TVQaruKB0ZQOG7Tz5Lw0RZEREOLnBwc3vSi_iLd-jBz01LdExTpqsAHMkaMQR9x62J8DE1ZNxVdn3ELYKik0f1L2r_WErzhvT1uq69HAybUp6WHcFYH0PSqHg4LOneXAdU1_g-ji2Zn9dlA_2oYGQ5S6JXPV7v2IVbEFpxyVD1lPbFT0iKhyZZevictjgD_JGHveIVqsq5w0Csyz08h0oEW9hYEq-4bquMxSf18gjldoS5uQPD7FUECgL8bxsCdc4hP6UEKYGw"}
37
+ server: http://bulletin-board.lvh.me:8000/api
38
+ websocket_url: ws://bulletin-board.lvh.me:8000/cable
39
+ api_key: "89Ht70GZNcicu8WEyagz_rRae6brbqZAGuBEICYBCii-PTV3MAstAtx1aRVe5H5YfODi-JgYPvyf9ZMH7tOeZ15e3mf9B2Ymgw7eknvBFMRP213YFGo1SPn_C4uLK90G"
40
+ number_of_trustees: 2
41
+ authority_name: "Decidim Test Authority"
42
+ scheme:
43
+ name: "dummy"
44
+ parameters:
45
+ quorum: 2
40
46
 
41
47
  development:
42
48
  <<: *default
@@ -75,3 +81,14 @@ production:
75
81
  smtp_port: "587"
76
82
  smtp_starttls_auto: true
77
83
  smtp_authentication: "plain"
84
+ bulletin_board:
85
+ identification_private_key: <%%= ENV["BULLETIN_BOARD_IDENTIFICATION_PRIVATE_KEY"] %>
86
+ server: <%%= ENV["BULLETIN_BOARD_SERVER"] %>
87
+ websocket_url: <%%= ENV["BULLETIN_BOARD_WEBSOCKET_URL"] %>
88
+ api_key: <%%= ENV["BULLETIN_BOARD_API_KEY"] %>
89
+ number_of_trustees: <%%= ENV["BULLETIN_BOARD_NUMBER_OF_TRUSTEES"] %>
90
+ authority_name: <%%= ENV["BULLETIN_BOARD_AUTHORITY_NAME"] %>
91
+ scheme:
92
+ name: <%%= ENV["BULLETIN_BOARD_SCHEME_NAME"] %>
93
+ parameters:
94
+ quorum: <%%= ENV["BULLETIN_BOARD_SCHEME_QUORUM"] %>
data/lib/decidim/generators/component_templates/Gemfile.erb CHANGED
@@ -18,7 +18,7 @@ group :development, :test do
18
18
  end
19
19
 
20
20
  group :development do
21
- gem "faker", "~> 1.9"
21
+ gem "faker", "~> 2.14"
22
22
  gem "letter_opener_web", "~> 1.3"
23
23
  gem "listen", "~> 3.1"
24
24
  gem "spring", "~> 2.0"
data/lib/decidim/generators/component_templates/decidim-component.gemspec.erb CHANGED
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
10
10
  s.email = ["<%= %x[git config user.email].chomp %>"]
11
11
  s.license = "AGPL-3.0"
12
12
  s.homepage = "https://github.com/decidim/decidim-module-<%= component_name %>"
13
- s.required_ruby_version = ">= 2.6"
13
+ s.required_ruby_version = ">= 2.7"
14
14
 
15
15
  s.name = "decidim-<%= component_name %>"
16
16
  s.summary = "A decidim <%= component_name %> module"
data/lib/decidim/generators/version.rb CHANGED
@@ -4,7 +4,7 @@
4
4
  module Decidim
5
5
  module Generators
6
6
  def self.version
7
- "0.23.3"
7
+ "0.24.1"
8
8
  end
9
9
  end
10
10
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-generators
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.23.3
4
+ version: 0.24.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: exe
12
12
  cert_chain: []
13
- date: 2021-02-23 00:00:00.000000000 Z
13
+ date: 2021-04-08 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 0.23.3
21
+ version: 0.24.1
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
26
  - - '='
27
27
  - !ruby/object:Gem::Version
28
- version: 0.23.3
28
+ version: 0.24.1
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: bundler
31
31
  requirement: !ruby/object:Gem::Requirement
@@ -117,14 +117,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
117
117
  requirements:
118
118
  - - ">="
119
119
  - !ruby/object:Gem::Version
120
- version: '2.6'
120
+ version: '2.7'
121
121
  required_rubygems_version: !ruby/object:Gem::Requirement
122
122
  requirements:
123
123
  - - ">="
124
124
  - !ruby/object:Gem::Version
125
125
  version: '0'
126
126
  requirements: []
127
- rubygems_version: 3.0.3
127
+ rubygems_version: 3.1.2
128
128
  signing_key:
129
129
  specification_version: 4
130
130
  summary: Citizen participation framework for Ruby on Rails.