decidim-generators 0.23.2 → 0.24.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +4 -2
  3. data/Gemfile.lock +272 -196
  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: 61f8d792212f102f392a0fc71e8bb20a6a922ca84e8edfe65e7bebd8139beea9
4
- data.tar.gz: 469b1e3ae61e9e39cac0f88c35b3d7b47061fd6b70d7b73b2b3f6f292e192400
3
+ metadata.gz: 8bfc3c02161daeb2b202f19d99570c80ca721c358bf6cb21df30f2895efd9181
4
+ data.tar.gz: a88f1e56b3d642e6cafc0b7a045cc7b6641b0345bd501d0a94e4649294d6b435
5
5
  SHA512:
6
- metadata.gz: 122e7d0d7497de2d8a70fae21eb508a947c56ad024f8e810a93412970f20faa657174cbef8e55cfea6496360e6dce376f9345c8c839a30fcc21c2423536a02d1
7
- data.tar.gz: 783e131b196b03198f633d89cf5d61d814685b6cd9dc409981213af4aac74bf2c1cbda2e872ae4a5f58d6e5c612e2c6ab5c6cb6f9106e5958a2aa1c5c2279f14
6
+ metadata.gz: faffaf38e2e241fdf8e3d7d8e75f783fbc97b40296af649063f7682c1937514c652baf1ce8658142f160803872a524dc4baf6bb138249b0c7a1a627a1cf0441e
7
+ data.tar.gz: 5faf9cf3ae683eaa4ceecac87c6dcbf75911cf5f36d7a06c099c12562dbc8ec17c0df5da308c2313735e0ecad80ec871944ab6f819d739dabad3a1cbea67c195
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.2)
5
- decidim-accountability (= 0.23.2)
6
- decidim-admin (= 0.23.2)
7
- decidim-api (= 0.23.2)
8
- decidim-assemblies (= 0.23.2)
9
- decidim-blogs (= 0.23.2)
10
- decidim-budgets (= 0.23.2)
11
- decidim-comments (= 0.23.2)
12
- decidim-core (= 0.23.2)
13
- decidim-debates (= 0.23.2)
14
- decidim-forms (= 0.23.2)
15
- decidim-generators (= 0.23.2)
16
- decidim-meetings (= 0.23.2)
17
- decidim-pages (= 0.23.2)
18
- decidim-participatory_processes (= 0.23.2)
19
- decidim-proposals (= 0.23.2)
20
- decidim-sortitions (= 0.23.2)
21
- decidim-surveys (= 0.23.2)
22
- decidim-system (= 0.23.2)
23
- decidim-verifications (= 0.23.2)
24
- decidim-accountability (0.23.2)
25
- decidim-comments (= 0.23.2)
26
- decidim-core (= 0.23.2)
4
+ decidim (0.24.0)
5
+ decidim-accountability (= 0.24.0)
6
+ decidim-admin (= 0.24.0)
7
+ decidim-api (= 0.24.0)
8
+ decidim-assemblies (= 0.24.0)
9
+ decidim-blogs (= 0.24.0)
10
+ decidim-budgets (= 0.24.0)
11
+ decidim-comments (= 0.24.0)
12
+ decidim-core (= 0.24.0)
13
+ decidim-debates (= 0.24.0)
14
+ decidim-forms (= 0.24.0)
15
+ decidim-generators (= 0.24.0)
16
+ decidim-meetings (= 0.24.0)
17
+ decidim-pages (= 0.24.0)
18
+ decidim-participatory_processes (= 0.24.0)
19
+ decidim-proposals (= 0.24.0)
20
+ decidim-sortitions (= 0.24.0)
21
+ decidim-surveys (= 0.24.0)
22
+ decidim-system (= 0.24.0)
23
+ decidim-templates (= 0.24.0)
24
+ decidim-verifications (= 0.24.0)
25
+ decidim-accountability (0.24.0)
26
+ decidim-comments (= 0.24.0)
27
+ decidim-core (= 0.24.0)
27
28
  kaminari (~> 1.2, >= 1.2.1)
