decidim-generators 0.23.0 → 0.24.0.rc1

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 +298 -219
  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 +11 -11
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f06d0d594262907deefc4cb15e68684304dcacf14cd08af818b6346cbf11e3b6
4
- data.tar.gz: 69572893d0398802aaab594776ffaea9ae96c507ad5822351b8d68a4e50494e3
3
+ metadata.gz: a9bd318053daa54e3e7d5e46913420e0d0c499cbe790c8a42c6576f394bfc199
4
+ data.tar.gz: e654241d35fac22c8a4c28049705077221bddf7ba1b0d8850f64f31515684d78
5
5
  SHA512:
6
- metadata.gz: 64c3f1814470d665e33fa9c05a9ce6548e769478a24bad581a9cd377530ce62b735495ff5bb6476470540ad6e4a062d6b17f65a82582bf30871c2304610fe931
7
- data.tar.gz: b6feab697f6ec1f4fa3bb74e213538910e48152e8a34f34d58395e3718b37b6755fa5b3d928a30c46be93502711a5424f36f757eb8860557dd600fb0732494f7
6
+ metadata.gz: ee5026041f4b35a955948c912a5f06ec9d1926d7d93ce38bce443aab5bd8e353bca5bbb41686189307810f3e2df720d73f7f2095852e687db92945ca62a1fe4a
7
+ data.tar.gz: 9f753e513f64c727d06484c269f3e2435506b5d1788c9149b3cfdcabe6a0c3a3cd216e7ae0b7de07d246a10f7f19270f9581a48b8c812178da598b6397da2dc8
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,81 +1,85 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- decidim (0.23.0)
5
- decidim-accountability (= 0.23.0)
6
- decidim-admin (= 0.23.0)
7
- decidim-api (= 0.23.0)
8
- decidim-assemblies (= 0.23.0)
9
- decidim-blogs (= 0.23.0)
10
- decidim-budgets (= 0.23.0)
11
- decidim-comments (= 0.23.0)
12
- decidim-core (= 0.23.0)
13
- decidim-debates (= 0.23.0)
14
- decidim-forms (= 0.23.0)
15
- decidim-generators (= 0.23.0)
16
- decidim-meetings (= 0.23.0)
17
- decidim-pages (= 0.23.0)
18
- decidim-participatory_processes (= 0.23.0)
19
- decidim-proposals (= 0.23.0)
20
- decidim-sortitions (= 0.23.0)
21
- decidim-surveys (= 0.23.0)
22
- decidim-system (= 0.23.0)
23
- decidim-templates (= 0.23.0)
24
- decidim-verifications (= 0.23.0)
25
- decidim-accountability (0.23.0)
26
- decidim-comments (= 0.23.0)
27
- decidim-core (= 0.23.0)
4
+ decidim (0.24.0.rc1)
5
+ decidim-accountability (= 0.24.0.rc1)
6
+ decidim-admin (= 0.24.0.rc1)
7
+ decidim-api (= 0.24.0.rc1)
8
+ decidim-assemblies (= 0.24.0.rc1)
9
+ decidim-blogs (= 0.24.0.rc1)
10
+ decidim-budgets (= 0.24.0.rc1)
11
+ decidim-comments (= 0.24.0.rc1)
12
+ decidim-core (= 0.24.0.rc1)
13
+ decidim-debates (= 0.24.0.rc1)
14
+ decidim-forms (= 0.24.0.rc1)
15
+ decidim-generators (= 0.24.0.rc1)
16
+ decidim-meetings (= 0.24.0.rc1)
17
+ decidim-pages (= 0.24.0.rc1)
18
+ decidim-participatory_processes (= 0.24.0.rc1)
19
+ decidim-proposals (= 0.24.0.rc1)
20
+ decidim-sortitions (= 0.24.0.rc1)
21
+ decidim-surveys (= 0.24.0.rc1)
22
+ decidim-system (= 0.24.0.rc1)
23
+ decidim-templates (= 0.24.0.rc1)
24
+ decidim-verifications (= 0.24.0.rc1)
25
+ decidim-accountability (0.24.0.rc1)
26
+ decidim-comments (= 0.24.0.rc1)
27
+ decidim-core (= 0.24.0.rc1)
28
28
  kaminari (~> 1.2, >= 1.2.1)
29
29
  searchlight (~> 4.1)
30
- decidim-admin (0.23.0)
30
+ decidim-admin (0.24.0.rc1)
31
31
  active_link_to (~> 1.0)
32
- decidim-core (= 0.23.0)
32
+ decidim-core (= 0.24.0.rc1)
33
33
  devise (~> 4.7)
34
34
  devise-i18n (~> 1.2)
35
35
  devise_invitable (~> 1.7)
36
- jquery-rails (~> 4.3)
37
- sassc (~> 2.3.0)
36
+ jquery-rails (~> 4.4)
37
+ sassc (~> 2.4.0)
38
38
  sassc-rails (~> 2.1.2)
39
- decidim-api (0.23.0)
39
+ decidim-api (0.24.0.rc1)
40
40
  graphiql-rails (~> 1.4, < 1.5)
41
- graphql (~> 1.9)
41
+ graphql (~> 1.12, >= 1.12.3)
42
42
  rack-cors (~> 1.0)
43
- redcarpet (~> 3.4)
43
+ redcarpet (~> 3.5, >= 3.5.1)
44
44
  sprockets-es6 (~> 0.9.2)