28
29
  searchlight (~> 4.1)
29
- decidim-admin (0.23.2)
30
+ decidim-admin (0.24.0)
30
31
  active_link_to (~> 1.0)
31
- decidim-core (= 0.23.2)
32
+ decidim-core (= 0.24.0)
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.2)
39
+ decidim-api (0.24.0)
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.2)
45
- decidim-core (= 0.23.2)
46
- decidim-blogs (0.23.2)
47
- decidim-admin (= 0.23.2)
48
- decidim-comments (= 0.23.2)
49
- decidim-core (= 0.23.2)
50
- httparty (~> 0.17)
45
+ decidim-assemblies (0.24.0)
46
+ decidim-core (= 0.24.0)
47
+ decidim-blogs (0.24.0)
48
+ decidim-admin (= 0.24.0)
49
+ decidim-comments (= 0.24.0)
50
+ decidim-core (= 0.24.0)
51
51
  jquery-tmpl-rails (~> 1.1)
52
52
  kaminari (~> 1.2, >= 1.2.1)
53
- decidim-budgets (0.23.2)
54
- decidim-comments (= 0.23.2)
55
- decidim-core (= 0.23.2)
53
+ decidim-budgets (0.24.0)
54
+ decidim-comments (= 0.24.0)
55
+ decidim-core (= 0.24.0)
56
56
  kaminari (~> 1.2, >= 1.2.1)
57
57
  searchlight (~> 4.1)
58
- decidim-comments (0.23.2)
59
- decidim-core (= 0.23.2)
60
- jquery-rails (~> 4.3)
61
- redcarpet (~> 3.4)
62
- decidim-consultations (0.23.2)
63
- decidim-admin (= 0.23.2)
64
- decidim-comments (= 0.23.2)
65
- decidim-core (= 0.23.2)
66
- decidim-core (0.23.2)
58
+ decidim-comments (0.24.0)
59
+ decidim-core (= 0.24.0)
60
+ jquery-rails (~> 4.4)
61
+ redcarpet (~> 3.5, >= 3.5.1)
62
+ decidim-conferences (0.24.0)
63
+ decidim-core (= 0.24.0)
64
+ decidim-meetings (= 0.24.0)
65
+ wicked_pdf (~> 1.4)
66
+ wkhtmltopdf-binary (~> 0.12)
67
+ decidim-consultations (0.24.0)
68
+ decidim-admin (= 0.24.0)
69
+ decidim-comments (= 0.24.0)
70
+ decidim-core (= 0.24.0)
71
+ decidim-core (0.24.0)
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.0)
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.2)
82
+ decidim-api (= 0.24.0)
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.4.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.2)
125
- decidim-comments (= 0.23.2)
126
- decidim-core (= 0.23.2)
130
+ decidim-debates (0.24.0)
131
+ decidim-comments (= 0.24.0)
132
+ decidim-core (= 0.24.0)
127
133
  kaminari (~> 1.2, >= 1.2.1)
128
134
  searchlight (~> 4.1)
129
- decidim-dev (0.23.2)
135
+ decidim-dev (0.24.0)
130
136
  byebug (~> 11.0)
131
137
  capybara (~> 3.24)
132
138
  db-query-matchers (~> 0.9.0)
133
- decidim (= 0.23.2)
139
+ decidim (= 0.24.0)
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.2)
156
- decidim-core (= 0.23.2)
163
+ decidim-elections (0.24.0)
164
+ decidim-bulletin_board (= 0.9.2)
165
+ decidim-core (= 0.24.0)
166
+ decidim-forms (= 0.24.0)
167
+ decidim-proposals (= 0.24.0)
168
+ decidim-forms (0.24.0)
169
+ decidim-core (= 0.24.0)
157
170
  wicked_pdf (~> 1.4)
158
171
  wkhtmltopdf-binary (~> 0.12)