45
- decidim-assemblies (0.23.0)
46
- decidim-core (= 0.23.0)
47
- decidim-blogs (0.23.0)
48
- decidim-admin (= 0.23.0)
49
- decidim-comments (= 0.23.0)
50
- decidim-core (= 0.23.0)
51
- httparty (~> 0.17)
45
+ decidim-assemblies (0.24.0.rc1)
46
+ decidim-core (= 0.24.0.rc1)
47
+ decidim-blogs (0.24.0.rc1)
48
+ decidim-admin (= 0.24.0.rc1)
49
+ decidim-comments (= 0.24.0.rc1)
50
+ decidim-core (= 0.24.0.rc1)
52
51
  jquery-tmpl-rails (~> 1.1)
53
52
  kaminari (~> 1.2, >= 1.2.1)
54
- decidim-budgets (0.23.0)
55
- decidim-comments (= 0.23.0)
56
- decidim-core (= 0.23.0)
53
+ decidim-budgets (0.24.0.rc1)
54
+ decidim-comments (= 0.24.0.rc1)
55
+ decidim-core (= 0.24.0.rc1)
57
56
  kaminari (~> 1.2, >= 1.2.1)
58
57
  searchlight (~> 4.1)
59
- decidim-comments (0.23.0)
60
- decidim-core (= 0.23.0)
61
- jquery-rails (~> 4.3)
62
- redcarpet (~> 3.4)
63
- decidim-consultations (0.23.0)
64
- decidim-admin (= 0.23.0)
65
- decidim-comments (= 0.23.0)
66
- decidim-core (= 0.23.0)
67
- decidim-core (0.23.0)
58
+ decidim-comments (0.24.0.rc1)
59
+ decidim-core (= 0.24.0.rc1)
60
+ jquery-rails (~> 4.4)
61
+ redcarpet (~> 3.5, >= 3.5.1)
62
+ decidim-conferences (0.24.0.rc1)
63
+ decidim-core (= 0.24.0.rc1)
64
+ decidim-meetings (= 0.24.0.rc1)
65
+ wicked_pdf (~> 1.4)
66
+ wkhtmltopdf-binary (~> 0.12)
67
+ decidim-consultations (0.24.0.rc1)
68
+ decidim-admin (= 0.24.0.rc1)
69
+ decidim-comments (= 0.24.0.rc1)
70
+ decidim-core (= 0.24.0.rc1)
71
+ decidim-core (0.24.0.rc1)
68
72
  active_link_to (~> 1.0)
69
- anchored (>= 1.1.0)
73
+ anchored (~> 1.1)
70
74
  autoprefixer-rails (~> 8.0)
71
75
  batch-loader (~> 1.2)
72
76
  browser (~> 2.7)
73
- carrierwave (~> 1.3)
77
+ carrierwave (~> 2.2.0)
74
78
  cells-erb (~> 0.1.0)
75
79
  cells-rails (~> 0.0.9)
76
80
  charlock_holmes (~> 0.7)
77
81
  date_validator (~> 0.9.0)
78
- decidim-api (= 0.23.0)
82
+ decidim-api (= 0.24.0.rc1)
79
83
  devise (~> 4.7)
80
84
  devise-i18n (~> 1.2)
81
85
  diffy (~> 3.3)
@@ -83,12 +87,13 @@ PATH
83
87
  doorkeeper-i18n (~> 4.0)
84
88
  etherpad-lite (~> 0.3)
85
89
  file_validators (~> 2.1)
90
+ fog-local (~> 0.6)
86
91
  foundation-rails (~> 6.6, < 6.7)
87
92
  foundation_rails_helper (~> 3.0)
88
- geocoder (>= 1.5)
93
+ geocoder (~> 1.5)
89
94
  hashdiff (>= 0.4.0, < 2.0.0)
90
95
  invisible_captcha (~> 0.12)
91
- jquery-rails (~> 4.3)
96
+ jquery-rails (~> 4.4)
92
97
  kaminari (~> 1.2, >= 1.2.1)
93
98
  loofah (~> 2.3.1)
94
99
  mini_magick (~> 4.9)
@@ -103,15 +108,15 @@ PATH
103
108
  pg (~> 1.1.4, < 2)
104
109
  pg_search (~> 2.2)
105
110
  premailer-rails (~> 1.10)
106
- rack (>= 2.2.3)
111
+ rack (~> 2.2, >= 2.2.3)
107
112
  rack-attack (~> 6.0)
108
- rails (>= 5.2.4.4, < 6.0.x)
113
+ rails (~> 5.2.4.5)
109
114
  rails-i18n (~> 5.0)
110
115
  rectify (~> 0.13.0)
111
116
  redis (~> 4.1)
112
117
  request_store (~> 1.5.0)
113
118
  rubyzip (~> 2.0)
114
- sassc (~> 2.3.0)
119
+ sassc (~> 2.4.0)
115
120
  sassc-rails (~> 2.1.2)
116
121
  seven_zip_ruby (~> 1.3)
117
122
  social-share-button (~> 1.2, >= 1.2.1)
@@ -122,124 +127,130 @@ PATH
122
127
  uglifier (~> 4.1)
123
128
  valid_email2 (~> 2.1)
124
129
  wisper (~> 2.0)