159
- decidim-generators (0.23.2)
160
- decidim-core (= 0.23.2)
161
- decidim-initiatives (0.23.2)
162
- decidim-admin (= 0.23.2)
163
- decidim-comments (= 0.23.2)
164
- decidim-core (= 0.23.2)
165
- decidim-verifications (= 0.23.2)
172
+ decidim-generators (0.24.0)
173
+ decidim-core (= 0.24.0)
174
+ decidim-initiatives (0.24.0)
175
+ decidim-admin (= 0.24.0)
176
+ decidim-comments (= 0.24.0)
177
+ decidim-core (= 0.24.0)
178
+ decidim-verifications (= 0.24.0)
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.2)
185
+ decidim-meetings (0.24.0)
173
186
  cells-erb (~> 0.1.0)
174
187
  cells-rails (~> 0.0.9)
175
- decidim-core (= 0.23.2)
176
- decidim-forms (= 0.23.2)
177
- httparty (~> 0.17)
188
+ decidim-core (= 0.24.0)
189
+ decidim-forms (= 0.24.0)
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.2)
183
- decidim-core (= 0.23.2)
184
- decidim-participatory_processes (0.23.2)
185
- decidim-core (= 0.23.2)
186
- decidim-proposals (0.23.2)
194
+ decidim-pages (0.24.0)
195
+ decidim-core (= 0.24.0)
196
+ decidim-participatory_processes (0.24.0)
197
+ decidim-core (= 0.24.0)
198
+ decidim-proposals (0.24.0)
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.2)
191
- decidim-core (= 0.23.2)
192
- doc2text (~> 0.4.2)
202
+ decidim-comments (= 0.24.0)
203
+ decidim-core (= 0.24.0)
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.2)
197
- decidim-admin (= 0.23.2)
198
- decidim-comments (= 0.23.2)
199
- decidim-core (= 0.23.2)
200
- decidim-proposals (= 0.23.2)
201
- decidim-surveys (0.23.2)
202
- decidim-core (= 0.23.2)
203
- decidim-forms (= 0.23.2)
204
- decidim-system (0.23.2)
207
+ redcarpet (~> 3.5, >= 3.5.1)
208
+ decidim-sortitions (0.24.0)
209
+ decidim-admin (= 0.24.0)
210
+ decidim-comments (= 0.24.0)
211
+ decidim-core (= 0.24.0)
212
+ decidim-proposals (= 0.24.0)
213
+ decidim-surveys (0.24.0)
214
+ decidim-core (= 0.24.0)
215
+ decidim-forms (= 0.24.0)
216
+ decidim-templates (= 0.24.0)
217
+ decidim-system (0.24.0)
205
218
  active_link_to (~> 1.0)
206
- decidim-core (= 0.23.2)
219
+ decidim-core (= 0.24.0)
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.2)
214
- decidim-core (= 0.23.2)
215
- decidim-forms (= 0.23.2)
216
- decidim-verifications (0.23.2)
217
- decidim-core (= 0.23.2)
226
+ decidim-templates (0.24.0)
227
+ decidim-core (= 0.24.0)
228
+ decidim-forms (= 0.24.0)
229
+ decidim-verifications (0.24.0)
230
+ decidim-core (= 0.24.0)
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.4.5)
236
+ actionpack (= 5.2.4.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.4.5)
240
+ actionpack (= 5.2.4.5)
241
+ actionview (= 5.2.4.5)
242
+ activejob (= 5.2.4.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.4.5)
246
+ actionview (= 5.2.4.5)
247
+ activesupport (= 5.2.4.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.4.5)
253
+ activesupport (= 5.2.4.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.4.5)
262
+ activesupport (= 5.2.4.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.4.5)
265
+ activesupport (= 5.2.4.5)
266
+ activerecord (5.2.4.5)
267
+ activemodel (= 5.2.4.5)
268
+ activesupport (= 5.2.4.5)
256
269
  arel (>= 9.0)
257
- activestorage (5.2.4.4)
258
- actionpack (= 5.2.4.4)
259
- activerecord (= 5.2.4.4)
270
+ activestorage (5.2.4.5)
271
+ actionpack (= 5.2.4.5)
272
+ activerecord (= 5.2.4.5)
260
273
  marcel (~> 0.3.1)
261
- activesupport (5.2.4.4)
274
+ activesupport (5.2.4.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.0)
321
+ activemodel (>= 5.0.0)
322
+ activesupport (>= 5.0.0)
323
+ addressable (~> 2.6)
324
+ image_processing (~> 1.1)
325
+ mimemagic (>= 0.3.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.11.7)
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.0)
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.4)
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.6)
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)
@@ -500,16 +553,18 @@ GEM
500
553
  method_source (1.0.0)
501
554
  mime-types (3.3.1)
502
555
  mime-types-data (~> 3.2015)
503
- mime-types-data (3.2020.1104)
504
- mimemagic (0.3.5)
556
+ mime-types-data (3.2021.0225)
557
+ mimemagic (0.3.9)
558
+ nokogiri (~> 1)
559
+ rake
505
560
  mini_magick (4.11.0)
506
561
  mini_mime (1.0.2)
507
- mini_portile2 (2.4.0)
508
- minitest (5.14.1)
562
+ mini_portile2 (2.5.0)
563
+ minitest (5.14.3)
509
564
  mixlib-cli (2.1.8)
510
565
  mixlib-config (3.0.9)
511
566
  tomlrb
512
- mixlib-shellout (3.2.2)
567
+ mixlib-shellout (3.2.5)
513
568
  chef-utils
514
569
  msgpack (1.3.3)
515
570
  multi_json (1.15.0)
@@ -517,12 +572,13 @@ GEM
517
572
  multipart-post (2.1.1)
518
573
  mustache (1.1.1)
519
574
  netrc (0.11.0)
520
- nio4r (2.5.2)
575
+ nio4r (2.5.5)
521
576
  nobspw (0.6.2)
522
- nokogiri (1.10.9)
523
- mini_portile2 (~> 2.4.0)
577
+ nokogiri (1.11.1)
578
+ mini_portile2 (~> 2.5.0)
579
+ racc (~> 1.4)
524
580
  oauth (0.5.5)
525
- oauth2 (1.4.4)
581
+ oauth2 (1.4.7)
526
582
  faraday (>= 0.8, < 2.0)
527
583
  jwt (>= 1.0, < 3.0)
528
584
  multi_json (~> 1.3)
@@ -533,10 +589,10 @@ GEM
533
589
  rack (>= 1.6.2, < 3)
534
590
  omniauth-facebook (5.0.0)
535
591
  omniauth-oauth2 (~> 1.2)
536
- omniauth-google-oauth2 (0.8.1)
592
+ omniauth-google-oauth2 (0.8.2)
537
593
  jwt (>= 2.0)
538
594
  oauth2 (~> 1.1)
539
- omniauth (>= 1.1.1)
595
+ omniauth (~> 1.1)
540
596
  omniauth-oauth2 (>= 1.6)
541
597
  omniauth-oauth (1.2.0)
542
598
  oauth
@@ -571,8 +627,17 @@ GEM
571
627
  actionmailer (>= 3)
572
628
  premailer (~> 1.7, >= 1.7.9)
573
629
  public_suffix (4.0.5)
574
- puma (4.3.5)
630
+ puffing-billy (2.4.1)
631
+ addressable (~> 2.5)
632
+ em-http-request (~> 1.1, >= 1.1.0)
633
+ em-synchrony
634
+ eventmachine (~> 1.2)
635
+ eventmachine_httpserver
636
+ http_parser.rb (~> 0.6.0)
637
+ multi_json
638
+ puma (5.1.1)
575
639
  nio4r (~> 2.0)
640
+ racc (1.5.2)
576
641
  rack (2.2.3)
577
642
  rack-attack (6.5.0)
578
643
  rack (>= 1.0, < 3)
@@ -580,18 +645,18 @@ GEM
580
645
  rack (>= 2.0.0)