125
- decidim-debates (0.23.0)
126
- decidim-comments (= 0.23.0)
127
- decidim-core (= 0.23.0)
130
+ decidim-debates (0.24.0.rc1)
131
+ decidim-comments (= 0.24.0.rc1)
132
+ decidim-core (= 0.24.0.rc1)
128
133
  kaminari (~> 1.2, >= 1.2.1)
129
134
  searchlight (~> 4.1)
130
- decidim-dev (0.23.0)
135
+ decidim-dev (0.24.0.rc1)
131
136
  byebug (~> 11.0)
132
137
  capybara (~> 3.24)
133
138
  db-query-matchers (~> 0.9.0)
134
- decidim (= 0.23.0)
139
+ decidim (= 0.24.0.rc1)
135
140
  erb_lint (~> 0.0.28)
136
141
  factory_bot_rails (~> 4.8)
137
142
  i18n-tasks (~> 0.9.18)
138
143
  mdl (~> 0.5)
139
- nokogiri (>= 1.10.8)
140
- puma (>= 4.3)
144
+ nokogiri (~> 1.11, >= 1.11.1)
145
+ puffing-billy (~> 2.4.0)
146
+ puma (~> 5.0)
141
147
  rails-controller-testing (~> 1.0)
142
148
  rspec-cells (~> 0.3.4)
143
149
  rspec-html-matchers (~> 0.9.1)
144
150
  rspec-rails (~> 3.7)
145
151
  rspec-retry (~> 0.6.2)
146
152
  rspec_junit_formatter (~> 0.3.0)
147
- rubocop (~> 0.71.0)
153
+ rubocop (~> 0.92.0)
148
154
  rubocop-rails (~> 2.0)
149
155
  rubocop-rspec (~> 1.21)
150
156
  selenium-webdriver (~> 3.142)
151
157
  simplecov (~> 0.19.0)
152
158
  simplecov-cobertura (~> 1.3.1)
153
159
  system_test_html_screenshots (~> 0.1.1)
160
+ vcr (~> 6.0)
154
161
  webmock (~> 3.6)
155
162
  wisper-rspec (~> 1.0)
156
- decidim-forms (0.23.0)
157
- decidim-core (= 0.23.0)
163
+ decidim-elections (0.24.0.rc1)
164
+ decidim-bulletin_board (= 0.9.2)
165
+ decidim-core (= 0.24.0.rc1)
166
+ decidim-forms (= 0.24.0.rc1)
167
+ decidim-proposals (= 0.24.0.rc1)
168
+ decidim-forms (0.24.0.rc1)
169
+ decidim-core (= 0.24.0.rc1)
158
170
  wicked_pdf (~> 1.4)
159
171
  wkhtmltopdf-binary (~> 0.12)
160
- decidim-generators (0.23.0)
161
- decidim-core (= 0.23.0)
162
- decidim-initiatives (0.23.0)
163
- decidim-admin (= 0.23.0)
164
- decidim-comments (= 0.23.0)
165
- decidim-core (= 0.23.0)
166
- decidim-verifications (= 0.23.0)
172
+ decidim-generators (0.24.0.rc1)
173
+ decidim-core (= 0.24.0.rc1)
174
+ decidim-initiatives (0.24.0.rc1)
175
+ decidim-admin (= 0.24.0.rc1)
176
+ decidim-comments (= 0.24.0.rc1)
177
+ decidim-core (= 0.24.0.rc1)
178
+ decidim-verifications (= 0.24.0.rc1)
167
179
  kaminari (~> 1.2, >= 1.2.1)
168
180
  origami (~> 2.1)
169
181
  virtus-multiparams (~> 0.1)
170
182
  wicked (~> 1.3)
171
183
  wicked_pdf (~> 1.4)
172
184
  wkhtmltopdf-binary (~> 0.12)
173
- decidim-meetings (0.23.0)
185
+ decidim-meetings (0.24.0.rc1)
174
186
  cells-erb (~> 0.1.0)
175
187
  cells-rails (~> 0.0.9)
176
- decidim-core (= 0.23.0)
177
- decidim-forms (= 0.23.0)
178
- httparty (~> 0.17)
188
+ decidim-core (= 0.24.0.rc1)
189
+ decidim-forms (= 0.24.0.rc1)
179
190
  icalendar (~> 2.5)
180
191
  jquery-tmpl-rails (~> 1.1)
181
192
  kaminari (~> 1.2, >= 1.2.1)
182
193
  searchlight (~> 4.1)
183
- decidim-pages (0.23.0)
184
- decidim-core (= 0.23.0)
185
- decidim-participatory_processes (0.23.0)
186
- decidim-core (= 0.23.0)
187
- decidim-proposals (0.23.0)
194
+ decidim-pages (0.24.0.rc1)
195
+ decidim-core (= 0.24.0.rc1)
196
+ decidim-participatory_processes (0.24.0.rc1)
197
+ decidim-core (= 0.24.0.rc1)
198
+ decidim-proposals (0.24.0.rc1)
188
199
  acts_as_list (~> 0.9)
189
200
  cells-erb (~> 0.1.0)
190
201
  cells-rails (~> 0.0.9)