581
646
  rack-test (1.1.0)
582
647
  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)
648
+ rails (5.2.4.5)
649
+ actioncable (= 5.2.4.5)
650
+ actionmailer (= 5.2.4.5)
651
+ actionpack (= 5.2.4.5)
652
+ actionview (= 5.2.4.5)
653
+ activejob (= 5.2.4.5)
654
+ activemodel (= 5.2.4.5)
655
+ activerecord (= 5.2.4.5)
656
+ activestorage (= 5.2.4.5)
657
+ activesupport (= 5.2.4.5)
593
658
  bundler (>= 1.3.0)
594
- railties (= 5.2.4.4)
659
+ railties (= 5.2.4.5)
595
660
  sprockets-rails (>= 2.0.0)
596
661
  rails-controller-testing (1.0.5)
597
662
  actionpack (>= 5.0.1.rc1)
@@ -605,14 +670,14 @@ GEM
605
670
  rails-i18n (5.1.3)
606
671
  i18n (>= 0.7, < 2)
607
672
  railties (>= 5.0, < 6)
608
- railties (5.2.4.4)
609
- actionpack (= 5.2.4.4)
610
- activesupport (= 5.2.4.4)
673
+ railties (5.2.4.5)
674
+ actionpack (= 5.2.4.5)
675
+ activesupport (= 5.2.4.5)
611
676
  method_source
612
677
  rake (>= 0.8.7)
613
678
  thor (>= 0.19.0, < 2.0)
614
679
  rainbow (3.0.0)
615
- rake (13.0.1)
680
+ rake (13.0.3)
616
681
  ransack (2.1.1)
617
682
  actionpack (>= 5.0)
618
683
  activerecord (>= 5.0)
@@ -629,7 +694,7 @@ GEM
629
694
  wisper (>= 1.6.1)
630
695
  redcarpet (3.5.1)
631
696
  redis (4.2.5)
632
- regexp_parser (2.0.3)
697
+ regexp_parser (2.1.1)
633
698
  request_store (1.5.0)
634
699
  rack (>= 1.4)
635
700
  responders (3.0.1)
@@ -672,28 +737,36 @@ GEM
672
737
  rspec-support (3.9.4)
673
738
  rspec_junit_formatter (0.3.0)
674
739
  rspec-core (>= 2, < 4, != 2.12.0)
675
- rubocop (0.71.0)
676
- jaro_winkler (~> 1.5.1)
740
+ rubocop (0.92.0)
677
741
  parallel (~> 1.10)
678
- parser (>= 2.6)
742
+ parser (>= 2.7.1.5)
679
743
  rainbow (>= 2.2.2, < 4.0)
744
+ regexp_parser (>= 1.7)
745
+ rexml
746
+ rubocop-ast (>= 0.5.0)
680
747
  ruby-progressbar (~> 1.7)
681
- unicode-display_width (>= 1.4.0, < 1.7)
682
- rubocop-rails (2.0.1)
748
+ unicode-display_width (>= 1.4.0, < 2.0)
749
+ rubocop-ast (1.4.1)
750
+ parser (>= 2.7.1.5)
751
+ rubocop-rails (2.9.1)
752
+ activesupport (>= 4.2.0)
683
753
  rack (>= 1.1)
684
- rubocop (>= 0.70.0)
685
- rubocop-rspec (1.41.0)
686
- rubocop (>= 0.68.1)
754
+ rubocop (>= 0.90.0, < 2.0)
755
+ rubocop-rspec (1.44.1)
756
+ rubocop (~> 0.87)
757
+ rubocop-ast (>= 0.7.1)
687
758
  ruby-ole (1.2.12.2)
688
759
  ruby-progressbar (1.11.0)
760
+ ruby-vips (2.1.0)
761
+ ffi (~> 1.12)
689
762
  ruby2_keywords (0.0.4)
690
- rubyzip (2.0.0)
763
+ rubyzip (2.3.0)
691
764
  sass (3.7.4)