191
- decidim-comments (= 0.23.0)
192
- decidim-core (= 0.23.0)
193
- doc2text (~> 0.4.2)
202
+ decidim-comments (= 0.24.0.rc1)
203
+ decidim-core (= 0.24.0.rc1)
204
+ doc2text (~> 0.4.3)
194
205
  kaminari (~> 1.2, >= 1.2.1)
195
206
  ransack (~> 2.1.1)
196
- redcarpet (~> 3.4)
197
- decidim-sortitions (0.23.0)
198
- decidim-admin (= 0.23.0)
199
- decidim-comments (= 0.23.0)
200
- decidim-core (= 0.23.0)
201
- decidim-proposals (= 0.23.0)
202
- decidim-surveys (0.23.0)
203
- decidim-core (= 0.23.0)
204
- decidim-forms (= 0.23.0)
205
- decidim-templates (= 0.23.0)
206
- decidim-system (0.23.0)
207
+ redcarpet (~> 3.5, >= 3.5.1)
208
+ decidim-sortitions (0.24.0.rc1)
209
+ decidim-admin (= 0.24.0.rc1)
210
+ decidim-comments (= 0.24.0.rc1)
211
+ decidim-core (= 0.24.0.rc1)
212
+ decidim-proposals (= 0.24.0.rc1)
213
+ decidim-surveys (0.24.0.rc1)
214
+ decidim-core (= 0.24.0.rc1)
215
+ decidim-forms (= 0.24.0.rc1)
216
+ decidim-templates (= 0.24.0.rc1)
217
+ decidim-system (0.24.0.rc1)
207
218
  active_link_to (~> 1.0)
208
- decidim-core (= 0.23.0)
219
+ decidim-core (= 0.24.0.rc1)
209
220
  devise (~> 4.7)
210
221
  devise-i18n (~> 1.2)
211
222
  devise_invitable (~> 1.7)
212
- jquery-rails (~> 4.3)
213
- sassc (~> 2.3.0)
223
+ jquery-rails (~> 4.4)
224
+ sassc (~> 2.4.0)
214
225
  sassc-rails (~> 2.1.2)
215
- decidim-templates (0.23.0)
216
- decidim-core (= 0.23.0)
217
- decidim-forms (= 0.23.0)
218
- decidim-verifications (0.23.0)
219
- decidim-core (= 0.23.0)
226
+ decidim-templates (0.24.0.rc1)
227
+ decidim-core (= 0.24.0.rc1)
228
+ decidim-forms (= 0.24.0.rc1)
229
+ decidim-verifications (0.24.0.rc1)
230
+ decidim-core (= 0.24.0.rc1)
220
231
 
221
232
  GEM
222
233
  remote: https://rubygems.org/
223
234
  specs:
224
- actioncable (5.2.4.4)
225
- actionpack (= 5.2.4.4)
235
+ actioncable (5.2.4.5)
236
+ actionpack (= 5.2.4.5)
226
237
  nio4r (~> 2.0)
227
238
  websocket-driver (>= 0.6.1)
228
- actionmailer (5.2.4.4)
229
- actionpack (= 5.2.4.4)
230
- actionview (= 5.2.4.4)
231
- 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)
232
243
  mail (~> 2.5, >= 2.5.4)
233
244
  rails-dom-testing (~> 2.0)
234
- actionpack (5.2.4.4)
235
- actionview (= 5.2.4.4)
236
- activesupport (= 5.2.4.4)
245
+ actionpack (5.2.4.5)
246
+ actionview (= 5.2.4.5)
247
+ activesupport (= 5.2.4.5)
237
248
  rack (~> 2.0, >= 2.0.8)
238
249
  rack-test (>= 0.6.3)
239
250
  rails-dom-testing (~> 2.0)
240
251
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
241
- actionview (5.2.4.4)
242
- activesupport (= 5.2.4.4)
252
+ actionview (5.2.4.5)
253
+ activesupport (= 5.2.4.5)
243
254
  builder (~> 3.1)
244
255
  erubi (~> 1.4)
245
256
  rails-dom-testing (~> 2.0)
@@ -247,20 +258,20 @@ GEM
247
258
  active_link_to (1.0.5)
248
259
  actionpack
249
260
  addressable
250
- activejob (5.2.4.4)
251
- activesupport (= 5.2.4.4)
261
+ activejob (5.2.4.5)
262
+ activesupport (= 5.2.4.5)
252
263
  globalid (>= 0.3.6)
253
- activemodel (5.2.4.4)
254
- activesupport (= 5.2.4.4)
255
- activerecord (5.2.4.4)
256
- activemodel (= 5.2.4.4)
257
- 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)
258
269
  arel (>= 9.0)
259
- activestorage (5.2.4.4)
260
- actionpack (= 5.2.4.4)
261
- activerecord (= 5.2.4.4)
270
+ activestorage (5.2.4.5)
271
+ actionpack (= 5.2.4.5)
272
+ activerecord (= 5.2.4.5)
262
273
  marcel (~> 0.3.1)
263
- activesupport (5.2.4.4)
274
+ activesupport (5.2.4.5)
264
275
  concurrent-ruby (~> 1.0, >= 1.0.2)
265
276
  i18n (>= 0.7, < 2)
266
277
  minitest (~> 5.1)
@@ -271,7 +282,7 @@ GEM
271
282
  public_suffix (>= 2.0.2, < 5.0)
272
283
  anchored (1.1.0)
273
284
  arel (9.0.0)
274
- ast (2.4.1)
285
+ ast (2.4.2)
275
286
  autoprefixer-rails (8.6.5)
276
287
  execjs
277
288
  axiom-types (0.1.1)
@@ -284,7 +295,7 @@ GEM
284
295
  execjs (~> 2.0)
285
296
  batch-loader (1.5.0)
286
297
  bcrypt (3.1.16)
287
- better_html (1.0.15)
298
+ better_html (1.0.16)
288
299
  actionview (>= 4.0)
289
300
  activesupport (>= 4.0)
290
301
  ast (~> 2.0)
@@ -298,18 +309,22 @@ GEM
298
309
  browser (2.7.1)
299
310
  builder (3.2.4)
300
311
  byebug (11.1.3)
301
- capybara (3.33.0)
312
+ capybara (3.35.3)
302
313
  addressable
303
314
  mini_mime (>= 0.1.3)
304
315
  nokogiri (~> 1.8)
305
316
  rack (>= 1.6.0)
306
317
  rack-test (>= 0.6.3)
307
- regexp_parser (~> 1.5)
318
+ regexp_parser (>= 1.5, < 3.0)
308
319
  xpath (~> 3.2)
309
- carrierwave (1.3.1)
310
- activemodel (>= 4.0.0)
311
- activesupport (>= 4.0.0)
312
- 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)
327
+ ssrf_filter (~> 1.0)
313
328
  cells (4.1.7)
314
329
  declarative-builder (< 0.2.0)
315
330
  declarative-option (< 0.2.0)
@@ -322,7 +337,7 @@ GEM
322
337
  actionpack (>= 3.0)
323
338
  cells (>= 4.1.6, < 5.0.0)
324
339
  charlock_holmes (0.7.7)
325
- chef-utils (16.6.14)
340
+ chef-utils (16.10.17)
326
341
  childprocess (3.0.0)
327
342
  coercible (1.0.0)
328
343
  descendants_tracker (~> 0.0.1)
@@ -334,10 +349,12 @@ GEM
334
349
  execjs
335
350
  coffee-script-source (1.12.2)
336
351
  colorize (0.8.1)
337
- concurrent-ruby (1.1.7)
338
- crack (0.4.4)
352
+ concurrent-ruby (1.1.8)
353
+ cookiejar (0.3.3)
354
+ crack (0.4.5)
355
+ rexml
339
356
  crass (1.0.6)
340
- css_parser (1.7.1)
357
+ css_parser (1.9.0)
341
358
  addressable
342
359
  date_validator (0.9.0)
343
360
  activemodel
@@ -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)
@@ -363,43 +386,69 @@ GEM
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)
369
- docile (1.3.2)
389
+ doc2text (0.4.3)
390
+ nokogiri (~> 1.11.1)
391
+ rubyzip (~> 2.3.0)
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
- erb_lint (0.0.30)
409
+ erb_lint (0.0.37)
377
410
  activesupport
378
411
  better_html (~> 1.0.7)
379
412
  html_tokenizer
413
+ parser (>= 2.7.1.4)
380
414
  rainbow
381
- rubocop (~> 0.51)
415
+ rubocop
382
416
  smart_properties
383
417
  erbse (0.1.4)
384
418
  temple
385
- erubi (1.9.0)
419
+ erubi (1.10.0)
386
420
  etherpad-lite (0.3.0)
387
421
  rest-client (>= 1.6)
422
+ eventmachine (1.2.7)
423
+ eventmachine_httpserver (0.2.1)
424
+ excon (0.79.0)
388
425
  execjs (2.7.0)
389
426
  factory_bot (4.11.1)
390
427
  activesupport (>= 3.0.0)
391
428
  factory_bot_rails (4.11.1)
392
429
  factory_bot (~> 4.11.1)
393
430
  railties (>= 3.0.0)
394
- faker (1.9.6)
395
- i18n (>= 0.7)
396
- faraday (1.1.0)
431
+ faker (2.14.0)
432
+ i18n (>= 1.6, < 2)
433
+ faraday (1.3.0)
434
+ faraday-net_http (~> 1.0)
397
435
  multipart-post (>= 1.2, < 3)
398
436
  ruby2_keywords
437
+ faraday-net_http (1.0.1)
438
+ faraday_middleware (1.0.0)
439
+ faraday (~> 1.0)
399
440
  ffi (1.13.1)
400
441
  file_validators (2.3.0)
401
442
  activemodel (>= 3.2)
402
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)
403
452
  foundation-rails (6.6.2.0)
404
453
  railties (>= 3.1.0)
405
454
  sass (>= 3.3.0)
@@ -410,13 +459,20 @@ GEM
410
459
  activesupport (>= 4.1, < 6.0)
411
460
  railties (>= 4.1, < 6.0)
412
461
  tzinfo (~> 1.2, >= 1.2.2)
413
- geocoder (1.6.4)
462
+ geocoder (1.6.5)
414
463
  globalid (0.4.2)
415
464
  activesupport (>= 4.2.0)
416
465
  graphiql-rails (1.4.11)
417
466
  railties
418
467
  sprockets-rails
419
- graphql (1.11.6)
468
+ graphlient (0.4.0)
469
+ faraday (>= 1.0)
470
+ faraday_middleware
471
+ graphql-client
472
+ graphql (1.12.5)
473
+ graphql-client (0.16.0)
474
+ activesupport (>= 3.0)
475
+ graphql (~> 1.8)
420
476
  hashdiff (1.0.1)