692
765
  sass-listen (~> 4.0.0)
693
766
  sass-listen (4.0.0)
694
767
  rb-fsevent (~> 0.9, >= 0.9.4)
695
768
  rb-inotify (~> 0.9, >= 0.9.7)
696
- sassc (2.3.0)
769
+ sassc (2.4.0)
697
770
  ffi (~> 1.9)
698
771
  sassc-rails (2.1.2)
699
772
  railties (>= 4.0.0)
@@ -715,7 +788,7 @@ GEM
715
788
  smart_properties (1.15.0)
716
789
  social-share-button (1.2.3)
717
790
  coffee-rails
718
- spreadsheet (1.2.7)
791
+ spreadsheet (1.2.8)
719
792
  ruby-ole
720
793
  spring (2.1.0)
721
794
  spring-watcher-listen (2.0.1)
@@ -738,14 +811,14 @@ GEM
738
811
  temple (0.8.2)
739
812
  terminal-table (3.0.0)
740
813
  unicode-display_width (~> 1.1, >= 1.1.1)
741
- thor (1.0.1)
814
+ thor (1.1.0)
742
815
  thread_safe (0.3.6)
743
816
  tilt (2.0.10)
744
817
  tomlrb (2.0.1)
745
818
  truncato (0.7.11)
746
819
  htmlentities (~> 4.3.1)
747
820
  nokogiri (>= 1.7.0, <= 2.0)
748
- tzinfo (1.2.7)
821
+ tzinfo (1.2.9)
749
822
  thread_safe (~> 0.1)
750
823
  uber (0.1.0)
751
824
  uglifier (4.2.0)
@@ -753,10 +826,11 @@ GEM
753
826
  unf (0.1.4)
754
827
  unf_ext
755
828
  unf_ext (0.0.7.7)
756
- unicode-display_width (1.6.1)
829
+ unicode-display_width (1.7.0)
757
830
  valid_email2 (2.3.1)
758
831
  activemodel (>= 3.2)
759
832
  mail (~> 2.5)
833
+ vcr (6.0.0)
760
834
  virtus (1.0.5)
761
835
  axiom-types (~> 0.1)
762
836
  coercible (~> 1.0)
@@ -771,7 +845,7 @@ GEM
771
845
  activemodel (>= 5.0)
772
846
  bindex (>= 0.4.0)
773
847
  railties (>= 5.0)
774
- webmock (3.11.2)
848
+ webmock (3.12.1)
775
849
  addressable (>= 2.3.6)
776
850
  crack (>= 0.3.2)
777
851
  hashdiff (>= 0.4.0, < 2.0.0)
@@ -795,14 +869,16 @@ DEPENDENCIES
795
869
  bootsnap (~> 1.3)
796
870
  byebug (~> 11.0)
797
871
  decidim!
872
+ decidim-conferences!
798
873
  decidim-consultations!
799
874
  decidim-dev!
875
+ decidim-elections!
800
876
  decidim-initiatives!
801
877
  decidim-templates!
802
- faker (~> 1.9)
878
+ faker (~> 2.14)
803
879
  letter_opener_web (~> 1.3)
804
880
  listen (~> 3.1)
805
- puma (>= 4.3.5)
881
+ puma (>= 5.0.0)
806
882
  spring (~> 2.0)
807
883
  spring-watcher-listen (~> 2.0)
808
884
  uglifier (~> 4.1)
@@ -810,7 +886,7 @@ DEPENDENCIES
810
886
  wicked_pdf (~> 1.4)
811
887
 
812
888
  RUBY VERSION
813
- ruby 2.6.6p146
889
+ ruby 2.7.1p83
814
890
 
815
891
  BUNDLED WITH
816
892
  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.2"
7
+ "0.24.0"
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.2
4
+ version: 0.24.0
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-09 00:00:00.000000000 Z
13
+ date: 2021-03-26 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.2
21
+ version: 0.24.0
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.2
28
+ version: 0.24.0
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.