421
477
  hashie (4.1.0)
422
478
  highline (2.0.3)
@@ -425,12 +481,10 @@ GEM
425
481
  http-accept (1.7.0)
426
482
  http-cookie (1.0.3)
427
483
  domain_name (~> 0.5)
428
- httparty (0.18.1)
429
- mime-types (~> 3.0)
430
- multi_xml (>= 0.5.2)
431
- i18n (1.8.3)
484
+ http_parser.rb (0.6.0)
485
+ i18n (1.8.9)
432
486
  concurrent-ruby (~> 1.0)
433
- i18n-tasks (0.9.31)
487
+ i18n-tasks (0.9.33)
434
488
  activesupport (>= 4.0.2)
435
489
  ast (>= 2.1.0)
436
490
  erubi
@@ -444,9 +498,11 @@ GEM
444
498
  ice_cube (~> 0.16)
445
499
  ice_cube (0.16.3)
446
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)
447
504
  invisible_captcha (0.13.0)
448
505
  rails (>= 3.2.0)
449
- jaro_winkler (1.5.4)
450
506
  jquery-rails (4.4.0)
451
507
  rails-dom-testing (>= 1, < 3)
452
508
  railties (>= 4.2.0)
@@ -497,16 +553,16 @@ GEM
497
553
  method_source (1.0.0)
498
554
  mime-types (3.3.1)
499
555
  mime-types-data (~> 3.2015)
500
- mime-types-data (3.2020.1104)
556
+ mime-types-data (3.2021.0225)
501
557
  mimemagic (0.3.5)
502
- mini_magick (4.10.1)
558
+ mini_magick (4.11.0)
503
559
  mini_mime (1.0.2)
504
- mini_portile2 (2.4.0)
505
- minitest (5.14.1)
560
+ mini_portile2 (2.5.0)
561
+ minitest (5.14.3)
506
562
  mixlib-cli (2.1.8)
507
563
  mixlib-config (3.0.9)
508
564
  tomlrb
509
- mixlib-shellout (3.1.7)
565
+ mixlib-shellout (3.2.5)
510
566
  chef-utils
511
567
  msgpack (1.3.3)
512
568
  multi_json (1.15.0)
@@ -514,11 +570,12 @@ GEM
514
570
  multipart-post (2.1.1)
515
571
  mustache (1.1.1)
516
572
  netrc (0.11.0)
517
- nio4r (2.5.2)
573
+ nio4r (2.5.5)
518
574
  nobspw (0.6.2)
519
- nokogiri (1.10.9)
520
- mini_portile2 (~> 2.4.0)
521
- oauth (0.5.4)
575
+ nokogiri (1.11.1)
576
+ mini_portile2 (~> 2.5.0)
577
+ racc (~> 1.4)
578
+ oauth (0.5.5)
522
579
  oauth2 (1.4.4)
523
580
  faraday (>= 0.8, < 2.0)
524
581
  jwt (>= 1.0, < 3.0)
@@ -530,16 +587,17 @@ GEM
530
587
  rack (>= 1.6.2, < 3)
531
588
  omniauth-facebook (5.0.0)
532
589
  omniauth-oauth2 (~> 1.2)
533
- omniauth-google-oauth2 (0.8.0)
590
+ omniauth-google-oauth2 (0.8.1)
534
591
  jwt (>= 2.0)
592
+ oauth2 (~> 1.1)
535
593
  omniauth (>= 1.1.1)
536
594
  omniauth-oauth2 (>= 1.6)
537
- omniauth-oauth (1.1.0)
595
+ omniauth-oauth (1.2.0)
538
596
  oauth
539
- omniauth (~> 1.0)
540
- omniauth-oauth2 (1.7.0)
597
+ omniauth (>= 1.0, < 3)
598
+ omniauth-oauth2 (1.7.1)
541
599
  oauth2 (~> 1.4)
542
- omniauth (~> 1.9)
600
+ omniauth (>= 1.9, < 3)
543
601
  omniauth-rails_csrf_protection (0.1.2)
544
602
  actionpack (>= 4.2)
545
603
  omniauth (>= 1.3.1)
@@ -552,11 +610,11 @@ GEM
552
610
  paper_trail (10.3.1)
553
611
  activerecord (>= 4.2)
554
612
  request_store (~> 1.1)
555
- parallel (1.19.2)
556
- parser (2.7.2.0)
613
+ parallel (1.20.1)
614
+ parser (3.0.0.0)
557
615
  ast (~> 2.4.1)
558
616
  pg (1.1.4)
559
- pg_search (2.3.4)
617
+ pg_search (2.3.5)
560
618
  activerecord (>= 5.2)
561
619
  activesupport (>= 5.2)
562
620
  premailer (1.14.2)
@@ -567,27 +625,36 @@ GEM
567
625
  actionmailer (>= 3)
568
626
  premailer (~> 1.7, >= 1.7.9)
569
627
  public_suffix (4.0.5)
570
- puma (4.3.5)
628
+ puffing-billy (2.4.1)
629
+ addressable (~> 2.5)
630
+ em-http-request (~> 1.1, >= 1.1.0)
631
+ em-synchrony
632
+ eventmachine (~> 1.2)
633
+ eventmachine_httpserver
634
+ http_parser.rb (~> 0.6.0)
635
+ multi_json
636
+ puma (5.1.1)
571
637
  nio4r (~> 2.0)
638
+ racc (1.5.2)
572
639
  rack (2.2.3)
573
- rack-attack (6.3.1)
640
+ rack-attack (6.5.0)
574
641
  rack (>= 1.0, < 3)
575
642
  rack-cors (1.1.1)
576
643
  rack (>= 2.0.0)
577
644
  rack-test (1.1.0)
578
645
  rack (>= 1.0, < 3)
579
- rails (5.2.4.4)
580
- actioncable (= 5.2.4.4)
581
- actionmailer (= 5.2.4.4)
582
- actionpack (= 5.2.4.4)
583
- actionview (= 5.2.4.4)
584
- activejob (= 5.2.4.4)
585
- activemodel (= 5.2.4.4)
586
- activerecord (= 5.2.4.4)
587
- activestorage (= 5.2.4.4)
588
- activesupport (= 5.2.4.4)
646
+ rails (5.2.4.5)
647
+ actioncable (= 5.2.4.5)
648
+ actionmailer (= 5.2.4.5)
649
+ actionpack (= 5.2.4.5)
650
+ actionview (= 5.2.4.5)
651
+ activejob (= 5.2.4.5)
652
+ activemodel (= 5.2.4.5)
653
+ activerecord (= 5.2.4.5)
654
+ activestorage (= 5.2.4.5)
655
+ activesupport (= 5.2.4.5)
589
656
  bundler (>= 1.3.0)
590
- railties (= 5.2.4.4)
657
+ railties (= 5.2.4.5)
591
658
  sprockets-rails (>= 2.0.0)
592
659
  rails-controller-testing (1.0.5)
593
660
  actionpack (>= 5.0.1.rc1)
@@ -601,14 +668,14 @@ GEM
601
668
  rails-i18n (5.1.3)
602
669
  i18n (>= 0.7, < 2)
603
670
  railties (>= 5.0, < 6)
604
- railties (5.2.4.4)
605
- actionpack (= 5.2.4.4)
606
- activesupport (= 5.2.4.4)
671
+ railties (5.2.4.5)
672
+ actionpack (= 5.2.4.5)
673
+ activesupport (= 5.2.4.5)
607
674
  method_source
608
675
  rake (>= 0.8.7)
609
676
  thor (>= 0.19.0, < 2.0)
610
677
  rainbow (3.0.0)
611
- rake (13.0.1)
678
+ rake (13.0.3)
612
679
  ransack (2.1.1)
613
680
  actionpack (>= 5.0)
614
681
  activerecord (>= 5.0)
@@ -623,9 +690,9 @@ GEM
623
690
  activesupport (>= 4.1.0)
624
691
  virtus (~> 1.0.5)
625
692
  wisper (>= 1.6.1)
626
- redcarpet (3.5.0)
627
- redis (4.2.2)
628
- regexp_parser (1.8.2)
693
+ redcarpet (3.5.1)
694
+ redis (4.2.5)
695
+ regexp_parser (2.1.1)
629
696
  request_store (1.5.0)
630
697
  rack (>= 1.4)
631
698
  responders (3.0.1)
@@ -668,28 +735,36 @@ GEM
668
735
  rspec-support (3.9.4)
669
736
  rspec_junit_formatter (0.3.0)
670
737
  rspec-core (>= 2, < 4, != 2.12.0)
671
- rubocop (0.71.0)
672
- jaro_winkler (~> 1.5.1)
738
+ rubocop (0.92.0)
673
739
  parallel (~> 1.10)
674
- parser (>= 2.6)
740
+ parser (>= 2.7.1.5)
675
741
  rainbow (>= 2.2.2, < 4.0)
742
+ regexp_parser (>= 1.7)
743
+ rexml
744
+ rubocop-ast (>= 0.5.0)
676
745
  ruby-progressbar (~> 1.7)
677
- unicode-display_width (>= 1.4.0, < 1.7)
678
- rubocop-rails (2.0.1)
746
+ unicode-display_width (>= 1.4.0, < 2.0)
747
+ rubocop-ast (1.4.1)
748
+ parser (>= 2.7.1.5)
749
+ rubocop-rails (2.9.1)
750
+ activesupport (>= 4.2.0)
679
751
  rack (>= 1.1)
680
- rubocop (>= 0.70.0)
681
- rubocop-rspec (1.41.0)
682
- rubocop (>= 0.68.1)
752
+ rubocop (>= 0.90.0, < 2.0)
753
+ rubocop-rspec (1.44.1)
754
+ rubocop (~> 0.87)
755
+ rubocop-ast (>= 0.7.1)
683
756
  ruby-ole (1.2.12.2)
684
- ruby-progressbar (1.10.1)
685
- ruby2_keywords (0.0.2)
686
- rubyzip (2.0.0)
757
+ ruby-progressbar (1.11.0)
758
+ ruby-vips (2.0.17)
759
+ ffi (~> 1.9)
760
+ ruby2_keywords (0.0.4)
761
+ rubyzip (2.3.0)
687
762
  sass (3.7.4)
688
763
  sass-listen (~> 4.0.0)
689
764
  sass-listen (4.0.0)
690
765
  rb-fsevent (~> 0.9, >= 0.9.4)
691
766
  rb-inotify (~> 0.9, >= 0.9.7)
692
- sassc (2.3.0)
767
+ sassc (2.4.0)
693
768
  ffi (~> 1.9)
694
769
  sassc-rails (2.1.2)
695
770
  railties (>= 4.0.0)
@@ -711,8 +786,8 @@ GEM
711
786
  smart_properties (1.15.0)
712
787
  social-share-button (1.2.3)
713
788
  coffee-rails
714
- spreadsheet (1.2.6)
715
- ruby-ole (>= 1.0)
789
+ spreadsheet (1.2.8)
790
+ ruby-ole
716
791
  spring (2.1.0)
717
792
  spring-watcher-listen (2.0.1)
718
793
  listen (>= 2.7, < 4.0)
@@ -728,19 +803,20 @@ GEM
728
803
  actionpack (>= 4.0)
729
804
  activesupport (>= 4.0)
730
805
  sprockets (>= 3.0.0)
806
+ ssrf_filter (1.0.7)
731
807
  system_test_html_screenshots (0.1.2)
732
808
  actionpack (>= 5.2, < 6.0.a)
733
809
  temple (0.8.2)
734
- terminal-table (2.0.0)
810
+ terminal-table (3.0.0)
735
811
  unicode-display_width (~> 1.1, >= 1.1.1)
736
- thor (1.0.1)
812
+ thor (1.1.0)
737
813
  thread_safe (0.3.6)
738
814
  tilt (2.0.10)
739
- tomlrb (1.3.0)
815
+ tomlrb (2.0.1)
740
816
  truncato (0.7.11)
741
817
  htmlentities (~> 4.3.1)
742
818
  nokogiri (>= 1.7.0, <= 2.0)
743
- tzinfo (1.2.7)
819
+ tzinfo (1.2.9)
744
820
  thread_safe (~> 0.1)
745
821
  uber (0.1.0)
746
822
  uglifier (4.2.0)
@@ -748,10 +824,11 @@ GEM
748
824
  unf (0.1.4)
749
825
  unf_ext
750
826
  unf_ext (0.0.7.7)
751
- unicode-display_width (1.6.1)
827
+ unicode-display_width (1.7.0)
752
828
  valid_email2 (2.3.1)
753
829
  activemodel (>= 3.2)
754
830
  mail (~> 2.5)
831
+ vcr (6.0.0)
755
832
  virtus (1.0.5)
756
833
  axiom-types (~> 0.1)
757
834
  coercible (~> 1.0)
@@ -766,7 +843,7 @@ GEM
766
843
  activemodel (>= 5.0)
767
844
  bindex (>= 0.4.0)
768
845
  railties (>= 5.0)
769
- webmock (3.9.3)
846
+ webmock (3.12.0)
770
847
  addressable (>= 2.3.6)
771
848
  crack (>= 0.3.2)
772
849
  hashdiff (>= 0.4.0, < 2.0.0)
@@ -790,14 +867,16 @@ DEPENDENCIES
790
867
  bootsnap (~> 1.3)
791
868
  byebug (~> 11.0)
792
869
  decidim!
870
+ decidim-conferences!
793
871
  decidim-consultations!
794
872
  decidim-dev!
873
+ decidim-elections!
795
874
  decidim-initiatives!
796
875
  decidim-templates!
797
- faker (~> 1.9)
876
+ faker (~> 2.14)
798
877
  letter_opener_web (~> 1.3)
799
878
  listen (~> 3.1)
800
- puma (>= 4.3.5)
879
+ puma (>= 5.0.0)
801
880
  spring (~> 2.0)
802
881
  spring-watcher-listen (~> 2.0)
803
882
  uglifier (~> 4.1)
@@ -805,7 +884,7 @@ DEPENDENCIES
805
884
  wicked_pdf (~> 1.4)
806
885
 
807
886
  RUBY VERSION
808
- ruby 2.6.6p146
887
+ ruby 2.7.1p83
809
888
 
810
889
  BUNDLED WITH
811
890
  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.0"
7
+ "0.24.0.rc1"
8
8
  end
9
9
  end
10
10
  end
metadata CHANGED
@@ -1,16 +1,16 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-generators
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.23.0
4
+ version: 0.24.0.rc1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josep Jaume Rey Peroy
8
8
  - Marc Riera Casals
9
9
  - Oriol Gual Oliva
10
- autorequire:
10
+ autorequire:
11
11
  bindir: exe
12
12
  cert_chain: []
13
- date: 2020-11-05 00:00:00.000000000 Z
13
+ date: 2021-03-01 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.0
21
+ version: 0.24.0.rc1
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.0
28
+ version: 0.24.0.rc1
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: bundler
31
31
  requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ homepage: https://github.com/decidim/decidim
109
109
  licenses:
110
110
  - AGPL-3.0
111
111
  metadata: {}
112
- post_install_message:
112
+ post_install_message:
113
113
  rdoc_options: []
114
114
  require_paths:
115
115
  - lib
@@ -117,15 +117,15 @@ 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
- version: '0'
125
+ version: 1.3.1
126
126
  requirements: []
127
- rubygems_version: 3.0.3
128
- signing_key:
127
+ rubygems_version: 3.1.2
128
+ signing_key:
129
129
  specification_version: 4
130
130
  summary: Citizen participation framework for Ruby on Rails.
131
131
  test_files: []